diff --git a/src/MNH/khko_notadjust.f90 b/src/MNH/khko_notadjust.f90
index 344c2e97643255c8eca1400ab2da6eeb7bd860a0..4ec4ecdab00f6597c1468a95ecef7af467dbf38b 100644
--- a/src/MNH/khko_notadjust.f90
+++ b/src/MNH/khko_notadjust.f90
@@ -10,7 +10,7 @@
INTERFACE
!
SUBROUTINE KHKO_NOTADJUST(KRR, KTCOUNT, TPFILE, HRAD, &
- PTSTEP, PRHODJ, PPABSM, PPABST, PRHODREF, PZZ, &
+ PTSTEP, PRHODJ, PPABSTT, PPABST, PRHODREF, PZZ, &
PTHT,PRVT,PRCT,PRRT, &
PTHS, PRVS, PRCS, PRRS, PCCS, PCNUCS, PSAT, &
PCLDFR, PSRCS, PNPRO,PSSPRO )
@@ -25,7 +25,7 @@ REAL, INTENT(IN) :: PTSTEP ! Double Time step
! (single if cold start)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Absolute Pressure at t-dt
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Absolute Pressure at t+dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! Absolute Pressure at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! Reference density
REAL, DIMENSION(:,:,:), INTENT(IN) :: PZZ ! Reference density
@@ -58,7 +58,7 @@ END MODULE MODI_KHKO_NOTADJUST
!
! ###############################################################################
SUBROUTINE KHKO_NOTADJUST(KRR, KTCOUNT, TPFILE, HRAD, &
- PTSTEP, PRHODJ, PPABSM, PPABST, PRHODREF, PZZ, &
+ PTSTEP, PRHODJ, PPABSTT, PPABST, PRHODREF, PZZ, &
PTHT,PRVT,PRCT,PRRT, &
PTHS, PRVS, PRCS, PRRS, PCCS, PCNUCS, PSAT, &
PCLDFR, PSRCS, PNPRO,PSSPRO )
@@ -133,7 +133,7 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVT ! Water vapor m.r.
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRCT ! Cloud water m.r.
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRRT ! Rain water m.r.
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Absolute Pressure at t-dt
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Absolute Pressure at t+dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! Absolute Pressure at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! Reference density
REAL, DIMENSION(:,:,:), INTENT(IN) :: PZZ ! Reference density
@@ -233,7 +233,7 @@ ZACT(:,:,:) = PCCS(:,:,:)
!
!* 2.2 estimate the Exner function at t+1 and t respectively
!
-ZEXNS(:,:,:)=((2.* PPABST(:,:,:)-PPABSM(:,:,:))/XP00 )**(XRD/XCPD)
+ZEXNS(:,:,:)=(PPABSTT(:,:,:)/XP00 )**(XRD/XCPD)
ZEXNT(:,:,:)=(PPABST(:,:,:)/XP00 )**(XRD/XCPD)
!sources terms *dt
PRRS(:,:,:) = PRRS(:,:,:) * PTSTEP
@@ -288,7 +288,7 @@ IF( INUCT >= 1 ) THEN
ALLOCATE(ZZLV(INUCT))
ALLOCATE(ZZCPH(INUCT))
DO JL=1,INUCT
- ZPRES(JL) = 2. * PPABST(I1(JL),I2(JL),I3(JL)) - PPABSM(I1(JL),I2(JL),I3(JL))
+ ZPRES(JL) = PPABSTT(I1(JL),I2(JL),I3(JL))
ZRHOD(JL) = PRHODREF(I1(JL),I2(JL),I3(JL))
ZRR(JL) = PRRS(I1(JL),I2(JL),I3(JL))
ZTT(JL) = PTHS(I1(JL),I2(JL),I3(JL))
@@ -337,7 +337,7 @@ ENDIF
WHERE(.NOT.GNUCT(:,:,:) )
ZRVSAT(:,:,:) = EXP(XALPW-XBETAW/PTHS(:,:,:)-XGAMW*ALOG(PTHS(:,:,:)))
!rvsat
- ZRVSAT(:,:,:) = (XMV / XMD)*ZRVSAT(:,:,:)/((2.* PPABST(:,:,:)-PPABSM(:,:,:))-ZRVSAT(:,:,:))
+ ZRVSAT(:,:,:) = (XMV / XMD)*ZRVSAT(:,:,:)/(PPABSTT(:,:,:)-ZRVSAT(:,:,:))
PSAT(:,:,:) = (PRVS(:,:,:)/ZRVSAT(:,:,:))-1D0
ENDWHERE
!
diff --git a/src/MNH/lima.f90 b/src/MNH/lima.f90
index 2085d5333d101083aaef16a0f40c5ddf2ab19b3e..9859c4bd02f194d19caae1e7e1cbd7c522344a7c 100644
--- a/src/MNH/lima.f90
+++ b/src/MNH/lima.f90
@@ -12,7 +12,7 @@ INTERFACE
SUBROUTINE LIMA ( KKA, KKU, KKL, &
PTSTEP, TPFILE, &
PRHODREF, PEXNREF, PDZZ, &
- PRHODJ, PPABSM, PPABST, &
+ PRHODJ, PPABST, &
NCCN, NIFN, NIMM, &
PDTHRAD, PTHT, PRT, PSVT, PW_NU, &
PTHS, PRS, PSVS, &
@@ -34,7 +34,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference Exner function
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! Layer thikness (m)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! absolute pressure at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! absolute pressure at t
!
INTEGER, INTENT(IN) :: NCCN ! for array size declarations
@@ -73,7 +72,7 @@ END MODULE MODI_LIMA
SUBROUTINE LIMA ( KKA, KKU, KKL, &
PTSTEP, TPFILE, &
PRHODREF, PEXNREF, PDZZ, &
- PRHODJ, PPABSM, PPABST, &
+ PRHODJ, PPABST, &
NCCN, NIFN, NIMM, &
PDTHRAD, PTHT, PRT, PSVT, PW_NU, &
PTHS, PRS, PSVS, &
@@ -159,7 +158,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference Exner function
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! Layer thikness (m)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! absolute pressure at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! absolute pressure at t
!
INTEGER, INTENT(IN) :: NCCN ! for array size declarations
diff --git a/src/MNH/lima_adjust.f90 b/src/MNH/lima_adjust.f90
index 780582ea3830a21a373b876d4fe622cb91cfbefc..189fe45146155c66740f559f4db5c9e2bd006a29 100644
--- a/src/MNH/lima_adjust.f90
+++ b/src/MNH/lima_adjust.f90
@@ -11,8 +11,8 @@ INTERFACE
!
SUBROUTINE LIMA_ADJUST(KRR, KMI, TPFILE, &
OSUBG_COND, PTSTEP, &
- PRHODREF, PRHODJ, PEXNREF, PPABSM, &
- PPABST, &
+ PRHODREF, PRHODJ, PEXNREF, &
+ PPABST, PPABSTT, &
PRT, PRS, PSVT, PSVS, &
PTHS, PSRCS, PCLDFR, PICEFR, PRAINFR )
!
@@ -30,8 +30,8 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! Dry density of the
! reference state
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference Exner function
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Absolute Pressure at t-dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! Absolute Pressure at t
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Absolute Pressure at t+dt
!
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT ! m.r. at t
!
@@ -59,8 +59,8 @@ END MODULE MODI_LIMA_ADJUST
! #############################################################
SUBROUTINE LIMA_ADJUST(KRR, KMI, TPFILE, &
OSUBG_COND, PTSTEP, &
- PRHODREF, PRHODJ, PEXNREF, PPABSM, &
- PPABST, &
+ PRHODREF, PRHODJ, PEXNREF, &
+ PPABST, PPABSTT, &
PRT, PRS, PSVT, PSVS, &
PTHS, PSRCS, PCLDFR, PICEFR, PRAINFR )
! #############################################################
@@ -187,8 +187,8 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! Dry density of the
! reference state
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference Exner function
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Absolute Pressure at t-dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! Absolute Pressure at t
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Absolute Pressure at t+dt
!
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT ! m.r. at t
!
@@ -440,7 +440,7 @@ END WHERE
!
!* 2.2 estimate the Exner function at t+1
!
-ZEXNS(:,:,:) = ( (2. * PPABST(:,:,:) - PPABSM(:,:,:)) / XP00 ) ** (XRD/XCPD)
+ZEXNS(:,:,:) = ( PPABSTT(:,:,:) / XP00 ) ** (XRD/XCPD)
!
! beginning of the iterative loop
!
@@ -515,7 +515,7 @@ IF( IMICRO >= 1 ) THEN
!
ZRHODREF(JL) = PRHODREF(I1(JL),I2(JL),I3(JL))
ZZT(JL) = ZT(I1(JL),I2(JL),I3(JL))
- ZPRES(JL) = 2.0*PPABST(I1(JL),I2(JL),I3(JL))-PPABSM(I1(JL),I2(JL),I3(JL))
+ ZPRES(JL) = PPABSTT(I1(JL),I2(JL),I3(JL))
ZEXNREF(JL) = PEXNREF(I1(JL),I2(JL),I3(JL))
ZZCPH(JL) = ZCPH(I1(JL),I2(JL),I3(JL))
ENDDO
@@ -665,7 +665,7 @@ IF( IMICRO >= 1 ) THEN
!
ZRHODREF(JL) = PRHODREF(I1(JL),I2(JL),I3(JL))
ZZT(JL) = ZT(I1(JL),I2(JL),I3(JL))
- ZPRES(JL) = 2.0*PPABST(I1(JL),I2(JL),I3(JL))-PPABSM(I1(JL),I2(JL),I3(JL))
+ ZPRES(JL) = PPABSTT(I1(JL),I2(JL),I3(JL))
ZEXNREF(JL) = PEXNREF(I1(JL),I2(JL),I3(JL))
ZZCPH(JL) = ZCPH(I1(JL),I2(JL),I3(JL))
ENDDO
@@ -801,7 +801,7 @@ IF( IMICRO >= 1 ) THEN
!
ZRHODREF(JL) = PRHODREF(I1(JL),I2(JL),I3(JL))
ZZT(JL) = ZT(I1(JL),I2(JL),I3(JL))
- ZPRES(JL) = 2.0*PPABST(I1(JL),I2(JL),I3(JL))-PPABSM(I1(JL),I2(JL),I3(JL))
+ ZPRES(JL) = PPABSTT(I1(JL),I2(JL),I3(JL))
ZEXNREF(JL) = PEXNREF(I1(JL),I2(JL),I3(JL))
ZZCPH(JL) = ZCPH(I1(JL),I2(JL),I3(JL))
ENDDO
@@ -1253,7 +1253,7 @@ END IF
IF ( tpfile%lopened ) THEN
ZT(:,:,:) = ( PTHS(:,:,:) * ZDT ) * ZEXNS(:,:,:)
ZW(:,:,:) = EXP( XALPI - XBETAI/ZT(:,:,:) - XGAMI*ALOG(ZT(:,:,:) ) )
- ZW1(:,:,:)= 2.0*PPABST(:,:,:)-PPABSM(:,:,:)
+ ZW1(:,:,:)= PPABSTT(:,:,:)
ZW(:,:,:) = PRVT(:,:,:)*( ZW1(:,:,:)-ZW(:,:,:) ) / ( (XMV/XMD) * ZW(:,:,:) ) - 1.0
TZFIELD%CMNHNAME = 'SSI'
diff --git a/src/MNH/lima_adjust_split.f90 b/src/MNH/lima_adjust_split.f90
index 816ffd470589e578ce8df50d105a2f88c741d33f..3ddcc4049d622e5c529c5a5868c0283affc2cd5a 100644
--- a/src/MNH/lima_adjust_split.f90
+++ b/src/MNH/lima_adjust_split.f90
@@ -11,8 +11,8 @@ INTERFACE
!
SUBROUTINE LIMA_ADJUST_SPLIT(KRR, KMI, TPFILE, HCONDENS, HLAMBDA3, &
OSUBG_COND, OSIGMAS, PTSTEP, PSIGQSAT, &
- PRHODREF, PRHODJ, PEXNREF, PPABSM, PSIGS, PMFCONV, &
- PPABST, PZZ, PDTHRAD, PW_NU, &
+ PRHODREF, PRHODJ, PEXNREF, PSIGS, PMFCONV, &
+ PPABST, PPABSTT, PZZ, PDTHRAD, PW_NU, &
PRT, PRS, PSVT, PSVS, &
PTHS, PSRCS, PCLDFR, PICEFR, PRC_MF, PRI_MF, PCF_MF)
!
@@ -36,10 +36,10 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! Dry density of the
! reference state
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference Exner function
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Absolute Pressure at t-dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSIGS ! Sigma_s at time t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PMFCONV !
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! Absolute Pressure at t
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Absolute Pressure at t+dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PZZ !
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDTHRAD ! Radiative temperature tendency
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
@@ -72,8 +72,8 @@ END MODULE MODI_LIMA_ADJUST_SPLIT
! ###########################################################################
SUBROUTINE LIMA_ADJUST_SPLIT(KRR, KMI, TPFILE, HCONDENS, HLAMBDA3, &
OSUBG_COND, OSIGMAS, PTSTEP, PSIGQSAT, &
- PRHODREF, PRHODJ, PEXNREF, PPABSM, PSIGS, PMFCONV, &
- PPABST, PZZ, PDTHRAD, PW_NU, &
+ PRHODREF, PRHODJ, PEXNREF, PSIGS, PMFCONV, &
+ PPABST, PPABSTT, PZZ, PDTHRAD, PW_NU, &
PRT, PRS, PSVT, PSVS, &
PTHS, PSRCS, PCLDFR, PICEFR, PRC_MF, PRI_MF, PCF_MF)
! ###########################################################################
@@ -198,10 +198,10 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! Dry density of the
! reference state
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference Exner function
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Absolute Pressure at t-dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSIGS ! Sigma_s at time t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PMFCONV !
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! Absolute Pressure at t
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Absolute Pressure at t+dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PZZ !
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDTHRAD ! Radiative temperature tendency
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
@@ -462,7 +462,7 @@ END WHERE
!
!* 2.2 estimate the Exner function at t+1
!
-ZEXNS(:,:,:) = ( (2. * PPABST(:,:,:) - PPABSM(:,:,:)) / XP00 ) ** (XRD/XCPD)
+ZEXNS(:,:,:) = ( PPABSTT(:,:,:) / XP00 ) ** (XRD/XCPD)
!
! beginning of the iterative loop
!
@@ -722,7 +722,7 @@ END IF
IF ( tpfile%lopened ) THEN
ZT(:,:,:) = ( PTHS(:,:,:) * ZDT ) * ZEXNS(:,:,:)
ZW(:,:,:) = EXP( XALPI - XBETAI/ZT(:,:,:) - XGAMI*ALOG(ZT(:,:,:) ) )
- ZW1(:,:,:)= 2.0*PPABST(:,:,:)-PPABSM(:,:,:)
+ ZW1(:,:,:)= PPABSTT(:,:,:)
ZW(:,:,:) = PRVT(:,:,:)*( ZW1(:,:,:)-ZW(:,:,:) ) / ( (XMV/XMD) * ZW(:,:,:) ) - 1.0
TZFIELD%CMNHNAME = 'SSI'
diff --git a/src/MNH/lima_cold.f90 b/src/MNH/lima_cold.f90
index 431f44e88aded8270bf7318da1cecb75568a525e..56ee422eb7a119cf64698742900da317719b4c39 100644
--- a/src/MNH/lima_cold.f90
+++ b/src/MNH/lima_cold.f90
@@ -11,7 +11,6 @@ INTERFACE
SUBROUTINE LIMA_COLD (OSEDI, OHHONI, KSPLITG, PTSTEP, KMI, &
KRR, PZZ, PRHODJ, &
PRHODREF, PEXNREF, PPABST, PW_NU, &
- PTHM, PPABSM, &
PTHT, PRT, PSVT, &
PTHS, PRS, PSVS, &
PINPRS, PINPRG, PINPRH)
@@ -36,9 +35,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! abs. pressure at time t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
! the nucleation param.
!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHM ! Theta at time t-dt
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! abs. pressure at time t-dt
-!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHT ! Theta at time t
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT ! m.r. at t
REAL, DIMENSION(:,:,:,NSV_LIMA_BEG:), INTENT(IN) :: PSVT ! Concentrations at time t
@@ -59,7 +55,6 @@ END MODULE MODI_LIMA_COLD
SUBROUTINE LIMA_COLD (OSEDI, OHHONI, KSPLITG, PTSTEP, KMI, &
KRR, PZZ, PRHODJ, &
PRHODREF, PEXNREF, PPABST, PW_NU, &
- PTHM, PPABSM, &
PTHT, PRT, PSVT, &
PTHS, PRS, PSVS, &
PINPRS, PINPRG, PINPRH)
@@ -154,9 +149,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! abs. pressure at time t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
! the nucleation param.
!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHM ! Theta at time t-dt
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! abs. pressure at time t-dt
-!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHT ! Theta at time t
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT ! m.r. at t
REAL, DIMENSION(:,:,:,NSV_LIMA_BEG:), INTENT(IN) :: PSVT ! Concentrations at time t
diff --git a/src/MNH/lima_mixed.f90 b/src/MNH/lima_mixed.f90
index 2045b158c24f4e476234b284ecd06052ca4cb209..400969656b513327addf6ebc070bff61d2e22fce 100644
--- a/src/MNH/lima_mixed.f90
+++ b/src/MNH/lima_mixed.f90
@@ -11,7 +11,6 @@ INTERFACE
SUBROUTINE LIMA_MIXED (OSEDI, OHHONI, KSPLITG, PTSTEP, KMI, &
KRR, PZZ, PRHODJ, &
PRHODREF, PEXNREF, PPABST, PW_NU, &
- PTHM, PPABSM, &
PTHT, PRT, PSVT, &
PTHS, PRS, PSVS)
!
@@ -35,9 +34,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! abs. pressure at time t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
! the nucleation param.
!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHM ! Theta at time t-dt
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! abs. pressure at time t-dt
-!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHT ! Theta at time t
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT ! m.r. at t
REAL, DIMENSION(:,:,:,NSV_LIMA_BEG:), INTENT(IN) :: PSVT ! Concentrations at time t
@@ -54,7 +50,6 @@ END MODULE MODI_LIMA_MIXED
SUBROUTINE LIMA_MIXED (OSEDI, OHHONI, KSPLITG, PTSTEP, KMI, &
KRR, PZZ, PRHODJ, &
PRHODREF, PEXNREF, PPABST, PW_NU, &
- PTHM, PPABSM, &
PTHT, PRT, PSVT, &
PTHS, PRS, PSVS )
! #######################################################################
@@ -145,9 +140,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! abs. pressure at time t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
! the nucleation param.
!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHM ! Theta at time t-dt
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! abs. pressure at time t-dt
-!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHT ! Theta at time t
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT ! m.r. at t
REAL, DIMENSION(:,:,:,NSV_LIMA_BEG:), INTENT(IN) :: PSVT ! Concentrations at time t
@@ -543,7 +535,6 @@ IF( IMICRO >= 0 ) THEN
WHERE (ZRIT(:)>XRTMIN(4) .AND. ZCIT(:)>XCTMIN(4))
ZLBDAI(:) = ( XLBI*ZCIT(:) / ZRIT(:) )**XLBEXI
END WHERE
- ZLBDAS(:) = 1.E10
IF (LSNOW_T .AND. NMOM_S.EQ.1) THEN
WHERE(ZZT(:)>263.15 .AND. ZRST(:)>XRTMIN(5))
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX, 10**(14.554-0.0423*ZZT(:))),XLBDAS_MIN)
@@ -559,11 +550,16 @@ IF( IMICRO >= 0 ) THEN
ZLBDAS(:) = ( XLBS*ZCST(:) / ZRST(:) )**XLBEXS
END WHERE
ELSE
+ ZLBDAS(:) = 1.E10
+ WHERE (ZRSS(:)>XRTMIN(5)/PTSTEP)
+ ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*( ZRHODREF(:)*ZRSS(:)*PTSTEP )**XLBEXS),XLBDAS_MIN)
+ END WHERE
+ ZCSS(:) = XCCS*ZLBDAS(:)**XCXS / ZRHODREF(:) / PTSTEP
+ ZLBDAS(:) = 1.E10
WHERE (ZRST(:)>XRTMIN(5) )
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*( ZRHODREF(:)*ZRST(:) )**XLBEXS),XLBDAS_MIN)
END WHERE
ZCST(:) = XCCS*ZLBDAS(:)**XCXS / ZRHODREF(:)
- ZCSS(:) = XCCS*ZLBDAS(:)**XCXS / ZRHODREF(:)
END IF
ZLBDAG(:) = 1.E10
if (NMOM_G.GE.2) then
diff --git a/src/MNH/lima_notadjust.f90 b/src/MNH/lima_notadjust.f90
index d63305ede9cd7aee3dbe5883e9ee2dcfcea2f60b..42a0b33d59f64b1be5a978b25edc8970fd9b4331 100644
--- a/src/MNH/lima_notadjust.f90
+++ b/src/MNH/lima_notadjust.f90
@@ -10,7 +10,7 @@
INTERFACE
!
SUBROUTINE LIMA_NOTADJUST(KMI, TPFILE, HRAD, &
- PTSTEP, PRHODJ, PPABSM, PPABST, PRHODREF, PEXNREF, PZZ, &
+ PTSTEP, PRHODJ, PPABSTT, PPABST, PRHODREF, PEXNREF, PZZ, &
PTHT,PRT, PSVT, PTHS, PRS,PSVS, PCLDFR, PICEFR, PRAINFR, PSRCS )
!
USE MODD_IO, ONLY: TFILEDATA
@@ -22,7 +22,7 @@ REAL, INTENT(IN) :: PTSTEP ! Double Time step
! (single if cold start)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Absolute Pressure at t-dt
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Absolute Pressure at t+dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! Absolute Pressure at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! Reference density
REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference density
@@ -50,7 +50,7 @@ END MODULE MODI_LIMA_NOTADJUST
!
! ####################################################################################
SUBROUTINE LIMA_NOTADJUST(KMI, TPFILE, HRAD, &
- PTSTEP, PRHODJ, PPABSM, PPABST, PRHODREF, PEXNREF, PZZ, &
+ PTSTEP, PRHODJ, PPABSTT, PPABST, PRHODREF, PEXNREF, PZZ, &
PTHT,PRT, PSVT, PTHS, PRS,PSVS, PCLDFR, PICEFR, PRAINFR, PSRCS )
! ####################################################################################
!
@@ -112,7 +112,7 @@ REAL, INTENT(IN) :: PTSTEP ! Double Time step
! (single if cold start)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Absolute Pressure at t-dt
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Absolute Pressure at t+dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! Absolute Pressure at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! Reference density
REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference density
@@ -250,7 +250,7 @@ END IF
!
!* 2.2 estimate the Exner function at t+1 and t respectively
!
-ZEXNS(:,:,:)=((2.* PPABST(:,:,:)-PPABSM(:,:,:))/XP00 )**(XRD/XCPD)
+ZEXNS(:,:,:)=(PPABSTT(:,:,:)/XP00 )**(XRD/XCPD)
ZEXNT(:,:,:)=(PPABST(:,:,:)/XP00 )**(XRD/XCPD)
!sources terms *dt
PRS(:,:,:,:) = PRS(:,:,:,:) * PTSTEP
@@ -337,7 +337,7 @@ IF( IMICRO >= 1 .AND. .NOT.LPTSPLIT) THEN
!
ZRHODREF(JL) = PRHODREF(I1(JL),I2(JL),I3(JL))
ZZT(JL) = ZT(I1(JL),I2(JL),I3(JL))
- ZPRES(JL) = 2.0*PPABST(I1(JL),I2(JL),I3(JL))-PPABSM(I1(JL),I2(JL),I3(JL))
+ ZPRES(JL) = PPABSTT(I1(JL),I2(JL),I3(JL))
ZEXNREF(JL) = PEXNREF(I1(JL),I2(JL),I3(JL))
ZZCPH(JL) = ZCPH(I1(JL),I2(JL),I3(JL))
ENDDO
@@ -473,7 +473,7 @@ IF( INUCT >= 1 ) THEN
ALLOCATE(ZZLV(INUCT))
ALLOCATE(ZZCPH(INUCT))
DO JL=1,INUCT
- ZPRES(JL) = 2. * PPABST(I1(JL),I2(JL),I3(JL)) - PPABSM(I1(JL),I2(JL),I3(JL))
+ ZPRES(JL) = PPABSTT(I1(JL),I2(JL),I3(JL))
ZRHOD(JL) = PRHODREF(I1(JL),I2(JL),I3(JL))
ZRR(JL) = PRS(I1(JL),I2(JL),I3(JL),3)
ZTT(JL) = PTHS(I1(JL),I2(JL),I3(JL))
@@ -536,7 +536,7 @@ ENDIF
WHERE(.NOT.GNUCT(:,:,:) )
ZRVSAT(:,:,:) = EXP(XALPW-XBETAW/PTHS(:,:,:)-XGAMW*ALOG(PTHS(:,:,:)))
!rvsat
- ZRVSAT(:,:,:) = (XMV / XMD)*ZRVSAT(:,:,:)/((2.* PPABST(:,:,:)-PPABSM(:,:,:))-ZRVSAT(:,:,:))
+ ZRVSAT(:,:,:) = (XMV / XMD)*ZRVSAT(:,:,:)/(PPABSTT(:,:,:)-ZRVSAT(:,:,:))
ZSAT(:,:,:) = (PRS(:,:,:,1)/ZRVSAT(:,:,:))-1D0
ENDWHERE
!
diff --git a/src/MNH/lima_warm.f90 b/src/MNH/lima_warm.f90
index 14b1a09fc41ca0b6afe5a36bbc3ca9322548d920..97ff7edb8ce5000ddb47d67efbcde89932c74a91 100644
--- a/src/MNH/lima_warm.f90
+++ b/src/MNH/lima_warm.f90
@@ -10,8 +10,8 @@
INTERFACE
SUBROUTINE LIMA_WARM (OACTIT, OSEDC, ORAIN, KSPLITR, PTSTEP, KMI, &
TPFILE, KRR, PZZ, PRHODJ, &
- PRHODREF, PEXNREF, PW_NU, PPABSM, PPABST, &
- PTHM, PRCM, &
+ PRHODREF, PEXNREF, PW_NU, PPABST, &
+ PTHM, &
PTHT, PRT, PSVT, &
PTHS, PRS, PSVS, &
PINPRC, PINPRR, PINDEP, PINPRR3D, PEVAP3D )
@@ -42,11 +42,9 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference Exner function
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
! the nucleation param.
!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! abs. pressure at time t-dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! abs. pressure at time t
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHM ! Theta at time t-dt
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PRCM ! Cloud water m.r. at t-dt
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHT ! Theta at time t
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT ! m.r. at t
@@ -70,8 +68,8 @@ END MODULE MODI_LIMA_WARM
! #####################################################################
SUBROUTINE LIMA_WARM (OACTIT, OSEDC, ORAIN, KSPLITR, PTSTEP, KMI, &
TPFILE, KRR, PZZ, PRHODJ, &
- PRHODREF, PEXNREF, PW_NU, PPABSM, PPABST, &
- PTHM, PRCM, &
+ PRHODREF, PEXNREF, PW_NU, PPABST, &
+ PTHM, &
PTHT, PRT, PSVT, &
PTHS, PRS, PSVS, &
PINPRC, PINPRR, PINDEP, PINPRR3D, PEVAP3D )
@@ -183,11 +181,9 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PEXNREF ! Reference Exner function
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
! the nucleation param.
!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! abs. pressure at time t-dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABST ! abs. pressure at time t
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHM ! Theta at time t-dt
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PRCM ! Cloud water m.r. at t-dt
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHT ! Theta at time t
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT ! m.r. at t
@@ -378,7 +374,7 @@ IF ( LACTI .AND. NMOD_CCN > 0 .AND. .NOT. LSPRO ) THEN
CALL LIMA_WARM_NUCL( OACTIT, PTSTEP, KMI, TPFILE, &
PRHODREF, PEXNREF, PPABST, ZT, PTHM, PW_NU, &
- PRCM, PRVT, PRCT, PRRT, &
+ PRVT, PRCT, PRRT, &
PTHS, PRVS, PRCS, PCCS, ZNFS, ZNAS )
if ( lbudget_th ) call Budget_store_end( tbudgets(NBUDGET_TH), 'HENU', pths(:, :, :) * prhodj(:, :, :) )
diff --git a/src/MNH/lima_warm_nucl.f90 b/src/MNH/lima_warm_nucl.f90
index d62e4f790ca42ab792afdcfa66b970171f83b2e8..cf5382b50799966e699e28adabb1054c237fddb6 100644
--- a/src/MNH/lima_warm_nucl.f90
+++ b/src/MNH/lima_warm_nucl.f90
@@ -10,7 +10,7 @@
INTERFACE
SUBROUTINE LIMA_WARM_NUCL( OACTIT, PTSTEP, KMI, TPFILE, &
PRHODREF, PEXNREF, PPABST, PT, PTM, PW_NU, &
- PRCM, PRVT, PRCT, PRRT, &
+ PRVT, PRCT, PRRT, &
PTHS, PRVS, PRCS, PCCS, PNFS, PNAS )
!
USE MODD_IO, ONLY: TFILEDATA
@@ -32,8 +32,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PTM ! Temperature at time t-dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
! the nucleation param.
!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PRCM ! Cloud water m.r. at t-dt
-!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVT ! Water vapor m.r. at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRCT ! Cloud water m.r. at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRRT ! Rain water m.r. at t
@@ -52,7 +50,7 @@ END MODULE MODI_LIMA_WARM_NUCL
! #######################################################################
SUBROUTINE LIMA_WARM_NUCL( OACTIT, PTSTEP, KMI, TPFILE, &
PRHODREF, PEXNREF, PPABST, PT, PTM, PW_NU, &
- PRCM, PRVT, PRCT, PRRT, &
+ PRVT, PRCT, PRRT, &
PTHS, PRVS, PRCS, PCCS, PNFS, PNAS )
! #######################################################################
!
@@ -143,8 +141,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PTM ! Temperature at time t-dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PW_NU ! updraft velocity used for
! the nucleation param.
!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PRCM ! Cloud water m.r. at t-dt
-!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVT ! Water vapor m.r. at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRCT ! Cloud water m.r. at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRRT ! Rain water m.r. at t
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index 1e183f9a4a6ff16e98568d5084adc43b94316561..81c19f7b279dd7dbe9de82360b62771ac6e61f7f 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -1894,7 +1894,7 @@ IF (CCLOUD /= 'NONE' .AND. CELEC == 'NONE') THEN
LSUBG_COND,LSIGMAS,CSUBG_AUCV,XTSTEP, &
XZZ, XRHODJ, XRHODREF, XEXNREF, &
ZPABST, XTHT,XRT,XSIGS,VSIGQSAT,XMFCONV,XTHM,XRCM, &
- XPABSM, XWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, &
+ XPABST, XWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, &
XSVT, XRSVS, &
XSRCT, XCLDFR,XICEFR, XCIT, &
LSEDIC,KACTIT, KSEDC, KSEDI, KRAIN, KWARM, KHHONI, &
@@ -1914,7 +1914,7 @@ IF (CCLOUD /= 'NONE' .AND. CELEC == 'NONE') THEN
LSUBG_COND,LSIGMAS,CSUBG_AUCV, &
XTSTEP,XZZ, XRHODJ, XRHODREF, XEXNREF, &
ZPABST, XTHT,XRT,XSIGS,VSIGQSAT,XMFCONV,XTHM,XRCM, &
- XPABSM, XWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, &
+ XPABST, XWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, &
XSVT, XRSVS, &
XSRCT, XCLDFR, XICEFR, XCIT, &
LSEDIC,KACTIT, KSEDC, KSEDI, KRAIN, KWARM, KHHONI, &
diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90
index de986a0cd5eb891a956958436988b5cb6cc85432..4e845ffbae6d27683d7711690ea9f02d9c19884d 100644
--- a/src/MNH/resolved_cloud.f90
+++ b/src/MNH/resolved_cloud.f90
@@ -13,7 +13,7 @@ INTERFACE
OSUBG_COND, OSIGMAS, HSUBG_AUCV, &
PTSTEP, PZZ, PRHODJ, PRHODREF, PEXNREF, &
PPABST, PTHT, PRT, PSIGS, PSIGQSAT, PMFCONV, &
- PTHM, PRCM, PPABSM, &
+ PTHM, PRCM, PPABSTT, &
PW_ACT,PDTHRAD, PTHS, PRS, PSVT, PSVS, PSRCS, PCLDFR, PICEFR,&
PCIT, OSEDIC, OACTIT, OSEDC, OSEDI, &
ORAIN, OWARM, OHHONI, OCONVHG, &
@@ -67,7 +67,7 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSIGS ! Sigma_s at time t
REAL, INTENT(IN) :: PSIGQSAT! coeff applied to qsat variance contribution
REAL, DIMENSION(:,:,:), INTENT(IN) :: PMFCONV ! convective mass flux
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHM ! Theta at time t-Dt
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Pressure time t-Dt
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Pressure time t+Dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRCM ! Cloud water m.r. at time t-Dt
!
!
@@ -152,7 +152,7 @@ END MODULE MODI_RESOLVED_CLOUD
OSUBG_COND, OSIGMAS, HSUBG_AUCV, &
PTSTEP, PZZ, PRHODJ, PRHODREF, PEXNREF, &
PPABST, PTHT, PRT, PSIGS, PSIGQSAT, PMFCONV, &
- PTHM, PRCM, PPABSM, &
+ PTHM, PRCM, PPABSTT, &
PW_ACT,PDTHRAD, PTHS, PRS, PSVT, PSVS, PSRCS, PCLDFR,PICEFR,&
PCIT, OSEDIC, OACTIT, OSEDC, OSEDI, &
ORAIN, OWARM, OHHONI, OCONVHG, &
@@ -373,7 +373,7 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSIGS ! Sigma_s at time t
REAL, INTENT(IN) :: PSIGQSAT! coeff applied to qsat variance contribution
REAL, DIMENSION(:,:,:), INTENT(IN) :: PMFCONV ! convective mass flux
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHM ! Theta at time t-Dt
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSM ! Pressure time t-Dt
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PPABSTT ! Pressure time t+Dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRCM ! Cloud water m.r. at time t-Dt
!
!
@@ -753,7 +753,7 @@ SELECT CASE ( HCLOUD )
CALL RAIN_C2R2_KHKO ( HCLOUD, OACTIT, OSEDC, ORAIN, KSPLITR, PTSTEP, KMI, &
TPFILE, PZZ, PRHODJ, PRHODREF, PEXNREF, &
PPABST, PTHT, PRT(:,:,:,1), PRT(:,:,:,2), PRT(:,:,:,3), &
- PTHM, PRCM, PPABSM, &
+ PTHM, PRCM, PPABSTT, &
PW_ACT,PDTHRAD,PTHS, PRS(:,:,:,1),PRS(:,:,:,2),PRS(:,:,:,3), &
PSVT(:,:,:,NSV_C2R2BEG), PSVT(:,:,:,NSV_C2R2BEG+1), &
PSVT(:,:,:,NSV_C2R2BEG+2), PSVS(:,:,:,NSV_C2R2BEG), &
@@ -767,7 +767,7 @@ SELECT CASE ( HCLOUD )
!
IF (LSUPSAT) THEN
CALL KHKO_NOTADJUST (KRR, KTCOUNT,TPFILE, HRAD, &
- PTSTEP, PRHODJ, PPABSM, PPABST, PRHODREF, PZZ, &
+ PTSTEP, PRHODJ, PPABSTT, PPABST, PRHODREF, PZZ, &
PTHT,PRT(:,:,:,1),PRT(:,:,:,2),PRT(:,:,:,3), &
PTHS,PRS(:,:,:,1),PRS(:,:,:,2),PRS(:,:,:,3), &
PSVS(:,:,:,NSV_C2R2BEG+1), PSVS(:,:,:,NSV_C2R2BEG), &
@@ -993,7 +993,7 @@ SELECT CASE ( HCLOUD )
CALL LIMA (1, IKU, 1, &
PTSTEP, TPFILE, &
PRHODREF, PEXNREF, ZDZZ, &
- PRHODJ, PPABSM, PPABST, &
+ PRHODJ, PPABST, &
NMOD_CCN, NMOD_IFN, NMOD_IMM, &
PDTHRAD, PTHT, PRT, &
PSVT(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), PW_ACT, &
@@ -1004,8 +1004,8 @@ SELECT CASE ( HCLOUD )
IF (OWARM) CALL LIMA_WARM(OACTIT, OSEDC, ORAIN, KSPLITR, PTSTEP, KMI, &
TPFILE, KRR, PZZ, PRHODJ, &
- PRHODREF, PEXNREF, PW_ACT, PPABSM, PPABST, &
- PDTHRAD, PRCM, &
+ PRHODREF, PEXNREF, PW_ACT, PPABST, &
+ PDTHRAD, &
PTHT, PRT, PSVT(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PTHS, PRS, PSVS(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PINPRC, PINPRR, PINDEP, PINPRR3D, PEVAP3D )
@@ -1013,7 +1013,6 @@ SELECT CASE ( HCLOUD )
IF (LCOLD) CALL LIMA_COLD(OSEDI, OHHONI, KSPLITG, PTSTEP, KMI, &
KRR, PZZ, PRHODJ, &
PRHODREF, PEXNREF, PPABST, PW_ACT, &
- PTHM, PPABSM, &
PTHT, PRT, PSVT(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PTHS, PRS, PSVS(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PINPRS, PINPRG, PINPRH )
@@ -1021,7 +1020,6 @@ SELECT CASE ( HCLOUD )
IF (OWARM .AND. LCOLD) CALL LIMA_MIXED(OSEDI, OHHONI, KSPLITG, PTSTEP, KMI, &
KRR, PZZ, PRHODJ, &
PRHODREF, PEXNREF, PPABST, PW_ACT, &
- PTHM, PPABSM, &
PTHT, PRT, PSVT(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PTHS, PRS, PSVS(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END) )
ENDIF
@@ -1030,14 +1028,14 @@ SELECT CASE ( HCLOUD )
!
IF (LSPRO) THEN
CALL LIMA_NOTADJUST (KMI, TPFILE, HRAD, &
- PTSTEP, PRHODJ, PPABSM, PPABST, PRHODREF, PEXNREF, PZZ, &
+ PTSTEP, PRHODJ, PPABSTT, PPABST, PRHODREF, PEXNREF, PZZ, &
PTHT,PRT, PSVT(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PTHS,PRS, PSVS(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PCLDFR, PICEFR, PRAINFR, PSRCS )
ELSE IF (LPTSPLIT) THEN
CALL LIMA_ADJUST_SPLIT(KRR, KMI, TPFILE, CCONDENS, CLAMBDA3, &
OSUBG_COND, OSIGMAS, PTSTEP, PSIGQSAT, &
- PRHODREF, PRHODJ, PEXNREF, PPABST, PSIGS, PMFCONV, PPABST, ZZZ, &
+ PRHODREF, PRHODJ, PEXNREF, PSIGS, PMFCONV, PPABST, PPABSTT, ZZZ,&
PDTHRAD, PW_ACT, &
PRT, PRS, PSVT(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PSVS(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
@@ -1045,7 +1043,7 @@ SELECT CASE ( HCLOUD )
ELSE
CALL LIMA_ADJUST(KRR, KMI, TPFILE, &
OSUBG_COND, PTSTEP, &
- PRHODREF, PRHODJ, PEXNREF, PPABST, PPABST, &
+ PRHODREF, PRHODJ, PEXNREF, PPABST, PPABSTT, &
PRT, PRS, PSVT(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PSVS(:,:,:,NSV_LIMA_BEG:NSV_LIMA_END), &
PTHS, PSRCS, PCLDFR, PICEFR, PRAINFR )