Changeset 2298 for LMDZ5/branches/testing/libf/phylmd/surf_land_bucket_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_bucket_mod.F90 (modified) (4 diffs)

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

@@ -13 +13 @@
        tsurf, p1lay, tq_cdrag, precip_rain, precip_snow, temp_air, &
        spechum, petAcoef, peqAcoef, petBcoef, peqBcoef, pref, &
-       u1, v1, rugoro, swnet, lwnet, &
+       u1, v1, gustiness, rugoro, swnet, lwnet, &
        snow, qsol, agesno, tsoil, &
        qsurf, z0_new, alb1_new, alb2_new, evap, &
@@ -49 +49 @@
     REAL, DIMENSION(klon), INTENT(IN)       :: petBcoef, peqBcoef
     REAL, DIMENSION(klon), INTENT(IN)       :: pref
-    REAL, DIMENSION(klon), INTENT(IN)       :: u1, v1
+    REAL, DIMENSION(klon), INTENT(IN)       :: u1, v1, gustiness
     REAL, DIMENSION(klon), INTENT(IN)       :: rugoro
     REAL, DIMENSION(klon), INTENT(IN)       :: swnet, lwnet
@@ -99 +99 @@
     CALL calbeta(dtime, is_ter, knon, snow, qsol, beta, capsol, dif_grnd)
     if (type_veget=='betaclim') then
-       CALL calbeta_clim(knon,jour,rlatd(knindex(:)),beta)
+       CALL calbeta_clim(knon,jour,rlatd(knindex(1:knon)),beta)
     endif
        
@@ -123 +123 @@
 
     CALL calcul_fluxs(knon, is_ter, dtime, &
-         tsurf, p1lay, cal, beta, tq_cdrag, pref, &
+         tsurf, p1lay, cal, beta, tq_cdrag, tq_cdrag, pref, &
          precip_rain, precip_snow, snow, qsurf,  &
-         radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, &
-         petAcoef, peqAcoef, petBcoef, peqBcoef, &
+         radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, gustiness, &
+         1.,petAcoef, peqAcoef, petBcoef, peqBcoef, &
          tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)