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

Timestamp:

Mar 3, 2015, 2:41:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -80 +80 @@
          o_alp_bl_conv, o_alp_bl_stat, &
          o_slab_qflux, o_tslab, o_slab_bils, &
+         o_slab_bilg, o_slab_sic, o_slab_tice, &
          o_weakinv, o_dthmin, o_cldtau, &
          o_cldemi, o_pr_con_l, o_pr_con_i, &
@@ -113 +114 @@
          o_rnebls, o_rhum, o_ozone, o_ozone_light, &
          o_dtphy, o_dqphy, o_albe_srf, o_rugs_srf, &
-         o_ages_srf, o_alb1, o_alb2, o_tke, &
+         o_ages_srf, o_snow_srf, o_alb1, o_alb2, o_tke, &
          o_tke_max, o_kz, o_kz_max, o_clwcon, &
          o_dtdyn, o_dqdyn, o_dudyn, o_dvdyn, &
@@ -166 +167 @@
          wake_deltaq, ftd, fqd, ale_bl_trig, albsol1, &
          rnebcon, wo, falb1, albsol2, coefh, clwcon0, &
-         ratqs, entr_therm, zqasc, detr_therm, f0, heat, &
-         heat0, cool, cool0, lwup, lwdn, lwup0, coefm, &
+         ratqs, entr_therm, zqasc, detr_therm, f0, &
+         lwup, lwdn, lwup0, coefm, &
          swupp, lwupp, swup0p, lwup0p, swdnp, lwdnp, &
          swdn0p, lwdn0p, tnondef, O3sumSTD, uvsumSTD, &
@@ -215 +216 @@
          d_u_ajs, d_v_ajs, &
          d_u_con, d_v_con, d_q_con, d_q_ajs, d_t_lsc, &
+         d_t_lwr,d_t_lw0,d_t_swr,d_t_sw0, &
          d_t_eva, d_q_lsc, beta_prec, d_t_lscth, &
          d_t_lscst, d_q_lscth, d_q_lscst, plul_th, &
@@ -226 +228 @@
          bils_ec,bils_ech, bils_tke, bils_kinetic, bils_latent, bils_enthalp, &
          itau_con, nfiles, clef_files, nid_files, zvstr_gwd_rando
-    USE ocean_slab_mod, only: tslab, slab_bils
+    USE ocean_slab_mod, only: tslab, slab_bils, slab_bilg, tice, seaice
+    USE pbl_surface_mod, only: snow
     USE indice_sol_mod, only: nbsrf
     USE infotrac, only: nqtot, nqo, type_trac
     USE comgeomphy, only: airephy
-    USE surface_data, only: type_ocean, ok_veget, ok_snow
+    USE surface_data, only: type_ocean, version_ocean, ok_veget, ok_snow
 !    USE aero_mod, only: naero_spc
     USE aero_mod, only: naero_tot, id_STRAT_phy
@@ -399 +402 @@
        CALL histwrite_phy(o_pluc, zx_tmp_fi2d)
        CALL histwrite_phy(o_snow, snow_fall)
-       CALL histwrite_phy(o_msnow, snow_o)
+       CALL histwrite_phy(o_msnow, zxsnow)
        CALL histwrite_phy(o_fsnow, zfra_o)
        CALL histwrite_phy(o_evap, evap)
@@ -513 +516 @@
 
        IF (ok_snow) THEN
-          CALL histwrite_phy(o_snowsrf, zxsnow)
+          CALL histwrite_phy(o_snowsrf, snow_o)
           CALL histwrite_phy(o_qsnow, qsnow)
           CALL histwrite_phy(o_snowhgt,snowhgt)
@@ -754 +757 @@
               CALL histwrite_phy(o_tslab, tslab)
           END IF
+          IF (version_ocean=='sicINT') THEN
+              CALL histwrite_phy(o_slab_bilg, slab_bilg)
+              CALL histwrite_phy(o_slab_tice, tice)
+              CALL histwrite_phy(o_slab_sic, seaice)
+          END IF
        ENDIF !type_ocean == force/slab
        CALL histwrite_phy(o_weakinv, weak_inversion)
@@ -969 +977 @@
           IF (vars_defined) zx_tmp_fi2d(1 : klon) = agesno( 1 : klon, nsrf)
           CALL histwrite_phy(o_ages_srf(nsrf), zx_tmp_fi2d)
+          IF (vars_defined) zx_tmp_fi2d(1 : klon) = snow( 1 : klon, nsrf)
+          CALL histwrite_phy(o_snow_srf(nsrf), zx_tmp_fi2d)
        ENDDO !nsrf=1, nbsrf
        CALL histwrite_phy(o_alb1, albsol1)
@@ -1127 +1137 @@
        IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_ajsb(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dqajs, zx_tmp_fi3d)
-       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=heat(1:klon,1:klev)/RDAY
+       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_swr(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dtswr, zx_tmp_fi3d)
-       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=heat0(1:klon,1:klev)/RDAY
+       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_sw0(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dtsw0, zx_tmp_fi3d)
-       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=-1.*cool(1:klon,1:klev)/RDAY
+       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_lwr(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dtlwr, zx_tmp_fi3d)
-       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=-1.*cool0(1:klon,1:klev)/RDAY
+       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_lw0(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dtlw0, zx_tmp_fi3d)
        IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_ec(1:klon,1:klev)/pdtphys
@@ -1193 +1203 @@
        CALL histwrite_phy(o_tnt, zx_tmp_fi3d)
        IF(vars_defined) THEN
-          zx_tmp_fi3d(1:klon,1:klev)=heat(1:klon,1:klev)/RDAY - &
-               cool(1:klon,1:klev)/RDAY
+          zx_tmp_fi3d(1:klon,1:klev)=d_t_swr(1:klon,1:klev)/pdtphys + &
+               d_t_lwr(1:klon,1:klev)/pdtphys
        ENDIF
        CALL histwrite_phy(o_tntr, zx_tmp_fi3d)