Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/coefcdrag.F90

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/coefcdrag.F90 (modified) (4 diffs)

LMDZ5/branches/testing/libf/phylmd/coefcdrag.F90

@@ -63 +63 @@
       REAL, dimension(klon) :: zcfm2, zcfh2
       REAL, dimension(klon) :: trm0, trm1
+
 !-------------------------------------------------------------------------
       REAL :: fsta, fins, x
@@ -77 +78 @@
        ztsolv(i) = ts(i)
 !       ztvd(i) = t(i) * (psol(i)/pref(i))**RKAPPA
-       ztvd(i) = (t(i)+zdphi(i)/RCPD/(1.+RVTMP2*q(i))) &
-          *(1.+RETV*q(i))
+!       ztvd(i) = (t(i)+zdphi(i)/RCPD/(1.+RVTMP2*q(i))) &
+!          *(1.+RETV*q(i))
+       ztvd(i) = (t(i)+zdphi(i)/RCPD/(1.+RVTMP2*q(i)))
        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) = ztvd(i) * trm1(i)
        zri1(i) = zdphi(i)*(ztvd(i)-ztsolv(i))/(zdu2(i)*ztvd(i))
 !
@@ -110 +112 @@
          IF (.NOT.zxli) THEN
            zscf(i) = SQRT(1.+CD*ABS(zri1(i)))
-           friv(i) = max(1. / (1.+2.*CB*zri1(i)/ zscf(i)), 0.1)
+           friv(i) = max(1. / (1.+2.*CB*zri1(i)/ zscf(i)), f_ri_cd_min)
            zcfm1(i) = cdran(i) * friv(i)
-           frih(i) = max(1./ (1.+3.*CB*zri1(i)*zscf(i)), 0.1 )
+           frih(i) = max(1./ (1.+3.*CB*zri1(i)*zscf(i)), f_ri_cd_min )
 !           zcfh1(i) = cdran(i) * frih(i)
            zcfh1(i) = f_cdrag_ter*cdran(i) * frih(i)
@@ -130 +132 @@
            zucf(i) = 1./(1.+3.0*CB*CC*cdran(i)*SQRT(ABS(zri1(i)) &
                  *(1.0+zdphi(i)/(RG*rugos(i)))))
-           zcfm2(i) = cdran(i)*max((1.-2.0*CB*zri1(i)*zucf(i)),0.1)
-!           zcfh2(i) = cdran(i)*max((1.-3.0*CB*zri1(i)*zucf(i)),0.1)
-           zcfh2(i) = f_cdrag_ter*cdran(i)*max((1.-3.0*CB*zri1(i)*zucf(i)),0.1)
+           zcfm2(i) = cdran(i)*max((1.-2.0*CB*zri1(i)*zucf(i)),f_ri_cd_min)
+!           zcfh2(i) = cdran(i)*max((1.-3.0*CB*zri1(i)*zucf(i)),f_ri_cd_min)
+           zcfh2(i) = f_cdrag_ter*cdran(i)*max((1.-3.0*CB*zri1(i)*zucf(i)),f_ri_cd_min)
            cdram(i) = zcfm2(i)
            cdrah(i) = zcfh2(i)