diff --git a/src/MNH/modd_sub_modeln.f90 b/src/MNH/modd_sub_modeln.f90 index 121f5d3570b1c0bdfbafc17920bf3ce92b92cdfa..e7f0a854aec1e3435fec0a8350ca9269d98a1135 100644 --- a/src/MNH/modd_sub_modeln.f90 +++ b/src/MNH/modd_sub_modeln.f90 @@ -48,7 +48,7 @@ TYPE SUB_MODEL_t REAL*8,DIMENSION(2) :: XT_TURB,XT_2WAY,XT_SHADOWS REAL*8,DIMENSION(2) :: XT_FORCING,XT_NUDGING,XT_CHEM - REAL, DIMENSION(:,:,:), POINTER :: ZWT_ACT_NUC=>NULL() + REAL, DIMENSION(:,:,:), POINTER :: XWT_ACT_NUC=>NULL() ! Vertical motion used for ACTivation/NUCleation LOGICAL, DIMENSION(:,:), POINTER :: GMASKkids=>NULL() ! kids domains mask @@ -77,7 +77,7 @@ REAL*8,DIMENSION(:), POINTER :: XT_COUPL=>NULL(),XT_1WAY=>NULL(),XT_STEP_BUD=>NU REAL*8,DIMENSION(:), POINTER :: XT_RAD=>NULL(),XT_DCONV=>NULL(),XT_GROUND=>NULL(),XT_MAFL=>NULL() REAL*8,DIMENSION(:), POINTER :: XT_TURB=>NULL(),XT_2WAY=>NULL(),XT_TRACER=>NULL() REAL*8,DIMENSION(:), POINTER :: XT_FORCING=>NULL(),XT_NUDGING=>NULL(),XT_CHEM=>NULL() -REAL, DIMENSION(:,:,:), POINTER :: ZWT_ACT_NUC=>NULL() +REAL, DIMENSION(:,:,:), POINTER :: XWT_ACT_NUC=>NULL() LOGICAL, DIMENSION(:,:), POINTER :: GMASKkids=>NULL() LOGICAL, POINTER :: GCLOSE_OUT=>NULL() @@ -99,7 +99,7 @@ SUB_MODEL_MODEL(KFROM)%TLSHALO2_ll=>TLSHALO2_ll SUB_MODEL_MODEL(KFROM)%THALO2T_ll=>THALO2T_ll SUB_MODEL_MODEL(KFROM)%THALO2MT_ll=>THALO2MT_ll SUB_MODEL_MODEL(KFROM)%THALO2SC_ll=>THALO2SC_ll -SUB_MODEL_MODEL(KFROM)%ZWT_ACT_NUC=>ZWT_ACT_NUC +SUB_MODEL_MODEL(KFROM)%XWT_ACT_NUC=>XWT_ACT_NUC SUB_MODEL_MODEL(KFROM)%GMASKkids=>GMASKkids ! ! Current model is set to model KTO @@ -152,7 +152,7 @@ XT_SHADOWS=>SUB_MODEL_MODEL(KTO)%XT_SHADOWS XT_FORCING=>SUB_MODEL_MODEL(KTO)%XT_FORCING XT_NUDGING=>SUB_MODEL_MODEL(KTO)%XT_NUDGING XT_CHEM=>SUB_MODEL_MODEL(KTO)%XT_CHEM -ZWT_ACT_NUC=>SUB_MODEL_MODEL(KTO)%ZWT_ACT_NUC +XWT_ACT_NUC=>SUB_MODEL_MODEL(KTO)%XWT_ACT_NUC GMASKkids=>SUB_MODEL_MODEL(KTO)%GMASKkids GCLOSE_OUT=>SUB_MODEL_MODEL(KTO)%GCLOSE_OUT diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90 index 09252e702dbd1ee3e872e28438b71919f199670a..a2884c77f766d699980473971e73e0a91f97cec4 100644 --- a/src/MNH/modeln.f90 +++ b/src/MNH/modeln.f90 @@ -632,7 +632,7 @@ IF (KTCOUNT == 1) THEN NULLIFY(TLSHALO2_ll) NULLIFY(TFIELDSC_ll) ! - ALLOCATE(ZWT_ACT_NUC(SIZE(XWT,1),SIZE(XWT,2),SIZE(XWT,3))) + ALLOCATE(XWT_ACT_NUC(SIZE(XWT,1),SIZE(XWT,2),SIZE(XWT,3))) ALLOCATE(GMASKkids(SIZE(XWT,1),SIZE(XWT,2))) ! ! initialization of the FM file backup/output number @@ -1776,19 +1776,19 @@ IF (CCLOUD /= 'NONE' .AND. CELEC == 'NONE') THEN IF (CCLOUD == 'C2R2' .OR. CCLOUD == 'KHKO' .OR. CCLOUD == 'C3R5' & .OR. CCLOUD == "LIMA" ) THEN IF ( LFORCING ) THEN - ZWT_ACT_NUC(:,:,:) = XWT(:,:,:) + XWTFRC(:,:,:) + XWT_ACT_NUC(:,:,:) = XWT(:,:,:) + XWTFRC(:,:,:) ELSE - ZWT_ACT_NUC(:,:,:) = XWT(:,:,:) + XWT_ACT_NUC(:,:,:) = XWT(:,:,:) END IF IF (CTURB /= 'NONE' ) THEN IF ( ((CCLOUD=='C2R2'.OR.CCLOUD=='KHKO').AND.LACTTKE) .OR. (CCLOUD=='LIMA'.AND.MACTTKE) ) THEN - ZWT_ACT_NUC(:,:,:) = ZWT_ACT_NUC(:,:,:) + (2./3. * XTKET(:,:,:))**0.5 + XWT_ACT_NUC(:,:,:) = XWT_ACT_NUC(:,:,:) + (2./3. * XTKET(:,:,:))**0.5 ELSE - ZWT_ACT_NUC(:,:,:) = ZWT_ACT_NUC(:,:,:) + XWT_ACT_NUC(:,:,:) = XWT_ACT_NUC(:,:,:) ENDIF ENDIF ELSE - ZWT_ACT_NUC(:,:,:) = 0. + XWT_ACT_NUC(:,:,:) = 0. END IF ! XRTHS_CLD = XRTHS @@ -1806,7 +1806,7 @@ IF (CCLOUD /= 'NONE' .AND. CELEC == 'NONE') THEN GCLOSE_OUT, LSUBG_COND,LSIGMAS,CSUBG_AUCV,XTSTEP, & XZZ, XRHODJ, XRHODREF, XEXNREF, & ZPABST, XTHT,XRT,XSIGS,VSIGQSAT,XMFCONV,XTHM,XRCM, & - XPABSM, ZWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, & + XPABSM, XWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, & XSVT, XRSVS, & XSRCT, XCLDFR,XCIT, & LSEDIC,KACTIT, KSEDC, KSEDI, KRAIN, KWARM, KHHONI, & @@ -1824,7 +1824,7 @@ IF (CCLOUD /= 'NONE' .AND. CELEC == 'NONE') THEN GCLOSE_OUT, LSUBG_COND,LSIGMAS,CSUBG_AUCV, & XTSTEP,XZZ, XRHODJ, XRHODREF, XEXNREF, & ZPABST, XTHT,XRT,XSIGS,VSIGQSAT,XMFCONV,XTHM,XRCM, & - XPABSM, ZWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, & + XPABSM, XWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, & XSVT, XRSVS, & XSRCT, XCLDFR,XCIT, & LSEDIC,KACTIT, KSEDC, KSEDI, KRAIN, KWARM, KHHONI, & @@ -1884,7 +1884,7 @@ XTIME_BU_PROCESS = 0. XTIME_LES_BU_PROCESS = 0. ! IF (CELEC /= 'NONE' .AND. (CCLOUD(1:3) == 'ICE')) THEN - ZWT_ACT_NUC(:,:,:) = 0. + XWT_ACT_NUC(:,:,:) = 0. ! XRTHS_CLD = XRTHS XRRS_CLD = XRRS