From 30a8a34b74f74e7f7340bc528c4dddc52b927811 Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Wed, 14 Dec 2022 15:41:48 +0100
Subject: [PATCH] Quentin 14/12/2022: PHYEX cleaning remove modd_ibm from turb
---
src/arome/ext/aro_turb_mnh.F90 | 2 +-
src/common/aux/modd_ibm_paramn.F90 | 15 ---------------
src/common/turb/modi_turb.F90 | 7 ++++++-
src/common/turb/turb.F90 | 12 ++++++++----
src/mesonh/ext/phys_paramn.f90 | 5 +++--
5 files changed, 18 insertions(+), 23 deletions(-)
delete mode 100644 src/common/aux/modd_ibm_paramn.F90
diff --git a/src/arome/ext/aro_turb_mnh.F90 b/src/arome/ext/aro_turb_mnh.F90
index 7863269a6..faf8fbf53 100644
--- a/src/arome/ext/aro_turb_mnh.F90
+++ b/src/arome/ext/aro_turb_mnh.F90
@@ -430,7 +430,7 @@ CALL TURB (CST,CSTURB,TBUCONF,TURBN, YLDIMPHYEX,TLES,&
& 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,&
- & OCOMPUTE_SRC, 1.0, &
+ & .FALSE., OCOMPUTE_SRC, 1.0, &
& OOCEAN,ODEEPOC, .FALSE., &
& 'NONE',CMICRO, &
& 2*PTSTEP,ZTFILE, &
diff --git a/src/common/aux/modd_ibm_paramn.F90 b/src/common/aux/modd_ibm_paramn.F90
deleted file mode 100644
index 716a93e6d..000000000
--- a/src/common/aux/modd_ibm_paramn.F90
+++ /dev/null
@@ -1,15 +0,0 @@
-!MNH_LIC Copyright 2019-2021 CNRS, Meteo-France and Universite Paul Sabatier
-!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
-!MNH_LIC for details. version 1.
-!-----------------------------------------------------------------
-!
-! #######################
-MODULE MODD_IBM_PARAM_n
- ! #######################
- IMPLICIT NONE
- LOGICAL :: LIBM,LIBM_TROUBLE
- REAL, DIMENSION(:,:,:,:) , POINTER :: XIBM_LS=>NULL() ! LSF for MNH
- REAL, DIMENSION(:,:,:) , POINTER :: XIBM_XMUT=>NULL()
-END MODULE MODD_IBM_PARAM_n
-!
diff --git a/src/common/turb/modi_turb.F90 b/src/common/turb/modi_turb.F90
index 404de57d6..3694890ae 100644
--- a/src/common/turb/modi_turb.F90
+++ b/src/common/turb/modi_turb.F90
@@ -8,7 +8,7 @@ INTERFACE
& KMI,KRR,KRRL,KRRI,HLBCX,HLBCY,KGRADIENTS,KHALO, &
& KSPLIT,KMODEL_CL,KSV,KSV_LGBEG,KSV_LGEND,HPROGRAM, &
& KSV_LIMA_NR, KSV_LIMA_NS, KSV_LIMA_NG, KSV_LIMA_NH, &
- & O2D,ONOMIXLG,OFLAT,OCOUPLES,OBLOWSNOW, &
+ & O2D,ONOMIXLG,OFLAT,OCOUPLES,OBLOWSNOW,OIBM, &
& OCOMPUTE_SRC, PRSNOW, &
& OOCEAN,ODEEPOC,ODIAG_IN_RUN, &
& HTURBLEN_CL,HCLOUD, &
@@ -29,6 +29,7 @@ INTERFACE
& PEDR,PLEM,PRTKEMS,PTPMF, &
& PDRUS_TURB,PDRVS_TURB, &
& PDRTHLS_TURB,PDRRTS_TURB,PDRSVS_TURB,PTR,PDISS, &
+ & PIBM_LS, PIBM_XMUT, &
& PCURRENT_TKE_DISS, PSSTFL, PSSTFL_C, PSSRFL_C, &
& PSSUFL_C, PSSVFL_C,PSSUFL,PSSVFL )
!
@@ -64,6 +65,7 @@ LOGICAL, INTENT(IN) :: OFLAT ! Logical for zero ororogr
LOGICAL, INTENT(IN) :: OCOUPLES ! switch to activate atmos-ocean LES version
LOGICAL, INTENT(IN) :: OBLOWSNOW ! switch to activate pronostic blowing snow
LOGICAL, INTENT(IN) :: ODIAG_IN_RUN ! switch to activate online diagnostics (mesonh)
+LOGICAL, INTENT(IN) :: OIBM ! switch to modity mixing length near building with IBM
CHARACTER(LEN=4), INTENT(IN) :: HTURBLEN_CL ! kind of cloud mixing length
CHARACTER (LEN=4), INTENT(IN) :: HCLOUD ! Kind of microphysical scheme
REAL, INTENT(IN) :: PRSNOW ! Ratio for diffusion coeff. scalar (blowing snow)
@@ -175,6 +177,9 @@ REAL, DIMENSION(D%NIJT), INTENT(IN),OPTIONAL :: PSSVFL_C !
REAL, DIMENSION(D%NIJT), INTENT(IN),OPTIONAL :: PSSUFL
REAL, DIMENSION(D%NIJT), INTENT(IN),OPTIONAL :: PSSVFL !
!
+REAL, DIMENSION(D%NIJT,D%NKT), INTENT(IN), OPTIONAL :: PIBM_XMUT ! IBM turbulent viscosity
+REAL, DIMENSION(D%NIJT,D%NKT), INTENT(IN), OPTIONAL :: PIBM_LS ! IBM Level-set function
+!
!-------------------------------------------------------------------------------
!
END SUBROUTINE TURB
diff --git a/src/common/turb/turb.F90 b/src/common/turb/turb.F90
index a6e511f70..5b129d93a 100644
--- a/src/common/turb/turb.F90
+++ b/src/common/turb/turb.F90
@@ -7,7 +7,7 @@
& KMI,KRR,KRRL,KRRI,HLBCX,HLBCY,KGRADIENTS,KHALO, &
& KSPLIT,KMODEL_CL,KSV,KSV_LGBEG,KSV_LGEND,HPROGRAM, &
& KSV_LIMA_NR, KSV_LIMA_NS, KSV_LIMA_NG, KSV_LIMA_NH, &
- & O2D,ONOMIXLG,OFLAT,OCOUPLES,OBLOWSNOW, &
+ & O2D,ONOMIXLG,OFLAT,OCOUPLES,OBLOWSNOW,OIBM, &
& OCOMPUTE_SRC, PRSNOW, &
& OOCEAN,ODEEPOC,ODIAG_IN_RUN, &
& HTURBLEN_CL,HCLOUD, &
@@ -28,6 +28,7 @@
& PEDR,PLEM,PRTKEMS,PTPMF, &
& PDRUS_TURB,PDRVS_TURB, &
& PDRTHLS_TURB,PDRRTS_TURB,PDRSVS_TURB,PTR,PDISS, &
+ & PIBM_LS, PIBM_XMUT, &
& PCURRENT_TKE_DISS, PSSTFL, PSSTFL_C, PSSRFL_C, &
& PSSUFL_C, PSSVFL_C,PSSUFL,PSSVFL )
! #################################################################
@@ -251,7 +252,6 @@ USE MODD_FIELD, ONLY: TFIELDDATA,TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
!
USE MODD_LES, ONLY : TLES_t
-USE MODD_IBM_PARAM_n, ONLY: LIBM, XIBM_LS, XIBM_XMUT
USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
USE MODD_TURB_n, ONLY: TURB_t
!
@@ -309,6 +309,7 @@ LOGICAL, INTENT(IN) :: OFLAT ! Logical for zero ororogr
LOGICAL, INTENT(IN) :: OCOUPLES ! switch to activate atmos-ocean LES version
LOGICAL, INTENT(IN) :: OBLOWSNOW ! switch to activate pronostic blowing snow
LOGICAL, INTENT(IN) :: ODIAG_IN_RUN ! switch to activate online diagnostics (mesonh)
+LOGICAL, INTENT(IN) :: OIBM ! switch to modity mixing length near building with IBM
CHARACTER(LEN=4), INTENT(IN) :: HTURBLEN_CL ! kind of cloud mixing length
CHARACTER (LEN=4), INTENT(IN) :: HCLOUD ! Kind of microphysical scheme
INTEGER, INTENT(IN) :: KHALO ! Size of the halo for parallel distribution
@@ -422,6 +423,9 @@ REAL, DIMENSION(D%NIJT), INTENT(IN),OPTIONAL :: PSSVFL_C !
REAL, DIMENSION(D%NIJT), INTENT(IN),OPTIONAL :: PSSUFL
REAL, DIMENSION(D%NIJT), INTENT(IN),OPTIONAL :: PSSVFL !
!
+REAL, DIMENSION(D%NIJT,D%NKT), INTENT(OUT), OPTIONAL :: PIBM_XMUT ! IBM turbulent viscosity
+REAL, DIMENSION(D%NIJT,D%NKT), INTENT(IN), OPTIONAL :: PIBM_LS ! IBM Level-set function
+!
!
!-------------------------------------------------------------------------------
!
@@ -860,8 +864,8 @@ END IF
!* 3.9 Mixing length correction if immersed walls
! ------------------------------------------
!
-IF (LIBM) THEN
- CALL IBM_MIXINGLENGTH(D,ZLM,ZLEPS,XIBM_XMUT,XIBM_LS(:,:,:,1),PTKET)
+IF (OIBM) THEN
+ CALL IBM_MIXINGLENGTH(D,ZLM,ZLEPS,PIBM_XMUT,PIBM_LS,PTKET)
ENDIF
!----------------------------------------------------------------------------
!
diff --git a/src/mesonh/ext/phys_paramn.f90 b/src/mesonh/ext/phys_paramn.f90
index 8a16b6df6..d675a0fa5 100644
--- a/src/mesonh/ext/phys_paramn.f90
+++ b/src/mesonh/ext/phys_paramn.f90
@@ -275,7 +275,7 @@ USE MODD_FRC
USE MODD_FRC_n
USE MODD_GRID
USE MODD_GRID_n
-USE MODD_IBM_PARAM_n, ONLY: LIBM, XIBM_EPSI, XIBM_LS
+USE MODD_IBM_PARAM_n, ONLY: LIBM, XIBM_EPSI, XIBM_LS, XIBM_XMUT
USE MODD_ICE_C1R3_DESCR, ONLY : XRTMIN_C1R3=>XRTMIN
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LATZ_EDFLX
@@ -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, LIBM, &
GCOMPUTE_SRC, XRSNOW, &
LOCEAN, LDEEPOC, LDIAG_IN_RUN, &
CTURBLEN_CLOUD, CCLOUD, &
@@ -1588,6 +1588,7 @@ END IF
XTHW_FLUX, XRCW_FLUX, XSVW_FLUX,XDYP, XTHP, ZTDIFF, ZTDISS, &
TBUDGETS, KBUDGETS=SIZE(TBUDGETS),PLEM=XLEM,PRTKEMS=XRTKEMS, &
PTR=XTR, PDISS=XDISS, PCURRENT_TKE_DISS=XCURRENT_TKE_DISS, &
+ PIBM_LS=XIBM_LS(:,:,:,1), PIBM_XMUT=XIBM_XMUT, &
PSSTFL=XSSTFL, PSSTFL_C=XSSTFL_C, PSSRFL_C=XSSRFL_C, &
PSSUFL_C=XSSUFL_C, PSSVFL_C=XSSVFL_C, PSSUFL=XSSUFL, PSSVFL=XSSVFL )
!
--
GitLab