Quentin 09/08/2024: fix commit 9364366a for simulation with no turbulence scheme

src/MNH/mean_field.f90

@@ -409,20 +409,24 @@ END IF
       ZCURRENT_MER10M(JI,JJ)=PVT(JI,JJ,JK) + &
             (PVT(JI,JJ,JK+1)-PVT(JI,JJ,JK)) * &
             (10.-XZHATM(JK))/(XZHATM(JK+1)-XZHATM(JK))
-      ZCURRENT_TKE10M(JI,JJ)=PTKET(JI,JJ,JK) + &
+      IF (CTURB/='NONE') THEN
+        ZCURRENT_TKE10M(JI,JJ)=PTKET(JI,JJ,JK) + &
             (PTKET(JI,JJ,JK+1)-PTKET(JI,JJ,JK)) * &
             (10.-XZHATM(JK))/(XZHATM(JK+1)-XZHATM(JK))
+      END IF
      END DO
     END DO
    END IF
-   IF ((XZHATM(JK+1) .GE. 20.) .AND. (XZHATM(JK)<20.)) THEN
-    DO JJ=IJB,IJE
-     DO JI=IIB,IIE
-      ZCURRENT_TKE20M(JI,JJ)=PTKET(JI,JJ,JK) + &
+   IF (CTURB/='NONE') THEN
+    IF ((XZHATM(JK+1) .GE. 20.) .AND. (XZHATM(JK)<20.)) THEN
+     DO JJ=IJB,IJE
+      DO JI=IIB,IIE
+       ZCURRENT_TKE20M(JI,JJ)=PTKET(JI,JJ,JK) + &
             (PTKET(JI,JJ,JK+1)-PTKET(JI,JJ,JK)) * &
             (20.-XZHATM(JK))/(XZHATM(JK+1)-XZHATM(JK))
+      END DO
      END DO
-    END DO
+    END IF
    END IF
    JK=JK+1
   END DO
@@ -448,19 +452,21 @@ END IF
   DO JJ=IJB,IJE
    DO JI=IIB,IIE
      ZWORK1(JI,JJ) = SQRT(ZCURRENT_ZON10M(JI,JJ)**2+ZCURRENT_MER10M(JI,JJ)**2)
-     ZWORK2(JI,JJ) =  4. * SQRT(PTKET(JI,JJ,IKB))
-     ZWORK3(JI,JJ) = 4. * SQRT(ZCURRENT_TKE10M(JI,JJ))
-     ZWORK4(JI,JJ) = 3.8 * SQRT(ZCURRENT_TKE20M(JI,JJ))
-     ZWORK5(JI,JJ) = ZWORK1(JI,JJ) + ZWORK2(JI,JJ)
-     ZWORK6(JI,JJ) = ZWORK1(JI,JJ) + ZWORK3(JI,JJ)
-     ZWORK7(JI,JJ) = ZWORK1(JI,JJ) + ZWORK4(JI,JJ)
      XWMOD10MAX_MAX(JI,JJ) = MAX(XWMOD10MAX_MAX(JI,JJ),ZWORK1(JI,JJ))
-     XTKEMAX_MAX(JI,JJ) = MAX(XTKEMAX_MAX(JI,JJ),ZWORK2(JI,JJ))
-     XTKE10MAX_MAX(JI,JJ) = MAX(XTKE10MAX_MAX(JI,JJ),ZWORK3(JI,JJ))
-     XTKE20MAX_MAX(JI,JJ) = MAX(XTKE20MAX_MAX(JI,JJ),ZWORK4(JI,JJ))
-     XFF10MAX_MAX(JI,JJ) = MAX(XFF10MAX_MAX(JI,JJ),ZWORK5(JI,JJ))
-     XFF10MAX2_MAX(JI,JJ) = MAX(XFF10MAX2_MAX(JI,JJ),ZWORK6(JI,JJ))
-     XFF10MAX_AROME_MAX(JI,JJ) = MAX(XFF10MAX_AROME_MAX(JI,JJ),ZWORK7(JI,JJ))
+     IF (CTURB/='NONE') THEN 
+       ZWORK2(JI,JJ) =  4. * SQRT(PTKET(JI,JJ,IKB))
+       ZWORK3(JI,JJ) = 4. * SQRT(ZCURRENT_TKE10M(JI,JJ))
+       ZWORK4(JI,JJ) = 3.8 * SQRT(ZCURRENT_TKE20M(JI,JJ))
+       ZWORK5(JI,JJ) = ZWORK1(JI,JJ) + ZWORK2(JI,JJ)
+       ZWORK6(JI,JJ) = ZWORK1(JI,JJ) + ZWORK3(JI,JJ)
+       ZWORK7(JI,JJ) = ZWORK1(JI,JJ) + ZWORK4(JI,JJ)
+       XTKEMAX_MAX(JI,JJ) = MAX(XTKEMAX_MAX(JI,JJ),ZWORK2(JI,JJ))
+       XTKE10MAX_MAX(JI,JJ) = MAX(XTKE10MAX_MAX(JI,JJ),ZWORK3(JI,JJ))
+       XTKE20MAX_MAX(JI,JJ) = MAX(XTKE20MAX_MAX(JI,JJ),ZWORK4(JI,JJ))
+       XFF10MAX_MAX(JI,JJ) = MAX(XFF10MAX_MAX(JI,JJ),ZWORK5(JI,JJ))
+       XFF10MAX2_MAX(JI,JJ) = MAX(XFF10MAX2_MAX(JI,JJ),ZWORK6(JI,JJ))
+       XFF10MAX_AROME_MAX(JI,JJ) = MAX(XFF10MAX_AROME_MAX(JI,JJ),ZWORK7(JI,JJ))
+     END IF
      XMSLP_MAX(JI,JJ) = MAX(XMSLP_MAX(JI,JJ),ZMSLP(JI,JJ)) ! 
      XMSLP_MIN(JI,JJ) = MIN(XMSLP_MIN(JI,JJ),ZMSLP(JI,JJ)) ! 
      IF (LUH_MAX) XUH_MAX(JI,JJ)= MAX(XUH_MAX(JI,JJ),ZUH(JI,JJ)) ! 

src/MNH/write_lfin.f90

@@ -1116,7 +1116,6 @@ IF (MEAN_COUNT /= 0) THEN
   TZFIELD%CUNITS     = 'm s-1'
   TZFIELD%CCOMMENT   = 'X_Y_max XTKE20MAX'
   CALL IO_Field_write(TPFILE,TZFIELD,XTKE20MAX_MAX)
- END IF
 !
   TZFIELD%CMNHNAME   = 'FF10MAX_MA'
   TZFIELD%CLONGNAME  = 'FF10MAX_MA'
@@ -1135,6 +1134,7 @@ IF (MEAN_COUNT /= 0) THEN
   TZFIELD%CUNITS     = 'm s-1'
   TZFIELD%CCOMMENT   = 'X_Y_max FF10MAX_AROME'
   CALL IO_Field_write(TPFILE,TZFIELD,XFF10MAX_AROME_MAX)
+ END IF
 !
 ! Min and max sea level pressure 
   TZFIELD%CMNHNAME   = 'MSLP_MAX'