Changeset 3630 for LMDZ6/trunk/libf/phylmd/Dust

Timestamp:

Feb 10, 2020, 11:04:40 AM (5 years ago)

Author:

Laurent Fairhead

Message:

Parameter new_aod is not needed anymore as it is assumed to be true
all the time. This means that we cannot replay AR4 simulations with new
LMDZ sources (we probably couldn't anyway)
LF, OB

File:

• LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90

@@ -85 +85 @@
   SUBROUTINE phys_output_write_spl(itap, pdtphys, paprs, pphis, &
        pplay, lmax_th, aerosol_couple,         &
-       ok_ade, ok_aie, ivap, new_aod, ok_sync, &
+       ok_ade, ok_aie, ivap, ok_sync, &
        ptconv, read_climoz, clevSTD, ptconvth, &
        d_t, qx, d_qx, d_tr_dyn, zmasse, flag_aerosol, flag_aerosol_strat, ok_cdnc)
@@ -405 +405 @@
     INTEGER, DIMENSION(klon) :: lmax_th
     LOGICAL :: aerosol_couple, ok_sync
-    LOGICAL :: ok_ade, ok_aie, new_aod
     LOGICAL, DIMENSION(klon, klev) :: ptconv, ptconvth
     REAL :: pdtphys
@@ -994 +993 @@
 !--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)
-             CALL histwrite_phy(o_od865aer, od865aer)
-             CALL histwrite_phy(o_absvisaer, absvisaer)
-             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)
-             CALL histwrite_phy(o_sconcss, sconcss)
-             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)
-             CALL histwrite_phy(o_concss, concss)
-             CALL histwrite_phy(o_concdust, concdust)
-             CALL histwrite_phy(o_loadso4, loadso4)
-             CALL histwrite_phy(o_loadoa, loadoa)
-             CALL histwrite_phy(o_loadbc, loadbc)
-             CALL histwrite_phy(o_loadss, loadss)
-             CALL histwrite_phy(o_loaddust, loaddust)
-             !--STRAT AER
-          ENDIF
-          IF (flag_aerosol.GT.0.OR.flag_aerosol_strat>=1) THEN
-!             DO naero = 1, naero_spc
+       IF (flag_aerosol.GT.0) THEN
+          CALL histwrite_phy(o_od550aer, od550aer)
+          CALL histwrite_phy(o_od865aer, od865aer)
+          CALL histwrite_phy(o_absvisaer, absvisaer)
+          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)
+          CALL histwrite_phy(o_sconcss, sconcss)
+          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)
+          CALL histwrite_phy(o_concss, concss)
+          CALL histwrite_phy(o_concdust, concdust)
+          CALL histwrite_phy(o_loadso4, loadso4)
+          CALL histwrite_phy(o_loadoa, loadoa)
+          CALL histwrite_phy(o_loadbc, loadbc)
+          CALL histwrite_phy(o_loadss, loadss)
+          CALL histwrite_phy(o_loaddust, loaddust)
+          !--STRAT AER
+       ENDIF
+       IF (flag_aerosol.GT.0.OR.flag_aerosol_strat>=1) THEN
+!          DO naero = 1, naero_spc
 !--correction mini bug OB
-             DO naero = 1, naero_tot
-                CALL histwrite_phy(o_tausumaero(naero), &
-                     tausum_aero(:,2,naero) )
-             ENDDO
-          ENDIF
-          IF (flag_aerosol_strat>=1) THEN
-             CALL histwrite_phy(o_tausumaero_lw, &
-                  tausum_aero(:,6,id_STRAT_phy) )
-          ENDIF
+          DO naero = 1, naero_tot
+             CALL histwrite_phy(o_tausumaero(naero), &
+                  tausum_aero(:,2,naero) )
+          ENDDO
+       ENDIF
+       IF (flag_aerosol_strat>=1) THEN
+          CALL histwrite_phy(o_tausumaero_lw, &
+               tausum_aero(:,6,id_STRAT_phy) )
        ENDIF
        IF (ok_ade) THEN
@@ -1043 +1039 @@
           CALL histwrite_phy(o_sollwad0, sollwad0_aero)
           !====MS forcing diagnostics
-          IF (new_aod) THEN
-             CALL histwrite_phy(o_swtoaas_nat, topsw_aero(:,1))
-             CALL histwrite_phy(o_swsrfas_nat, solsw_aero(:,1))
-             CALL histwrite_phy(o_swtoacs_nat, topsw0_aero(:,1))
-             CALL histwrite_phy(o_swsrfcs_nat, solsw0_aero(:,1))
-             !ant
-             CALL histwrite_phy(o_swtoaas_ant, topsw_aero(:,2))
-             CALL histwrite_phy(o_swsrfas_ant, solsw_aero(:,2))
-             CALL histwrite_phy(o_swtoacs_ant, topsw0_aero(:,2))
-             CALL histwrite_phy(o_swsrfcs_ant, solsw0_aero(:,2))
-             !cf
-             IF (.not. aerosol_couple) THEN
-                CALL histwrite_phy(o_swtoacf_nat, topswcf_aero(:,1))
-                CALL histwrite_phy(o_swsrfcf_nat, solswcf_aero(:,1))
-                CALL histwrite_phy(o_swtoacf_ant, topswcf_aero(:,2))
-                CALL histwrite_phy(o_swsrfcf_ant, solswcf_aero(:,2))
-                CALL histwrite_phy(o_swtoacf_zero,topswcf_aero(:,3))
-                CALL histwrite_phy(o_swsrfcf_zero,solswcf_aero(:,3))
-             ENDIF
-          ENDIF ! new_aod
+          CALL histwrite_phy(o_swtoaas_nat, topsw_aero(:,1))
+          CALL histwrite_phy(o_swsrfas_nat, solsw_aero(:,1))
+          CALL histwrite_phy(o_swtoacs_nat, topsw0_aero(:,1))
+          CALL histwrite_phy(o_swsrfcs_nat, solsw0_aero(:,1))
+          !ant
+          CALL histwrite_phy(o_swtoaas_ant, topsw_aero(:,2))
+          CALL histwrite_phy(o_swsrfas_ant, solsw_aero(:,2))
+          CALL histwrite_phy(o_swtoacs_ant, topsw0_aero(:,2))
+          CALL histwrite_phy(o_swsrfcs_ant, solsw0_aero(:,2))
+          !cf
+          IF (.not. aerosol_couple) THEN
+             CALL histwrite_phy(o_swtoacf_nat, topswcf_aero(:,1))
+             CALL histwrite_phy(o_swsrfcf_nat, solswcf_aero(:,1))
+             CALL histwrite_phy(o_swtoacf_ant, topswcf_aero(:,2))
+             CALL histwrite_phy(o_swsrfcf_ant, solswcf_aero(:,2))
+             CALL histwrite_phy(o_swtoacf_zero,topswcf_aero(:,3))
+             CALL histwrite_phy(o_swsrfcf_zero,solswcf_aero(:,3))
+          ENDIF
           !====MS forcing diagnostics
        ENDIF