From 1c4f8dd93b9f731982b2cf87f584eb3aaa607a3c Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Mon, 28 Feb 2022 23:33:06 +0100
Subject: [PATCH] Quentin 28/02/2022: Correction on AROME from Merge of QR_MNH
branch : qsatmx_tab needed + problem with passing HCLOUD=CMICRO as new arg in
apl_arome (TODO)
---
src/arome/aux/mode_tridiag_w.F90 | 3 ---
src/arome/aux/modi_tridiag_w.F90 | 3 +++
src/arome/ext/apl_arome.F90 | 2 +-
src/arome/ext/aro_turb_mnh.F90 | 6 +++---
src/arome/{dead_code => micro}/mode_qsatmx_tab.F90 | 0
5 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 src/arome/aux/mode_tridiag_w.F90
create mode 100644 src/arome/aux/modi_tridiag_w.F90
rename src/arome/{dead_code => micro}/mode_qsatmx_tab.F90 (100%)
diff --git a/src/arome/aux/mode_tridiag_w.F90 b/src/arome/aux/mode_tridiag_w.F90
deleted file mode 100644
index 6e5ce1304..000000000
--- a/src/arome/aux/mode_tridiag_w.F90
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE MODE_TRIDIAG_W
-! Empty module for PHYEX, used in TURB 3D
-END MODULE MODE_TRIDIAG_W
diff --git a/src/arome/aux/modi_tridiag_w.F90 b/src/arome/aux/modi_tridiag_w.F90
new file mode 100644
index 000000000..f7926ae5d
--- /dev/null
+++ b/src/arome/aux/modi_tridiag_w.F90
@@ -0,0 +1,3 @@
+MODULE MODI_TRIDIAG_W
+! Empty module for PHYEX, used in TURB 3D
+END MODULE MODI_TRIDIAG_W
diff --git a/src/arome/ext/apl_arome.F90 b/src/arome/ext/apl_arome.F90
index 69c5696f4..298f6c90d 100644
--- a/src/arome/ext/apl_arome.F90
+++ b/src/arome/ext/apl_arome.F90
@@ -3055,7 +3055,7 @@ IF (LTURB) THEN
& PZZ=ZZZ_,PZZF=ZZZ_F_,&
& PZZTOP=ZZTOP_,PRHODJ=ZRHODJM__,PTHVREF=ZTHVREFM__,&
& PRHODREF=ZRHODREFM__,HINST_SFU='M',&
- & HMF_UPDRAFT=CMF_UPDRAFT,HCLOUD=CMICRO,&
+ & HMF_UPDRAFT=CMF_UPDRAFT,&
& PSFTH=ZSFTH_,PSFRV=ZSFRV_,&
& PSFSV=ZSFSVLIMA_,PSFU=ZSFU_,&
& PSFV=ZSFV_,PPABSM=ZPABSM__,&
diff --git a/src/arome/ext/aro_turb_mnh.F90 b/src/arome/ext/aro_turb_mnh.F90
index a37f4064f..73772849b 100644
--- a/src/arome/ext/aro_turb_mnh.F90
+++ b/src/arome/ext/aro_turb_mnh.F90
@@ -2,7 +2,7 @@
SUBROUTINE ARO_TURB_MNH( KKA,KKU,KKL,KLON,KLEV,KRR,KRRL,KRRI,KSV, &
KTCOUNT, KGRADIENTS, LDHARATU, PTSTEP, &
PZZ, PZZF, PZZTOP, &
- PRHODJ, PTHVREF,PRHODREF,HINST_SFU,HMF_UPDRAFT,HCLOUD,&
+ PRHODJ, PTHVREF,PRHODREF,HINST_SFU,HMF_UPDRAFT, &
PSFTH,PSFRV,PSFSV,PSFU,PSFV, &
PPABSM,PUM,PVM,PWM,PTKEM,PEPSM,PSVM,PSRCM, &
PTHM,PRM, &
@@ -101,7 +101,7 @@ INTEGER, INTENT(IN) :: KGRADIENTS ! Number of stored horizon
LOGICAL, INTENT(IN) :: LDHARATU ! HARATU scheme active
CHARACTER (LEN=4), INTENT(IN) :: HMF_UPDRAFT ! Type of mass flux scheme
-CHARACTER (LEN=4), INTENT(IN) :: HCLOUD ! Type of microphysical scheme
+CHARACTER (LEN=4) :: HCLOUD ! Type of microphysical scheme
REAL, INTENT(IN) :: PTSTEP ! Time step
!
!
@@ -281,7 +281,7 @@ ORMC01=.FALSE.
HTURBDIM='1DIM'
HTURBLEN='BL89'
-
+HCLOUD='ICE3'
ZIMPL=1.
!Version Ocean du schema de turbulence
diff --git a/src/arome/dead_code/mode_qsatmx_tab.F90 b/src/arome/micro/mode_qsatmx_tab.F90
similarity index 100%
rename from src/arome/dead_code/mode_qsatmx_tab.F90
rename to src/arome/micro/mode_qsatmx_tab.F90
--
GitLab