Changeset 3252 for LMDZ6/trunk/libf/phylmd

Timestamp:

Mar 12, 2018, 6:32:18 PM (7 years ago)

Author:

jyg

Message:

Bug correction concerning the growth rate of the
wake radius.

File:

• LMDZ6/trunk/libf/phylmd/wake.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/wake.F90

@@ -315 +315 @@
 !!  DATA wapecut, sigmad, hwmin/5., .02, 10./
   DATA wapecut, sigmad, hwmin/1., .02, 10./
-  DATA wdensmin/1.e-12/
+!!  DATA wdensmin/1.e-12/
+  DATA wdensmin/1.e-14/
   ! cc nrlmd
   DATA sigmaw_max/0.4/
@@ -987 +988 @@
         wdens0 = (sigmaw(i)/(4.*3.14))* &
           ((1.-sigmaw(i))*omg(i,kupper(i)+1)/((ph(i,1)-pupper(i))*cstar(i)))**(2)
+        IF (prt_level >= 10) THEN
+             print*,'omg(i,kupper(i)+1),wdens0,wdens(i),cstar(i), ph(i,1)-pupper(i)', &
+                     omg(i,kupper(i)+1),wdens0,wdens(i),cstar(i), ph(i,1)-pupper(i)
+        ENDIF
         IF (wdens(i)<=wdens0*1.1) THEN
           IF (iflag_wk_pop_dyn >= 1) THEN
@@ -993 +998 @@
           wdens(i) = wdens0
         END IF
-        ! c        print*,'omg(i,kupper(i)+1),wdens0,wdens(i),cstar(i)
-        ! c     $     ,ph(i,1)-pupper(i)',
-        ! c     $             omg(i,kupper(i)+1),wdens0,wdens(i),cstar(i)
-        ! c     $     ,ph(i,1)-pupper(i)
       END IF
     END DO
@@ -1032 +1033 @@
           tau_wk_inv_min = min(tau_wk_inv(i), 1./dtimesub)
           drdt(i) = (cstar(i) - wgen(i)*(sigmaw(i)/wdens(i)-aa0)/gfl(i)) / &
-                    (1 - 2*sigmaw(i)*(1.-f_shear(i)))
+                    (1 + 2*f_shear(i)*(2.*sigmaw(i)-aa0*wdens(i)) - 2.*sigmaw(i))
+!!                    (1 - 2*sigmaw(i)*(1.-f_shear(i)))
           drdt_pos=max(drdt(i),0.)