From e7846d9ecb6c231340cb3c4749f1d269e460eace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Vi=C3=A9?= <benoit.vie@meteo.fr>
Date: Thu, 31 Mar 2022 09:17:00 +0200
Subject: [PATCH] Bugfix
---
src/MNH/default_desfmn.f90 | 4 ++--
src/MNH/ice4_fast_rs.f90 | 4 ++--
src/MNH/ice4_slow.f90 | 4 ++--
src/MNH/ice4_tendencies.f90 | 9 +++++----
src/MNH/ini_ice_c1r3.f90 | 2 +-
src/MNH/rain_ice_red.f90 | 4 ++--
6 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90
index 758eebf0f..e7eb7820c 100644
--- a/src/MNH/default_desfmn.f90
+++ b/src/MNH/default_desfmn.f90
@@ -277,7 +277,7 @@ USE MODD_ALLSTATION_n
USE MODD_PARAM_LIMA, ONLY : LCOLD, LNUCL, LSEDI, LHHONI, LSNOW, LHAIL, LMEYERS, &
NMOD_IFN, NMOM_I, XIFN_CONC, LIFN_HOM, CIFN_SPECIES, &
CINT_MIXING, NMOD_IMM, NIND_SPECIE, &
- LSNOW_T, CPRISTINE_ICE_LIMA, CHEVRIMED_ICE_LIMA, &
+ YSNOW_T=>LSNOW_T, CPRISTINE_ICE_LIMA, CHEVRIMED_ICE_LIMA, &
XFACTNUC_DEP, XFACTNUC_CON, &
OWARM=>LWARM, LACTI, ORAIN=>LRAIN, OSEDC=>LSEDC, &
OACTIT=>LACTIT, LBOUND, LSPRO, LADJ, LKHKO, &
@@ -1027,7 +1027,7 @@ IF (KMI == 1) THEN
LSEDI = .TRUE.
LSNOW = .TRUE.
LHAIL = .FALSE.
- LSNOW_T = .TRUE.
+ YSNOW_T = .TRUE.
CPRISTINE_ICE_LIMA = 'PLAT'
CHEVRIMED_ICE_LIMA = 'GRAU'
XFACTNUC_DEP = 1.0
diff --git a/src/MNH/ice4_fast_rs.f90 b/src/MNH/ice4_fast_rs.f90
index 50d0cae7d..11dbd67f5 100644
--- a/src/MNH/ice4_fast_rs.f90
+++ b/src/MNH/ice4_fast_rs.f90
@@ -86,12 +86,12 @@ SUBROUTINE ICE4_FAST_RS(KSIZE, LDSOFT, PCOMPUTE, &
USE MODD_CST, ONLY: XALPI,XALPW,XBETAI,XBETAW,XCI,XCL,XCPV,XESTT,XGAMI,XGAMW,XLMTT,XLVTT,XMD,XMV,XRV,XTT, &
XEPSILO
USE MODD_PARAM_ICE, ONLY: LEVLIMIT, CSNOWRIMING
-USE MODD_RAIN_ICE_DESCR, ONLY: XBS,XCEXVT,XCXS,XRTMIN,XALPHAS,XNUS
+USE MODD_RAIN_ICE_DESCR, ONLY: XBS,XCEXVT,XCXS,XRTMIN,XALPHAS,XNUS,XFVELOS
USE MODD_RAIN_ICE_PARAM, ONLY: NACCLBDAR,NACCLBDAS,NGAMINC,X0DEPS,X1DEPS,XACCINTP1R,XACCINTP1S,XACCINTP2R,XACCINTP2S, &
XCRIMSG,XCRIMSS,XEX0DEPS,XEX1DEPS,XEXCRIMSG,XEXCRIMSS,XEXSRIMCG,XEXSRIMCG2,XFRACCSS, &
XFSACCRG,XFSCVMG,XGAMINC_RIM1,XGAMINC_RIM1,XGAMINC_RIM2,XGAMINC_RIM4,XKER_RACCS, &
XKER_RACCSS,XKER_SACCRG,XLBRACCS1,XLBRACCS2,XLBRACCS3,XLBSACCR1,XLBSACCR2,XLBSACCR3, &
- XRIMINTP1,XRIMINTP2,XSRIMCG,XSRIMCG2,XSRIMCG3,XFVELOS
+ XRIMINTP1,XRIMINTP2,XSRIMCG,XSRIMCG2,XSRIMCG3
!
IMPLICIT NONE
!
diff --git a/src/MNH/ice4_slow.f90 b/src/MNH/ice4_slow.f90
index 521096775..e08dd1e77 100644
--- a/src/MNH/ice4_slow.f90
+++ b/src/MNH/ice4_slow.f90
@@ -72,9 +72,9 @@ SUBROUTINE ICE4_SLOW(KSIZE, LDSOFT, PCOMPUTE, PRHODREF, PT, &
! ------------
!
USE MODD_CST, ONLY: XTT
-USE MODD_RAIN_ICE_DESCR, ONLY: XCEXVT,XRTMIN,XALPHAS,XNUS,XBS
+USE MODD_RAIN_ICE_DESCR, ONLY: XCEXVT,XRTMIN,XALPHAS,XNUS,XBS,XFVELOS
USE MODD_RAIN_ICE_PARAM, ONLY: X0DEPG,X0DEPS,X1DEPG,X1DEPS,XACRIAUTI,XALPHA3,XBCRIAUTI,XBETA3,XCOLEXIS,XCRIAUTI, &
- XEX0DEPG,XEX0DEPS,XEX1DEPG,XEX1DEPS,XEXIAGGS,XFIAGGS,XHON,XTEXAUTI,XTIMAUTI,XFVELOS
+ XEX0DEPG,XEX0DEPS,XEX1DEPG,XEX1DEPS,XEXIAGGS,XFIAGGS,XHON,XTEXAUTI,XTIMAUTI
!
IMPLICIT NONE
!
diff --git a/src/MNH/ice4_tendencies.f90 b/src/MNH/ice4_tendencies.f90
index c4ec3d69c..ec33e100c 100644
--- a/src/MNH/ice4_tendencies.f90
+++ b/src/MNH/ice4_tendencies.f90
@@ -182,7 +182,8 @@ 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,LSNOW_T
-USE MODD_RAIN_ICE_DESCR, ONLY: XLBDAS_MAX,XLBEXG,XLBEXH,XLBEXR,XLBEXS,XLBG,XLBH,XLBR,XLBS,XRTMIN
+USE MODD_RAIN_ICE_DESCR, ONLY: XLBDAS_MIN,XLBDAS_MAX,XLBEXG,XLBEXH,XLBEXR,XLBEXS,&
+ XLBG,XLBH,XLBR,XLBS,XRTMIN,XTRANS_MP_GAMMAS
USE MODD_RAIN_ICE_PARAM, ONLY: XSCFAC
!
USE MODI_ICE4_COMPUTE_PDF
@@ -318,7 +319,7 @@ REAL, DIMENSION(KSIZE) :: ZRVT, ZRCT, ZRRT, ZRIT, ZRST, ZRGT, &
& ZRF, &
& ZLBDAR, ZLBDAS, ZLBDAG, ZLBDAH, ZLBDAR_RF, &
& ZRGSI, ZRGSI_MR
-REAL, DIMENSION(KIT,KJT,KKT) :: ZLBDAS3D, ZRRT3D, ZRST3D, ZRGT3D, ZRHT3D
+REAL, DIMENSION(KIT,KJT,KKT) :: ZRRT3D, ZRST3D, ZRGT3D, ZRHT3D
INTEGER :: JL
REAL, DIMENSION(KSIZE) :: ZWETG ! 1. if graupel growths in wet mode, 0. otherwise
@@ -410,7 +411,7 @@ ELSE
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX, 10**(6.226-0.0106*ZT(:))),XLBDAS_MIN)*XTRANS_MP_GAMMAS
END WHERE
ELSE
- ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(:)*MAX(ZRST(:), XRTMIN(5)))**XLBEXS,XLBDAS_MIN)
+ ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(:)*ZRST(:))**XLBEXS),XLBDAS_MIN)
END IF
CALL ICE4_RSRIMCG_OLD(KSIZE, ODSOFT, PCOMPUTE==1., &
&PRHODREF, &
@@ -486,7 +487,7 @@ IF(KSIZE>0) THEN
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX, 10**(6.226-0.0106*ZT(:))),XLBDAS_MIN)*XTRANS_MP_GAMMAS
END WHERE
ELSE
- ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(:)*MAX(ZRST(:), XRTMIN(5)))**XLBEXS,XLBDAS_MIN)
+ ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(:)*ZRST(:))**XLBEXS),XLBDAS_MIN)
END IF
ZLBDAG(:)=0.
WHERE(ZRGT(:)>0.)
diff --git a/src/MNH/ini_ice_c1r3.f90 b/src/MNH/ini_ice_c1r3.f90
index 8ee439bab..d04e13358 100644
--- a/src/MNH/ini_ice_c1r3.f90
+++ b/src/MNH/ini_ice_c1r3.f90
@@ -110,7 +110,7 @@ USE MODD_REF
!
use mode_msg
!
-USE MODD_RAIN_ICE_PARAM, ONLY : XFVELOS
+USE MODD_RAIN_ICE_DESCR, ONLY : XFVELOS
!
USE MODI_GAMMA
USE MODI_GAMMA_INC
diff --git a/src/MNH/rain_ice_red.f90 b/src/MNH/rain_ice_red.f90
index 4e378d3aa..3ad44addb 100644
--- a/src/MNH/rain_ice_red.f90
+++ b/src/MNH/rain_ice_red.f90
@@ -274,7 +274,7 @@ 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,LSNOW_T
-USE MODD_RAIN_ICE_DESCR, ONLY: XRTMIN,XLBDAS_MIN,XLBDAS_MAX,XTRANS_MP_GAMMAS
+USE MODD_RAIN_ICE_DESCR, ONLY: XRTMIN,XLBDAS_MIN,XLBDAS_MAX,XTRANS_MP_GAMMAS,XLBS,XLBEXS
USE MODD_VAR_ll, ONLY: IP
use mode_budget, only: Budget_store_add, Budget_store_init, Budget_store_end
@@ -590,7 +590,7 @@ DO JK = 1, KKT
END IF
END IF
ELSE
- ZLBDAS(JI,JJ,JK) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(JI,JK,JL)*MAX(PRST(JI,JK,JL), XRTMIN(5)))**XLBEXS,XLBDAS_MIN)
+ ZLBDAS(JI,JJ,JK) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(JI,JK,JL)*PRST(JI,JK,JL))**XLBEXS),XLBDAS_MIN)
END IF
END DO
END DO
--
GitLab