Quentin 29/09/2023: Modify CYCLE on horizontal dimensions for adaptation to column computation

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)

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)