From 407ab5be6dc34500afc8ac3bb9780b5f39ce4158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Vi=C3=A9?= <benoit.vie@meteo.fr>
Date: Wed, 30 Mar 2022 18:10:29 +0200
Subject: [PATCH] Add LSNOW_T_I in lidar, radar... + Move LSNOW_T to
modd_param_ice
---
src/MNH/aircraft_balloon_evol.f90 | 4 +++-
src/MNH/default_desfmn.f90 | 3 ++-
src/MNH/ice4_tendencies.f90 | 2 +-
src/MNH/lidar.f90 | 4 +++-
src/MNH/modd_param_ice.f90 | 1 +
src/MNH/modd_rain_ice_descr.f90 | 1 -
src/MNH/modn_param_ice.f90 | 2 +-
src/MNH/profilern.f90 | 4 +++-
src/MNH/radar_rain_ice.f90 | 4 +++-
src/MNH/radar_scattering.f90 | 3 ++-
src/MNH/rain_ice_red.f90 | 4 ++--
11 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/MNH/aircraft_balloon_evol.f90 b/src/MNH/aircraft_balloon_evol.f90
index 43cab9ac9..aa0a13bf2 100644
--- a/src/MNH/aircraft_balloon_evol.f90
+++ b/src/MNH/aircraft_balloon_evol.f90
@@ -154,6 +154,7 @@ USE MODD_PARAM_LIMA_MIXED, ONLY: XDG_L=>XDG,XLBEXG_L=>XLBEXG,XLBG_L=>XLBG,XCCG_L
USE MODD_PARAM_LIMA_WARM, ONLY: XLBEXR_L=>XLBEXR,XLBR_L=>XLBR,XBR_L=>XBR,XAR_L=>XAR,&
XBC_L=>XBC,XAC_L=>XAC
USE MODD_PARAM_n, ONLY: CCLOUD, CSURF
+USE MODD_PARAM_ICE, ONLY: LSNOW_T_I=>LSNOW_T
USE MODD_RAIN_ICE_DESCR, ONLY: XALPHAR_I=>XALPHAR,XNUR_I=>XNUR,XLBEXR_I=>XLBEXR,&
XLBR_I=>XLBR,XCCR_I=>XCCR,XBR_I=>XBR,XAR_I=>XAR,&
XALPHAC_I=>XALPHAC,XNUC_I=>XNUC,&
@@ -1179,7 +1180,8 @@ IF ( TPFLYER%FLY) THEN
ZLB=( ZA*ZCC*MOMG(ZALPHA,ZNU,ZB) )**(-ZLBEX)
ENDIF
END SELECT
- IF (JLOOP.EQ.5 .AND. CCLOUD=='LIMA' .AND. LSNOW_T_L) THEN
+ IF (JLOOP.EQ.5 .AND. ( (CCLOUD=='LIMA'.AND.LSNOW_T_L).OR. &
+ (CCLOUD=='ICE3'.AND.LSNOW_T_I) ) ) THEN
IF (ZTEMPZ(JK)>-10.) THEN
ZLBDA = MAX(MIN(XLBDAS_MAX, 10**(14.554-0.0423*(ZTEMPZ(JK)+273.15))),XLBDAS_MIN)
ELSE
diff --git a/src/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90
index f4bd710ae..758eebf0f 100644
--- a/src/MNH/default_desfmn.f90
+++ b/src/MNH/default_desfmn.f90
@@ -872,7 +872,8 @@ IF (KMI == 1) THEN
CFRAC_ICE_SHALLOW_MF = 'S'
LSEDIM_AFTER = .FALSE.
LDEPOSC = .FALSE.
- XVDEPOSC= 0.02 ! 2 cm/s
+ XVDEPOSC= 0.02 ! 2 cm/s
+ LSNOW_T=.FALSE.
END IF
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/ice4_tendencies.f90 b/src/MNH/ice4_tendencies.f90
index f012b2184..c4ec3d69c 100644
--- a/src/MNH/ice4_tendencies.f90
+++ b/src/MNH/ice4_tendencies.f90
@@ -181,7 +181,7 @@ SUBROUTINE ICE4_TENDENCIES(KSIZE, KIB, KIE, KIT, KJB, KJE, KJT, KKB, KKE, KKT, K
! ------------
!
USE MODD_CST, ONLY: XALPI,XBETAI,XCI,XCPV,XEPSILO,XGAMI,XLSTT,XMD,XMV,XP00,XRV,XTT
-USE MODD_PARAM_ICE, ONLY: CSNOWRIMING
+USE MODD_PARAM_ICE, ONLY: CSNOWRIMING,LSNOW_T
USE MODD_RAIN_ICE_DESCR, ONLY: XLBDAS_MAX,XLBEXG,XLBEXH,XLBEXR,XLBEXS,XLBG,XLBH,XLBR,XLBS,XRTMIN
USE MODD_RAIN_ICE_PARAM, ONLY: XSCFAC
!
diff --git a/src/MNH/lidar.f90 b/src/MNH/lidar.f90
index 1bee4acda..a7b0bf94d 100644
--- a/src/MNH/lidar.f90
+++ b/src/MNH/lidar.f90
@@ -99,6 +99,7 @@ USE MODD_RAIN_C2R2_DESCR, ONLY : XLBEXC, XLBEXR, &
XRTMIN, XCTMIN
USE MODD_PARAM_C2R2, ONLY : YALPHAC=>XALPHAC,YNUC=>XNUC, &
YALPHAR=>XALPHAR,YNUR=>XNUR
+USE MODD_PARAM_ICE, ONLY: WSNOW_T=>LSNOW_T
USE MODD_RAIN_ICE_DESCR, ONLY : XCCR, WLBEXR=>XLBEXR, XLBR, &
XCCS, XCXS, XLBEXS, XLBS, &
XCCG, XCXG, XLBEXG, XLBG, &
@@ -527,7 +528,8 @@ SELECT CASE ( HCLOUD )
!
YDSD = 'MONOD'
ZIWC = PRHO(JI,JJ,JK)*PRT(JI,JJ,JK,5)
- IF (HCLOUD=='LIMA' .AND. USNOW_T) THEN
+ IF ( (HCLOUD=='LIMA' .AND. USNOW_T) .OR. &
+ (HCLOUD=='ICE3' .AND. WSNOW_T) ) THEN
IF (PT(JI,JJ,JK)>-10.) THEN
ZLBDAS = MAX(MIN(XLBDAS_MAX, 10**(14.554-0.0423*(PT(JI,JJ,JK)+273.15))),XLBDAS_MIN)
ELSE
diff --git a/src/MNH/modd_param_ice.f90 b/src/MNH/modd_param_ice.f90
index ddafd7516..ade107121 100644
--- a/src/MNH/modd_param_ice.f90
+++ b/src/MNH/modd_param_ice.f90
@@ -78,6 +78,7 @@ LOGICAL, SAVE :: LSEDIM_AFTER ! sedimentation done before (.FALSE.) or after (.T
!
REAL, SAVE :: XSPLIT_MAXCFL ! Maximum CFL number allowed for SPLIT scheme
!
+LOGICAL,SAVE :: LSNOW_T ! Snow parameterization from Wurtz (2021)
!-------------------------------------------------------------------------------
!
END MODULE MODD_PARAM_ICE
diff --git a/src/MNH/modd_rain_ice_descr.f90 b/src/MNH/modd_rain_ice_descr.f90
index e754d5a8f..789a251c8 100644
--- a/src/MNH/modd_rain_ice_descr.f90
+++ b/src/MNH/modd_rain_ice_descr.f90
@@ -76,7 +76,6 @@ REAL,SAVE :: XALPHAS,XNUS,XLBEXS,XLBS ! Snow/agg. distribution parameters
REAL,SAVE :: XALPHAG,XNUG,XLBEXG,XLBG ! Graupel distribution parameters
REAL,SAVE :: XALPHAH,XNUH,XLBEXH,XLBH ! Hail distribution parameters
!
-LOGICAL,SAVE :: LSNOW_T ! Snow parameterization from Wurtz (2021)
REAL,SAVE :: XFVELOS ! factor for snow fall speed after Thompson (2008)
REAL,SAVE :: XTRANS_MP_GAMMAS ! coefficient to convert lambdas for gamma function
!
diff --git a/src/MNH/modn_param_ice.f90 b/src/MNH/modn_param_ice.f90
index 0c7379b3b..085f74d73 100644
--- a/src/MNH/modn_param_ice.f90
+++ b/src/MNH/modn_param_ice.f90
@@ -26,6 +26,6 @@ NAMELIST/NAM_PARAM_ICE/LWARM,LSEDIC,LCONVHG,CPRISTINE_ICE,CSEDIM,LDEPOSC,XVDEPOS
LEVLIMIT,LNULLWETG,LWETGPOST,LNULLWETH,LWETHPOST, &
CSNOWRIMING,XFRACM90,NMAXITER,XMRSTEP,XTSTEP_TS, &
LADJ_BEFORE, LADJ_AFTER, CFRAC_ICE_ADJUST, LCRFLIMIT, &
- XSPLIT_MAXCFL, CFRAC_ICE_SHALLOW_MF, LSEDIM_AFTER
+ XSPLIT_MAXCFL, CFRAC_ICE_SHALLOW_MF, LSEDIM_AFTER, LSNOW_T
!
END MODULE MODN_PARAM_ICE
diff --git a/src/MNH/profilern.f90 b/src/MNH/profilern.f90
index e2025c578..997562e4f 100644
--- a/src/MNH/profilern.f90
+++ b/src/MNH/profilern.f90
@@ -121,6 +121,7 @@ USE MODD_PARAM_LIMA_MIXED, ONLY: XDG_L=>XDG,XLBEXG_L=>XLBEXG,XLBG_L=>XLBG,XCCG_L
XAG_L=>XAG,XBG_L=>XBG,XCXG_L=>XCXG,XCG_L=>XCG
USE MODD_PARAM_LIMA_WARM, ONLY: XLBEXR_L=>XLBEXR,XLBR_L=>XLBR,XBR_L=>XBR,XAR_L=>XAR,&
XBC_L=>XBC,XAC_L=>XAC
+USE MODD_PARAM_ICE, ONLY: LSNOW_T_I=>LSNOW_T
USE MODD_RAIN_ICE_DESCR, ONLY: XALPHAR_I=>XALPHAR,XNUR_I=>XNUR,XLBEXR_I=>XLBEXR,&
XLBR_I=>XLBR,XCCR_I=>XCCR,XBR_I=>XBR,XAR_I=>XAR,&
XALPHAC_I=>XALPHAC,XNUC_I=>XNUC,&
@@ -726,7 +727,8 @@ IF (GSTORE) THEN
ZLB=( ZA*ZCC*MOMG(ZALPHA,ZNU,ZB) )**(-ZLBEX)
ENDIF
END SELECT
- IF (JLOOP.EQ.5 .AND. CCLOUD=='LIMA' .AND. LSNOW_T_L) THEN
+ IF (JLOOP.EQ.5 .AND. ( (CCLOUD=='LIMA'.AND.LSNOW_T_L).OR. &
+ (CCLOUD=='ICE3'.AND.LSNOW_T_I) ) ) THEN
IF (ZTEMPZ(JK)>-10.) THEN
ZLBDA = MAX(MIN(XLBDAS_MAX, 10**(14.554-0.0423*(ZTEMPZ(JK)+273.15))),XLBDAS_MIN)
ELSE
diff --git a/src/MNH/radar_rain_ice.f90 b/src/MNH/radar_rain_ice.f90
index b42848f56..bd892a452 100644
--- a/src/MNH/radar_rain_ice.f90
+++ b/src/MNH/radar_rain_ice.f90
@@ -96,6 +96,7 @@ END MODULE MODI_RADAR_RAIN_ICE
!
USE MODD_CST
USE MODD_REF
+USE MODD_PARAM_ICE, ONLY: LSNOW_T_I=>LSNOW_T
USE MODD_RAIN_ICE_DESCR, ONLY: XALPHAR_I=>XALPHAR,XNUR_I=>XNUR,XLBEXR_I=>XLBEXR,&
XLBR_I=>XLBR,XCCR_I=>XCCR,XBR_I=>XBR,XAR_I=>XAR,&
XALPHAC_I=>XALPHAC,XNUC_I=>XNUC,&
@@ -328,7 +329,8 @@ END IF
! ---------------
!
IF (SIZE(PRT,4) >= 5) THEN
- IF (CCLOUD=='LIMA' .AND. LSNOW_T_L) THEN
+ IF ( (CCLOUD=='LIMA' .AND. LSNOW_T_L) .OR. &
+ (CCLOUD=='ICE3' .AND. LSNOW_T_I) ) THEN
ZDMELT_FACT = ( (6.0*XAS_L)/(XPI*XRHOLW) )**(2.0)
ZEXP = 2.0*XBS_L
WHERE(PTEMP(:,:,:)>-10. .AND. PRT(:,:,:,5).GT.XRTMIN_L(5))
diff --git a/src/MNH/radar_scattering.f90 b/src/MNH/radar_scattering.f90
index 413bbbb92..4d6537af5 100644
--- a/src/MNH/radar_scattering.f90
+++ b/src/MNH/radar_scattering.f90
@@ -105,6 +105,7 @@ USE MODD_CST
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT
USE MODD_PARAMETERS
+USE MODD_PARAM_ICE, ONLY: LSNOW_T_I=>LSNOW_T
USE MODD_RAIN_ICE_DESCR, ONLY: XALPHAR_I=>XALPHAR,XNUR_I=>XNUR,XDR_I=>XDR,XLBEXR_I=>XLBEXR,&
XLBR_I=>XLBR,XCCR_I=>XCCR,XBR_I=>XBR,XCR_I=>XCR,&
XALPHAS_I=>XALPHAS,XNUS_I=>XNUS,XDS_I=>XDS,XLBEXS_I=>XLBEXS,&
@@ -1284,7 +1285,7 @@ DO JI=1,INBRAD
ZDMELT_FACT=6.*ZAS/(XPI*.92*XRHOLW)
ZEXP=2.*ZBS !XBS = 1.9 in ini_radar.f90 (bj tab 2.1 p24)
!dans ini_rain_ice.f90 :
- IF (GLIMA .AND. LSNOW_T_L) THEN
+ IF ( (GLIMA .AND. LSNOW_T_L) .OR. (.NOT.GLIMA .AND. LSNOW_T_I) ) THEN
IF (PT_RAY(JI,JEL,JAZ,JL,JH,JV)>-10.) THEN
ZLBDA = MAX(MIN(XLBDAS_MAX, 10**(14.554-0.0423*(PT_RAY(JI,JEL,JAZ,JL,JH,JV)+273.15))),XLBDAS_MIN)
ELSE
diff --git a/src/MNH/rain_ice_red.f90 b/src/MNH/rain_ice_red.f90
index a44c3af43..4e378d3aa 100644
--- a/src/MNH/rain_ice_red.f90
+++ b/src/MNH/rain_ice_red.f90
@@ -273,8 +273,8 @@ use modd_budget, only: lbu_enable,
USE MODD_CST, ONLY: XCI,XCL,XCPD,XCPV,XLSTT,XLVTT,XTT
USE MODD_PARAMETERS, ONLY: JPVEXT,XUNDEF
USE MODD_PARAM_ICE, ONLY: CSUBG_PR_PDF,CSUBG_RC_RR_ACCR,CSUBG_RR_EVAP,LDEPOSC,LFEEDBACKT,LSEDIM_AFTER, &
- NMAXITER,XMRSTEP,XTSTEP_TS,XVDEPOSC
-USE MODD_RAIN_ICE_DESCR, ONLY: XRTMIN,XLBDAS_MIN,XLBDAS_MAX,XTRANS_MP_GAMMAS,LSNOW_T
+ NMAXITER,XMRSTEP,XTSTEP_TS,XVDEPOSC,LSNOW_T
+USE MODD_RAIN_ICE_DESCR, ONLY: XRTMIN,XLBDAS_MIN,XLBDAS_MAX,XTRANS_MP_GAMMAS
USE MODD_VAR_ll, ONLY: IP
use mode_budget, only: Budget_store_add, Budget_store_init, Budget_store_end
--
GitLab