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

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

@@ -36 +36 @@
   REAL tsoil(klon, nsoilmx, nbsrf)
   REAL qsurf(klon, nbsrf)
-  REAL qsol(klon)
   REAL snow(klon, nbsrf)
-  REAL evap(klon, nbsrf)
   real fder(klon)
-  REAL frugs(klon, nbsrf)
-  REAL agesno(klon, nbsrf)
   REAL run_off_lic_0(klon)
   REAL trs(klon, nbtr)
@@ -60 +56 @@
   ! Get variables which will be written to restart file from module 
   ! pbl_surface_mod
-  CALL pbl_surface_final(qsol, fder, snow, qsurf,  &
-       evap, frugs, agesno, tsoil)
+  CALL pbl_surface_final(fder, snow, qsurf,  tsoil)
 
   ! Get a variable calculated in module fonte_neige_mod
@@ -190 +185 @@
      IF (nsrf.LE.99) THEN
         WRITE(str2, '(i2.2)') nsrf
-        CALL put_field("ALBE"//str2, "albedo de surface No."//str2, &
-             falb1(:, nsrf))
-     ELSE
-        PRINT*, "Trop de sous-mailles"
-        call abort_gcm("phyredem", "", 1)
-     ENDIF
-  ENDDO
-
-  DO nsrf = 1, nbsrf
-     IF (nsrf.LE.99) THEN
-        WRITE(str2, '(i2.2)') nsrf
-        CALL put_field("ALBLW"//str2, "albedo LW de surface No."//str2, &
-             falb2(:, nsrf))
-     ELSE
-        PRINT*, "Trop de sous-mailles"
-        call abort_gcm("phyredem", "", 1)
-     ENDIF
-  ENDDO
-
-  DO nsrf = 1, nbsrf
-     IF (nsrf.LE.99) THEN
-        WRITE(str2, '(i2.2)') nsrf
         CALL put_field("EVAP"//str2, "Evaporation de surface No."//str2 &
-             , evap(:, nsrf))
+             , fevap(:, nsrf))
      ELSE
         PRINT*, "Trop de sous-mailles"
@@ -248 +221 @@
      IF (nsrf.LE.99) THEN
         WRITE(str2, '(i2.2)') nsrf
-        CALL put_field("RUG"//str2, "rugosite de surface No."//str2, &
-             frugs(:, nsrf))
+        CALL put_field("Z0m"//str2, "rugosite de surface No."//str2, &
+             z0m(:, nsrf))
+        CALL put_field("Z0h"//str2, "rugosite de surface No."//str2, &
+             z0h(:, nsrf))
      ELSE
         PRINT*, "Trop de sous-mailles"
@@ -291 +266 @@
 
   CALL put_field("VANCIEN", "", v_ancien)
-
-  CALL put_field("RUGMER", "Longueur de rugosite sur mer", &
-       frugs(:, is_oce))
 
   CALL put_field("CLWCON", "Eau liquide convective", clwcon)
@@ -313 +285 @@
            CALL put_field("TKE"//str2, "Energ. Cineti. Turb."//str2, &
                 pbl_tke(:, 1:klev+1, nsrf))
+           CALL put_field("DELTATKE"//str2, "Del TKE wk/env."//str2, &
+                wake_delta_pbl_tke(:, 1:klev+1, nsrf))
         ELSE
            PRINT*, "Trop de sous-mailles"
@@ -363 +337 @@
      CALL traclmdz_to_restart(trs)
      DO it=1, nbtr
-        iiq=niadv(it+2)
+!!        iiq=niadv(it+2)                                                           ! jyg
+        iiq=niadv(it+nqo)                                                           ! jyg
         CALL put_field("trs_"//tname(iiq), "", trs(:, it))
      END DO