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

Timestamp:

Jul 18, 2016, 9:41:10 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2545:2589 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -60 +60 @@
          o_fsw_srf, o_wbils_srf, o_wbilo_srf, &
          o_tke_srf, o_tke_max_srf,o_dltpbltke_srf, o_wstar, &
+         o_l_mixmin,o_l_mix, &
          o_cdrm, o_cdrh, o_cldl, o_cldm, o_cldh, &
          o_cldt, o_JrNt, o_cldljn, o_cldmjn, &
@@ -116 +117 @@
          o_lcc3dstra, o_reffclwtop, o_ec550aer, &
          o_lwcon, o_iwcon, o_temp, o_theta, &
-         o_ovapinit, o_ovap, o_oliq, o_geop, &
+         o_ovapinit, o_ovap, o_oliq, o_ocond, o_geop, &
          o_vitu, o_vitv, o_vitw, o_pres, o_paprs, &
          o_zfull, o_zhalf, o_rneb, o_rnebjn, o_rnebcon, &
@@ -167 +168 @@
          o_sens_prec_sol_oce, o_sens_prec_sol_sic, &
          o_lat_prec_liq_oce, o_lat_prec_liq_sic, &
-         o_lat_prec_sol_oce, o_lat_prec_sol_sic
+         o_lat_prec_sol_oce, o_lat_prec_sol_sic, &
+! Marine
+         o_map_prop_hc, o_map_prop_hist, o_map_emis_hc, o_map_iwp_hc, &
+         o_map_deltaz_hc, o_map_pcld_hc, o_map_tcld_hc, &
+         o_map_emis_hist, o_map_iwp_hist, o_map_deltaz_hist, &
+         o_map_rad_hist, &
+         o_map_emis_Cb, o_map_pcld_Cb, o_map_tcld_Cb, &
+         o_map_emis_ThCi, o_map_pcld_ThCi, o_map_tcld_ThCi, &
+         o_map_emis_Anv, o_map_pcld_Anv, o_map_tcld_Anv, &
+         o_map_ntot, o_map_hc,o_map_hist,o_map_Cb,o_map_ThCi,o_map_Anv, &
+         o_alt_tropo
+
 
     USE phys_state_var_mod, only: pctsrf, paire_ter, rain_fall, snow_fall, &
@@ -198 +210 @@
     USE phys_local_var_mod, only: zxfluxlat, slp, ptstar, pt0, zxtsol, zt2m, &
          t2m_min_mon, t2m_max_mon, evap, &
+         l_mixmin,l_mix, &
          zu10m, zv10m, zq2m, zustar, zxqsurf, &
          rain_lsc, rain_num, snow_lsc, bils, sens, fder, &
@@ -237 +250 @@
          lcc, lcc3d, lcc3dcon, lcc3dstra, reffclwtop, &
          ec550aer, flwc, fiwc, t_seri, theta, q_seri, &
-         ql_seri, tr_seri, &
+         ql_seri, qs_seri, tr_seri, &
          zphi, u_seri, v_seri, omega, cldfra, &
          rneb, rnebjn, zx_rh, d_t_dyn,  & 
@@ -262 +275 @@
          zustr_gwd_hines, zvstr_gwd_hines,zustr_gwd_rando, zvstr_gwd_rando, &
          zustr_gwd_front, zvstr_gwd_front,     &
-         sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o
+         sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o, &
+! Marine
+         map_prop_hc, map_prop_hist, &
+         map_emis_hc,map_iwp_hc,map_deltaz_hc,&
+         map_pcld_hc,map_tcld_hc,&
+         map_emis_hist,map_iwp_hist,map_deltaz_hist,&
+         map_rad_hist,&
+         map_ntot,map_hc,map_hist,&
+         map_Cb,map_ThCi,map_Anv,&
+         map_emis_Cb,map_pcld_Cb,map_tcld_Cb,&
+         map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi,&
+         map_emis_Anv,map_pcld_Anv,map_tcld_Anv, &
+         alt_tropo
+
   
 
@@ -331 +357 @@
 
     ! On calcul le nouveau tau:
-    itau_w = itau_phy + itap + start_time * day_step_phy
+    itau_w = itau_phy + itap 
     ! On le donne à iophy pour que les histwrite y aient accès:
     CALL set_itau_iophy(itau_w)
@@ -378 +404 @@
        CALL histwrite_phy(o_aireTER, paire_ter)
 !!! Champs 2D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Simulateur AIRS
+     IF (ok_airs) then
+      CALL histwrite_phy(o_alt_tropo,alt_tropo)
+ 
+      CALL histwrite_phy(o_map_prop_hc,map_prop_hc)
+      CALL histwrite_phy(o_map_prop_hist,map_prop_hist)
+
+      CALL histwrite_phy(o_map_emis_hc,map_emis_hc)
+      CALL histwrite_phy(o_map_iwp_hc,map_iwp_hc)
+      CALL histwrite_phy(o_map_deltaz_hc,map_deltaz_hc)
+      CALL histwrite_phy(o_map_pcld_hc,map_pcld_hc)
+      CALL histwrite_phy(o_map_tcld_hc,map_tcld_hc)
+
+      CALL histwrite_phy(o_map_emis_hist,map_emis_hist)
+      CALL histwrite_phy(o_map_iwp_hist,map_iwp_hist)
+      CALL histwrite_phy(o_map_deltaz_hist,map_deltaz_hist)
+
+      CALL histwrite_phy(o_map_ntot,map_ntot)
+      CALL histwrite_phy(o_map_hc,map_hc)
+      CALL histwrite_phy(o_map_hist,map_hist)
+
+      CALL histwrite_phy(o_map_Cb,map_Cb)
+      CALL histwrite_phy(o_map_ThCi,map_ThCi)
+      CALL histwrite_phy(o_map_Anv,map_Anv)
+
+      CALL histwrite_phy(o_map_emis_Cb,map_emis_Cb)
+      CALL histwrite_phy(o_map_pcld_Cb,map_pcld_Cb)
+      CALL histwrite_phy(o_map_tcld_Cb,map_tcld_Cb)
+
+      CALL histwrite_phy(o_map_emis_ThCi,map_emis_ThCi)
+      CALL histwrite_phy(o_map_pcld_ThCi,map_pcld_ThCi)
+      CALL histwrite_phy(o_map_tcld_ThCi,map_tcld_ThCi)
+
+      CALL histwrite_phy(o_map_emis_Anv,map_emis_Anv)
+      CALL histwrite_phy(o_map_pcld_Anv,map_pcld_Anv)
+      CALL histwrite_phy(o_map_tcld_Anv,map_tcld_Anv)
+     ENDIF
+
        CALL histwrite_phy(o_flat, zxfluxlat)
        CALL histwrite_phy(o_ptstar, ptstar)
@@ -619 +683 @@
           IF (iflag_pbl > 1) THEN
              CALL histwrite_phy(o_tke_srf(nsrf),  pbl_tke(:,1:klev,nsrf))
+             CALL histwrite_phy(o_l_mix(nsrf),  l_mix(:,1:klev,nsrf))
+             CALL histwrite_phy(o_l_mixmin(nsrf),  l_mixmin(:,1:klev,nsrf))
              CALL histwrite_phy(o_tke_max_srf(nsrf),  pbl_tke(:,1:klev,nsrf))
           ENDIF
@@ -1055 +1121 @@
        CALL histwrite_phy(o_ovap, q_seri)
        CALL histwrite_phy(o_oliq, ql_seri)
+       CALL histwrite_phy(o_ocond, ql_seri+qs_seri)
        CALL histwrite_phy(o_geop, zphi)
        CALL histwrite_phy(o_vitu, u_seri)