diff --git a/src/MNH/aircraft_balloon.f90 b/src/MNH/aircraft_balloon.f90 index 153d76fe61b3174ea15d8e7546a8acf6cc4ddc74..ef6648cd6972e9caf618a7fa101eca6d44f82d66 100644 --- a/src/MNH/aircraft_balloon.f90 +++ b/src/MNH/aircraft_balloon.f90 @@ -34,7 +34,7 @@ REAL, DIMENSION(:,:), INTENT(IN) :: PTS ! surface temperature ! ++ OC REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! dry air density of the reference state REAL, DIMENSION(:,:,:), INTENT(IN) :: PCIT ! pristine ice concentration -REAL, DIMENSION(:,:),INTENT(IN) :: PSEA +REAL, DIMENSION(:,:),OPTIONAL,INTENT(IN) :: PSEA ! -- OC ! !------------------------------------------------------------------------------- diff --git a/src/MNH/aircraft_balloon_evol.f90 b/src/MNH/aircraft_balloon_evol.f90 index 9642bcc4e8de8a731373a2db1fc3b94934abb8ce..930b6e37ebfff8a3b52f2f66fb6ac95fdd495b3e 100644 --- a/src/MNH/aircraft_balloon_evol.f90 +++ b/src/MNH/aircraft_balloon_evol.f90 @@ -37,7 +37,7 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! dry air density of the re REAL, DIMENSION(:,:,:), INTENT(IN) :: PCIT ! pristine ice concentration ! TYPE(FLYER), INTENT(INOUT) :: TPFLYER! balloon/aircraft -REAL, DIMENSION(:,:), INTENT(IN) :: PSEA +REAL, DIMENSION(:,:),OPTIONAL,INTENT(IN) :: PSEA ! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90 index cd4f419175b5f9e2164687d3aa04ba4db0600766..9fd9da5c079211d190a13c6ae956eba9bc110075 100644 --- a/src/MNH/modeln.f90 +++ b/src/MNH/modeln.f90 @@ -2106,12 +2106,23 @@ XT_STEP_SWA = XT_STEP_SWA + ZTIME2 - ZTIME1 - XTIME_BU_PROCESS ! ZTIME1 = ZTIME2 ! -IF (LFLYER) & - CALL AIRCRAFT_BALLOON(XTSTEP, & +IF (LFLYER) THEN + IF (CSURF=='EXTE') THEN + ALLOCATE(ZSEA(IIU,IJU)) + ZSEA(:,:) = 0. + CALL MNHGET_SURF_PARAM_n (PSEA=ZSEA(:,:)) + CALL AIRCRAFT_BALLOON(XTSTEP, & XXHAT, XYHAT, XZZ, XMAP, XLONORI, XLATORI, & XUT, XVT, XWT, XPABST, XTHT, XRT, XSVT, XTKET, XTSRAD, & XRHODREF,XCIT,PSEA=ZSEA(:,:)) - + DEALLOCATE(ZSEA) + ELSE + CALL AIRCRAFT_BALLOON(XTSTEP, & + XXHAT, XYHAT, XZZ, XMAP, XLONORI, XLATORI, & + XUT, XVT, XWT, XPABST, XTHT, XRT, XSVT, XTKET, XTSRAD, & + XRHODREF,XCIT) + END IF +END IF !------------------------------------------------------------------------------- !