Changeset 4623 for LMDZ6/trunk

Timestamp:

Jul 10, 2023, 9:53:26 AM (17 months ago)

Author:

fhourdin

Message:

 

File:

• LMDZ6/trunk/libf/phylmd/cloudth_mod.F90 (modified) (12 diffs)

LMDZ6/trunk/libf/phylmd/cloudth_mod.F90

@@ -25 +25 @@
 
       INCLUDE "YOMCST.h"
+      INCLUDE "nuage.h" ! iflag_ratqs
       INCLUDE "YOETHF.h"
       INCLUDE "FCTTRE.h"
@@ -30 +31 @@
       INTEGER itap,ind1,ind2
       INTEGER ngrid,klev,klon,l,ig 
-!ym      INTEGER iflag_ratqs
       
       REAL ztv(ngrid,klev)
@@ -270 +270 @@
 
       INCLUDE "YOMCST.h"
+      INCLUDE "nuage.h" ! iflag_ratqs 
       INCLUDE "YOETHF.h"
       INCLUDE "FCTTRE.h"
@@ -275 +276 @@
       INTEGER itap,ind1,ind2
       INTEGER ngrid,klev,klon,l,ig 
-!ym      INTEGER iflag_ratqs
       
       REAL ztv(ngrid,klev)
@@ -610 +610 @@
 
       INCLUDE "YOMCST.h"
+      INCLUDE "nuage.h" ! iflag ratq
       INCLUDE "YOETHF.h"
       INCLUDE "FCTTRE.h"
@@ -615 +616 @@
       INTEGER itap,ind1,ind2
       INTEGER ngrid,klev,klon,l,ig 
-!ym      INTEGER iflag_ratqs
       
       REAL ztv(ngrid,klev)
@@ -833 +833 @@
 
       INCLUDE "YOMCST.h"
+      INCLUDE "nuage.h" ! iflag ratq
       INCLUDE "YOETHF.h"
       INCLUDE "FCTTRE.h"
@@ -838 +839 @@
       INTEGER itap,ind1,ind2
       INTEGER ngrid,klev,klon,l,ig 
-!ym      INTEGER iflag_ratqs
       
       REAL ztv(ngrid,klev)
@@ -1026 +1026 @@
       ENDIF
       sigma1s = sigma1s_fraca + sigma1s_ratqs
-!ym           IF (iflag_ratqs.eq.11) then
-!ym              sigma1s = ratqs(ind1,ind2)*po(ind1)*aenv
-!ym           ENDIF
+      IF (iflag_ratqs.eq.11) then
+         sigma1s = ratqs(ind1,ind2)*po(ind1)*aenv
+      ENDIF
       sigma2s=(sigma2s_factor*(((sth-senv)**2)**0.5)/((fraca(ind1,ind2)+0.02)**sigma2s_power))+0.002*zqta(ind1,ind2)
 !      tests
@@ -1566 +1566 @@
 
       INCLUDE "YOMCST.h"
+      INCLUDE "nuage.h" ! iflag_ratqs
       INCLUDE "YOETHF.h"
       INCLUDE "FCTTRE.h"
@@ -1902 +1903 @@
  
            sigma1s = sigma1s_fraca + sigma1s_ratqs
-!ym           IF (iflag_ratqs.eq.11) then
-!ym              sigma1s = ratqs(ind1,ind2)*po(ind1)*aenv
-!ym           ENDIF
+           IF (iflag_ratqs.eq.11) then
+              sigma1s = ratqs(ind1,ind2)*po(ind1)*aenv
+           ENDIF
            sigma2s=(sigma2s_factor*(((sth-senv)**2)**0.5)/((fraca(ind1,ind2)+0.02)**sigma2s_power))+0.002*zqta(ind1,ind2)
 
@@ -2147 +2148 @@
 
             sigma1s = sigma1s_fraca + sigma1s_ratqs
-!ym           IF (iflag_ratqs.eq.11) then
-!ym              sigma1s = ratqs(ind1,ind2)*po(ind1)*aenv
-!ym           ENDIF
-!ym           IF (iflag_ratqs.eq.11) then
-!ym             sigma1s = ratqs(ind1,ind2)*po(ind1)*aenvl
-!ym           ENDIF
+            IF (iflag_ratqs.eq.11) then
+               sigma1s = ratqs(ind1,ind2)*po(ind1)*aenv
+            ENDIF
+            IF (iflag_ratqs.eq.11) then
+              sigma1s = ratqs(ind1,ind2)*po(ind1)*aenvl
+            ENDIF
             deltasenv=aenvl*vert_alpha*sigma1s
             xenv1=-(senvl+deltasenv)/(sqrt(2.)*sigma1s)