Changeset 2187 for LMDZ5/branches/testing/libf/phylmd/phys_output_write_mod.F90

Timestamp:

Jan 30, 2015, 2:57:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2158:2186 into testing branch.

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_output_write_mod.F90 (modified) (6 diffs)

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

@@ -57 +57 @@
          o_sens_srf, o_lat_srf, o_flw_srf, &
          o_fsw_srf, o_wbils_srf, o_wbilo_srf, &
-         o_tke_srf, o_tke_max_srf, o_wstar, &
+         o_tke_srf, o_tke_max_srf,o_dltpbltke_srf, o_wstar, &
          o_cdrm, o_cdrh, o_cldl, o_cldm, o_cldh, &
          o_cldt, o_JrNt, o_cldljn, o_cldmjn, &
@@ -160 +160 @@
          radsol, sollw0, sollwdown, sollw, &
          sollwdownclr, lwdn0, ftsol, ustar, u10m, &
-         v10m, pbl_tke, wstar, cape, ema_pcb, ema_pct, &
+         v10m, pbl_tke, wake_delta_pbl_TKE, &
+         wstar, cape, ema_pcb, ema_pct, &
          ema_cbmf, Ma, fm_therm, ale_bl, alp_bl, ale, &
          alp, cin, wake_pe, wake_s, wake_deltat, &
@@ -227 +228 @@
     USE ocean_slab_mod, only: tslab, slab_bils
     USE indice_sol_mod, only: nbsrf
-    USE infotrac, only: nqtot, nqo
+    USE infotrac, only: nqtot, nqo, type_trac
     USE comgeomphy, only: airephy
     USE surface_data, only: type_ocean, ok_veget, ok_snow
@@ -561 +562 @@
              CALL histwrite_phy(o_tke_max_srf(nsrf),  pbl_tke(:,1:klev,nsrf))
           ENDIF
+!jyg<
+          IF (iflag_pbl > 1) THEN
+             CALL histwrite_phy(o_dltpbltke_srf(nsrf), wake_delta_pbl_TKE(:,1:klev,nsrf))
+          ENDIF
+!>jyg
 
        ENDDO
@@ -1317 +1323 @@
         IF (nqtot.GE.nqo+1) THEN
             DO iq=nqo+1,nqtot
+              IF (type_trac == 'lmdz' .OR. type_trac == 'repr') THEN
 
              CALL histwrite_phy(o_trac(iq-nqo), qx(:,:,iq))
@@ -1339 +1346 @@
              ENDIF
              CALL histwrite_phy(o_trac_cum(iq-nqo), zx_tmp_fi2d)
+             endif
           ENDDO
        ENDIF