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

Timestamp:

Jan 30, 2017, 5:54:45 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2727:2785 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

@@ -25 +25 @@
 
     USE dimphy, ONLY: klon, klev, klevp1
-    USE infotrac, ONLY: nbtr
+    USE infotrac_phy, ONLY: nbtr
     USE mod_phys_lmdz_para, ONLY: is_north_pole_phy,is_south_pole_phy
     USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
@@ -115 +115 @@
          o_swsrfcs_nat, o_swsrfcf_ant, &
          o_swtoacf_zero, o_swsrfcf_zero, &
-         o_topswai, o_solswai, o_scdnc, &
+         o_topswai, o_solswai, o_toplwai, o_sollwai, o_scdnc, &
          o_cldncl, o_reffclws, o_reffclwc, o_stratomask,&
          o_cldnvi, o_lcc, o_lcc3d, o_lcc3dcon, &
@@ -185 +185 @@
 #ifdef CPP_StratAer
     USE phys_output_ctrlout_mod, ONLY:  & 
-         o_sulf_convert, o_sulf_nucl, o_sulf_cond_evap, o_ocs_convert, &
-         o_sfluxaer, o_R2SO4, o_OCS_lifetime, o_SO2_lifetime, &
-         o_OCS_backgr_tend, o_SO2_backgr_tend, o_sulf_dep_dry, o_sulf_dep_wet, &
+         o_budg_3D_nucl, o_budg_3D_cond_evap, o_budg_3D_ocs_to_so2, o_budg_3D_so2_to_h2so4, &
+         o_budg_sed_part, o_R2SO4, o_OCS_lifetime, o_SO2_lifetime, &
+         o_budg_3D_backgr_ocs, o_budg_3D_backgr_so2, & 
+         o_budg_dep_dry_h2so4, o_budg_dep_wet_h2so4, &
+         o_budg_dep_dry_part, o_budg_dep_wet_part, & 
+         o_budg_emi_ocs, o_budg_emi_so2, o_budg_emi_h2so4, o_budg_emi_part, & 
+         o_budg_ocs_to_so2, o_budg_so2_to_h2so4, o_budg_h2so4_to_part, &
          o_surf_PM25_sulf, o_ext_strat_550, o_tau_strat_550, &
          o_p_tropopause, o_vsed_aer, o_tau_strat_1020, o_ext_strat_1020, o_f_r_wet
@@ -284 +288 @@
 #ifdef CPP_StratAer 
     USE phys_local_var_mod, ONLY:  &
-         sulf_convert, sulf_nucl, sulf_cond_evap, ocs_convert, &
-         sfluxaer, R2SO4, OCS_lifetime, SO2_lifetime, &
-         OCS_backgr_tend, SO2_backgr_tend, sulf_dep_dry, sulf_dep_wet, &
+         budg_3D_nucl, budg_3D_cond_evap, budg_3D_ocs_to_so2, budg_3D_so2_to_h2so4, &
+         budg_sed_part, R2SO4, OCS_lifetime, SO2_lifetime, &
+         budg_3D_backgr_ocs, budg_3D_backgr_so2, & 
+         budg_dep_dry_h2so4, budg_dep_wet_h2so4, &
+         budg_dep_dry_part, budg_dep_wet_part, &
+         budg_emi_ocs, budg_emi_so2, budg_emi_h2so4, budg_emi_part, & 
+         budg_ocs_to_so2, budg_so2_to_h2so4, budg_h2so4_to_part, & 
          surf_PM25_sulf, tau_strat_550, p_tropopause, tausum_strat, &
          vsed_aer, tau_strat_1020, f_r_wet
@@ -385 +393 @@
     TYPE(xios_field) :: child
 #endif
+#ifdef CPP_StratAer 
+    LOGICAL, PARAMETER :: debug_strataer=.FALSE.
+#endif
 
     ! On calcul le nouveau tau:
@@ -406 +417 @@
             iiq=niadv(iq)
             varname=trim(tname(iiq))
-            WRITE (lunout,*) 'XIOS var=', nqo, iq, varname
+            WRITE (lunout,*) 'XIOS var=', nqo, iq, nqtot, varname
             CALL xios_add_child(group_handle, child, varname)
             CALL xios_set_attr(child, name=varname, unit="kg kg-1")
@@ -455 +466 @@
             iiq=niadv(iq)
             varname='cum'//trim(tname(iiq))
-            WRITE (lunout,*) 'XIOS var=', iq, varname
+            WRITE (lunout,*) 'XIOS var=', iq, nqtot, varname
             CALL xios_add_child(group_handle, child, varname)
             CALL xios_set_attr(child, name=varname, unit="kg m-2")
@@ -468 +479 @@
     ! ug la boucle qui suit ne sert qu'une fois, pour l'initialisation, sinon il n'y a toujours qu'un seul passage:
     DO iinit=1, iinitend
+!      print *,'IFF iinit=', iinit, iinitend 
 #ifdef CPP_XIOS
        !$OMP MASTER
@@ -1194 +1206 @@
 #ifdef CPP_StratAer
        IF (type_trac=='coag') THEN
-          CALL histwrite_phy(o_sulf_convert, sulf_convert)
-          CALL histwrite_phy(o_sulf_nucl, sulf_nucl)
-          CALL histwrite_phy(o_sulf_cond_evap, sulf_cond_evap)
-          CALL histwrite_phy(o_ocs_convert, ocs_convert)
           CALL histwrite_phy(o_R2SO4, R2SO4)
           CALL histwrite_phy(o_OCS_lifetime, OCS_lifetime)
           CALL histwrite_phy(o_SO2_lifetime, SO2_lifetime)
-          CALL histwrite_phy(o_OCS_backgr_tend, OCS_backgr_tend)
-          CALL histwrite_phy(o_SO2_backgr_tend, SO2_backgr_tend)
-          CALL histwrite_phy(o_sulf_dep_dry, sulf_dep_dry)
-          CALL histwrite_phy(o_sulf_dep_wet, sulf_dep_wet)
+          CALL histwrite_phy(o_budg_3D_backgr_ocs,   budg_3D_backgr_ocs)
+          CALL histwrite_phy(o_budg_3D_backgr_so2,   budg_3D_backgr_so2)
+          CALL histwrite_phy(o_budg_3D_ocs_to_so2,   budg_3D_ocs_to_so2)
+          CALL histwrite_phy(o_budg_3D_so2_to_h2so4, budg_3D_so2_to_h2so4)
+          CALL histwrite_phy(o_budg_3D_nucl,         budg_3D_nucl)
+          CALL histwrite_phy(o_budg_3D_cond_evap,    budg_3D_cond_evap)
+          CALL histwrite_phy(o_budg_dep_dry_h2so4,   budg_dep_dry_h2so4)
+          CALL histwrite_phy(o_budg_dep_wet_h2so4,   budg_dep_wet_h2so4)
+          CALL histwrite_phy(o_budg_dep_dry_part,    budg_dep_dry_part)
+          CALL histwrite_phy(o_budg_dep_wet_part,    budg_dep_wet_part)
+          CALL histwrite_phy(o_budg_emi_ocs,         budg_emi_ocs)
+          CALL histwrite_phy(o_budg_emi_so2,         budg_emi_so2)
+          CALL histwrite_phy(o_budg_emi_h2so4,       budg_emi_h2so4)
+          CALL histwrite_phy(o_budg_emi_part,        budg_emi_part)
+          CALL histwrite_phy(o_budg_ocs_to_so2,      budg_ocs_to_so2)
+          CALL histwrite_phy(o_budg_so2_to_h2so4,    budg_so2_to_h2so4)
+          CALL histwrite_phy(o_budg_h2so4_to_part,   budg_h2so4_to_part)
+          CALL histwrite_phy(o_budg_sed_part,        budg_sed_part)
           CALL histwrite_phy(o_surf_PM25_sulf, surf_PM25_sulf)
           CALL histwrite_phy(o_p_tropopause, p_tropopause)
-          CALL histwrite_phy(o_sfluxaer, sfluxaer)
           CALL histwrite_phy(o_vsed_aer, vsed_aer)
           CALL histwrite_phy(o_f_r_wet, f_r_wet)
@@ -1264 +1285 @@
        IF (ok_aie) THEN
           CALL histwrite_phy(o_topswai, topswai_aero*swradcorr)
+          CALL histwrite_phy(o_toplwai, toplwai_aero*swradcorr)
           CALL histwrite_phy(o_solswai, solswai_aero*swradcorr)
+          CALL histwrite_phy(o_sollwai, sollwai_aero*swradcorr)
        ENDIF
        IF (flag_aerosol.GT.0.AND.ok_cdnc) THEN
@@ -1726 +1749 @@
        ! Champs interpolles sur des niveaux de pression
        missing_val=missing_val_nf90
-       DO iff=7, nfiles
+       DO iff=7, nfiles-1 !--OB: here we deal with files 7,8,9
 
           CALL histwrite_phy(o_tnondef,tnondef(:,:,iff-6),iff)