diff --git a/src/MNH/compute_updraft_raha.f90 b/src/MNH/compute_updraft_raha.f90 index 553a95de070f4bf91ba31074ea9cf92194c643a4..c685be9a979beea9c8af7b94e3454c2271ca0c72 100644 --- a/src/MNH/compute_updraft_raha.f90 +++ b/src/MNH/compute_updraft_raha.f90 @@ -348,7 +348,7 @@ PTHL_UP(:,KKB)= ZTHLM_F(:,KKB)+MAX(0.,MIN(ZTMAX,(PSFTH(:)/SQRT(ZTKEM_F(:,KKB)))* PRT_UP(:,KKB) = ZRTM_F(:,KKB)+MAX(0.,MIN(ZRMAX,(PSFRV(:)/SQRT(ZTKEM_F(:,KKB)))*XALP_PERT)) ZQT_UP(:) = PRT_UP(:,KKB)/(1.+PRT_UP(:,KKB)) -ZTHS_UP(:,KKB)=PTHL_UP(:,KKB)*(1.+XLAMBDA*ZQT_UP(:)) +ZTHS_UP(:,KKB)=PTHL_UP(:,KKB)*(1.+XLAMBDA_MF*ZQT_UP(:)) ZTHM_F (:,:) = MZM_MF(KKA,KKU,KKL,PTHM (:,:)) ZPRES_F(:,:) = MZM_MF(KKA,KKU,KKL,PPABSM(:,:)) @@ -499,13 +499,13 @@ DO JK=KKB,KKE-KKL,KKL ZMIX3(:) = (PZZ(:,JK+KKL)-PZZ(:,JK))*PDETR(:,JK) !& ZQTM(:) = PRTM(:,JK)/(1.+PRTM(:,JK)) - ZTHSM(:,JK) = PTHLM(:,JK)*(1.+XLAMBDA*ZQTM(:)) + ZTHSM(:,JK) = PTHLM(:,JK)*(1.+XLAMBDA_MF*ZQTM(:)) ZTHS_UP(:,JK+KKL)=(ZTHS_UP(:,JK)*(1.-0.5*ZMIX2(:)) + ZTHSM(:,JK)*ZMIX2(:)) & /(1.+0.5*ZMIX2(:)) PRT_UP(:,JK+KKL)=(PRT_UP (:,JK)*(1.-0.5*ZMIX2(:)) + PRTM(:,JK)*ZMIX2(:)) & /(1.+0.5*ZMIX2(:)) ZQT_UP(:) = PRT_UP(:,JK+KKL)/(1.+PRT_UP(:,JK+KKL)) - PTHL_UP(:,JK+KKL)=ZTHS_UP(:,JK+KKL)/(1.+XLAMBDA*ZQT_UP(:)) + PTHL_UP(:,JK+KKL)=ZTHS_UP(:,JK+KKL)/(1.+XLAMBDA_MF*ZQT_UP(:)) ENDWHERE diff --git a/src/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90 index f77c69a49c1aaca734a73688264c0980078bd139..7ba55add1bd92ef8b3530e4d691628aa3706decc 100644 --- a/src/MNH/default_desfmn.f90 +++ b/src/MNH/default_desfmn.f90 @@ -1145,7 +1145,7 @@ XB = 0.002 XC = 0.012 XBETA1 = 0.9 XR = 2. -XLAMBDA= 0. +XLAMBDA_MF= 0. ! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/mf_turb_expl.f90 b/src/MNH/mf_turb_expl.f90 index cec383e9e2b0aad7d8ed520432b1a1a81bd60804..a22f092c2747410eef8c2728b1966736f8eeed2a 100644 --- a/src/MNH/mf_turb_expl.f90 +++ b/src/MNH/mf_turb_expl.f90 @@ -184,8 +184,8 @@ ZRTM_F (:,:) = MZM_MF(KKA,KKU,KKL,PRTM (:,:)) ZTHLM_F(:,:) = MZM_MF(KKA,KKU,KKL,PTHLM(:,:)) ZQTM (:,:) = ZRTM_F (:,:)/(1.+ZRTM_F (:,:)) ZQT_UP (:,:) = PRT_UP (:,:)/(1.+PRT_UP (:,:)) -ZTHS_UP(:,:) = PTHL_UP(:,:)*(1.+XLAMBDA*ZQT_UP(:,:)) -ZTHSM (:,:) = ZTHLM_F(:,:)*(1.+XLAMBDA*ZQTM(:,:)) +ZTHS_UP(:,:) = PTHL_UP(:,:)*(1.+XLAMBDA_MF*ZQT_UP(:,:)) +ZTHSM (:,:) = ZTHLM_F(:,:)*(1.+XLAMBDA_MF*ZQTM(:,:)) PFLXZTHLMF(:,:) = PEMF(:,:)*(PTHL_UP(:,:)-MZM_MF(KKA,KKU,KKL,PTHLM(:,:))) ! ThetaL PFLXZRMF(:,:) = PEMF(:,:)*(PRT_UP (:,:)-MZM_MF(KKA,KKU,KKL,PRTM (:,:))) ! Rt @@ -213,7 +213,7 @@ DO JK=KKB,KKE-KKL,KKL PRTDT (:,JK) = (PFLXZRMF (:,JK ) - PFLXZRMF (:,JK+KKL)) / PRHODJ(:,JK) ZQTDT (:,JK) = PRTDT (:,JK)/(1.+ ZRTM_F (:,JK)*ZRTM_F (:,JK)) ZTHSDT(:,JK) = (ZFLXZTHSMF(:,JK ) - ZFLXZTHSMF(:,JK+KKL)) / PRHODJ(:,JK) - PTHLDT(:,JK) = ZTHSDT(:,JK)/(1.+XLAMBDA*ZQTM(:,JK)) - ZTHLM_F(:,JK)*XLAMBDA*ZQTDT(:,JK) + PTHLDT(:,JK) = ZTHSDT(:,JK)/(1.+XLAMBDA_MF*ZQTM(:,JK)) - ZTHLM_F(:,JK)*XLAMBDA_MF*ZQTDT(:,JK) END DO IF (OMIXUV) THEN diff --git a/src/MNH/modd_param_mfshalln.f90 b/src/MNH/modd_param_mfshalln.f90 index d501f7c6f85c8d9272578b2e926d1341fc51a3e8..1c4683dc4936e3212c5bf4125470c8570e1e6a48 100644 --- a/src/MNH/modd_param_mfshalln.f90 +++ b/src/MNH/modd_param_mfshalln.f90 @@ -84,7 +84,7 @@ REAL :: XR ! Aspect ratio of updraft ! Thermodynamic parameter -REAL :: XLAMBDA ! Lambda to compute ThetaS1 from ThetaL +REAL :: XLAMBDA_MF ! Lambda to compute ThetaS1 from ThetaL END TYPE PARAM_MFSHALL_t @@ -118,7 +118,7 @@ REAL, POINTER :: XB=>NULL() REAL, POINTER :: XC=>NULL() REAL, POINTER :: XBETA1=>NULL() REAL, POINTER :: XR=>NULL() -REAL, POINTER :: XLAMBDA=>NULL() +REAL, POINTER :: XLAMBDA_MF=>NULL() CONTAINS @@ -156,7 +156,7 @@ XB=>PARAM_MFSHALL_MODEL(KTO)%XB XC=>PARAM_MFSHALL_MODEL(KTO)%XC XBETA1=>PARAM_MFSHALL_MODEL(KTO)%XBETA1 XR=>PARAM_MFSHALL_MODEL(KTO)%XR -XLAMBDA=>PARAM_MFSHALL_MODEL(KTO)%XLAMBDA +XLAMBDA_MF=>PARAM_MFSHALL_MODEL(KTO)%XLAMBDA_MF END SUBROUTINE PARAM_MFSHALL_GOTO_MODEL diff --git a/src/MNH/modn_param_mfshalln.f90 b/src/MNH/modn_param_mfshalln.f90 index 5d6b8320519c553d73ad44567aa9f6f4268ad665..4254cec7b78dd76681be33d240a686f66bbc8269 100644 --- a/src/MNH/modn_param_mfshalln.f90 +++ b/src/MNH/modn_param_mfshalln.f90 @@ -44,7 +44,7 @@ USE MODD_PARAM_MFSHALL_n, ONLY: & XC_n => XC, & XBETA1_n => XBETA1, & XR_n => XR, & - XLAMBDA_n => XLAMBDA + XLAMBDA_MF_n => XLAMBDA_MF ! IMPLICIT NONE ! @@ -89,13 +89,13 @@ REAL,SAVE :: XBETA1 ! Tuning variables for RAHA updraft : REAL,SAVE :: XR -REAL,SAVE :: XLAMBDA +REAL,SAVE :: XLAMBDA_MF NAMELIST/NAM_PARAM_MFSHALLn/XIMPL_MF,CMF_UPDRAFT,CMF_CLOUD,LMIXUV,LMF_FLX,& XALP_PERT,XABUO,XBENTR,XBDETR,XCMF,XENTR_MF,& XCRAD_MF,XENTR_DRY,XDETR_DRY,XDETR_LUP,XKCF_MF,& XKRC_MF,XTAUSIGMF,XPRES_UV,XALPHA_MF,XSIGMA_MF,& - XFRAC_UP_MAX,XA1,XB,XC,XBETA1,XR,XLAMBDA + XFRAC_UP_MAX,XA1,XB,XC,XBETA1,XR,XLAMBDA_MF ! @@ -129,7 +129,7 @@ SUBROUTINE INIT_NAM_PARAM_MFSHALLn XC = XC_n XBETA1 = XBETA1_n XR = XR_n - XLAMBDA = XLAMBDA_n + XLAMBDA_MF = XLAMBDA_MF_n END SUBROUTINE INIT_NAM_PARAM_MFSHALLn @@ -161,7 +161,7 @@ SUBROUTINE UPDATE_NAM_PARAM_MFSHALLn XC_n = XC XBETA1_n = XBETA1 XR_n = XR - XLAMBDA_n = XLAMBDA + XLAMBDA_MF_n = XLAMBDA_MF END SUBROUTINE UPDATE_NAM_PARAM_MFSHALLn END MODULE MODN_PARAM_MFSHALL_n