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

Timestamp:

Apr 3, 2016, 12:09:34 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -37 +37 @@
          o_psol, o_mass, o_qsurf, o_qsol, &
          o_precip, o_ndayrain, o_plul, o_pluc, &
-         o_snow, o_msnow, o_fsnow, o_evap, &
+         o_snow, o_msnow, o_fsnow, o_evap, o_ep,o_epmax_diag, & ! epmax_cape
          o_tops, o_tops0, o_topl, o_topl0, &
          o_SWupTOA, o_SWupTOAclr, o_SWdnTOA, &
@@ -65 +65 @@
          o_ue, o_ve, o_uq, o_vq, o_cape, o_pbase, &
          o_ptop, o_fbase, o_plcl, o_plfc, &
-         o_wbeff, o_cape_max, o_upwd, o_Ma, &
+         o_wbeff, o_cape_max, o_upwd, o_ep,o_epmax_diag, o_Ma, &
          o_dnwd, o_dnwd0, o_ftime_con, o_mc, &
          o_prw, o_s_pblh, o_s_pblt, o_s_lcl, &
@@ -79 +79 @@
          o_ale, o_alp, o_cin, o_WAPE, o_wake_h, &
          o_wake_s, o_wake_deltat, o_wake_deltaq, &
-         o_wake_omg, o_dtwak, o_dqwak, o_Vprecip, &
+         o_wake_omg, o_dtwak, o_dqwak, o_dqwak2d, o_Vprecip, &
          o_ftd, o_fqd, o_wdtrainA, o_wdtrainM, &
          o_n2, o_s2, o_proba_notrig, &
@@ -120 +120 @@
          o_zfull, o_zhalf, o_rneb, o_rnebjn, o_rnebcon, &
          o_rnebls, o_rhum, o_ozone, o_ozone_light, &
-         o_dtphy, o_dqphy, o_albe_srf, o_z0m_srf, o_z0h_srf, &
+         o_dtphy, o_dqphy, o_dqphy2d, o_albe_srf, o_z0m_srf, o_z0h_srf, &
          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, &
+         o_dtdyn, o_dqdyn, o_dqdyn2d, o_dudyn, o_dvdyn, &
          o_dtcon, o_tntc, o_ducon, o_dvcon, &
-         o_dqcon, o_tnhusc, o_tnhusc, o_dtlsc, &
-         o_dtlschr, o_dqlsc, o_beta_prec, &
-         o_dtlscth, o_dtlscst, o_dqlscth, &
-         o_dqlscst, o_plulth, o_plulst, &
+         o_dqcon, o_dqcon2d, o_tnhusc, o_tnhusc, o_dtlsc, &
+         o_dtlschr, o_dqlsc, o_dqlsc2d, o_beta_prec, &
+         o_dtlscth, o_dtlscst, o_dqlscth, o_dqlscth2d, &
+         o_dqlscst, o_dqlscst2d, o_plulth, o_plulst, &
          o_ptconvth, o_lmaxth, o_dtvdf, &
-         o_dtdis, o_dqvdf, o_dteva, o_dqeva, &
+         o_dtdis, o_dqvdf, o_dqvdf2d, o_dteva, o_dqeva, o_dqeva2d, &
          o_ptconv, o_ratqs, o_dtthe, & 
          o_duthe, o_dvthe, o_ftime_th, &
          o_f_th, o_e_th, o_w_th, o_q_th, &
          o_a_th, o_d_th, o_f0_th, o_zmax_th, &
-         o_dqthe, o_dtajs, o_dqajs, o_dtswr, &
+         o_dqthe, o_dqthe2d, o_dtajs, o_dqajs, o_dqajs2d, o_dtswr, &
          o_dtsw0, o_dtlwr, o_dtlw0, o_dtec, &
          o_duvdf, o_dvvdf, o_duoro, o_dvoro, &
@@ -249 +249 @@
          dv_gwd_rando, dv_gwd_front, &
          east_gwstress, west_gwstress, &
-         d_q_ch4, pmfd, pmfu, ref_liq, ref_ice, rhwriteSTD
+         d_q_ch4, pmfd, pmfu, ref_liq, ref_ice, rhwriteSTD, &
+         ep, epmax_diag ! epmax_cape
 
     USE phys_output_var_mod, only: vars_defined, snow_o, zfra_o, bils_diss, &
@@ -428 +429 @@
        CALL histwrite_phy(o_precip, zx_tmp_fi2d)
        CALL histwrite_phy(o_ndayrain, nday_rain)
+
+       ! epmax_cape:
+!       CALL histwrite_phy(o_epmax_diag, epmax_diag)
+       CALL histwrite_phy(o_ep, ep)
 
        IF (vars_defined) THEN
@@ -810 +815 @@
              IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_wake(1:klon,1:klev)/pdtphys
              CALL histwrite_phy(o_dqwak, zx_tmp_fi3d)
+             CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
+             CALL histwrite_phy(o_dqwak2d, zx_tmp_fi2d)
           ENDIF ! iflag_wake>=1
           CALL histwrite_phy(o_ftd, ftd)
@@ -1058 +1065 @@
        CALL histwrite_phy(o_dtphy, d_t)
        CALL histwrite_phy(o_dqphy,  d_qx(:,:,ivap))
+       CALL water_int(klon,klev,d_qx(:,:,ivap),zmasse,zx_tmp_fi2d)
+       CALL histwrite_phy(o_dqphy2d,  zx_tmp_fi2d)
        DO nsrf=1, nbsrf
           IF (vars_defined) zx_tmp_fi2d(1 : klon) = falb1( 1 : klon, nsrf)
@@ -1095 +1104 @@
        CALL histwrite_phy(o_dtdyn, d_t_dyn)
        CALL histwrite_phy(o_dqdyn, d_q_dyn)
+       CALL water_int(klon,klev,d_q_dyn,zmasse,zx_tmp_fi2d)
+       CALL histwrite_phy(o_dqdyn2d,zx_tmp_fi2d)
        CALL histwrite_phy(o_dudyn, d_u_dyn)
        CALL histwrite_phy(o_dvdyn, d_v_dyn)
@@ -1122 +1133 @@
        IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_con(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dqcon, zx_tmp_fi3d)
+       CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
+       CALL histwrite_phy(o_dqcon2d, zx_tmp_fi2d)
 
        IF(iflag_thermals.EQ.0) THEN
@@ -1142 +1155 @@
        IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_lsc(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dqlsc, zx_tmp_fi3d)
+       CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
+       CALL histwrite_phy(o_dqlsc2d, zx_tmp_fi2d)
        IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=beta_prec(1:klon,1:klev)
        CALL histwrite_phy(o_beta_prec, zx_tmp_fi3d)
@@ -1153 +1168 @@
           IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_lscth(1:klon,1:klev)/pdtphys
           CALL histwrite_phy(o_dqlscth, zx_tmp_fi3d)
+          CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
+          CALL histwrite_phy(o_dqlscth2d, zx_tmp_fi2d)
           IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_lscst(1:klon,1:klev)/pdtphys
           CALL histwrite_phy(o_dqlscst, zx_tmp_fi3d)
+          CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
+          CALL histwrite_phy(o_dqlscst2d, zx_tmp_fi2d)
           CALL histwrite_phy(o_plulth, plul_th)
           CALL histwrite_phy(o_plulst, plul_st)
@@ -1183 +1202 @@
        IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_vdf(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dqvdf, zx_tmp_fi3d)
+       CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
+       CALL histwrite_phy(o_dqvdf2d, zx_tmp_fi2d)
        IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_eva(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dteva, zx_tmp_fi3d)
        IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_eva(1:klon,1:klev)/pdtphys
        CALL histwrite_phy(o_dqeva, zx_tmp_fi3d)
+       CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
+       CALL histwrite_phy(o_dqeva2d, zx_tmp_fi2d)
        zpt_conv = 0.
        WHERE (ptconv) zpt_conv = 1.
@@ -1222 +1245 @@
           ENDIF
           CALL histwrite_phy(o_dqthe, zx_tmp_fi3d)
+          CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
+          CALL histwrite_phy(o_dqthe2d, zx_tmp_fi2d)
        ENDIF !iflag_thermals
        IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_ajsb(1:klon,1:klev)/pdtphys
@@ -1227 +1252 @@
        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)
+       CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
+       CALL histwrite_phy(o_dqajs2d, zx_tmp_fi2d)
        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)