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

Timestamp:

Mar 30, 2017, 4:16:38 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2785:2838 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -68 +68 @@
          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_ep,o_epmax_diag, o_Ma, &
+         o_wbeff, o_convoccur, o_cape_max, o_upwd, o_ep,o_epmax_diag, o_Ma, &
          o_dnwd, o_dnwd0, o_ftime_con, o_mc, &
          o_prw, o_prlw, o_prsw, o_s_pblh, o_s_pblt, o_s_lcl, &
@@ -99 +99 @@
          o_SWdownOR, o_LWdownOR, o_snowl, &
          o_solldown, o_dtsvdfo, o_dtsvdft, &
-         o_dtsvdfg, o_dtsvdfi, o_z0m, o_z0h, o_od550aer, &
+         o_dtsvdfg, o_dtsvdfi, o_z0m, o_z0h, o_od443aer, o_od550aer, &
          o_od865aer, o_absvisaer, o_od550lt1aer, &
          o_sconcso4, o_sconcno3, o_sconcoa, o_sconcbc, &
@@ -105 +105 @@
          o_concoa, o_concbc, o_concss, o_concdust, &
          o_loadso4, o_loadoa, o_loadbc, o_loadss, &
-         o_loaddust, o_tausumaero, o_tausumaero_lw, &
+         o_loaddust, o_loadno3, o_tausumaero, o_tausumaero_lw, &
          o_topswad, o_topswad0, o_solswad, o_solswad0, &
          o_toplwad, o_toplwad0, o_sollwad, o_sollwad0, &
@@ -196 +196 @@
 #endif
 
-    USE phys_state_var_mod, ONLY: pctsrf, paire_ter, rain_fall, snow_fall, &
+    USE phys_state_var_mod, ONLY: pctsrf, rain_fall, snow_fall, &
          qsol, z0m, z0h, fevap, agesno, &
          nday_rain, rain_con, snow_con, &
@@ -236 +236 @@
          cldh, cldt, JrNt, cldljn, cldmjn, cldhjn, &
          cldtjn, cldq, flwp, fiwp, ue, ve, uq, vq, &
-         plcl, plfc, wbeff, upwd, dnwd, dnwd0, prw, prlw, prsw, &
+         plcl, plfc, wbeff, convoccur, upwd, dnwd, dnwd0, prw, prlw, prsw, &
          s_pblh, s_pblt, s_lcl, s_therm, uwriteSTD, &
          vwriteSTD, wwriteSTD, phiwriteSTD, qwriteSTD, &
@@ -252 +252 @@
          weak_inversion, dthmin, cldtau, cldemi, &
          pmflxr, pmflxs, prfl, psfl, re, fl, rh2m, &
-         qsat2m, tpote, tpot, d_ts, od550aer, &
+         qsat2m, tpote, tpot, d_ts, od443aer, od550aer, &
          od865aer, absvisaer, od550lt1aer, sconcso4, sconcno3, &
          sconcoa, sconcbc, sconcss, sconcdust, concso4, concno3, &
          concoa, concbc, concss, concdust, loadso4, &
-         loadoa, loadbc, loadss, loaddust, tausum_aero, &
+         loadoa, loadbc, loadss, loaddust, loadno3, tausum_aero, &
          topswad_aero, topswad0_aero, solswad_aero, &
          solswad0_aero, topsw_aero, solsw_aero, &
@@ -325 +325 @@
     USE geometry_mod, ONLY: cell_area
     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
     USE ioipsl, ONLY: histend, histsync
@@ -410 +409 @@
 #ifdef CPP_XIOS
 #ifdef CPP_StratAer
-    IF (.NOT.vars_defined) THEN
+!$OMP MASTER
+   IF (.NOT.vars_defined) THEN
           !On ajoute les variables 3D traceurs par l interface fortran 
           CALL xios_get_handle("fields_strataer_trac_3D", group_handle)
@@ -474 +474 @@
           ENDDO
     ENDIF
-#endif
-#endif
-
+!$OMP END MASTER
+#endif
+#endif
     ! 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
@@ -513 +513 @@
        CALL histwrite_phy(o_contfracATM, zx_tmp_fi2d)
        CALL histwrite_phy(o_contfracOR, pctsrf(:,is_ter))
-       CALL histwrite_phy(o_aireTER, paire_ter)
 !
 #ifdef CPP_XIOS
@@ -739 +738 @@
        CALL histwrite_phy(o_bils_diss, bils_diss)
        CALL histwrite_phy(o_bils_ec, bils_ec)
-       IF (iflag_ener_conserv>=1) THEN
-         CALL histwrite_phy(o_bils_ech, bils_ech)
-       ENDIF
+       CALL histwrite_phy(o_bils_ech, bils_ech)
        CALL histwrite_phy(o_bils_tke, bils_tke)
        CALL histwrite_phy(o_bils_kinetic, bils_kinetic)
@@ -890 +887 @@
              CALL histwrite_phy(o_plfc, plfc)
              CALL histwrite_phy(o_wbeff, wbeff)
+             CALL histwrite_phy(o_convoccur, convoccur)
           ENDIF
 
@@ -1172 +1170 @@
        IF (new_aod) THEN
           IF (flag_aerosol.GT.0) THEN
+             CALL histwrite_phy(o_od443aer, od443aer)
              CALL histwrite_phy(o_od550aer, od550aer)
              CALL histwrite_phy(o_od865aer, od865aer)
@@ -1193 +1192 @@
              CALL histwrite_phy(o_loadss, loadss)
              CALL histwrite_phy(o_loaddust, loaddust)
+             CALL histwrite_phy(o_loadno3, loadno3)
              !--STRAT AER
           ENDIF