diff --git a/src/arome/ext/aroini_turb.F90 b/src/arome/ext/aroini_turb.F90 index 7be33a4177f8e894eadf5e08b3cc986a40d45c63..2680c00ce5c148525b008e6cb619094f871cfbbb 100644 --- a/src/arome/ext/aroini_turb.F90 +++ b/src/arome/ext/aroini_turb.F90 @@ -1,5 +1,5 @@ ! ######spl -SUBROUTINE AROINI_TURB(PLINI,OHARATU,OSTATNW) +SUBROUTINE AROINI_TURB(PLINI,OHARATU,OSTATNW,OSUBG_COND) USE PARKIND1, ONLY : JPRB USE YOMHOOK , ONLY : LHOOK, DR_HOOK !**** *INI_TURB* - Initialize common meso_NH MODD_ used in Turbulence scheme @@ -43,7 +43,8 @@ USE YOMHOOK , ONLY : LHOOK, DR_HOOK USE MODD_LES, ONLY : LLES, LLES_CALL USE MODD_CTURB, ONLY : XLINI -USE MODD_TURB_n, ONLY: LHARAT, LSTATNW, CTURBLEN, TURB_GOTO_MODEL +USE MODD_TURB_n, ONLY: LHARAT, LSTATNW, CTURBLEN, TURB_GOTO_MODEL, LTURB_FLX, LTURB_DIAG, & + LSUBG_COND, LRMC01, CTURBDIM USE MODI_INI_CTURB IMPLICIT NONE @@ -54,6 +55,7 @@ IMPLICIT NONE REAL, INTENT(IN) :: PLINI ! minimum bl89 mixing length LOGICAL,INTENT(IN) :: OHARATU ! switch HARATU LOGICAL,INTENT(IN) :: OSTATNW ! switch LSTATNW +LOGICAL,INTENT(IN) :: OSUBG_COND ! switch of subgrid condensation ! ! ------------------------------------------------------------------ @@ -79,6 +81,11 @@ LLES_CALL=.FALSE. ! 3. Set implicit default values for MODD_TURB_n CTURBLEN = 'BL89' +CTURBDIM = '1DIM' +LTURB_FLX = .FALSE. +LTURB_DIAG = .FALSE. +LSUBG_COND = OSUBG_COND +LRMC01 = .FALSE. ! ------------------------------------------------------------------ IF (LHOOK) CALL DR_HOOK('AROINI_TURB',1,ZHOOK_HANDLE) diff --git a/src/arome/ext/suphmpa.F90 b/src/arome/ext/suphmpa.F90 index bcedf617b2dfb43274d1e69c14063ab3c83354cb..cafaf9bef0750a63d837caa4e03e7df539f2fe16 100644 --- a/src/arome/ext/suphmpa.F90 +++ b/src/arome/ext/suphmpa.F90 @@ -106,7 +106,7 @@ ASSOCIATE(XDETR_LUP=>YDPARAR%XDETR_LUP, XCMF=>YDPARAR%XCMF, & & LAROBU_ENABLE=>YDPARAR%LAROBU_ENABLE, LCRIAUTI=>YDPARAR%LCRIAUTI, & & XKRC_MF=>YDPARAR%XKRC_MF, XALPHA_MF=>YDPARAR%XALPHA_MF, & & XPRES_UV=>YDPARAR%XPRES_UV, NRR=>YDPARAR%NRR, XCRAD_MF=>YDPARAR%XCRAD_MF, & - & CMF_UPDRAFT=>YDPARAR%CMF_UPDRAFT, LHARATU=>YDPARAR%LHARATU, & + & CMF_UPDRAFT=>YDPARAR%CMF_UPDRAFT, LHARATU=>YDPARAR%LHARATU, LSUBG_COND=>YDPARAR%LSUBG_COND,& & LSTATNW=>YDPARAR%LSTATNW, & & LMPA=>YDARPHY%LMPA, LKFBCONV=>YDARPHY%LKFBCONV, LMFSHAL=>YDARPHY%LMFSHAL, & & LGRADHPHY=>YDARPHY%LGRADHPHY, & @@ -166,7 +166,7 @@ CALL AROINI_BUDGET(LAROBU_ENABLE) ! 4. Initialisation of Turbulence scheme -CALL AROINI_TURB(XLINI,LHARATU,LSTATNW) +CALL AROINI_TURB(XLINI,LHARATU,LSTATNW,LSUBG_COND) ! 5. Initialisation of Mass Flux Shallow convection scheme