Changeset 1940 for LMDZ5/branches/LMDZ5-DOFOCO

Timestamp:

Jan 21, 2014, 3:25:10 PM (11 years ago)

Author:

jghattas

Message:

Bug corrections done by Fuxing Wang.

Location:

LMDZ5/branches/LMDZ5-DOFOCO/libf/phylmd

Files:

• coefcdrag.F90 (modified) (1 diff)
• fisrtilp.F90 (modified) (1 diff)

LMDZ5/branches/LMDZ5-DOFOCO/libf/phylmd/coefcdrag.F90

@@ -75 +75 @@
                  (1.+ RETV * max(q(i),0.0))))
        ztsolv(i) = ts(i)
-       ztvd(i) = t(i) * (psol(i)/pref(i))**RKAPPA
        trm0(i) = 1. + RETV * max(qsurf(i),0.0)
        trm1(i) = 1. + RETV * max(q(i),0.0)
        ztsolv(i) = ztsolv(i) * trm0(i)
-       ztvd(i) = ztvd(i) * trm1(i)
+       ztvd(i) = (t(i)+zdphi(i)/RCPD/(1.+RVTMP2*q(i))) &
+          *(1.+RETV*q(i))
        zri1(i) = zdphi(i)*(ztvd(i)-ztsolv(i))/(zdu2(i)*ztvd(i))
 !

LMDZ5/branches/LMDZ5-DOFOCO/libf/phylmd/fisrtilp.F90

@@ -441 +441 @@
               zqn(i) = zq(i)
               rneb(i,k) = 1.0                  
-              zcond(i) = MAX(0.0,zqn(i)-zqs(i))/(1+zdqs(i))
+              zcond(i) = MAX(0.0,zqn(i)-zqs(i))
               rhcl(i,k)=1.0
            ELSE
-              zcond(i) = MAX(0.0,zqn(i)-zqs(i))*rneb(i,k)/(1+zdqs(i))
+              zcond(i) = MAX(0.0,zqn(i)-zqs(i))*rneb(i,k)
               rhcl(i,k)=(zqs(i)+zq(i)-zdelq)/2./zqs(i)
            ENDIF