Changeset 1864 for LMDZ5/branches/testing/libf/phylmd/pbl_surface_mod.F90

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/pbl_surface_mod.F90 (modified) (8 diffs)

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

@@ -174 +174 @@
        t,         q,         u,        v,             &
        pplay,     paprs,     pctsrf,                  &
-       ts,        alb1,      alb2,ustar, u10m, v10m,  &
+       ts,        alb1, alb2,ustar, u10m, v10m,wstar, &
        lwdown_m,  cdragh,    cdragm,   zu1,    zv1,   &
        alb1_m,    alb2_m,    zxsens,   zxevap,        &
@@ -294 +294 @@
     REAL, DIMENSION(klon, nbsrf), INTENT(INOUT)     :: alb2    ! albedo in near infra-red SW interval
     REAL, DIMENSION(klon, nbsrf), INTENT(INOUT)     :: ustar   ! u* (m/s)
+    REAL, DIMENSION(klon, nbsrf+1), INTENT(INOUT)   :: wstar   ! w* (m/s)
     REAL, DIMENSION(klon, nbsrf), INTENT(INOUT)     :: u10m    ! u speed at 10m
     REAL, DIMENSION(klon, nbsrf), INTENT(INOUT)     :: v10m    ! v speed at 10m
@@ -406 +407 @@
     REAL, DIMENSION(klon)              :: yt2m, yq2m, yu10m
     REAL, DIMENSION(klon)              :: yustar
+    REAL, DIMENSION(klon)              :: ywstar
     REAL, DIMENSION(klon)              :: ywindsp
     REAL, DIMENSION(klon)              :: yt10m, yq10m
@@ -1065 +1067 @@
        q2m(:,nsrf)    = 0.
        ustar(:,nsrf)   = 0.
+       wstar(:,nsrf)   = 0.
        u10m(:,nsrf)   = 0.
        v10m(:,nsrf)   = 0.
@@ -1145 +1148 @@
 
 !   print*,'OK pbl 5'
-       CALL HBTM(knon, ypaprs, ypplay, &
-            yt2m,yt10m,yq2m,yq10m,yustar, &
+       CALL hbtm(knon, ypaprs, ypplay, &
+            yt2m,yt10m,yq2m,yq10m,yustar,ywstar, &
             y_flux_t,y_flux_q,yu,yv,yt,yq, &
             ypblh,ycapCL,yoliqCL,ycteiCL,ypblT, &
@@ -1154 +1157 @@
           i = ni(j)
           pblh(i,nsrf)   = ypblh(j)
+          wstar(i,nsrf)  = ywstar(j)
           plcl(i,nsrf)   = ylcl(j)
           capCL(i,nsrf)  = ycapCL(j)
@@ -1215 +1219 @@
     s_therm(:) = 0.0 ; s_trmb1(:) = 0.0
     s_trmb2(:) = 0.0 ; s_trmb3(:) = 0.0
+    wstar(:,is_ave)=0.
     
 !   print*,'OK pbl 9'
@@ -1233 +1238 @@
           zq2m(i)  = zq2m(i)  + q2m(i,nsrf)  * pctsrf(i,nsrf)
           zustar(i) = zustar(i) + ustar(i,nsrf) * pctsrf(i,nsrf)
+          wstar(i,is_ave)=wstar(i,is_ave)+wstar(i,nsrf)*pctsrf(i,nsrf)
           zu10m(i) = zu10m(i) + u10m(i,nsrf) * pctsrf(i,nsrf)
           zv10m(i) = zv10m(i) + v10m(i,nsrf) * pctsrf(i,nsrf)