Changeset 2495

Timestamp:

Apr 14, 2016, 4:20:44 PM (9 years ago)

Author:

lguez

Message:

Bug fix. Virtual temperature is:

[1 + (1 / eps - 1) q] T

not:

(1 + eps q) T

(no worry: the numerical difference is small).

File:

• LMDZ5/trunk/libf/phylmd/wake.F90 (modified) (9 diffs)

LMDZ5/trunk/libf/phylmd/wake.F90

@@ -625 +625 @@
     z(i) = 1.
     dz(i) = 1.
-    sum_thvu(i) = thu(i, 1)*(1.+eps*qu(i,1))*dz(i)
+    sum_thvu(i) = thu(i, 1)*(1.+epsim1*qu(i,1))*dz(i)
     sum_dth(i) = 0.
   END DO
@@ -637 +637 @@
         sum_tu(i) = sum_tu(i) + tu(i, k)*dz(i)
         sum_qu(i) = sum_qu(i) + qu(i, k)*dz(i)
-        sum_thvu(i) = sum_thvu(i) + thu(i, k)*(1.+eps*qu(i,k))*dz(i)
+        sum_thvu(i) = sum_thvu(i) + thu(i, k)*(1.+epsim1*qu(i,k))*dz(i)
         sum_dth(i) = sum_dth(i) + dth(i, k)*dz(i)
         sum_dq(i) = sum_dq(i) + deltaqw(i, k)*dz(i)
@@ -671 +671 @@
     av_dqdwn(i) = sum_dqdwn(i)/hw0(i)
 
-    wape(i) = -rg*hw0(i)*(av_dth(i)+eps*(av_thu(i)*av_dq(i)+av_dth(i)*av_qu(i &
+    wape(i) = -rg*hw0(i)*(av_dth(i)+epsim1*(av_thu(i)*av_dq(i)+av_dth(i)*av_qu(i &
       )+av_dth(i)*av_dq(i)))/av_thvu(i)
   END DO
@@ -1398 +1398 @@
         z(i) = 1.
         dz(i) = 1.
-        sum_thvu(i) = thu(i, 1)*(1.+eps*qu(i,1))*dz(i)
+        sum_thvu(i) = thu(i, 1)*(1.+epsim1*qu(i,1))*dz(i)
         sum_dth(i) = 0.
       END IF
@@ -1412 +1412 @@
             sum_tu(i) = sum_tu(i) + tu(i, k)*dz(i)
             sum_qu(i) = sum_qu(i) + qu(i, k)*dz(i)
-            sum_thvu(i) = sum_thvu(i) + thu(i, k)*(1.+eps*qu(i,k))*dz(i)
+            sum_thvu(i) = sum_thvu(i) + thu(i, k)*(1.+epsim1*qu(i,k))*dz(i)
             sum_dth(i) = sum_dth(i) + dth(i, k)*dz(i)
             sum_dq(i) = sum_dq(i) + deltaqw(i, k)*dz(i)
@@ -1449 +1449 @@
         av_dqdwn(i) = sum_dqdwn(i)/hw0(i)
 
-        wape(i) = -rg*hw0(i)*(av_dth(i)+eps*(av_thu(i)*av_dq(i)+av_dth(i)* &
+        wape(i) = -rg*hw0(i)*(av_dth(i)+epsim1*(av_thu(i)*av_dq(i)+av_dth(i)* &
           av_qu(i)+av_dth(i)*av_dq(i)))/av_thvu(i)
       END IF
@@ -1578 +1578 @@
       z(i) = 1.
       dz(i) = 1.
-      sum_thvu(i) = thu(i, 1)*(1.+eps*qu(i,1))*dz(i)
+      sum_thvu(i) = thu(i, 1)*(1.+epsim1*qu(i,1))*dz(i)
       sum_dth(i) = 0.
     END IF
@@ -1594 +1594 @@
           sum_tu(i) = sum_tu(i) + tu(i, k)*dz(i)
           sum_qu(i) = sum_qu(i) + qu(i, k)*dz(i)
-          sum_thvu(i) = sum_thvu(i) + thu(i, k)*(1.+eps*qu(i,k))*dz(i)
+          sum_thvu(i) = sum_thvu(i) + thu(i, k)*(1.+epsim1*qu(i,k))*dz(i)
           sum_dth(i) = sum_dth(i) + dth(i, k)*dz(i)
           sum_dq(i) = sum_dq(i) + deltaqw(i, k)*dz(i)
@@ -1632 +1632 @@
       av_dqdwn(i) = sum_dqdwn(i)/hw0(i)
 
-      wape2(i) = -rg*hw0(i)*(av_dth(i)+eps*(av_thu(i)*av_dq(i)+av_dth(i)* &
+      wape2(i) = -rg*hw0(i)*(av_dth(i)+epsim1*(av_thu(i)*av_dq(i)+av_dth(i)* &
         av_qu(i)+av_dth(i)*av_dq(i)))/av_thvu(i)
     END IF