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

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

@@ -48 +48 @@
     REAL :: run_off_lic_0(nlon)
     REAL :: qsolsrf(nlon, nbsrf), snsrf(nlon, nbsrf)
-    REAL :: frugs(nlon, nbsrf)
-    REAL :: agesno(nlon, nbsrf)
     REAL :: tsoil(nlon, nsoilmx, nbsrf)
     REAL :: tslab(nlon), seaice(nlon)
-    REAL evap(nlon, nbsrf), fder(nlon)
+    REAL fder(nlon)
 
 
@@ -67 +65 @@
     REAL tsurf
     REAL time, timestep, day, day0
-    REAL qsol_f, qsol(nlon)
+    REAL qsol_f
     REAL rugsrel(nlon)
     ! real zmea(nlon),zstd(nlon),zsig(nlon)
@@ -328 +326 @@
     seaice(:) = 0.
     run_off_lic_0 = 0.
-    evap = 0.
+    fevap = 0.
 
 
@@ -336 +334 @@
     qsolsrf(:, :) = qsol(1) ! humidite du sol des sous surface
     snsrf(:, :) = 0. ! couverture de neige des sous surface
-    frugs(:, :) = rugos ! couverture de neige des sous surface
-
-
-    CALL pbl_surface_init(qsol, fder, snsrf, qsolsrf, evap, frugs, agesno, &
-      tsoil)
+    z0m(:, :) = rugos ! couverture de neige des sous surface
+    z0h=z0m
+
+
+    CALL pbl_surface_init(fder, snsrf, qsolsrf, tsoil)
 
     PRINT *, 'iniaqua: before phyredem'