Changeset 2146 for LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

Timestamp:

Nov 14, 2014, 9:22:21 PM (10 years ago)

Author:

idelkadi

Message:

Les modifications introduites ont pour but :
1/ d'autoriser le couplage entre INCA-aerosol et les parametrisations de
la nouvelle physique (NP) de LMDZ, en particulier les thermiques et le
transport convectif,
2/ generaliser les routines de calcul de proprietes optiques des
aerosols pour RRTM au cas ou les aerosols sont interactifs
3/ d'inclure les effets LW des aerosols stratospheriques pour RRTM

File:

• LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90 (modified) (10 diffs)

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -89 +89 @@
          o_dtsvdfg, o_dtsvdfi, o_rugs, o_od550aer, &
          o_od865aer, o_absvisaer, o_od550lt1aer, &
-         o_sconcso4, o_sconcoa, o_sconcbc, &
-         o_sconcss, o_sconcdust, o_concso4, &
+         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_tausumaero, o_topswad, &
-         o_topswad0, o_solswad, o_solswad0, &
+         o_loaddust, o_tausumaero, o_tausumaero_lw, &
+         o_topswad, o_topswad0, o_solswad, o_solswad0, &
+         o_toplwad, o_toplwad0, o_sollwad, o_sollwad0, &
          o_swtoaas_nat, o_swsrfas_nat, &
          o_swtoacs_nat, o_swtoaas_ant, &
@@ -195 +196 @@
          pmflxr, pmflxs, prfl, psfl, re, fl, rh2m, &
          qsat2m, tpote, tpot, d_ts, zxrugs, od550aer, &
-         od865aer, absvisaer, od550lt1aer, sconcso4, &
-         sconcoa, sconcbc, sconcss, sconcdust, concso4, &
+         od865aer, absvisaer, od550lt1aer, sconcso4, sconcno3, &
+         sconcoa, sconcbc, sconcss, sconcdust, concso4, concno3, &
          concoa, concbc, concss, concdust, loadso4, &
          loadoa, loadbc, loadss, loaddust, tausum_aero, &
@@ -203 +204 @@
          topsw0_aero, solsw0_aero, topswcf_aero, &
          solswcf_aero, topswai_aero, solswai_aero, &
+         toplwad_aero, toplwad0_aero, sollwad_aero, &
+         sollwad0_aero, toplwai_aero, sollwai_aero, &
          scdnc, cldncl, reffclws, reffclwc, cldnvi, &
          lcc, lcc3d, lcc3dcon, lcc3dstra, reffclwtop, &
@@ -228 +231 @@
     USE surface_data, only: type_ocean, ok_veget, ok_snow
 !    USE aero_mod, only: naero_spc
-    USE aero_mod, only: naero_tot
+    USE aero_mod, only: naero_tot, id_STRAT_phy
     USE ioipsl, only: histend, histsync
     USE iophy, only: set_itau_iophy, histwrite_phy
@@ -331 +334 @@
        CALL histwrite_phy(o_t2m_min, zt2m)
        CALL histwrite_phy(o_t2m_max, zt2m)
-       if (.not. ok_all_xml) then
-         CALL histwrite_phy(o_t2m_max_mon, t2m_max_mon)
-         CALL histwrite_phy(o_t2m_min_mon, t2m_min_mon)
-       endif
+       CALL histwrite_phy(o_t2m_max_mon, t2m_max_mon)
+       CALL histwrite_phy(o_t2m_min_mon, t2m_min_mon)
 
        IF (vars_defined) THEN
@@ -795 +796 @@
        CALL histwrite_phy(o_rugs, zxrugs)
        ! OD550 per species
-       IF (new_aod .and. (.not. aerosol_couple)) THEN
+!--OLIVIER
+!This is warranted by treating INCA aerosols as offline aerosols
+!       IF (new_aod .and. (.not. aerosol_couple)) THEN
+       IF (new_aod) THEN
           IF (flag_aerosol.GT.0) THEN
              CALL histwrite_phy(o_od550aer, od550aer)
@@ -802 +806 @@
              CALL histwrite_phy(o_od550lt1aer, od550lt1aer)
              CALL histwrite_phy(o_sconcso4, sconcso4)
+             CALL histwrite_phy(o_sconcno3, sconcno3)
              CALL histwrite_phy(o_sconcoa, sconcoa)
              CALL histwrite_phy(o_sconcbc, sconcbc)
@@ -807 +812 @@
              CALL histwrite_phy(o_sconcdust, sconcdust)
              CALL histwrite_phy(o_concso4, concso4)
+             CALL histwrite_phy(o_concno3, concno3)
              CALL histwrite_phy(o_concoa, concoa)
              CALL histwrite_phy(o_concbc, concbc)
@@ -826 +832 @@
              END DO
           ENDIF
+          IF (flag_aerosol_strat) THEN
+             CALL histwrite_phy(o_tausumaero_lw, &
+                  tausum_aero(:,6,id_STRAT_phy) )
+          ENDIF
        ENDIF
        IF (ok_ade) THEN
@@ -832 +842 @@
           CALL histwrite_phy(o_solswad, solswad_aero)
           CALL histwrite_phy(o_solswad0, solswad0_aero)
+          CALL histwrite_phy(o_toplwad, toplwad_aero)
+          CALL histwrite_phy(o_toplwad0, toplwad0_aero)
+          CALL histwrite_phy(o_sollwad, sollwad_aero)
+          CALL histwrite_phy(o_sollwad0, sollwad0_aero)
           !====MS forcing diagnostics
           if (new_aod) then