diff --git a/src/common/micro/mode_icecloud.F90 b/src/common/micro/mode_icecloud.F90 index 5f44bf9a07a50a38d50f8df88cba054496f40e19..cbfcde5ca782d164b527fd773e3c50ea6bb5cb30 100644 --- a/src/common/micro/mode_icecloud.F90 +++ b/src/common/micro/mode_icecloud.F90 @@ -106,14 +106,11 @@ DO JIJ = IIJB, IIJE SSIU(JIJ) = MIN(ZI2W,ZRHI) SSIO(JIJ) = SSIU(JIJ) W2D(JIJ) = 1. - IF (PT(JIJ)>273.1 .OR. ZR<=0. .OR. ESATI(PT(JIJ)) >= PP(JIJ)*0.5) THEN SSIU(JIJ) = SSIU(JIJ) - 1. SSIO(JIJ) = SSIU(JIJ) IF(PWCLD(JIJ)>=0.) SIFRC(JIJ) = PWCLD(JIJ) - CYCLE - ENDIF - + ELSE ZRHIN = MAX(0.05, MIN(1.,ZRHW)) @@ -200,7 +197,7 @@ DO JIJ = IIJB, IIJE SSIO(JIJ) = SSIO(JIJ) - 1. IF (XW2D > 1.) W2D(JIJ) = 1./(1. - SIFRC(JIJ) + XW2D*SIFRC(JIJ)) - + END IF ENDDO IF (LHOOK) CALL DR_HOOK('ICECLOUD',1,ZHOOK_HANDLE) diff --git a/src/common/turb/mode_bl_depth_diag.F90 b/src/common/turb/mode_bl_depth_diag.F90 index d3a77f13e53ce9ea130b51d4513388870332e97b..4725a1124e123ef1ba1fa9cd9a4e35e06b1f41e6 100644 --- a/src/common/turb/mode_bl_depth_diag.F90 +++ b/src/common/turb/mode_bl_depth_diag.F90 @@ -84,18 +84,18 @@ BL_DEPTH_DIAG3D(:) = 0. ! DO JIJ=IIJB,IIJE - IF (PSURF(JIJ)==0.) CYCLE + IF (PSURF(JIJ)/=0.) THEN DO JK=IKB,IKE,IKL - IF (PZZ(JIJ,JK-IKL)<=PZS(JIJ)) CYCLE + IF (PZZ(JIJ,JK-IKL)>PZS(JIJ)) THEN ZFLX = PSURF(JIJ) * PFTOP_O_FSURF IF ( (PFLUX(JIJ,JK)-ZFLX)*(PFLUX(JIJ,JK-IKL)-ZFLX) <= 0. ) THEN BL_DEPTH_DIAG3D(JIJ) = (PZZ (JIJ,JK-IKL) - PZS(JIJ)) & + (PZZ (JIJ,JK) - PZZ (JIJ,JK-IKL)) & * (ZFLX - PFLUX(JIJ,JK-IKL) ) & / (PFLUX(JIJ,JK) - PFLUX(JIJ,JK-IKL) ) - EXIT END IF END DO + END IF END DO ! !$mnh_expand_array(JIJ=IIJB:IIJE)