Changeset 3670 for LMDZ6/trunk/libf/phylmd

Timestamp:

Apr 27, 2020, 10:49:09 AM (5 years ago)

Author:

jyg

Message:

In order to makEmanuel scheme : set iflag=14 in
cv3_trigger when
no convection and reset Cin to Cin_noconv at the
end of cva_driver when iflag=14.

Location:

LMDZ6/trunk/libf/phylmd

Files:

• cv3_routines.F90 (modified) (2 diffs)
• cva_driver.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/cv3_routines.F90

@@ -888 +888 @@
 ! - relaxation of sig and w0 when no convection
 
-! Caution1: if no convection, we set iflag=4
+! Caution1: if no convection, we set iflag=14
 ! (it used to be 0 in convect3)
 
@@ -968 +968 @@
         sig(i, k) = amax1(sig(i,k), 0.0)
         w0(i, k) = beta*w0(i, k)
-        iflag(i) = 4 ! pour version vectorisee
+        iflag(i) = 14 ! pour version vectorisee
 ! convect3         iflag(i)=0
       END IF

LMDZ6/trunk/libf/phylmd/cva_driver.F90

@@ -361 +361 @@
 !               then the level NL-1.
 !        10     No moist convection: cloud top is too warm.
+!        14     No moist convection; atmosphere is very
+!               stable (=> no computation)
 !
 
@@ -539 +541 @@
   CHARACTER (LEN=80) :: abort_message
 
+  REAL, PARAMETER    :: Cin_noconv = -100000.
+  REAL, PARAMETER    :: Cape_noconv = -1.
+
   INTEGER,SAVE                                       :: igout=1
 !$OMP THREADPRIVATE(igout)
@@ -622 +627 @@
 
   DO il = 1, len
-    cin1(il) = -100000.
-    cape1(il) = -1.
+!!    cin1(il) = -100000.
+!!    cape1(il) = -1.
+    cin1(il) = Cin_noconv
+    cape1(il) = Cape_noconv
   END DO
 
@@ -1246 +1253 @@
 
   END IF ! ncum>0
+!
+!
+  DO i = 1,len
+    IF (iflag1(i) == 14) THEN
+      Cin1(i) = Cin_noconv
+      Cape1(i) = Cape_noconv
+    ENDIF
+  ENDDO
 
 !