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

Timestamp:

Jul 28, 2025, 6:44:28 PM (11 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_local_var_mod.F90 (modified) (3 diffs)

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

@@ -685 +685 @@
       REAL, SAVE, ALLOCATABLE :: d_q_avi(:,:)
       !$OMP THREADPRIVATE(d_q_avi)
-      REAL, SAVE, ALLOCATABLE :: cfl_seri(:,:), d_cfl_dyn(:,:)
-      !$OMP THREADPRIVATE(cfl_seri, d_cfl_dyn)
       REAL, SAVE, ALLOCATABLE :: cfc_seri(:,:), d_cfc_dyn(:,:)
       !$OMP THREADPRIVATE(cfc_seri, d_cfc_dyn)
-      REAL, SAVE, ALLOCATABLE :: qtl_seri(:,:), d_qtl_dyn(:,:)
-      !$OMP THREADPRIVATE(qtl_seri, d_qtl_dyn)
       REAL, SAVE, ALLOCATABLE :: qtc_seri(:,:), d_qtc_dyn(:,:)
       !$OMP THREADPRIVATE(qtc_seri, d_qtc_dyn)
-      REAL, SAVE, ALLOCATABLE :: flight_dist(:,:), flight_h2o(:,:)
-      !$OMP THREADPRIVATE(flight_dist, flight_h2o)
+      REAL, SAVE, ALLOCATABLE :: nic_seri(:,:), d_nic_dyn(:,:)
+      !$OMP THREADPRIVATE(nic_seri, d_nic_dyn)
+      REAL, SAVE, ALLOCATABLE :: flight_dist(:,:), flight_fuel(:,:)
+      !$OMP THREADPRIVATE(flight_dist, flight_fuel)
       REAL, SAVE, ALLOCATABLE :: Tcritcont(:,:), qcritcont(:,:)
       !$OMP THREADPRIVATE(Tcritcont, qcritcont)
       REAL, SAVE, ALLOCATABLE :: potcontfraP(:,:), potcontfraNP(:,:)
       !$OMP THREADPRIVATE(potcontfraP, potcontfraNP)
-      REAL, SAVE, ALLOCATABLE :: qice_lincont(:,:), qice_circont(:,:)
-      !$OMP THREADPRIVATE(qice_lincont, qice_circont)
-      REAL, SAVE, ALLOCATABLE :: qradice_lincont(:,:), qradice_circont(:,:)
-      !$OMP THREADPRIVATE(qradice_lincont, qradice_circont)
-      REAL, SAVE, ALLOCATABLE :: dcfl_cir(:,:), dqtl_cir(:,:)
-      !$OMP THREADPRIVATE(dcfl_cir, dqtl_cir)
-      REAL, SAVE, ALLOCATABLE :: dcfl_ini(:,:), dqil_ini(:,:), dqtl_ini(:,:)
-      !$OMP THREADPRIVATE(dcfl_ini, dqil_ini, dqtl_ini)
-      REAL, SAVE, ALLOCATABLE :: dcfl_sub(:,:), dqil_sub(:,:), dqtl_sub(:,:)
-      !$OMP THREADPRIVATE(dcfl_sub, dqil_sub, dqtl_sub)
-      REAL, SAVE, ALLOCATABLE :: dcfl_mix(:,:), dqil_mix(:,:), dqtl_mix(:,:)
-      !$OMP THREADPRIVATE(dcfl_mix, dqil_mix, dqtl_mix)
-      REAL, SAVE, ALLOCATABLE :: dcfl_sed(:,:), dqil_sed(:,:), dqtl_sed(:,:)
-      !$OMP THREADPRIVATE(dcfl_sed, dqil_sed, dqtl_sed)
-      REAL, SAVE, ALLOCATABLE :: dcfc_sed(:,:), dqic_sed(:,:), dqtc_sed(:,:)
-      !$OMP THREADPRIVATE(dcfc_sed, dqic_sed, dqtc_sed)
-      REAL, SAVE, ALLOCATABLE :: dcfl_auto(:,:), dqil_auto(:,:), dqtl_auto(:,:)
-      !$OMP THREADPRIVATE(dcfl_auto, dqil_auto, dqtl_auto)
-      REAL, SAVE, ALLOCATABLE :: dcfc_auto(:,:), dqic_auto(:,:), dqtc_auto(:,:)
-      !$OMP THREADPRIVATE(dcfc_auto, dqic_auto, dqtc_auto)
-      REAL, SAVE, ALLOCATABLE :: dcfc_sub(:,:), dqic_sub(:,:), dqtc_sub(:,:)
-      !$OMP THREADPRIVATE(dcfc_sub, dqic_sub, dqtc_sub)
-      REAL, SAVE, ALLOCATABLE :: dcfc_mix(:,:), dqic_mix(:,:), dqtc_mix(:,:)
-      !$OMP THREADPRIVATE(dcfc_mix, dqic_mix, dqtc_mix)
+      REAL, SAVE, ALLOCATABLE :: AEI_contrails(:,:), AEI_surv_contrails(:,:)
+      !$OMP THREADPRIVATE(AEI_contrails, AEI_surv_contrails)
+      REAL, SAVE, ALLOCATABLE :: fsurv_contrails(:,:), section_contrails(:,:)
+      !$OMP THREADPRIVATE(fsurv_contrails, section_contrails)
+      REAL, SAVE, ALLOCATABLE :: qice_cont(:,:)
+      !$OMP THREADPRIVATE(qice_cont)
+      REAL, SAVE, ALLOCATABLE :: qradice_cont(:,:)
+      !$OMP THREADPRIVATE(qradice_cont)
+      REAL, SAVE, ALLOCATABLE :: dcfc_ini(:,:), dqic_ini(:,:), dqtc_ini(:,:), dnic_ini(:,:)
+      !$OMP THREADPRIVATE(dcfc_ini, dqic_ini, dqtc_ini, dnic_ini)
+      REAL, SAVE, ALLOCATABLE :: dcfc_sed(:,:), dqic_sed(:,:), dqtc_sed(:,:), dnic_sed(:,:)
+      !$OMP THREADPRIVATE(dcfc_sed, dqic_sed, dqtc_sed, dnic_sed)
+      REAL, SAVE, ALLOCATABLE :: dcfc_auto(:,:), dqic_auto(:,:), dqtc_auto(:,:), dnic_auto(:,:)
+      !$OMP THREADPRIVATE(dcfc_auto, dqic_auto, dqtc_auto, dnic_auto)
+      REAL, SAVE, ALLOCATABLE :: dcfc_sub(:,:), dqic_sub(:,:), dqtc_sub(:,:), dnic_sub(:,:)
+      !$OMP THREADPRIVATE(dcfc_sub, dqic_sub, dqtc_sub, dnic_sub)
+      REAL, SAVE, ALLOCATABLE :: dcfc_mix(:,:), dqic_mix(:,:), dqtc_mix(:,:), dnic_mix(:,:)
+      !$OMP THREADPRIVATE(dcfc_mix, dqic_mix, dqtc_mix, dnic_mix)
+      REAL, SAVE, ALLOCATABLE :: dnic_agg(:,:)
+      !$OMP THREADPRIVATE(dnic_agg)
       REAL, SAVE, ALLOCATABLE :: cldfra_nocont(:,:), cldtau_nocont(:,:), cldemi_nocont(:,:)
       !$OMP THREADPRIVATE(cldfra_nocont, cldtau_nocont, cldemi_nocont)
@@ -1299 +1293 @@
 !-- LSCP - aviation and contrails variables
       ALLOCATE(d_q_avi(klon,klev))
-      ALLOCATE(cfl_seri(klon,klev), d_cfl_dyn(klon,klev))
       ALLOCATE(cfc_seri(klon,klev), d_cfc_dyn(klon,klev))
-      ALLOCATE(qtl_seri(klon,klev), d_qtl_dyn(klon,klev))
       ALLOCATE(qtc_seri(klon,klev), d_qtc_dyn(klon,klev))
-      ALLOCATE(flight_dist(klon,klev), flight_h2o(klon,klev))
+      ALLOCATE(nic_seri(klon,klev), d_nic_dyn(klon,klev))
+      ALLOCATE(flight_dist(klon,klev), flight_fuel(klon,klev))
       ALLOCATE(Tcritcont(klon,klev), qcritcont(klon,klev))
       ALLOCATE(potcontfraP(klon,klev), potcontfraNP(klon,klev))
-      ALLOCATE(qice_lincont(klon,klev), qice_circont(klon,klev))
-      ALLOCATE(qradice_lincont(klon,klev), qradice_circont(klon,klev))
-      ALLOCATE(dcfl_cir(klon,klev), dqtl_cir(klon,klev))
-      ALLOCATE(dcfl_ini(klon,klev), dqil_ini(klon,klev), dqtl_ini(klon,klev))
-      ALLOCATE(dcfl_sub(klon,klev), dqil_sub(klon,klev), dqtl_sub(klon,klev))
-      ALLOCATE(dcfl_mix(klon,klev), dqil_mix(klon,klev), dqtl_mix(klon,klev))
-      ALLOCATE(dcfl_sed(klon,klev), dqil_sed(klon,klev), dqtl_sed(klon,klev))
-      ALLOCATE(dcfl_auto(klon,klev), dqil_auto(klon,klev), dqtl_auto(klon,klev))
-      ALLOCATE(dcfc_sub(klon,klev), dqic_sub(klon,klev), dqtc_sub(klon,klev))
-      ALLOCATE(dcfc_mix(klon,klev), dqic_mix(klon,klev), dqtc_mix(klon,klev))
-      ALLOCATE(dcfc_sed(klon,klev), dqic_sed(klon,klev), dqtc_sed(klon,klev))
-      ALLOCATE(dcfc_auto(klon,klev), dqic_auto(klon,klev), dqtc_auto(klon,klev))
+      ALLOCATE(AEI_contrails(klon,klev), AEI_surv_contrails(klon,klev))
+      ALLOCATE(fsurv_contrails(klon,klev), section_contrails(klon,klev))
+      ALLOCATE(qice_cont(klon,klev))
+      ALLOCATE(qradice_cont(klon,klev))
+      ALLOCATE(dcfc_ini(klon,klev), dqic_ini(klon,klev), dqtc_ini(klon,klev), dnic_ini(klon,klev))
+      ALLOCATE(dcfc_sub(klon,klev), dqic_sub(klon,klev), dqtc_sub(klon,klev), dnic_sub(klon,klev))
+      ALLOCATE(dcfc_mix(klon,klev), dqic_mix(klon,klev), dqtc_mix(klon,klev), dnic_mix(klon,klev))
+      ALLOCATE(dnic_agg(klon,klev))
+      ALLOCATE(dcfc_sed(klon,klev), dqic_sed(klon,klev), dqtc_sed(klon,klev), dnic_sed(klon,klev))
+      ALLOCATE(dcfc_auto(klon,klev), dqic_auto(klon,klev), dqtc_auto(klon,klev), dnic_auto(klon,klev))
       ALLOCATE(cldfra_nocont(klon,klev), cldtau_nocont(klon,klev), cldemi_nocont(klon,klev))
       ALLOCATE(cldh_nocont(klon), contcov(klon), conttau(klon,klev), contemi(klon,klev))
@@ -1741 +1732 @@
 
 !-- LSCP - aviation and contrails variables
-      DEALLOCATE(cfl_seri, d_cfl_dyn, cfc_seri, d_cfc_dyn)
-      DEALLOCATE(qtl_seri, d_qtl_dyn, qtc_seri, d_qtc_dyn)
-      DEALLOCATE(d_q_avi, flight_dist, flight_h2o)
+      DEALLOCATE(cfc_seri, d_cfc_dyn, qtc_seri, d_qtc_dyn, nic_seri, d_nic_dyn)
+      DEALLOCATE(d_q_avi, flight_dist, flight_fuel)
       DEALLOCATE(Tcritcont, qcritcont, potcontfraP, potcontfraNP)
-      DEALLOCATE(qice_lincont, qice_circont, qradice_lincont, qradice_circont)
-      DEALLOCATE(dcfl_cir, dqtl_cir, dcfl_ini, dqil_ini)
-      DEALLOCATE(dqtl_ini, dcfl_sub, dqil_sub, dqtl_sub, dcfl_mix, dqil_mix, dqtl_mix)
-      DEALLOCATE(dcfc_sub, dqic_sub, dqtc_sub, dcfc_mix, dqic_mix, dqtc_mix)
-      DEALLOCATE(dcfl_sed, dqil_sed, dqtl_sed, dcfc_sed, dqic_sed, dqtc_sed)
-      DEALLOCATE(dcfl_auto, dqil_auto, dqtl_auto, dcfc_auto, dqic_auto, dqtc_auto)
+      DEALLOCATE(AEI_contrails, AEI_surv_contrails, fsurv_contrails, section_contrails)
+      DEALLOCATE(qice_cont, qradice_cont)
+      DEALLOCATE(dcfc_ini, dqic_ini, dqtc_ini, dnic_ini)
+      DEALLOCATE(dcfc_sub, dqic_sub, dqtc_sub, dnic_sub)
+      DEALLOCATE(dcfc_mix, dqic_mix, dqtc_mix, dnic_mix)
+      DEALLOCATE(dnic_agg)
+      DEALLOCATE(dcfc_sed, dqic_sed, dqtc_sed, dnic_sed)
+      DEALLOCATE(dcfc_auto, dqic_auto, dqtc_auto, dnic_auto)
       DEALLOCATE(cldfra_nocont, cldtau_nocont, cldemi_nocont, conttau, contemi)
       DEALLOCATE(cldh_nocont, contcov, fiwp_nocont, fiwc_nocont, ref_ice_nocont)