Changeset 2011 for LMDZ5/trunk/libf/phylmd

Timestamp:

Apr 10, 2014, 3:16:18 PM (11 years ago)

Author:

Laurent Fairhead

Message:

Homogénéisation des calculs du nombre de Richardson et de f_cdrag entre coefcdrag.F90 et clcdrag.F90
modification des zlev pour orchidee

---

Keeping the same calculation between coefcdrag.F90 and clcdrag.F90 for richardson number & f_cdrag
modification of zlev for orchidee

Fuxing Wang

Location:

LMDZ5/trunk/libf/phylmd

Files:

• coefcdrag.F90 (modified) (5 diffs)
• surf_land_orchidee_mod.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/coefcdrag.F90

@@ -52 +52 @@
       include "YOMCST.h"
       include "YOETHF.h"
+      INCLUDE "clesphys.h"
 ! Quelques constantes :
       REAL, parameter :: RKAR=0.40, CB=5.0, CC=5.0, CD=5.0, cepdu2=(0.1)**2
@@ -75 +76 @@
                  (1.+ RETV * max(q(i),0.0))))
        ztsolv(i) = ts(i)
-       ztvd(i) = t(i) * (psol(i)/pref(i))**RKAPPA
+!       ztvd(i) = t(i) * (psol(i)/pref(i))**RKAPPA
+       ztvd(i) = (t(i)+zdphi(i)/RCPD/(1.+RVTMP2*q(i))) &
+          *(1.+RETV*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 +113 @@
            zcfm1(i) = cdran(i) * friv(i)
            frih(i) = max(1./ (1.+3.*CB*zri1(i)*zscf(i)), 0.1 )
-           zcfh1(i) = cdran(i) * frih(i)
+!           zcfh1(i) = cdran(i) * frih(i)
+           zcfh1(i) = f_cdrag_ter*cdran(i) * frih(i)
+           IF(nsrf.EQ.is_oce) zcfh1(i)=f_cdrag_oce*cdran(i)*frih(i)
            cdram(i) = zcfm1(i)
            cdrah(i) = zcfh1(i)
@@ -126 +131 @@
                  *(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) = 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)
            cdram(i) = zcfm2(i)
            cdrah(i) = zcfh2(i)
@@ -138 +144 @@
          zcr(i) = (0.0016/(cdran(i)*SQRT(zdu2(i))))*ABS(ztvd(i)-ztsolv(i)) &
                **(1./3.)
-         IF (nsrf.EQ.is_oce) cdrah(i) = cdran(i)*(1.0+zcr(i)**1.25) &
+!         IF (nsrf.EQ.is_oce) cdrah(i) = cdran(i)*(1.0+zcr(i)**1.25) &
+!                  **(1./1.25)
+         IF (nsrf.EQ.is_oce) cdrah(i)=f_cdrag_oce*cdran(i)*(1.0+zcr(i)**1.25) &
                   **(1./1.25)
        ENDIF

LMDZ5/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -370 +370 @@
 
 ! zlev(1:knon) = (100.*plev(1:knon))/((ps(1:knon)/287.05*temp_air(1:knon))*9.80665)
-    zlev(1:knon) = (100.*plev(1:knon))/((ps(1:knon)/RD*temp_air(1:knon))*RG)
+!    zlev(1:knon) = (100.*plev(1:knon))/((ps(1:knon)/RD*temp_air(1:knon))*RG)
+     zlev(1:knon) = plev(1:knon)*RD*temp_air(1:knon)/((ps(1:knon)*100.0)*RG)