From 49420fc6d7e6cb6320646afa8434b38fa5c515bf Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Wed, 14 Dec 2022 14:51:23 +0100 Subject: [PATCH] Quentin 14/12/2022: bugfix from merge 15917023 --- src/arome/ext/aro_turb_mnh.F90 | 4 ++-- src/common/turb/mode_turb_hor.F90 | 5 +++-- src/mesonh/ext/phys_paramn.f90 | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/arome/ext/aro_turb_mnh.F90 b/src/arome/ext/aro_turb_mnh.F90 index 7863269a6..c28009f6f 100644 --- a/src/arome/ext/aro_turb_mnh.F90 +++ b/src/arome/ext/aro_turb_mnh.F90 @@ -69,7 +69,6 @@ ! ------------ ! USE MODD_CONF -USE MODD_NSV, ONLY: NSV_LIMA_NR, NSV_LIMA_NS, NSV_LIMA_NG, NSV_LIMA_NH USE MODD_CST, ONLY:CST USE MODD_CTURB, ONLY:CSTURB USE MODD_LES, ONLY:TLES @@ -217,6 +216,7 @@ INTEGER :: KSV_LGBEG, KSV_LGEND ! number of scalar variables ! REAL, DIMENSION(KLON,1,KLEV+2) :: ZDXX,ZDYY,ZDZZ,ZDZX,ZDZY ! metric coefficients +INTEGER :: NSV_LIMA_NR, NSV_LIMA_NS, NSV_LIMA_NG, NSV_LIMA_NH ! TODO LIMA integration : to be sent from above aro_turb_mnh REAL, DIMENSION(KLON,1) :: PZS ! TODO: to be sent from above aro_turb_mnh REAL, POINTER :: ZDIRCOSXW(:,:), ZDIRCOSYW(:,:), ZDIRCOSZW(:,:) ! Director Cosinus along x, y and z directions at surface w-point @@ -429,7 +429,7 @@ CALL TURB (CST,CSTURB,TBUCONF,TURBN, YLDIMPHYEX,TLES,& & IMI, KRR, KRRL, KRRI, HLBCX, HLBCY, KGRADIENTS,1, & & ISPLIT,IMI, KSV, KSV_LGBEG, KSV_LGEND, HPROGRAM,& & NSV_LIMA_NR, NSV_LIMA_NS, NSV_LIMA_NG, NSV_LIMA_NH, & - & O2D, ONOMIXLG, OFLAT, TLES%LLES_CALL,OCOUPLES,OBLOWSNOW,& + & O2D, ONOMIXLG, OFLAT, OCOUPLES,OBLOWSNOW,& & OCOMPUTE_SRC, 1.0, & & OOCEAN,ODEEPOC, .FALSE., & & 'NONE',CMICRO, & diff --git a/src/common/turb/mode_turb_hor.F90 b/src/common/turb/mode_turb_hor.F90 index 892580aff..dfa971d9f 100644 --- a/src/common/turb/mode_turb_hor.F90 +++ b/src/common/turb/mode_turb_hor.F90 @@ -366,8 +366,9 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS PSVM, & PRSVS ) ! - IF (KSPLT==1 .AND. TLES%LLES_CALL) & - CALL TURB_HOR_SV_CORR(D,CST,CSTURB,KSV,KSV_LGBEG,KSV_LGEND,& + IF (KSPLT==1 .AND. TLES%LLES_CALL) & + CALL TURB_HOR_SV_CORR(D,CST,CSTURB,TLES, & + KSV,KSV_LGBEG,KSV_LGEND, & KRR,KRRL,KRRI,OOCEAN,OCOMPUTE_SRC,OBLOWSNOW, & ONOMIXLG,O2D, & PDXX,PDYY,PDZZ,PDZX,PDZY,PRSNOW, & diff --git a/src/mesonh/ext/phys_paramn.f90 b/src/mesonh/ext/phys_paramn.f90 index 8a16b6df6..e9a1463be 100644 --- a/src/mesonh/ext/phys_paramn.f90 +++ b/src/mesonh/ext/phys_paramn.f90 @@ -1570,7 +1570,7 @@ END IF NSV, NSV_LGBEG, NSV_LGEND,CPROGRAM, & NSV_LIMA_NR, NSV_LIMA_NS, NSV_LIMA_NG, NSV_LIMA_NH, & L2D, LNOMIXLG,LFLAT, & - LLES_CALL, LCOUPLES, LBLOWSNOW, & + LCOUPLES, LBLOWSNOW, & GCOMPUTE_SRC, XRSNOW, & LOCEAN, LDEEPOC, LDIAG_IN_RUN, & CTURBLEN_CLOUD, CCLOUD, & -- GitLab