Changeset 5618 for LMDZ6/branches/contrails/libf/misc/readTracFiles_mod.f90

Timestamp:

Apr 15, 2025, 11:56:45 AM (2 months ago)

Author:

aborella

Message:

Merge with trunk testing r5597. We have convergence in prod and debug in NPv7.0.1c

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/misc/readTracFiles_mod.f90 (modified) (4 diffs)

LMDZ6/branches/contrails/libf/misc/readTracFiles_mod.f90

@@ -61 +61 @@
     INTEGER               :: nqChildren  = 0                    !--- Number of children  (first generation)
     INTEGER               :: iadv        = 10                   !--- Advection scheme used
-    LOGICAL               :: isAdvected  = .FALSE.              !--- "true" tracers: iadv > 0.   COUNT(isAdvected )=nqtrue
     LOGICAL               :: isInPhysics = .TRUE.               !--- "true" tracers: in tr_seri. COUNT(isInPhysics)=nqtottr
-    INTEGER               :: iso_iGroup  = -1                   !--- Isotopes group index in isotopes(:)
+    INTEGER               :: iso_iGroup  = 0                    !--- Isotopes group index in isotopes(:)
     INTEGER               :: iso_iName   = 0                    !--- Isotope  name  index in isotopes(iso_iGroup)%trac(:)
     INTEGER               :: iso_iZone   = 0                    !--- Isotope  zone  index in isotopes(iso_iGroup)%zone(:)
@@ -185 +184 @@
 !     * The "keys" component (of type keys_type) is in principle enough to store everything we could need.
 !     But some variables are stored as direct-access keys to make the code more readable and because they are used often.
-!     * Most of the direct-access keys are set in this module, but some are not (longName, iadv, isAdvected for now).
+!     * Most of the direct-access keys are set in this module, but some are not (longName, iadv and isInPhysicsfor now).
 !     * Some of the direct-access keys must be updated (using the routine "setDirectKeys") is a subset of "tracers(:)"
 !     is extracted: the indexes are no longer valid for a subset (examples: iqParent, iqDescen).
@@ -1075 +1074 @@
     CALL addKey('iqParent',   parent(iq), tr(iq)%keys)
     CALL addKey('iqGeneration', iGen(iq), tr(iq)%keys)
+    tr(iq)%iqParent = iqParent(iq)
   END DO
 
@@ -1314 +1314 @@
 
   !=== SELECT WATER ISOTOPES CLASS OR, IF UNFOUND, THE FIRST ISOTOPES CLASS
-  IF(isoSelect('H2O', .TRUE.)) THEN; iH2O = ixIso; ELSE; lerr = isoSelect(1, .TRUE.); END IF
+  IF(.NOT.isoSelect('H2O', .TRUE.)) THEN; iH2O = ixIso; ELSE; lerr = isoSelect(1, .TRUE.); END IF
 
 CONTAINS