Changeset 5641 for LMDZ6/branches/contrails/libf/phylmd/infotrac_phy.F90

Timestamp:

May 1, 2025, 6:00:03 PM (5 weeks ago)

Author:

aborella

Message:

Changed the contrails classes that are advected

File:

• LMDZ6/branches/contrails/libf/phylmd/infotrac_phy.F90 (modified) (3 diffs)

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

@@ -27 +27 @@
    !=== FOR ISOTOPES: Specific to water
    PUBLIC :: iH2O                                          !--- Value of "ixIso" for "H2O" isotopes class
-   PUBLIC :: ivap, iliq, isol, ibs, icf, iqvc, icfa, ipcf, iqia, iqva
+   PUBLIC :: ivap, iliq, isol, ibs, icf, iqvc, icfl, icfc, iqtl, iqtc
    !=== FOR ISOTOPES: Depending on the selected isotopes family
    PUBLIC :: isotope                                       !--- Selected isotopes database (argument of getKey)
@@ -103 +103 @@
 
    !=== INDICES FOR WATER
-   INTEGER, SAVE :: ivap, iliq, isol, ibs, icf, iqvc, icfa, ipcf, iqia, iqva
-!$OMP THREADPRIVATE(ivap, iliq, isol, ibs, icf, iqvc, icfa, ipcf, iqia, iqva)
+   INTEGER, SAVE :: ivap, iliq, isol, ibs, icf, iqvc, icfl, icfc, iqtl, iqtc
+!$OMP THREADPRIVATE(ivap, iliq, isol, ibs, icf, iqvc, icfl, icfc, iqtl, iqtc)
 
    !=== DIMENSIONS OF THE TRACERS TABLES AND OTHER SCALAR VARIABLES
@@ -364 +364 @@
    ibs  = strIdx(tracers(:)%name, addPhase('H2O', 'b'))
    icf  = strIdx(tracers(:)%name, 'CLDFRA')
-   iqvc = strIdx(tracers(:)%name, 'CLDVAP_g')
-   icfa = strIdx(tracers(:)%name, 'CONTFRA')
-   ipcf = strIdx(tracers(:)%name, 'PERSCONTFRA')
-   iqva = strIdx(tracers(:)%name, 'CONTWATER_g')
-   iqia = strIdx(tracers(:)%name, 'CONTWATER_s')
+   iqvc = strIdx(tracers(:)%name, 'CLDVAP')
+   icfl = strIdx(tracers(:)%name, 'LINCONTFRA')
+   icfc = strIdx(tracers(:)%name, 'CIRCONTFRA')
+   iqtl = strIdx(tracers(:)%name, 'LINCONTWATER')
+   iqtc = strIdx(tracers(:)%name, 'CIRCONTWATER')
    !--Two ways of declaring tracers - the way below should be deleted in the future
    IF (icf.EQ.0) icf  = strIdx(tracers(:)%name, addPhase('H2O', 'f'))
    IF (iqvc.EQ.0) iqvc = strIdx(tracers(:)%name, addPhase('H2O', 'c'))
-   IF (icfa.EQ.0) icfa = strIdx(tracers(:)%name, addPhase('H2O', 'a'))
-   IF (ipcf.EQ.0) ipcf = strIdx(tracers(:)%name, addPhase('H2O', 'p'))
-   IF (iqva.EQ.0) iqva = strIdx(tracers(:)%name, addPhase('H2O', 'q'))
-   IF (iqia.EQ.0) iqia = strIdx(tracers(:)%name, addPhase('H2O', 't'))
+   IF (icfl.EQ.0) icfl = strIdx(tracers(:)%name, addPhase('H2O', 'z'))
+   IF (icfc.EQ.0) icfc = strIdx(tracers(:)%name, addPhase('H2O', 'y'))
+   IF (iqtl.EQ.0) iqtl = strIdx(tracers(:)%name, addPhase('H2O', 'x'))
+   IF (iqtc.EQ.0) iqtc = strIdx(tracers(:)%name, addPhase('H2O', 'w'))
 
    IF(CPPKEY_STRATAER .AND. type_trac == 'coag') THEN