Changeset 2298 for LMDZ5/branches/testing/libf/phylmd/surf_land_mod.F90

Timestamp:

Jun 14, 2015, 9:13:32 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -14 +14 @@
        AcoefH, AcoefQ, BcoefH, BcoefQ, &
        AcoefU, AcoefV, BcoefU, BcoefV, & 
-       pref, u1, v1, rugoro, pctsrf, &
+       pref, u1, v1, gustiness, rugoro, pctsrf, &
        lwdown_m, q2m, t2m, &
        snow, qsol, agesno, tsoil, &
-!albedo SB >>>
-!      z0_new, alb1_new, alb2_new, evap, fluxsens, fluxlat, &
-       z0_new, SFRWL, alb_dir_new, alb_dif_new, evap, fluxsens, fluxlat, &   
-!albedo SB <<<
+       z0m, z0h, SFRWL, alb_dir_new, alb_dif_new, evap, fluxsens, fluxlat, &   
        qsurf, tsurf_new, dflux_s, dflux_l, &
        flux_u1, flux_v1 ) 
@@ -61 +58 @@
     REAL, DIMENSION(klon), INTENT(IN)       :: AcoefU, AcoefV, BcoefU, BcoefV
     REAL, DIMENSION(klon), INTENT(IN)       :: pref   ! pressure reference
-    REAL, DIMENSION(klon), INTENT(IN)       :: u1, v1
+    REAL, DIMENSION(klon), INTENT(IN)       :: u1, v1, gustiness
     REAL, DIMENSION(klon), INTENT(IN)       :: rugoro
     REAL, DIMENSION(klon,nbsrf), INTENT(IN) :: pctsrf
@@ -76 +73 @@
 ! Output variables
 !****************************************************************************************
-    REAL, DIMENSION(klon), INTENT(OUT)       :: z0_new
+    REAL, DIMENSION(klon), INTENT(OUT)       :: z0m, z0h
 !albedo SB >>>
 !    REAL, DIMENSION(klon), INTENT(OUT)       :: alb1_new ! albdeo for shortwave interval 1(visible)
@@ -137 +134 @@
             knindex, rlon, rlat, pctsrf, &
             debut, lafin, &
-            zlev,  u1, v1, temp_air, spechum, epot_air, ccanopy, & 
+            zlev,  u1, v1, gustiness, temp_air, spechum, epot_air, ccanopy, & 
             cdragh, AcoefH, AcoefQ, BcoefH, BcoefQ, &
             precip_rain, precip_snow, lwdown_m, swnet, swdown, &
@@ -143 +140 @@
             evap, fluxsens, fluxlat, &              
             tsol_rad, tsurf_new, alb1_new, alb2_new, &
-            emis_new, z0_new, qsurf)       
+            emis_new, z0m, qsurf)       
+        z0h(1:knon)=z0m(1:knon) ! En attendant mieux
 
 !  
@@ -149 +147 @@
 !  
        DO i=1,knon
-          z0_new(i) = MAX(1.5e-05,SQRT(z0_new(i)**2 + rugoro(i)**2))
+          z0m(i) = MAX(1.5e-05,SQRT(z0m(i)**2 + rugoro(i)**2))
        ENDDO
 
@@ -160 +158 @@
             tsurf, p1lay, cdragh, precip_rain, precip_snow, temp_air, &
             spechum, AcoefH, AcoefQ, BcoefH, BcoefQ, pref, &
-            u1, v1, rugoro, swnet, lwnet, &
+            u1, v1, gustiness, rugoro, swnet, lwnet, &
             snow, qsol, agesno, tsoil, &
-            qsurf, z0_new, alb1_new, alb2_new, evap, &
+            qsurf, z0m, alb1_new, alb2_new, evap, &
             fluxsens, fluxlat, tsurf_new, dflux_s, dflux_l)
+        z0h(1:knon)=z0m(1:knon) ! En attendant mieux
 
     ENDIF ! ok_veget
@@ -175 +174 @@
     v0(:)=0.0
     CALL calcul_flux_wind(knon, dtime, &
-         u0, v0, u1, v1, cdragm, &
+         u0, v0, u1, v1, gustiness, cdragm, &
          AcoefU, AcoefV, BcoefU, BcoefV, &
          p1lay, temp_air, &