Changeset 2374

Timestamp:

Oct 13, 2015, 7:43:21 PM (9 years ago)

Author:

jyg

Message:

Creation of a new closure routine for Emanuel
convective scheme: cv3p2_closure.F90 (called when
iflag_clos=3) is a cleaned up and reordered
version of cv3p1_closure.F90. cv3p1_closure.F90
(called when iflag_clos=2) is kept for numerical
compatibility with earlier versions.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• cv3p2_closure.F90 (added)
• cva_driver.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/phylmd/cva_driver.F90

@@ -530 +530 @@
   CHARACTER (LEN=80) :: abort_message
 
+  INTEGER,SAVE                                       :: igout=1
+!$OMP THREADPRIVATE(igout)
+
 
 ! print *, 't1, t1_wake ',(k,t1(1,k),t1_wake(1,k),k=1,klev)
@@ -913 +916 @@
                          pbase, p, ph, tv, buoy, &
                          sig, w0, cape, m, iflag)
-      END IF
+      END IF   ! iflag_clos==0
 
       ok_inhib = iflag_mix == 2
@@ -923 +926 @@
 ! c    :                       ,supmax
 ! c    o                       ,sig,w0,ptop2,cape,cin,m)
-      END IF
+      END IF   ! iflag_clos==1
+
       IF (iflag_clos==2) THEN
         CALL cv3p1_closure(nloc, ncum, nd, icb, inb, &         ! na->nd
@@ -933 +937 @@
         if (prt_level >= 10) &
              PRINT *, 'cv3p1_closure-> plfc,wbeff ', plfc(1), wbeff(1)
-      END IF
-    END IF ! iflag_con.eq.3
+      END IF   ! iflag_clos==2
+
+      IF (iflag_clos==3) THEN
+        CALL cv3p2_closure(nloc, ncum, nd, icb, inb, &         ! na->nd
+                           pbase, plcl, p, ph, tv, tvp, buoy, &
+                           supmax, ok_inhib, Ale, Alp, omega, &
+                           sig, w0, ptop2, cape, cin, m, iflag, coef_clos, &
+                           Plim1, plim2, asupmax, supmax0, &
+                           asupmaxmin, cbmf, plfc, wbeff)
+        if (prt_level >= 10) &
+             PRINT *, 'cv3p2_closure-> plfc,wbeff ', plfc(1), wbeff(1)
+      END IF   ! iflag_clos==3
+    END IF ! iflag_con==3
 
     IF (iflag_con==4) THEN
@@ -993 +1008 @@
                      faci, b, sigd, &
                      wdtrainA, wdtrainM)                                       ! RomP
-    END IF
+!
+      IF (prt_level >= 10) THEN
+        Print *, 'cva_driver after cv3_unsat:mp , water, ice, evap, fondue '
+        DO k = 1,nd
+        write (6, '(i4,5(1x,e13.6))'), &
+          k, mp(idcum(igout),k), water(idcum(igout),k), ice(idcum(igout),k), &
+           evap(idcum(igout),k), fondue(idcum(igout),k)
+        ENDDO
+        Print *, 'cva_driver after cv3_unsat: wdtrainA, wdtrainM '
+        DO k = 1,nd
+        write (6, '(i4,2(1x,e13.6))'), &
+           k, wdtrainA(idcum(igout),k), wdtrainM(idcum(igout),k)
+        ENDDO
+      ENDIF
+!
+    END IF  !(iflag_con==3)
 
     IF (iflag_con==4) THEN
@@ -1029 +1059 @@
                      qcondc, wd, &
                      ftd, fqd, qnk, qtc, sigt, tau_cld_cv, coefw_cld_cv)
-    END IF
-
-    IF (debut) THEN
-      PRINT *, ' cv3_yield -> fqd(1) = ', fqd(1, 1)
-    END IF !(debut) THEN
+!
+      IF (debut) THEN
+        PRINT *, ' cv3_yield -> fqd(1) = ', fqd(idcum(igout), 1)
+      END IF !(debut) THEN
+!   
+      IF (prt_level >= 10) THEN
+        Print *, 'cva_driver after cv3_yield:ft(1) , ftd(1) ', &
+                    ft(idcum(igout),1), ftd(idcum(igout),1)
+        Print *, 'cva_driver after cv3_yield:fq(1) , fqd(1) ', &
+                    fq(idcum(igout),1), fqd(idcum(igout),1)
+      ENDIF
+!   
+    END IF
 
     IF (iflag_con==4) THEN