diff --git a/src/PHYEX/micro/ini_rain_ice_elec.f90 b/src/PHYEX/micro/ini_rain_ice_elec.f90 index 3a0279455f46639c20443f68f27caa1b166700f3..1a7fa798b429365740460f18850a2215c1a69bb3 100644 --- a/src/PHYEX/micro/ini_rain_ice_elec.f90 +++ b/src/PHYEX/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 diff --git a/src/PHYEX/micro/mode_ice4_pack.f90 b/src/PHYEX/micro/mode_ice4_pack.f90 index 8c334e752f0acf2e1b459e83f90394f8ee4f240d..75e770993ad5fc77efcde4265e1a84413f31e580 100644 --- a/src/PHYEX/micro/mode_ice4_pack.f90 +++ b/src/PHYEX/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/PHYEX/micro/rain_ice.f90 b/src/PHYEX/micro/rain_ice.f90 index 0eebb9cc00cdaa89ad0b1ed0bd0cc07ef98c5c50..8c000324b0b3eba5b9520d006ca770cd3d532273 100644 --- a/src/PHYEX/micro/rain_ice.f90 +++ b/src/PHYEX/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 @@ -530,8 +530,6 @@ ENDIF IF (OELEC) THEN LSAVE_MICRO = .TRUE. ZMICRO_TEND(:,:,:) = 0. -ELSE - LSAVE_MICRO = .FALSE. END IF ! !This part is put in another routine to separate pack/unpack operations from computations