diff --git a/src/MNH/ini_rain_ice_elec.f90 b/src/MNH/ini_rain_ice_elec.f90
index d425bc79ad448ecf72ff6cb5f44234de174e8e4a..7c1eaf591957ce9b2d99915b2c79d7a1c584c5e9 100644
--- a/src/MNH/ini_rain_ice_elec.f90
+++ b/src/MNH/ini_rain_ice_elec.f90
@@ -87,7 +87,6 @@ END MODULE MODI_INI_RAIN_ICE_ELEC
!! Modifications:
!! C. Barthe 20/11/09 update to version 4.8.1
! P. Wautelet 26/04/2019: replace non-standard FLOAT function by REAL function
-! J. Wurtz 03/2022: New snow characteristics with LSNOW_T
!
!-------------------------------------------------------------------------------
!
@@ -272,25 +271,12 @@ XF2I = 0.14
!
XAS = 0.02
XBS = 1.9
-IF (LSNOW_T) THEN
-!Cas Gamma generalisee
-XCS = 11.52
-XDS = 0.39
-XFVELOS =0.097
-!Cas MP
-!XCS = 13.2
-!XDS = 0.423
-!XFVELOS = 25.14
-ELSE
-XCS = 5.
+XCS = 5.1
XDS = 0.27
XFVELOS = 0.
-END IF
!
-IF (.NOT. LSNOW_T) THEN
XCCS = 5.0
XCXS = 1.0
-END IF
!
XF0S = 0.86
XF1S = 0.28
@@ -357,17 +343,8 @@ XNUR = 1.0 ! Exponential law
XALPHAI = 3.0 ! Gamma law for the ice crystal volume
XNUI = 3.0 ! Gamma law with little dispersion
!
-IF (LSNOW_T) THEN
-!Cas GAMMAGEN
- XALPHAS = .214 ! Generalized gamma law
- XNUS = 43.7 ! Generalized gamma law
- XTRANS_MP_GAMMAS = SQRT( ( GAMMA(XNUS + 2./XALPHAS)*GAMMA(XNUS + 4./XALPHAS) ) / &
- ( 8.* GAMMA(XNUS + 1./XALPHAS)*GAMMA(XNUS + 3./XALPHAS) ) )
-ELSE
- XALPHAS = 1.0 ! Exponential law
- XNUS = 1.0 ! Exponential law
- XTRANS_MP_GAMMAS = 1.
-END IF
+XALPHAS = 1.0 ! Exponential law
+XNUS = 1.0 ! Exponential law
!
XALPHAG = 1.0 ! Exponential law
XNUG = 1.0 ! Exponential law
@@ -389,7 +366,6 @@ XLBR = (XAR * XCCR * MOMG(XALPHAR,XNUR,XBR))**(-XLBEXR)
XLBEXI = 1.0 / (-XBI)
XLBI = (XAI * MOMG(XALPHAI,XNUI,XBI))**(-XLBEXI)
!
-XNS = 1.0/(XAS*MOMG(XALPHAS,XNUS,XBS))
XLBEXS = 1.0/(XCXS-XBS)
XLBS = ( XAS*XCCS*MOMG(XALPHAS,XNUS,XBS) )**(-XLBEXS)
!
@@ -406,8 +382,7 @@ XLBDAS_MAX = 100000.0
XLBDAG_MAX = 100000.0
!
ZCONC_MAX = 1.E6 ! Maximal concentration for falling particules set to 1 per cc
-XLBDAS_MAX = 1.E6
-XLBDAS_MIN = 1000.
+XLBDAS_MAX = (ZCONC_MAX / XCCS)**(1./XCXS)
!
IF (HCLOUD == 'ICE4') THEN
ALLOCATE( XRTMIN(7) )
@@ -468,20 +443,9 @@ XEXCSEDI =-0.9324 * 3.0
WRITE (KLUOUT,FMT=*)' PRISTINE ICE SEDIMENTATION for columns XFSEDI =',XFSEDI
!
!
-IF (LSNOW_T) THEN
-!HOUZE/HAIC
- !XEXSEDS = -XDS !(2*XBS+XDS)
- !XFSEDS = XCS*MOMG(XALPHAS,XNUS,XBS+XDS)/(MOMG(XALPHAS,XNUS,XBS)) &
- ! *(ZRHO00)**XCEXVT
-!LH_EXTENDED
- XEXSEDS = -XDS-XBS
- XFSEDS = XCS*MOMG(XALPHAS,XNUS,XBS+XDS)/(MOMG(XALPHAS,XNUS,XBS)) &
- *(ZRHO00)**XCEXVT
-ELSE
- XEXSEDS = (XBS+XDS-XCXS)/(XBS-XCXS)
- XFSEDS = XCS*XAS*XCCS*MOMG(XALPHAS,XNUS,XBS+XDS)* &
+XEXSEDS = (XBS+XDS-XCXS)/(XBS-XCXS)
+XFSEDS = XCS*XAS*XCCS*MOMG(XALPHAS,XNUS,XBS+XDS)* &
(XAS*XCCS*MOMG(XALPHAS,XNUS,XBS))**(-XEXSEDS)*(ZRHO00)**XCEXVT
-END IF
!
XEXSEDG = (XBG+XDG-XCXG)/(XBG-XCXG)
XFSEDG = XCG*XAG*XCCG*MOMG(XALPHAG,XNUG,XBG+XDG)* &
@@ -554,10 +518,10 @@ XSCFAC = (0.63**(1./3.)) * SQRT((ZRHO00)**XCEXVT) ! One assumes Sc=0.63
X0DEPI = (4.0 * XPI) * XC1I * XF0I * MOMG(XALPHAI,XNUI,1.)
X2DEPI = (4.0 * XPI) * XC1I * XF2I * XC_I * MOMG(XALPHAI,XNUI,XDI+2.0)
!
-X0DEPS = XNS*(4.0*XPI)*XC1S*XF0S*MOMG(XALPHAS,XNUS,1.)
-X1DEPS = XNS*(4.0*XPI)*XC1S*XF1S*SQRT(XCS)*MOMG(XALPHAS,XNUS,0.5*XDS+1.5)
-XEX0DEPS = XBS-1.0
-XEX1DEPS = -0.5*(XDS+3.0)
+X0DEPS = (4.0 * XPI) * XCCS * XC1S * XF0S * MOMG(XALPHAS,XNUS,1.)
+X1DEPS = (4.0 * XPI) * XCCS * XC1S * XF1S * SQRT(XCS) * MOMG(XALPHAS,XNUS,0.5*XDS+1.5)
+XEX0DEPS = XCXS - 1.0
+XEX1DEPS = XCXS - 0.5 * (XDS + 3.0)
!
X0DEPG = (4.0 * XPI) * XCCG * XC1G * XF0G * MOMG(XALPHAG,XNUG,1.)
X1DEPG = (4.0 * XPI) * XCCG * XC1G * XF1G * SQRT(XCG) * MOMG(XALPHAG,XNUG,0.5*XDG+1.5)
@@ -590,8 +554,9 @@ END IF
!
XCOLIS = 0.25 ! Collection efficiency of I+S
XCOLEXIS = 0.05 ! Temperature factor of the I+S collection efficiency
-XFIAGGS = XNS*(XPI/4.0)*XCOLIS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
-XEXIAGGS = -XDS - 2.0 ! GAMMGEN LH_EXTENDED
+XFIAGGS = (XPI / 4.0) * XCOLIS * XCCS * XCS * (ZRHO00**XCEXVT) * &
+ MOMG(XALPHAS,XNUS,XDS+2.0)
+XEXIAGGS = XCXS - XDS - 2.0
!
GFLAG = .TRUE.
IF (GFLAG) THEN
@@ -641,15 +606,12 @@ XEX1EVAR = -1.0 - 0.5 * (XDR + 3.0)
!
XDCSLIM = 0.007 ! D_cs^lim = 7 mm as suggested by Farley et al. (1989)
XCOLCS = 1.0
-XEXCRIMSS= -XDS-2.0
-XCRIMSS = XNS * (XPI/4.0)*XCOLCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
+XEXCRIMSS= XCXS - XDS - 2.0
+XCRIMSS = (XPI / 4.0) * XCOLCS * XCCS * XCS * (ZRHO00**XCEXVT) * MOMG(XALPHAS,XNUS,XDS+2.0)
XEXCRIMSG= XEXCRIMSS
XCRIMSG = XCRIMSS
-XSRIMCG = XNS*XAS*MOMG(XALPHAS,XNUS,XBS)
-XEXSRIMCG = -XBS
-XSRIMCG2 = XNS*XAG*MOMG(XALPHAS,XNUS,XBG)
-XSRIMCG3 = XFRACM90
-XEXSRIMCG2=XBS-XBG
+XSRIMCG = XCCS * XAS * MOMG(XALPHAS,XNUS,XBS)
+XEXSRIMCG= XCXS - XBS
!
GFLAG = .TRUE.
IF (GFLAG) THEN
@@ -680,13 +642,13 @@ XRIMINTP2 = 1.0 + XRIMINTP1 * LOG(XDCSLIM/(XGAMINC_BOUND_MIN)**(1.0/XALPHAS))
!
!* 7.2 Constants for the accretion of raindrops onto aggregates
!
-XFRACCSS = XNS*((XPI**2)/24.0)*XCCR*XRHOLW*(ZRHO00**XCEXVT)
+XFRACCSS = ((XPI**2) / 24.0) * XCCS * XCCR * XRHOLW * (ZRHO00**XCEXVT)
!
XLBRACCS1 = MOMG(XALPHAS,XNUS,2.) * MOMG(XALPHAR,XNUR,3.)
XLBRACCS2 = 2. * MOMG(XALPHAS,XNUS,1.) * MOMG(XALPHAR,XNUR,4.)
XLBRACCS3 = MOMG(XALPHAR,XNUR,5.)
!
-XFSACCRG = XNS*(XPI/4.0)*XAS*XCCR*(ZRHO00**XCEXVT)
+XFSACCRG = (XPI / 4.0) * XAS * XCCS * XCCR * (ZRHO00**XCEXVT)
!
XLBSACCR1 = MOMG(XALPHAR,XNUR,2.) * MOMG(XALPHAS,XNUS,XBS)
XLBSACCR2 = 2. * MOMG(XALPHAR,XNUR,1.) * MOMG(XALPHAS,XNUS,XBS+1.)
@@ -861,8 +823,6 @@ XCOLEXIG = 0.1 ! Temperature factor of the I+G collection efficiency
WRITE (KLUOUT, FMT=*) ' NEW Constants for the cloud ice collection by the graupeln'
WRITE (KLUOUT, FMT=*) ' XCOLIG, XCOLEXIG = ',XCOLIG,XCOLEXIG
XFIDRYG = (XPI/4.0)*XCOLIG*XCCG*XCG*(ZRHO00**XCEXVT)*MOMG(XALPHAG,XNUG,XDG+2.0)
-XEXFIDRYG=(XCXG-XDG-2.)/(XCXG-XBG)
-XFIDRYG2=XFIDRYG/XCOLIG*(XAG*XCCG*MOMG(XALPHAG,XNUG,XBG))**(-XEXFIDRYG)
!
GFLAG = .TRUE.
IF (GFLAG) THEN
@@ -879,7 +839,8 @@ XCOLSG = 0.01 ! Collection efficiency of S+G
XCOLEXSG = 0.1 ! Temperature factor of the S+G collection efficiency
WRITE (KLUOUT, FMT=*) ' NEW Constants for the aggregate collection by the graupeln'
WRITE (KLUOUT, FMT=*) ' XCOLSG, XCOLEXSG = ',XCOLSG,XCOLEXSG
-XFSDRYG = XNS*(XPI/4.0)*XCOLSG*XCCG*XAS*(ZRHO00**XCEXVT)
+!
+XFSDRYG = (XPI / 4.0) * XCOLSG * XCCG * XCCS * XAS * (ZRHO00**XCEXVT)
!
XLBSDRYG1 = MOMG(XALPHAG,XNUG,2.) * MOMG(XALPHAS,XNUS,XBS)
XLBSDRYG2 = 2. * MOMG(XALPHAG,XNUG,1.) * MOMG(XALPHAS,XNUS,XBS+1.)
@@ -1072,10 +1033,7 @@ XFWETH = (XPI / 4.0) * XCCH * XCH * (ZRHO00**XCEXVT) * MOMG(XALPHAH,XNUH,XDH+2.0
!
!* 9.2.2 Constants for the aggregate collection by the hailstones
!
-XCOLSH = 0.01 ! Collection efficiency of S+H
-XCOLEXSH = 0.1 ! Temperature factor of the S+H collection efficiency
-!XFSWETH = (XPI/4.0)*XCCH*XCCS*XAS*(ZRHO00**XCEXVT)
-XFSWETH = XNS*(XPI/4.0)*XCCH*XAS*(ZRHO00**XCEXVT) ! Wurtz
+XFSWETH = (XPI/4.0) * XCCH * XCCS * XAS * (ZRHO00**XCEXVT)
!
XLBSWETH1 = MOMG(XALPHAH,XNUH,2.) * MOMG(XALPHAS,XNUS,XBS)
XLBSWETH2 = 2. * MOMG(XALPHAH,XNUH,1.) * MOMG(XALPHAS,XNUS,XBS+1.)