Changeset 2901 for LMDZ5/trunk/libf

Timestamp:

Jun 2, 2017, 6:12:21 PM (8 years ago)

Author:

jyg

Message:

new option to switch on/off homogenization of convective tendencies below cloud base

Location:

LMDZ5/trunk/libf/phylmd

Files:

• cv3_routines.F90 (modified) (4 diffs)
• cv3param.h (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/cv3_routines.F90

@@ -111 +111 @@
      ok_optim_yield=.False.
      CALL getin_p('ok_optim_yield',ok_optim_yield)
+     ok_homo_tend=.TRUE.
+     CALL getin_p('ok_homo_tend',ok_homo_tend)
+
      coef_peel=0.25
      CALL getin_p('coef_peel',coef_peel)
@@ -2984 +2987 @@
                      qcondc, wd, &
                      ftd, fqd, qnk, qtc, sigt, tau_cld_cv, coefw_cld_cv)
+
+    USE print_control_mod, ONLY: lunout, prt_level
 
   IMPLICIT NONE
@@ -3873 +3878 @@
 
 !!!!      do 700 i=1,icb(il)-1
-  DO i = 1, nl
-    DO il = 1, ncum
-      IF (i<=(icb(il)-1) .AND. iflag(il)<=1) THEN
-        ftd(il, i) = esum(il)*t_wake(il, i)/(th_wake(il,i)*hsum(il))
-        fqd(il, i) = fsum(il)/gsum(il)
-        ft(il, i) = ftd(il, i) + asum(il)*t(il, i)/(th(il,i)*dsum(il))
-        fr(il, i) = fqd(il, i) + bsum(il)/csum(il)
-      END IF
-    END DO
-  END DO
+  IF (ok_homo_tend) THEN
+    DO i = 1, nl
+      DO il = 1, ncum
+        IF (i<=(icb(il)-1) .AND. iflag(il)<=1) THEN
+          ftd(il, i) = esum(il)*t_wake(il, i)/(th_wake(il,i)*hsum(il))
+          fqd(il, i) = fsum(il)/gsum(il)
+          ft(il, i) = ftd(il, i) + asum(il)*t(il, i)/(th(il,i)*dsum(il))
+          fr(il, i) = fqd(il, i) + bsum(il)/csum(il)
+        END IF
+      END DO
+    END DO
+  ENDIF
 
 !jyg<
@@ -3920 +3927 @@
   END DO
 !
-!    print *,' YIELD : alpha_qpos ',alpha_qpos(1)
+    IF (prt_level .GE. 5) THEN
+      print *,' CV3_YIELD : alpha_qpos ',alpha_qpos(1)
+    ENDIF
 !
   DO il = 1, ncum

LMDZ5/trunk/libf/phylmd/cv3param.h

@@ -7 +7 @@
 !------------------------------------------------------------
 
+      logical ok_homo_tend
       logical ok_optim_yield
       logical ok_convstop
@@ -41 +42 @@
                       ,noff, minorig, nl, nlp, nlm  &
                       ,ok_convstop, ok_intermittent &
-                      ,ok_optim_yield
+                      ,ok_optim_yield &
+                      ,ok_homo_tend
 !$OMP THREADPRIVATE(/cv3param/)