Changeset 5609 for LMDZ6/branches/contrails/libf/dyn3d_common

Timestamp:

Apr 13, 2025, 7:10:19 PM (4 months ago)

Author:

aborella

Message:

• changed treatment of prognostic variables for prognostic clouds
• adapted sedimentation and autoconversion for prognostic cirrus clouds
• cloud mixing, ice sedimentation and ISSR diagnosis are now consistent with the water vapor PDF
• simplified assumptions for ice crystals deposition / sublimation
• first version of the coupling between prognostic cirrus clouds and deep convection
• added persistent contrail cirrus clouds in radiative diagnostics

File:

• LMDZ6/branches/contrails/libf/dyn3d_common/infotrac.f90 (modified) (3 diffs)

LMDZ6/branches/contrails/libf/dyn3d_common/infotrac.f90

@@ -266 +266 @@
    !---------------------------------------------------------------------------------------------------------------------------
    nqtrue = SIZE(tracers)                                                                               !--- "true" tracers
-   nqo    =      COUNT(tracers(:)%component == 'lmdz' .AND. delPhase(tracers(:)%name)     == 'H2O')     !--- Water phases
-   nbtr = nqtrue-COUNT(tracers(:)%component == 'lmdz' .AND. delPhase(tracers(:)%gen0Name) == 'H2O')     !--- Passed to phytrac
+!   nqo    =      COUNT(tracers(:)%component == 'lmdz' .AND. delPhase(tracers(:)%name)     == 'H2O')     !--- Water phases
+   nqo    =      COUNT(tracers(:)%component == 'lmdz' .AND. &
+       ((delPhase(tracers(:)%name)     == 'H2O') .OR. &    !--- Water phases
+        (delPhase(tracers(:)%name)     == 'CLDFRA')))
+!   nbtr = nqtrue-COUNT(tracers(:)%component == 'lmdz' .AND. delPhase(tracers(:)%gen0Name) == 'H2O')     !--- Passed to phytrac
+   nbtr = nqtrue-COUNT(tracers(:)%component == 'lmdz' .AND. &
+       ((delPhase(tracers(:)%gen0Name)     == 'H2O') .OR. &    !--- Passed to phytrac
+        (delPhase(tracers(:)%gen0Name)     == 'CLDFRA')))
    nqCO2  =      COUNT( [type_trac == 'inco', type_trac == 'co2i'] )
 IF (CPPKEY_INCA) THEN
@@ -335 +341 @@
       t1%iadv       = iad
       t1%isAdvected = iad >= 0
-      t1%isInPhysics= delPhase(t1%gen0Name) /= 'H2O' .OR. t1%component /= 'lmdz' !=== MORE EXCEPTIONS ? CO2i, SURSAT CLOUD H2O
+!      t1%isInPhysics= delPhase(t1%gen0Name) /= 'H2O' .OR. t1%component /= 'lmdz' !=== MORE EXCEPTIONS ? CO2i, SURSAT CLOUD H2O
+      t1%isInPhysics=((delPhase(t1%gen0Name) /= 'H2O') .AND. &
+                      (delPhase(t1%gen0Name) /= 'CLDFRA')) .OR. t1%component /= 'lmdz'
       ttr(iq)       = t1
 
@@ -388 +396 @@
 
    !--- Note: nqtottr can differ from nbtr when nmom/=0
-   nqtottr = nqtot - COUNT(delPhase(tracers%gen0Name) == 'H2O' .AND. tracers%component == 'lmdz')
-   IF(COUNT(tracers%iso_iName == 0) - COUNT(delPhase(tracers%name) == 'H2O' .AND. tracers%component == 'lmdz') /= nqtottr) &
-      CALL abort_gcm(modname, 'problem with the computation of nqtottr', 1)
+!   nqtottr = nqtot - COUNT(delPhase(tracers%gen0Name) == 'H2O' .AND. tracers%component == 'lmdz')
+   nqtottr = nqtot - COUNT(tracers(:)%component == 'lmdz' .AND. &
+       ((delPhase(tracers(:)%gen0Name)     == 'H2O') .OR. & 
+        (delPhase(tracers(:)%gen0Name)     == 'CLDFRA')))
+!   IF(COUNT(tracers%iso_iName == 0) - COUNT(delPhase(tracers%name) == 'H2O' .AND. tracers%component == 'lmdz') /= nqtottr) &
+!   IF(COUNT(tracers%iso_iName == 0) - COUNT(tracers(:)%component == 'lmdz' .AND. &
+!       ((delPhase(tracers(:)%name)     == 'H2O') .OR. &
+!        (delPhase(tracers(:)%name)     == 'CLDFRA') /= nqtottr) &
+!      CALL abort_gcm(modname, 'problem with the computation of nqtottr', 1)
 
    !=== DISPLAY THE RESULTS