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

Timestamp:

May 4, 2017, 9:31:05 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2842:2865 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -100 +100 @@
          o_solldown, o_dtsvdfo, o_dtsvdft, &
          o_dtsvdfg, o_dtsvdfi, o_z0m, o_z0h, o_od443aer, o_od550aer, &
-         o_od865aer, o_abs550aer, o_od550lt1aer, &
+         o_dryod550aer, o_od865aer, o_abs550aer, o_od550lt1aer, &
          o_sconcso4, o_sconcno3, o_sconcoa, o_sconcbc, &
          o_sconcss, o_sconcdust, o_concso4, o_concno3, &
          o_concoa, o_concbc, o_concss, o_concdust, &
          o_loadso4, o_loadoa, o_loadbc, o_loadss, &
-         o_loaddust, o_loadno3, o_tausumaero, o_tausumaero_lw, &
+         o_loaddust, o_loadno3, o_tausumaero, & 
+         o_drytausumaero, o_tausumaero_lw, &
          o_topswad, o_topswad0, o_solswad, o_solswad0, &
          o_toplwad, o_toplwad0, o_sollwad, o_sollwad0, &
@@ -252 +253 @@
          weak_inversion, dthmin, cldtau, cldemi, &
          pmflxr, pmflxs, prfl, psfl, re, fl, rh2m, &
-         qsat2m, tpote, tpot, d_ts, od443aer, od550aer, &
+         qsat2m, tpote, tpot, d_ts, od443aer, od550aer, dryod550aer, &
          od865aer, abs550aer, od550lt1aer, sconcso4, sconcno3, &
          sconcoa, sconcbc, sconcss, sconcdust, concso4, concno3, &
          concoa, concbc, concss, concdust, loadso4, &
-         loadoa, loadbc, loadss, loaddust, loadno3, tausum_aero, &
+         loadoa, loadbc, loadss, loaddust, loadno3, tausum_aero, drytausum_aero, &
          topswad_aero, topswad0_aero, solswad_aero, &
          solswad0_aero, topsw_aero, solsw_aero, &
@@ -301 +302 @@
     USE phys_output_var_mod, ONLY: vars_defined, snow_o, zfra_o, bils_diss, &
          bils_ec,bils_ech, bils_tke, bils_kinetic, bils_latent, bils_enthalp, &
-         itau_con, nfiles, clef_files, nid_files, &
+         itau_con, nfiles, clef_files, nid_files, dryaod_diag, &
          zustr_gwd_hines, zvstr_gwd_hines,zustr_gwd_rando, zvstr_gwd_rando, &
          zustr_gwd_front, zvstr_gwd_front,     &
@@ -1164 +1165 @@
        CALL histwrite_phy(o_z0m, z0m(:,nbsrf+1))
        CALL histwrite_phy(o_z0h, z0h(:,nbsrf+1))
-       ! OD550 per species
+       ! od550 per species
 !--OLIVIER
 !This is warranted by treating INCA aerosols as offline aerosols
@@ -1193 +1194 @@
              CALL histwrite_phy(o_loaddust, loaddust)
              CALL histwrite_phy(o_loadno3, loadno3)
-             !--STRAT AER
-          ENDIF
+             CALL histwrite_phy(o_dryod550aer, dryod550aer)
+             DO naero = 1, naero_tot-1
+                CALL histwrite_phy(o_drytausumaero(naero),drytausum_aero(:,naero))
+             END DO
+          ENDIF
+          !--STRAT AER
           IF (flag_aerosol.GT.0.OR.flag_aerosol_strat.GT.0) THEN
              DO naero = 1, naero_tot