Quentin 28/11/2023: bugfix merge of ELEC to PHYEX contributions

src/common/micro/mode_ice4_pack.F90

@@ -299,7 +299,7 @@ IF(PARAMI%LPACK_MICRO) THEN
               ! Save indices for later usages:
               I1(IC) = JIJ
               I2(IC) = JK
-              IF(BUCONF%LBU_ENABLE) THEN
+              IF(BUCONF%LBU_ENABLE .OR. OSAVE_MICRO) THEN
                 I1TOT(JMICRO+IC-1)=JIJ
                 I2TOT(JMICRO+IC-1)=JK
               ENDIF

src/common/micro/rain_ice.F90

@@ -364,7 +364,7 @@ LOGICAL, DIMENSION(D%NIJT,D%NKT) :: LLW3D
 REAL, DIMENSION(KRR) :: ZRSMIN
 INTEGER :: ISIZE, IPROMA, IGPBLKS, ISIZE2
 !
-LOGICAL :: LSAVE_MICRO ! if true, microphysical tendencies are saved for cloud electricity
+LOGICAL :: LSAVE_MICRO = .FALSE. ! if true, microphysical tendencies are saved for cloud electricity
 REAL, DIMENSION(MERGE(D%NIJT,0,OELEC),MERGE(D%NKT,0,OELEC),MERGE(IBUNUM-IBUNUM_EXTRA,0,OELEC)) :: &
            ZMICRO_TEND ! Total mixing ratio change, used for electric charge tendencies
 LOGICAL, DIMENSION(MERGE(D%NIJT,0,OELEC),MERGE(D%NKT,0,OELEC)) :: GMASK_ELEC
@@ -532,8 +532,6 @@ ENDIF
 IF (OELEC) THEN
   LSAVE_MICRO = .TRUE.
   ZMICRO_TEND(:,:,:) = 0.
-ELSE
-  LSAVE_MICRO = .FALSE.
 END IF
 !
 WRITE(20,*) "RAIN_ICE 6"

src/mesonh/micro/ini_rain_ice_elec.f90

@@ -208,12 +208,6 @@ IF (CSEDIM == 'SPLI') THEN
   END DO SPLIT
 END IF
 !
-IF (HCLOUD == 'ICE4') THEN
-  CALL RAIN_ICE_DESCR_ALLOCATE(7)
-ELSE IF (HCLOUD == 'ICE3') THEN
-  CALL RAIN_ICE_DESCR_ALLOCATE(6)
-END IF
-!
 XRTMIN(1) = 1.0E-20
 XRTMIN(2) = 1.0E-20
 XRTMIN(3) = 1.0E-20