From 121bf8d877f32a3b796f665921b95f3715d816bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Vi=C3=A9?= <benoit.vie@meteo.fr>
Date: Fri, 28 Jan 2022 13:36:30 +0100
Subject: [PATCH] Correction d'erreurs issues du rebase sur branche principale
---
src/MNH/ice4_fast_rs.f90 | 11 ++++++-----
src/MNH/ice4_sedimentation_split.f90 | 11 ++++++-----
src/MNH/ice4_slow.f90 | 4 ++--
src/MNH/rain_ice_red.f90 | 11 ++++++-----
src/MNH/write_lesn.f90 | 5 -----
5 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/MNH/ice4_fast_rs.f90 b/src/MNH/ice4_fast_rs.f90
index 15084073a..b3df38c8c 100644
--- a/src/MNH/ice4_fast_rs.f90
+++ b/src/MNH/ice4_fast_rs.f90
@@ -85,12 +85,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
+USE MODD_RAIN_ICE_DESCR, ONLY: XBS,XCEXVT,XCXS,XRTMIN,XALPHAS,XNUS
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
+ XRIMINTP1,XRIMINTP2,XSRIMCG,XSRIMCG2,XSRIMCG3,XFVELOS
!
IMPLICIT NONE
!
@@ -171,8 +171,9 @@ ELSE
(PDV(:)*(XLVTT+(XCPV-XCL)*(PT(:)-XTT)) &
*(XESTT-PRS_TEND(:, IFREEZ1))/(XRV*PT(:)) )
PRS_TEND(:, IFREEZ1)=PRS_TEND(:, IFREEZ1)* PRST(:) * ( X0DEPS* PLBDAS(:)**XEX0DEPS + &
- X1DEPS*PCJ(:)*PLBDAS(:) **(XBS+XEX1DEPS)*(1+(XFVELOS/(2*PLBDAS(:)))**XALPHAS)**(-XNUS+XEX1DEPS/XALPHAS))/ &
- ( PRHODREF(:)*(XLMTT-XCL*(XTT-PT(:))) )
+ X1DEPS*PCJ(:)*PLBDAS(:) **(XBS+XEX1DEPS)* &
+ (1+(XFVELOS/(2*PLBDAS(:)))**XALPHAS)**(-XNUS+XEX1DEPS/XALPHAS))/ &
+ ( PRHODREF(:)*(XLMTT-XCL*(XTT-PT(:))) )
PRS_TEND(:, IFREEZ2)=(PRHODREF(:)*(XLMTT+(XCI-XCL)*(XTT-PT(:))) ) / &
( PRHODREF(:)*(XLMTT-XCL*(XTT-PT(:))) )
END WHERE
@@ -218,7 +219,7 @@ ELSE
! 5.1.1 select the PLBDAS
!
DO JJ = 1, IGRIM
- ZVEC1(JJ) = PLBDAS(I1(JJ))**XALPHAS + XFVELOS**XALPHAS)**(1./XALPHAS)
+ ZVEC1(JJ) = (PLBDAS(I1(JJ))**XALPHAS + XFVELOS**XALPHAS)**(1./XALPHAS)
END DO
!
! 5.1.2 find the next lower indice for the PLBDAS in the geometrical
diff --git a/src/MNH/ice4_sedimentation_split.f90 b/src/MNH/ice4_sedimentation_split.f90
index ae0039103..9e93d59e5 100644
--- a/src/MNH/ice4_sedimentation_split.f90
+++ b/src/MNH/ice4_sedimentation_split.f90
@@ -332,8 +332,9 @@ SUBROUTINE INTERNAL_SEDIM_SPLI(KIB,KIE,KIT,KJB,KJE,KJT,KKB,KKTB,KKTE,KKT,KKL,KRR
! ------------
!
USE MODD_CST, ONLY: XCPD,XP00,XRD
-USE MODD_RAIN_ICE_DESCR, ONLY: XCC,XCEXVT,XDC,XLBEXC,XRTMIN
-USE MODD_RAIN_ICE_PARAM, ONLY: XEXCSEDI,XEXSEDG,XEXSEDH,XEXSEDR,XEXSEDS,XFSEDG,XFSEDH,XFSEDI,XFSEDR,XFSEDS
+USE MODD_RAIN_ICE_DESCR, ONLY: XCC,XCEXVT,XDC,XLBEXC,XRTMIN,XALPHAS,XNUS,XBS
+USE MODD_RAIN_ICE_PARAM, ONLY: XEXCSEDI,XEXSEDG,XEXSEDH,XEXSEDR,XEXSEDS,XFSEDG,XFSEDH,XFSEDI,XFSEDR,XFSEDS,&
+ XFVELOS
!
IMPLICIT NONE
!
@@ -446,14 +447,14 @@ DO WHILE (ANY(ZREMAINT>0.))
ENDDO
ELSEIF(KSPE==5) THEN
! ******* for snow
- PWSED(:,:,:) = 0.
- DO JL=1, KSEDIM
+ ZWSED(:,:,:) = 0.
+ DO JL=1, ISEDIM
JI=I1(JL)
JJ=I2(JL)
JK=I3(JL)
IF(PRXT(JI,JJ,JK)> XRTMIN(KSPE)) THEN
- PWSED(JI, JJ, JK) = XFSEDS * &
+ ZWSED(JI, JJ, JK) = XFSEDS * &
& PRXT(JI,JJ,JK)* &
& PRHODREF(JI,JJ,JK)**(1-XCEXVT) * & ! Modif Wurtz snow
& (1 + (XFVELOS/PLBDAS(JI, JJ, JK))**XALPHAS)** (-XNUS+XEXSEDS/XALPHAS) * & ! GAMMAGEN LH_EXTENDED
diff --git a/src/MNH/ice4_slow.f90 b/src/MNH/ice4_slow.f90
index 6396ede49..df434ef76 100644
--- a/src/MNH/ice4_slow.f90
+++ b/src/MNH/ice4_slow.f90
@@ -71,9 +71,9 @@ SUBROUTINE ICE4_SLOW(KSIZE, LDSOFT, PCOMPUTE, PRHODREF, PT, &
! ------------
!
USE MODD_CST, ONLY: XTT
-USE MODD_RAIN_ICE_DESCR, ONLY: XCEXVT,XRTMIN
+USE MODD_RAIN_ICE_DESCR, ONLY: XCEXVT,XRTMIN,XALPHAS,XNUS,XBS
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
+ XEX0DEPG,XEX0DEPS,XEX1DEPG,XEX1DEPS,XEXIAGGS,XFIAGGS,XHON,XTEXAUTI,XTIMAUTI,XFVELOS
!
IMPLICIT NONE
!
diff --git a/src/MNH/rain_ice_red.f90 b/src/MNH/rain_ice_red.f90
index d0445e41e..153617ef6 100644
--- a/src/MNH/rain_ice_red.f90
+++ b/src/MNH/rain_ice_red.f90
@@ -273,7 +273,8 @@ 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
+USE MODD_RAIN_ICE_DESCR, ONLY: XRTMIN,XLBDAS_MAX
+USE MODD_RAIN_ICE_PARAM, ONLY: XLBDAS_MIN,XTRANS_MP_GAMMAS
USE MODD_VAR_ll, ONLY: IP
use mode_budget, only: Budget_store_add, Budget_store_init, Budget_store_end
@@ -370,7 +371,7 @@ INTEGER :: JI, JJ, JK
!For packing
INTEGER :: IMICRO ! Case r_x>0 locations
INTEGER, DIMENSION(KSIZE) :: I1,I2,I3 ! Used to replace the COUNT
-INTEGER :: JI, JJ, JK, JL ! and PACK intrinsics
+INTEGER :: JL ! and PACK intrinsics
!
!Arrays for nucleation call outisde of LDMICRO points
REAL, DIMENSION(KIT, KJT, KKT) :: ZW ! work array
@@ -578,9 +579,9 @@ ENDIF
!Compute lambda_snow parameter ! Modif Wurtz
!ZT en KELVIN
PLBDAS(:,:,:)=1000. !Wurtz
-DO JK = 1, IKT
- DO JJ = 1, IJT
- DO JI = 1, IIT
+DO JK = 1, KKT
+ DO JJ = 1, KJT
+ DO JI = 1, KIT
IF (PRST(JI,JJ,JK)>XRTMIN(5)) THEN
IF(ZT(JI,JJ,JK)>263.15) THEN
diff --git a/src/MNH/write_lesn.f90 b/src/MNH/write_lesn.f90
index a583470a4..783b5f3c8 100644
--- a/src/MNH/write_lesn.f90
+++ b/src/MNH/write_lesn.f90
@@ -126,11 +126,6 @@ INTEGER :: IMI ! Current model inde
!
IF (.NOT. LLES) RETURN
!
-IF (HLES_AVG=='A' &
- .AND. (XLES_TEMP_MEAN_START==XUNDEF .OR. XLES_TEMP_MEAN_END==XUNDEF)) RETURN
-IF (HLES_AVG=='E' .AND. CLES_NORM_TYPE=='NONE' ) RETURN
-IF ( HLES_AVG == 'H' .AND. ( CLES_NORM_TYPE == 'NONE' &
- .OR. XLES_TEMP_MEAN_START == XUNDEF .OR. XLES_TEMP_MEAN_END == XUNDEF ) ) RETURN
!
!* 1. Initializations
! ---------------
--
GitLab