diff --git a/src/common/micro/mode_ice4_pack.F90 b/src/common/micro/mode_ice4_pack.F90 index 2a9828fafa62e9bd8b0a542344bc9f9f71ac643f..c5edf8263fe9fa77af9739860ae5279e9af356e5 100644 --- a/src/common/micro/mode_ice4_pack.F90 +++ b/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 diff --git a/src/common/micro/rain_ice.F90 b/src/common/micro/rain_ice.F90 index bd64c23915a47dd2701d6372b3a7ce5caaa5c11d..c41a94b70e7746af684bd6cc6f6fc981e795ba26 100644 --- a/src/common/micro/rain_ice.F90 +++ b/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" diff --git a/src/mesonh/micro/ini_rain_ice_elec.f90 b/src/mesonh/micro/ini_rain_ice_elec.f90 index 3a0279455f46639c20443f68f27caa1b166700f3..1a7fa798b429365740460f18850a2215c1a69bb3 100644 --- a/src/mesonh/micro/ini_rain_ice_elec.f90 +++ b/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