Changeset 5790 for LMDZ6/branches/contrails/libf/phylmd/phys_output_write_mod.F90

Timestamp:

Jul 28, 2025, 6:44:28 PM (7 days ago)

Author:

aborella

Message:

Major modifs to treatment of contrails (from 2 classes to 2 moments) + diagnostics. Increased numerical efficiency

File:

• LMDZ6/branches/contrails/libf/phylmd/phys_output_write_mod.F90 (modified) (4 diffs)

LMDZ6/branches/contrails/libf/phylmd/phys_output_write_mod.F90

@@ -239 +239 @@
          o_issrfra250to300, o_issrfra300to400, o_issrfra400to500, &
 !-- LSCP - aviation variables
-         o_cflseri, o_dcfldyn, o_cfcseri, o_dcfcdyn, &
-         o_qtlseri, o_dqtldyn, o_qtcseri, o_dqtcdyn, o_dqavi, &
+         o_cfcseri, o_dcfcdyn, o_qtcseri, o_dqtcdyn, o_nicseri, o_dnicdyn, o_dqavi, &
          o_Tcritcont, o_qcritcont, o_potcontfraP, o_potcontfraNP, &
-         o_flight_dist, o_flight_h2o, o_qice_lincont, o_qice_circont, o_dcflcir, o_dqtlcir, &
-         o_dcflini, o_dqilini, o_dqtlini, o_dcflsub, o_dqilsub, o_dqtlsub, &
-         o_dcflmix, o_dqilmix, o_dqtlmix, &
-         o_dcflsed, o_dqilsed, o_dqtlsed, o_dcfcsed, o_dqicsed, o_dqtcsed, &
-         o_dcflauto, o_dqilauto, o_dqtlauto, o_dcfcauto, o_dqicauto, o_dqtcauto, &
-         o_dcfcsub, o_dqicsub, o_dqtcsub, o_dcfcmix, o_dqicmix, o_dqtcmix, &
+         o_AEI_contrails, o_AEI_surv_contrails, o_fsurv_contrails, o_section_contrails, &
+         o_flight_dist, o_flight_fuel, o_qice_cont, &
+         o_dcfcini, o_dqicini, o_dqtcini, o_dnicini, &
+         o_dcfcmix, o_dqicmix, o_dqtcmix, o_dnicmix, o_dnicagg, &
+         o_dcfcsub, o_dqicsub, o_dqtcsub, o_dnicsub, &
+         o_dcfcsed, o_dqicsed, o_dqtcsed, o_dnicsed, &
+         o_dcfcauto, o_dqicauto, o_dqtcauto, o_dnicauto, &
          o_cldfra_nocont, o_cldtau_nocont, o_cldemi_nocont, o_cldh_nocont, &
          o_contcov, o_conttau, o_contemi, o_iwp_nocont, o_iwc_nocont, o_ref_ice_nocont, &
@@ -379 +379 @@
          issrfra100to150, issrfra150to200, issrfra200to250, &
          issrfra250to300, issrfra300to400, issrfra400to500, &
-         cfl_seri, d_cfl_dyn, cfc_seri, d_cfc_dyn, &
-         qtl_seri, d_qtl_dyn, qtc_seri, d_qtc_dyn, d_q_avi, &
+         cfc_seri, d_cfc_dyn, qtc_seri, d_qtc_dyn, nic_seri, d_nic_dyn, d_q_avi, &
          Tcritcont, qcritcont, potcontfraP, potcontfraNP, &
-         flight_dist, flight_h2o, qice_lincont, qice_circont, dcfl_cir, dqtl_cir, &
-         dcfl_ini, dqil_ini, dqtl_ini, dcfl_sub, dqil_sub, dqtl_sub, &
-         dcfl_mix, dqil_mix, dqtl_mix, &
-         dcfl_sed, dqil_sed, dqtl_sed, dcfc_sed, dqic_sed, dqtc_sed, &
-         dcfl_auto, dqil_auto, dqtl_auto, dcfc_auto, dqic_auto, dqtc_auto, &
-         dcfc_sub, dqic_sub, dqtc_sub, dcfc_mix, dqic_mix, dqtc_mix, &
+         AEI_contrails, AEI_surv_contrails, fsurv_contrails, section_contrails, &
+         flight_dist, flight_fuel, qice_cont, &
+         dcfc_ini, dqic_ini, dqtc_ini, dnic_ini, &
+         dcfc_sub, dqic_sub, dqtc_sub, dnic_sub, &
+         dcfc_mix, dqic_mix, dqtc_mix, dnic_mix, dnic_agg, &
+         dcfc_sed, dqic_sed, dqtc_sed, dnic_sed, &
+         dcfc_auto, dqic_auto, dqtc_auto, dnic_auto, &
          cldfra_nocont, cldtau_nocont, cldemi_nocont, cldh_nocont, &
          contcov, conttau, contemi, fiwp_nocont, fiwc_nocont, ref_ice_nocont, &
@@ -2237 +2237 @@
 !-- LSCP - aviation variables
        IF (ok_plane_contrail) THEN
-         CALL histwrite_phy(o_cflseri, cfl_seri)
-         CALL histwrite_phy(o_dcfldyn, d_cfl_dyn)
          CALL histwrite_phy(o_cfcseri, cfc_seri)
          CALL histwrite_phy(o_dcfcdyn, d_cfc_dyn)
-         CALL histwrite_phy(o_qtlseri, qtl_seri)
-         CALL histwrite_phy(o_dqtldyn, d_qtl_dyn)
          CALL histwrite_phy(o_qtcseri, qtc_seri)
          CALL histwrite_phy(o_dqtcdyn, d_qtc_dyn)
+         CALL histwrite_phy(o_nicseri, nic_seri)
+         CALL histwrite_phy(o_dnicdyn, d_nic_dyn)
          CALL histwrite_phy(o_flight_dist, flight_dist)
+         CALL histwrite_phy(o_flight_fuel, flight_fuel)
          CALL histwrite_phy(o_Tcritcont, Tcritcont)
          CALL histwrite_phy(o_qcritcont, qcritcont)
          CALL histwrite_phy(o_potcontfraP, potcontfraP)
          CALL histwrite_phy(o_potcontfraNP, potcontfraNP)
-         CALL histwrite_phy(o_qice_lincont, qice_lincont)
-         CALL histwrite_phy(o_qice_circont, qice_circont)
-         CALL histwrite_phy(o_dcflcir, dcfl_cir)
-         CALL histwrite_phy(o_dqtlcir, dqtl_cir)
-         CALL histwrite_phy(o_dcflini, dcfl_ini)
-         CALL histwrite_phy(o_dqilini, dqil_ini)
-         CALL histwrite_phy(o_dqtlini, dqtl_ini)
-         CALL histwrite_phy(o_dcflsub, dcfl_sub)
-         CALL histwrite_phy(o_dqilsub, dqil_sub)
-         CALL histwrite_phy(o_dqtlsub, dqtl_sub)
-         CALL histwrite_phy(o_dcflmix, dcfl_mix)
-         CALL histwrite_phy(o_dqilmix, dqil_mix)
-         CALL histwrite_phy(o_dqtlmix, dqtl_mix)
-         CALL histwrite_phy(o_dcflsed, dcfl_sed)
-         CALL histwrite_phy(o_dqilsed, dqil_sed)
-         CALL histwrite_phy(o_dqtlsed, dqtl_sed)
-         CALL histwrite_phy(o_dcflauto, dcfl_auto)
-         CALL histwrite_phy(o_dqilauto, dqil_auto)
-         CALL histwrite_phy(o_dqtlauto, dqtl_auto)
+         CALL histwrite_phy(o_AEI_contrails, AEI_contrails)
+         CALL histwrite_phy(o_AEI_surv_contrails, AEI_surv_contrails)
+         CALL histwrite_phy(o_fsurv_contrails, fsurv_contrails)
+         CALL histwrite_phy(o_section_contrails, section_contrails)
+         CALL histwrite_phy(o_qice_cont, qice_cont)
+         CALL histwrite_phy(o_dcfcini, dcfc_ini)
+         CALL histwrite_phy(o_dqicini, dqic_ini)
+         CALL histwrite_phy(o_dqtcini, dqtc_ini)
+         CALL histwrite_phy(o_dnicini, dnic_ini)
          CALL histwrite_phy(o_dcfcsub, dcfc_sub)
          CALL histwrite_phy(o_dqicsub, dqic_sub)
          CALL histwrite_phy(o_dqtcsub, dqtc_sub)
+         CALL histwrite_phy(o_dnicsub, dnic_sub)
          CALL histwrite_phy(o_dcfcmix, dcfc_mix)
          CALL histwrite_phy(o_dqicmix, dqic_mix)
          CALL histwrite_phy(o_dqtcmix, dqtc_mix)
+         CALL histwrite_phy(o_dnicmix, dnic_mix)
+         CALL histwrite_phy(o_dnicagg, dnic_agg)
          CALL histwrite_phy(o_dcfcsed, dcfc_sed)
          CALL histwrite_phy(o_dqicsed, dqic_sed)
          CALL histwrite_phy(o_dqtcsed, dqtc_sed)
+         CALL histwrite_phy(o_dnicsed, dnic_sed)
          CALL histwrite_phy(o_dcfcauto, dcfc_auto)
          CALL histwrite_phy(o_dqicauto, dqic_auto)
          CALL histwrite_phy(o_dqtcauto, dqtc_auto)
+         CALL histwrite_phy(o_dnicauto, dnic_auto)
          CALL histwrite_phy(o_cldfra_nocont, cldfra_nocont)
          CALL histwrite_phy(o_cldtau_nocont, cldtau_nocont)
@@ -2301 +2295 @@
            CALL histwrite_phy(o_soll_nocont, sollw_nocont)
          ENDIF
-       ENDIF
-       IF (ok_plane_h2o) THEN
-         CALL histwrite_phy(o_flight_h2o, flight_h2o)
-         CALL histwrite_phy(o_dqavi, d_q_avi)
+         IF (ok_plane_h2o) THEN
+           CALL histwrite_phy(o_dqavi, d_q_avi)
+         ENDIF
        ENDIF