Changeset 2759 for LMDZ5/trunk/libf/phylmd

Timestamp:

Jan 10, 2017, 3:41:55 PM (8 years ago)

Author:

jyg

Message:

Small improvements to convection scheme
(cv3_unsat) and to wake scheme.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• cv3_routines.F90 (modified) (2 diffs)
• wake.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/cv3_routines.F90

@@ -2835 +2835 @@
         END IF !(amp2.gt.(0.1*amfac))
 
-! ***         limit magnitude of mp(i) to meet cfl condition      ***
-
-        ampmax = 2.0*(ph(il,i)-ph(il,i+1))*delti
-        amp2 = 2.0*(ph(il,i-1)-ph(il,i))*delti
-        ampmax = min(ampmax, amp2)
-        mp(il, i) = min(mp(il,i), ampmax)
+!jyg<    This part shifted 10 lines farther
+!!! ***         limit magnitude of mp(i) to meet cfl condition      ***
+!!
+!!        ampmax = 2.0*(ph(il,i)-ph(il,i+1))*delti
+!!        amp2 = 2.0*(ph(il,i-1)-ph(il,i))*delti
+!!        ampmax = min(ampmax, amp2)
+!!        mp(il, i) = min(mp(il,i), ampmax)
+!>jyg
 
 ! ***      force mp to decrease linearly to zero                 ***
@@ -2852 +2854 @@
           mp(il, i) = mp(il, i)*(ph(il,1)-ph(il,i))/(ph(il,1)-0.9*plcl(il))
         END IF
+
+!jyg<    Shifted part
+! ***         limit magnitude of mp(i) to meet cfl condition      ***
+
+        ampmax = 2.0*(ph(il,i)-ph(il,i+1))*delti
+        amp2 = 2.0*(ph(il,i-1)-ph(il,i))*delti
+        ampmax = min(ampmax, amp2)
+        mp(il, i) = min(mp(il,i), ampmax)
+!>jyg
 
       END IF ! (i.le.inb(il) .and. lwork(il) .and. i.ne.1)

LMDZ5/trunk/libf/phylmd/wake.F90

@@ -1928 +1928 @@
 
       ! cc nrlmd        IF ( wk_adv(i) .AND. k .LE. kupper(i)) THEN
-      IF (ok_qx_qw(i) .AND. k<=kupper(i)) THEN
+!jyg<
+!!      IF (ok_qx_qw(i) .AND. k<=kupper(i)) THEN
+      IF (ok_qx_qw(i)) THEN
+!>jyg
         ! cc
         dtls(i, k) = dtls(i, k)/dtime