Changeset 5190 for LMDZ6/trunk/libf

Timestamp:

Sep 15, 2024, 10:38:32 AM (10 months ago)

Author:

dcugnet

Message:

Revert to r5182 because r5183 still craches with gfortran for unclear reasons.
r5188 and r5189 have been included.

Location:

LMDZ6/trunk/libf

Files:

• dyn3d/check_isotopes.F90 (modified) (3 diffs)
• dyn3d/dynetat0.F90 (modified) (8 diffs)
• dyn3d/iniacademic.F90 (modified) (5 diffs)
• dyn3d/qminimum.F (modified) (1 diff)
• dyn3d_common/infotrac.F90 (modified) (19 diffs)
• dyn3d_common/iso_verif_dyn.F (modified) (2 diffs)
• dyn3dmem/check_isotopes_loc.F90 (modified) (3 diffs)
• dyn3dmem/dynetat0_loc.F90 (modified) (7 diffs)
• dyn3dmem/iniacademic_loc.F90 (modified) (5 diffs)
• dyn3dmem/qminimum_loc.F (modified) (1 diff)
• dynphy_lonlat/calfis.F (modified) (1 diff)
• dynphy_lonlat/calfis_loc.F (modified) (1 diff)
• misc/iso_params_mod.F90 (deleted)
• misc/readTracFiles_mod.f90 (modified) (104 diffs)
• phylmd/infotrac_phy.F90 (modified) (20 diffs)
• phylmd/phyetat0_mod.F90 (modified) (1 diff)
• phylmd/physiq_mod.F90 (modified) (1 diff)
• phylmdiso/isotopes_mod.F90 (modified) (7 diffs)
• phylmdiso/isotopes_routines_mod.F90 (modified) (2 diffs)
• phylmdiso/isotrac_mod.F90 (modified) (1 diff)
• phylmdiso/phyetat0_mod.F90 (modified) (1 diff)
• phylmdiso/physiq_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/dyn3d/check_isotopes.F90

@@ -2 +2 @@
    USE strings_mod, ONLY: maxlen, msg, strIdx, strStack, int2str, real2str
    USE infotrac,    ONLY: nqtot, niso, nphas, isotope, isoCheck, iqIsoPha, isoSelect, &
-                          ntiso, iH2O, nzone, tracers, isoName,  itZonIso
-   USE iso_params_mod,  ONLY: tnat_H216O, tnat_H217O, tnat_H218O, tnat_HDO, tnat_HTO
-   USE ioipsl_getincom, ONLY: getin
+                          ntiso, iH2O, nzone, tracers, isoName,  itZonIso, getKey
    IMPLICIT NONE
    include "dimensions.h"
@@ -22 +20 @@
                       deltaDmin =-999.0, &
                       ridicule  = 1e-12
-   INTEGER, SAVE :: iso_eau, iso_O17, iso_O18, iso_HDO, iso_HTO
-   LOGICAL, SAVE :: ltnat1, first=.TRUE.
+   INTEGER, SAVE :: iso_eau, iso_HDO, iso_O18, &
+                             iso_O17, iso_HTO
+   LOGICAL, SAVE :: first=.TRUE.
+   LOGICAL, PARAMETER :: tnat1=.TRUE.
 
    modname='check_isotopes'
@@ -30 +30 @@
    IF(niso == 0)        RETURN                   !--- No isotopes => finished
    IF(first) THEN
-      ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
-      ALLOCATE(tnat(niso))
-      iso_eau = strIdx(isoName,'H216O'); IF(iso_eau /= 0) tnat(iso_eau) = tnat_H216O
-      iso_O17 = strIdx(isoName,'H217O'); IF(iso_O17 /= 0) tnat(iso_O17) = tnat_H217O
-      iso_O18 = strIdx(isoName,'H218O'); IF(iso_O18 /= 0) tnat(iso_O18) = tnat_H218O
-      iso_HDO = strIdx(isoName,'HDO');   IF(iso_HDO /= 0) tnat(iso_HDO) = tnat_HDO
-      iso_HTO = strIdx(isoName,'HTO');   IF(iso_HTO /= 0) tnat(iso_HTO) = tnat_HTO
-      IF(ltnat1) tnat(:) = 1.
+      iso_eau = strIdx(isoName,'H216O')
+      iso_HDO = strIdx(isoName,'HDO')
+      iso_O18 = strIdx(isoName,'H218O')
+      iso_O17 = strIdx(isoName,'H217O')
+      iso_HTO = strIdx(isoName,'HTO')
+      if (tnat1) then
+              tnat(:)=1.0
+      else
+         IF(getKey('tnat', tnat)) CALL abort_gcm(modname, 'missing isotopic parameter', 1)
+      endif
       first = .FALSE.
    END IF

LMDZ6/trunk/libf/dyn3d/dynetat0.F90

@@ -6 +6 @@
 ! Purpose: Initial state reading.
 !-------------------------------------------------------------------------------
-  USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName, &
-                         new2oldH2O, newHNO3, oldHNO3
+  USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName
   USE strings_mod, ONLY: maxlen, msg, strStack, real2str, int2str
   USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQ_VARID, &
                          NF90_CLOSE, NF90_GET_VAR, NF90_NoErr
+  USE readTracFiles_mod, ONLY: new2oldH2O, newHNO3, oldHNO3, getKey
   USE control_mod, ONLY: planet_type
   USE assert_eq_m, ONLY: assert_eq
@@ -19 +19 @@
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
-#ifdef CPP_IOIPSL
-  USE IOIPSL,   ONLY: getin
-#else
-  USE ioipsl_getincom, ONLY: getin
-#endif
-  USE iso_params_mod   ! tnat_* and alpha_ideal_*
 
   IMPLICIT NONE
@@ -48 +42 @@
   INTEGER :: iq, fID, vID, idecal, iqParent, iName, iZone, iPhase
   REAL    :: time, tnat, alpha_ideal, tab_cntrl(length)    !--- RUN PARAMS TABLE
-  LOGICAL :: lSkip, ll, ltnat1
+  LOGICAL :: lSkip, ll
+  LOGICAL,PARAMETER :: tnat1=.TRUE.
 !-------------------------------------------------------------------------------
   modname="dynetat0"
@@ -121 +116 @@
   var="temps"
   IF(NF90_INQ_VARID(fID,var,vID)/=NF90_NoErr) THEN
-    CALL msg('Missing field <temps> ; trying with <Time>', modname)
+    CALL msg('missing field <temps> ; trying with <Time>', modname)
     var="Time"
     CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
@@ -138 +133 @@
   ll = NF90_INQ_VARID(fID, 'HNO3tot', vID) /= NF90_NoErr                                 !--- DETECT OLD REPRO start.nc FILE
 #endif
-  ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
   DO iq=1,nqtot
     var = tracers(iq)%name
@@ -154 +148 @@
     !--------------------------------------------------------------------------------------------------------------------------
     ELSE IF(NF90_INQ_VARID(fID, oldVar, vID) == NF90_NoErr) THEN                         !=== TRY WITH ALTERNATE NAME
-      CALL msg('Missing tracer <'//TRIM(var)//'> => initialized to <'//TRIM(oldVar)//'>', modname)
+      CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to <'//TRIM(oldVar)//'>', modname)
       CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",oldVar)
     !--------------------------------------------------------------------------------------------------------------------------
@@ -162 +156 @@
       iqParent = tracers(iq)%iqParent
       IF(tracers(iq)%iso_iZone == 0) THEN
-         IF(ltnat1) THEN
-            tnat = 1.0
-            alpha_ideal = 1.0
-            CALL msg(' !!!  Beware: alpha_ideal put to 1  !!!', modname)
-         ELSE
-            SELECT CASE(isoName(iName))
-              CASE('H216O'); tnat = tnat_H216O; alpha_ideal = alpha_ideal_H216O
-              CASE('H217O'); tnat = tnat_H217O; alpha_ideal = alpha_ideal_H217O
-              CASE('H218O'); tnat = tnat_H218O; alpha_ideal = alpha_ideal_H218O
-              CASE('HDO');   tnat = tnat_HDO;   alpha_ideal = alpha_ideal_HDO
-              CASE('HTO');   tnat = tnat_HTO;   alpha_ideal = alpha_ideal_HTO
-              CASE DEFAULT; CALL abort_gcm(TRIM(modname),'unknown isotope "'//TRIM(isoName(iName))//'" ; check tracer.def file',1)
-            END SELECT
-         END IF
-         CALL msg('Missing tracer <'//TRIM(var)//'> => initialized with a simplified Rayleigh distillation law.', modname)
+         if (tnat1) then
+                 tnat=1.0
+                 alpha_ideal=1.0
+                 write(*,*) 'attention dans dynetat0: les alpha_ideal sont a 1'
+         else
+          IF(getKey('tnat', tnat, isoName(iName)) .OR. getKey('alpha', alpha_ideal, isoName(iName))) &
+            CALL abort_gcm(TRIM(modname), 'missing isotopic parameters', 1)
+         endif
+         CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized with a simplified Rayleigh distillation law.', modname)
          q(:,:,:,iq) = q(:,:,:,iqParent)*tnat*(q(:,:,:,iqParent)/30.e-3)**(alpha_ideal-1.)
       ELSE
-         CALL msg('Missing tracer <'//TRIM(var)//'> => initialized to its parent isotope concentration.', modname)
+         CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to its parent isotope concentration.', modname)
          ! Camille 9 mars 2023: attention!! seuls les tags qui correspondent à
          ! izone=izone_init (définie dans isotrac_mod) sont initialisés comme
@@ -193 +181 @@
     !--------------------------------------------------------------------------------------------------------------------------
     ELSE                                                                                 !=== MISSING: SET TO 0
-      CALL msg('Missing tracer <'//TRIM(var)//'> => initialized to zero', modname)
+      CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to zero', modname)
       q(:,:,:,iq)=0.
     !--------------------------------------------------------------------------------------------------------------------------

LMDZ6/trunk/libf/dyn3d/iniacademic.F90

@@ -5 +5 @@
 
   USE filtreg_mod, ONLY: inifilr
-  USE infotrac,    ONLY: nqtot, niso, iqIsoPha, tracers, getKey, isoName, addPhase
+  USE infotrac,    ONLY: nqtot, niso, iqIsoPha, tracers, getKey, isoName
   USE control_mod, ONLY: day_step,planet_type
   use exner_hyb_m, only: exner_hyb
@@ -21 +21 @@
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+  USE readTracFiles_mod, ONLY: addPhase
   use netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID
   use netcdf, only : NF90_CLOSE, NF90_GET_VAR
-  USE iso_params_mod   ! tnat_* and alpha_ideal_*
 
 
@@ -80 +80 @@
 
   REAL zdtvr, tnat, alpha_ideal
-  LOGICAL :: ltnat1
+  LOGICAL,PARAMETER :: tnat1=.true.
   
   character(len=*),parameter :: modname="iniacademic"
@@ -309 +309 @@
         ! bulk initialization of tracers
         if (planet_type=="earth") then
-           ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
            ! Earth: first two tracers will be water
            do iq=1,nqtot
@@ -323 +322 @@
               iqParent = tracers(iq)%iqParent
               IF(tracers(iq)%iso_iZone == 0) THEN
-                 IF(ltnat1) THEN
-                    tnat = 1.0
-                    alpha_ideal = 1.0
-                    WRITE(lunout, *)'In '//TRIM(modname)//': !!!  Beware: alpha_ideal put to 1  !!!'
-                 ELSE
-                    SELECT CASE(isoName(iName))
-                      CASE('H216O'); tnat = tnat_H216O; alpha_ideal = alpha_ideal_H216O
-                      CASE('H217O'); tnat = tnat_H217O; alpha_ideal = alpha_ideal_H217O
-                      CASE('H218O'); tnat = tnat_H218O; alpha_ideal = alpha_ideal_H218O
-                      CASE('HDO');   tnat = tnat_HDO;   alpha_ideal = alpha_ideal_HDO
-                      CASE('HTO');   tnat = tnat_HTO;   alpha_ideal = alpha_ideal_HTO
-                      CASE DEFAULT
-                         CALL abort_gcm(TRIM(modname),'unknown isotope "'//TRIM(isoName(iName))//'" ; check tracer.def file',1)
-                    END SELECT
-                 END IF
+                 if (tnat1) then
+                         tnat=1.0
+                         alpha_ideal=1.0
+                         write(*,*) 'Attention dans iniacademic: alpha_ideal=1'
+                 else
+                    IF(getKey('tnat', tnat, isoName(iName)) .OR. getKey('alpha', alpha_ideal, isoName(iName))) &
+                    CALL abort_gcm(TRIM(modname), 'missing isotopic parameters', 1)
+                 endif
                  q(:,:,iq) = q(:,:,iqParent)*tnat*(q(:,:,iqParent)/30.e-3)**(alpha_ideal-1.)
               ELSE !IF(tracers(iq)%iso_iZone == 0) THEN

LMDZ6/trunk/libf/dyn3d/qminimum.F

@@ -4 +4 @@
       SUBROUTINE qminimum( q,nqtot,deltap )
 
-      USE infotrac, ONLY: niso, ntiso, iqIsoPha, tracers, addPhase
+      USE infotrac, ONLY: niso, ntiso,iqIsoPha, tracers
       USE strings_mod, ONLY: strIdx
+      USE readTracFiles_mod, ONLY: addPhase
       IMPLICIT none
 c

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -3 +3 @@
 MODULE infotrac
 
-   USE       strings_mod, ONLY: msg, maxlen, cat, dispTable, int2str, bool2str, strStack, strParse, strCount, strIdx
-   USE readTracFiles_mod, ONLY: readTracersFiles, maxTableWidth,  tisot=>isot_type, addPhase, addKey, iH2O, &
-        indexUpdate, keys_type, testTracersFiles, processIsotopes, trac=>tracers,   delPhase, getKey, tran0
-   USE readTracFiles_mod, ONLY: new2oldH2O, newHNO3, oldHNO3
-
+   USE       strings_mod, ONLY: msg, fmsg, maxlen, cat, dispTable, int2str, bool2str, strStack, strParse
+   USE readTracFiles_mod, ONLY: trac_type, readTracersFiles, tracers, setGeneration, itZonIso, nzone, tran0, isoZone, &
+        delPhase, niso, getKey, isot_type, processIsotopes,  isotope, maxTableWidth, iqIsoPha, nphas, ixIso, isoPhas, &
+        addPhase, iH2O, addKey, isoSelect, testTracersFiles, isoKeys, indexUpdate,  iqWIsoPha, nbIso, ntiso, isoName, isoCheck
    IMPLICIT NONE
 
@@ -17 +16 @@
    PUBLIC :: nqtot,   nbtr,   nqo,   nqCO2,   nqtottr      !--- Main dimensions
    PUBLIC :: conv_flg, pbl_flg                             !--- Convection & boundary layer activation keys
-   PUBLIC :: new2oldH2O, newHNO3, oldHNO3                  !--- For backwards compatibility in dynetat0
-   PUBLIC :: addPhase, delPhase                            !--- Add/remove the phase from the name of a tracer
 
    !=== FOR ISOTOPES: General
    PUBLIC :: isot_type, nbIso                              !--- Derived type, full isotopes families database + nb of families
-   PUBLIC :: isoSelect, ixIso, isoFamilies                 !--- Isotopes families selection tool + selected index + list
+   PUBLIC :: isoSelect, ixIso                              !--- Isotopes family selection tool + selected family index
    !=== FOR ISOTOPES: Specific to water
-   PUBLIC :: iH2O                                          !--- Value of "ixIso" for "H2O" isotopes class
+   PUBLIC :: iH2O                                          !--- H2O isotopes class index
    PUBLIC :: min_qParent, min_qMass, min_ratio             !--- Min. values for various isotopic quantities
    !=== FOR ISOTOPES: Depending on the selected isotopes family
-   PUBLIC :: isotope                                       !--- Selected isotopes database (argument of getKey)
-   PUBLIC :: isoKeys, isoName, isoZone, isoPhas            !--- Isotopes keys & names, tagging zones names, phases
-   PUBLIC ::    niso,   ntiso,   nzone,   nphas            !--- Number of   "   "
-   PUBLIC :: itZonIso                                      !--- index "it" in "isoName(1:niso)" = f(tagging idx, isotope idx)
-   PUBLIC :: iqIsoPha                                      !--- index "iq" in "qx"              = f(isotope idx,   phase idx)
+   PUBLIC :: isotope, isoKeys                              !--- Selected isotopes database + associated keys (cf. getKey)
+   PUBLIC :: isoName, isoZone, isoPhas                     !--- Isotopes and tagging zones names, phases
+   PUBLIC :: niso,    nzone,   nphas,   ntiso              !---  " " numbers + isotopes & tagging tracers number
+   PUBLIC :: itZonIso                                      !--- idx "it" (in "isoName(1:niso)") = function(tagging idx, isotope idx)
+   PUBLIC :: iqIsoPha                                      !--- idx "iq" (in "qx") = function(isotope idx, phase idx) + aliases
    PUBLIC :: isoCheck                                      !--- Run isotopes checking routines
    !=== FOR BOTH TRACERS AND ISOTOPES
@@ -39 +36 @@
 !  |--------------------+-----------------------+-----------------+---------------+----------------------------|
 !  | water in different |    water tagging      |  water isotopes | other tracers | additional tracers moments |
-!  | phases: H2O_[glsrb]|      isotopes         |                 |               |  for higher order schemes  |
+!  | phases: H2O_[gls]  |      isotopes         |                 |               |  for higher order schemes  |
 !  |--------------------+-----------------------+-----------------+---------------+----------------------------|
 !  |                    |                       |                 |               |                            |
@@ -53 +50 @@
 !  |-----------------------------------------------------------------------------------------------------------|
 !  NOTES FOR THIS TABLE:
-!  * Used "niso", "nzone" and "ntiso" are components of "isotopes(ip)" for water (isotopes(ip)%name == 'H2O'),
+!  * Used "niso", "nzone" and "ntiso" are components of "isotopes(ip)" for water (isotopes(ip)%parent == 'H2O'),
 !    since water is so far the sole tracers family, except passive CO2, removed from the main tracers table.
 !  * For water, "nqo" is equal to the more general field "isotopes(ip)%nphas".
 !  * "niso", "nzone", "ntiso", "nphas" are defined for other isotopic tracers families, if any.
-!  * If you deal with an isotopes family other than "H2O" ("Sulf" in the example), a good practice is to keep
-!    track of the isotopes class (of its index) before switching to it at the beginning of the dedicated code:
-!  - first time (use selection by name and compute the corresponding index iSulf) :
-!  i0=ixIso; IF(.NOT.isoSelect('Sulf')) CALL abort_gcm("Can't select isotopes class", modname, 1); iS=ixIso
-!  - next times (use selection by index - "iS" has been computed at first call):
-!  i0=ixIso; IF(.NOT.isoSelect(iS))     CALL abort_gcm("Can't select isotopes class", modname, 1)
-!    and to switch back to the original category when you're done with "Sulf":
-!            IF(.NOT.isoSelect(i0))     CALL abort_gcm("Can't select isotopes class", modname, 1)
-!    to restore the original isotopes category (before dealing with "Sulf" (most of the time "H2O").
-!
-!=== LOCAL DERIVED TYPE "trac_type" EMBEDDING MOST OF THE TRACERS-RELATED QUANTITIES (LENGTH: nqtot)
+!
+!=== DERIVED TYPE EMBEDDING MOST OF THE TRACERS-RELATED QUANTITIES (LENGTH: nqtot)
 !    Each entry is accessible using "%" sign.
 !  |-------------+------------------------------------------------------+-------------+------------------------+
@@ -73 +61 @@
 !  |-------------+------------------------------------------------------+-------------+------------------------+
 !  | name        | Name (short)                                         | tname       |                        |
-!  | keys        | key/val pairs accessible with "getKey" routine       | /           |                        |
 !  | gen0Name    | Name of the 1st generation ancestor                  | /           |                        |
 !  | parent      | Name of the parent                                   | /           |                        |
 !  | longName    | Long name (with adv. scheme suffix) for outputs      | ttext       |                        |
 !  | type        | Type (so far: tracer or tag)                         | /           | tracer,tag             |
-!  | phase       | Phases list ("g"as / "l"iquid / "s"olid              |             | [g|l|s|r|b]            |
-!  |             |              "r"(cloud) / "b"lowing)                 | /           |                        |
+!  | phase       | Phases list ("g"as / "l"iquid / "s"olid)             | /           | [g][l][s]              |
 !  | component   | Name(s) of the merged/cumulated section(s)           | /           | coma-separated names   |
 !  | iGeneration | Generation (>=1)                                     | /           |                        |
@@ -86 +72 @@
 !  | nqDescen    | Number of the descendants   (all generations)        | nqdesc      | 1:nqtot                |
 !  | nqChildren  | Number of childs            (1st generation only)    | nqfils      | 1:nqtot                |
+!  | keys        | key/val pairs accessible with "getKey" routine       | /           |                        |
 !  | iadv        | Advection scheme number                              | iadv        | 1,2,10-20(exc.15,19),30|
+!  | isAdvected  | advected tracers flag (.TRUE. if iadv >= 0)          | /           | nqtrue  .TRUE. values  |
+!  | isInPhysics | tracers not extracted from the main table in physics | /           | nqtottr .TRUE. values  |
 !  | iso_iGroup  | Isotopes group index in isotopes(:)                  | /           | 1:nbIso                |
 !  | iso_iName   | Isotope  name  index in isotopes(iso_iGroup)%trac(:) | iso_indnum  | 1:niso                 |
@@ -98 +87 @@
 !  |  entry | length | Meaning                                          |    Former name     | Possible values |
 !  |-----------------+--------------------------------------------------+--------------------+-----------------+
-!  | name            | Name of the isotopes class (family)              |                    |                 |
+!  | parent          | Parent tracer (isotopes family name)             |                    |                 |
 !  | keys   | niso   | Isotopes keys/values pairs list + number         |                    |                 |
 !  | trac   | ntiso  | Isotopes + tagging tracers list + number         | / | ntraciso       |                 |
 !  | zone   | nzone  | Geographic tagging zones   list + number         | / | ntraceurs_zone |                 |
-!  | phase  | nphas  | Phases                     list + number         |                    | [g|l|s|r|b] 1:5 |
+!  | phase  | nphas  | Phases                     list + number         |                    | [g][l][s], 1:3  |
 !  | iqIsoPha        | Index in "qx"           = f(name(1:ntiso)),phas) | iqiso              | 1:nqtot         |
 !  | itZonIso        | Index in "trac(1:ntiso)"= f(zone, name(1:niso))  | index_trac         | 1:ntiso         |
 !  +-----------------+--------------------------------------------------+--------------------+-----------------+
 
-!------------------------------------------------------------------------------------------------------------------------------
-   TYPE :: trac_type                                            !=== TYPE FOR A SINGLE TRACER NAMED "name"
-     CHARACTER(LEN=maxlen) :: name        = ''                  !--- Name of the tracer
-     TYPE(keys_type)       :: keys                              !--- <key>=<val> pairs vector (general container)
-     CHARACTER(LEN=maxlen) :: gen0Name    = ''                  !--- First generation ancestor name
-     CHARACTER(LEN=maxlen) :: parent      = ''                  !--- Parent name
-     CHARACTER(LEN=maxlen) :: longName    = ''                  !--- Long name (with advection scheme suffix)
-     CHARACTER(LEN=maxlen) :: type        = 'tracer'            !--- Type  (so far: 'tracer' / 'tag')
-     CHARACTER(LEN=maxlen) :: phase       = 'g'                 !--- Phase ('g'as / 'l'iquid / 's'olid)
-     CHARACTER(LEN=maxlen) :: component   = ''                  !--- Coma-separated list of components (Ex: lmdz,inca)
-     INTEGER               :: iGeneration = -1                  !--- Generation number (>=0)
-     INTEGER               :: iqParent    = 0                   !--- Parent index
-     INTEGER,  ALLOCATABLE :: iqDescen(:)                       !--- Descendants index (in growing generation order)
-     INTEGER               :: nqDescen    = 0                   !--- Number of descendants (all generations)
-     INTEGER               :: nqChildren  = 0                   !--- Number of children  (first generation)
-     INTEGER               :: iadv        = 10                  !--- Advection scheme used
-     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(:)
-     INTEGER               :: iso_iPhase  = 0                   !--- Isotope  phase index in isotopes(iso_iGroup)%phase
-   END TYPE trac_type
-!------------------------------------------------------------------------------------------------------------------------------
-  TYPE :: isot_type                                             !=== TYPE FOR THE ISOTOPES FAMILY DESCENDING ON TRACER "name"
-    CHARACTER(LEN=maxlen)              :: name                  !--- Isotopes family name (ex: H2O)
-    TYPE(keys_type),       ALLOCATABLE :: keys(:)               !--- Isotopes keys/values pairs list     (length: niso)
-    LOGICAL                            :: check=.FALSE.         !--- Flag for checking routines triggering
-    CHARACTER(LEN=maxlen), ALLOCATABLE :: trac(:)               !--- Isotopes + tagging tracers list     (length: ntiso)
-    CHARACTER(LEN=maxlen), ALLOCATABLE :: zone(:)               !--- Geographic tagging zones names list (length: nzone)
-    CHARACTER(LEN=maxlen)              :: phase = 'g'           !--- Phases list: [g|l|s|r|b]            (length: nphas)
-    INTEGER                            :: niso  = 0             !--- Number of isotopes, excluding tagging tracers
-    INTEGER                            :: ntiso = 0             !--- Number of isotopes, including tagging tracers
-    INTEGER                            :: nzone = 0             !--- Number of geographic tagging zones
-    INTEGER                            :: nphas = 0             !--- Number of phases
-    INTEGER,               ALLOCATABLE :: iqIsoPha(:,:)         !--- Idx in "tracers(1:nqtot)" = f(     name(1:ntiso) ,phas)
-    INTEGER,               ALLOCATABLE :: itZonIso(:,:)         !--- Idx in "trac(1:ntiso)"    = f(zone,name(1:niso))
-  END TYPE isot_type
-!------------------------------------------------------------------------------------------------------------------------------
-  INTERFACE isoSelect; MODULE PROCEDURE isoSelectByIndex, isoSelectByName; END INTERFACE isoSelect
-!------------------------------------------------------------------------------------------------------------------------------
-
-   !=== THRESHOLDS FOR WATER
    REAL, PARAMETER :: min_qParent = 1.e-30, min_qMass = 1.e-18, min_ratio = 1.e-16 ! MVals et CRisi
 
    !=== DIMENSIONS OF THE TRACERS TABLES AND OTHER SCALAR VARIABLES
-   INTEGER,               SAVE :: nqtot,   &                    !--- Tracers nb in dynamics (incl. higher moments + H2O)
-                                  nbtr,    &                    !--- Tracers nb in physics  (excl. higher moments + H2O)
-                                  nqo,     &                    !--- Number of water phases
+   INTEGER,               SAVE :: nqtot,  &                     !--- Tracers nb in dynamics (incl. higher moments + H2O)
+                                  nbtr,   &                     !--- Tracers nb in physics  (excl. higher moments + H2O)
+                                  nqo,    &                     !--- Number of water phases
                                   nqtottr, &                    !--- Number of tracers passed to phytrac (TO BE DELETED ?)
                                   nqCO2                         !--- Number of tracers of CO2  (ThL)
-   CHARACTER(LEN=maxlen), SAVE :: type_trac                     !--- Keyword for tracers type(s)
-
-   !=== NUMBER AND LIST OF DEFINED ISOTOPES FAMILIES
-   INTEGER,               SAVE              :: nbIso            !--- Number of defined isotopes classes
-   CHARACTER(LEN=maxlen), SAVE, ALLOCATABLE :: isoFamilies(:)   !--- Generation 0 tracer name for each isotopes family (nbIso)
-
-   !=== QUANTITIES RELATED TO THE CURRENTLY SELECTED ISOTOPES CLASS (USUALLY H2O)
-   TYPE(isot_type),       SAVE, POINTER :: isotope              !--- Selected isotopes database (=isotopes(ixIso))
-   TYPE(keys_type),       SAVE, POINTER :: isoKeys(:)           !--- Database to get isotopes keys using "getKey"       (niso)
-   CHARACTER(LEN=maxlen), SAVE, POINTER :: isoName(:),      &   !--- Isotopes list including tagging tracers, no phase (ntiso)
-                                           isoZone(:),      &   !--- Geographic tagging zones list                     (nzone)
-                                           isoPhas              !--- Used phases names ([g|l|s|r|b])                   (nphas)
-   INTEGER,               SAVE, POINTER :: itZonIso(:,:),   &   !--- Idx "it" in isoName(1:niso) = f(tagging idx, isotope idx)
-                                           iqIsoPha(:,:)        !--- Idx "iq" in qx              = f(isotope idx,   phase idx)
-   INTEGER,               SAVE          :: ixIso,           &   !--- Idx in "isoFamilies" of currently selectd class
-                                           niso,            &   !--- Number of isotopes
-                                           ntiso,           &   !--- Number of isotopes + tagging tracers
-                                           nzone,           &   !--- Number of tagging zones
-                                           nphas                !--- Number of phases
-   LOGICAL,               SAVE          :: isoCheck             !--- Isotopes checking routines triggering flag
+   CHARACTER(LEN=maxlen), SAVE :: type_trac                     !--- Keyword for tracers type
 
    !=== VARIABLES FOR INCA
-   INTEGER, DIMENSION(:), SAVE, ALLOCATABLE :: &
-                    conv_flg, pbl_flg                           !--- Convection / boundary layer activation (nbtr)
-
-   !=== TRACERS/ISOTOPES DESCRIPTORS: EFFECTIVE STORAGE (LOCAL DERIVED TYPES)
-   TYPE(trac_type), SAVE, ALLOCATABLE, TARGET ::  tracers(:)
-   TYPE(isot_type), SAVE, ALLOCATABLE, TARGET :: isotopes(:)
+   INTEGER,               SAVE, ALLOCATABLE :: conv_flg(:), &   !--- Convection     activation ; needed for INCA        (nbtr)
+                                                pbl_flg(:)      !--- Boundary layer activation ; needed for INCA        (nbtr)
 
 CONTAINS
@@ -189 +114 @@
 SUBROUTINE init_infotrac
    USE control_mod, ONLY: planet_type
-#ifdef CPP_IOIPSL
-    USE IOIPSL, ONLY: getin
-#else
-    USE ioipsl_getincom, only: getin
-#endif
-#ifdef CPP_PARA
-   USE parallel_lmdz, ONLY: is_master
-#endif
 #ifdef REPROBUS
-   USE CHEM_REP, ONLY: Init_chem_rep_trac
+   USE CHEM_REP,    ONLY: Init_chem_rep_trac
 #endif
    IMPLICIT NONE
@@ -225 +142 @@
 !------------------------------------------------------------------------------------------------------------------------------
 ! Local variables
-   INTEGER, ALLOCATABLE :: hadv(:), vadv(:), itmp(:)                 !--- Horizontal/vertical transport scheme number
+   INTEGER, ALLOCATABLE :: hadv(:), vadv(:)                          !--- Horizontal/vertical transport scheme number
 #ifdef INCA
    INTEGER, ALLOCATABLE :: had (:), hadv_inca(:), conv_flg_inca(:), &!--- Variables specific to INCA
@@ -232 +149 @@
    INTEGER :: nqINCA
 #endif
-#ifndef CPP_PARA
-   LOGICAL               :: is_master=.TRUE.
-#endif
    CHARACTER(LEN=2)      ::   suff(9)                                !--- Suffixes for schemes of order 3 or 4 (Prather)
    CHARACTER(LEN=3)      :: descrq(30)                               !--- Advection scheme description tags
-   CHARACTER(LEN=maxlen) :: msg1, texp, ttp, ky, nam, val            !--- Strings for messages and expanded tracers type
+   CHARACTER(LEN=maxlen) :: msg1, texp, ttp                          !--- Strings for messages and expanded tracers type
    INTEGER :: fType                                                  !--- Tracers description file type ; 0: none
                                                                      !--- 1/2/3: "traceur.def"/"tracer.def"/"tracer_*.def"
    INTEGER :: nqtrue                                                 !--- Tracers nb from tracer.def (no higher order moments)
    INTEGER :: iad                                                    !--- Advection scheme number
-   INTEGER :: iq, jq, it, nt, im, nm, ig                             !--- Indexes and temporary variables
-   LOGICAL :: lerr, lInit
-   TYPE(keys_type), ALLOCATABLE, TARGET :: tra(:)                    !--- Tracers  descriptor as in readTracFiles_mod
-   TYPE(tisot),     ALLOCATABLE         :: iso(:)                    !--- Isotopes descriptor as in readTracFiles_mod
+   INTEGER :: iq, jq, nt, im, nm                                     !--- Indexes and temporary variables
+   LOGICAL :: lerr, ll
    TYPE(trac_type), ALLOCATABLE, TARGET :: ttr(:)
-   TYPE(trac_type), POINTER             :: t(:), t1
-   TYPE(keys_type), POINTER             :: k(:)
-   CHARACTER(LEN=maxlen),   ALLOCATABLE :: types_trac(:)             !--- Keywords for tracers type(s), parsed version
+   TYPE(trac_type), POINTER             :: t1, t(:)
+   CHARACTER(LEN=maxlen),   ALLOCATABLE :: types_trac(:)  !--- Keyword for tracers type(s), parsed version
+
    CHARACTER(LEN=*), PARAMETER :: modname="init_infotrac"
 !------------------------------------------------------------------------------------------------------------------------------
@@ -259 +171 @@
    descrq(10:20) = ['VL1','VLP','FH1','FH2','VLH','   ','PPM','PPS','PPP','   ','SLP']
    descrq(30)    =  'PRA'
-
-   CALL msg('type_trac = "'//TRIM(type_trac)//'"', modname, is_master)
-   IF(strCount(type_trac, '|', nt)) CALL abort_gcm(modname, 'Could''nt parse the "type_trac" string with delimiter "|"', 1)
-   IF(nt >= 3) CALL abort_gcm(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
-   IF(strParse(type_trac, '|', types_trac, n=nt)) CALL abort_gcm(modname, "couldn't parse "//'"type_trac"', 1)
-   IF(nt == 2) type_trac = types_trac(2) ! TO BE DELETED SOON
-
-   lInit = .NOT.ALLOCATED(trac)
-
-!##############################################################################################################################
-   IF(lInit .AND. is_master) THEN                                    !=== SKIPED IF ALREADY DONE
-!##############################################################################################################################
+    
+   CALL msg('type_trac = "'//TRIM(type_trac)//'"', modname)
+
+   lerr=strParse(type_trac, '|', types_trac, n=nt)
+   IF (nt .GT. 1) THEN
+      IF (nt .GT. 2) CALL abort_gcm(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
+      if (nt .EQ. 2) type_trac=types_trac(2)
+   ENDIF
+
+
+   
    !--- MESSAGE ABOUT THE CHOSEN CONFIGURATION
    msg1 = 'For type_trac = "'//TRIM(type_trac)//'":'
@@ -298 +209 @@
 #endif
    END SELECT
-!##############################################################################################################################
-   END IF
-!##############################################################################################################################
-
-!==============================================================================================================================
-! 0) DETERMINE THE TYPE OF THE INPUT TRACERS DESCRIPTION FILE AND READ IT ; TRANSFER THE NEEDED QUANTITIES TO LOCAL "tracers".
-!==============================================================================================================================
-   texp = type_trac                                                            !=== EXPANDED (WITH "|" SEPARATOR) "type_trac"
+
+   nqCO2 = COUNT( [type_trac == 'inco', type_trac == 'co2i'] )
+
+!==============================================================================================================================
+! 1) Get the numbers of: true (first order only) tracers "nqtrue", water tracers "nqo" (vapor/liquid/solid)
+!==============================================================================================================================
+   texp = type_trac                                                  !=== EXPANDED VERSION OF "type_trac", WITH "|" SEPARATOR
    IF(texp == 'inco') texp = 'co2i|inca'
    IF(texp /= 'lmdz') texp = 'lmdz|'//TRIM(texp)
-   IF(testTracersFiles(modname, texp, fType, lInit.AND.is_master)) CALL abort_gcm(modname, 'problem with tracers file(s)',1)
+
+   !=== DETERMINE THE TYPE OF THE INPUT TRACERS DESCRIPTION FILE
+   IF(testTracersFiles(modname, texp, fType, .TRUE.)) CALL abort_gcm(modname, 'problem with tracers file(s)',1)
    ttp = type_trac; IF(fType /= 1) ttp = texp
-   !---------------------------------------------------------------------------------------------------------------------------
-   IF(fType == 0) CALL abort_gcm(modname, 'Missing "traceur.def", "tracer.def" or "tracer_<keyword>.def tracers file.',1)
-   !---------------------------------------------------------------------------------------------------------------------------
-   IF(fType == 1 .AND. ANY(['inca', 'inco'] == type_trac) .AND. lInit) &       !=== FOUND OLD STYLE INCA "traceur.def"
-      CALL abort_gcm(modname, 'retro-compatibility with old-style INCA traceur.def files has been disabled.', 1)
-   !---------------------------------------------------------------------------------------------------------------------------
-
-!##############################################################################################################################
-   IF(lInit) THEN
-      IF(readTracersFiles(ttp, tra, type_trac == 'repr')) CALL abort_gcm(modname, 'problem with tracers file(s)',1)
-   ELSE
-      tra = trac
+
+   IF(readTracersFiles(ttp, lRepr=type_trac=='repr')) CALL abort_gcm(modname, 'problem with tracers file(s)',1)
+   !---------------------------------------------------------------------------------------------------------------------------
+   IF(fType == 0) CALL abort_gcm(modname, 'Missing tracers file: "traceur.def", "tracer.def" or "tracer_<keyword>.def file.',1)
+   !---------------------------------------------------------------------------------------------------------------------------
+   IF(fType == 1 .AND. ANY(['inca','inco']==type_trac)) THEN         !=== FOUND OLD STYLE INCA "traceur.def"
+   !---------------------------------------------------------------------------------------------------------------------------
+#ifdef INCA
+      nqo = SIZE(tracers) - nqCO2
+      CALL Init_chem_inca_trac(nqINCA)                               !--- Get nqINCA from INCA
+      nbtr = nqINCA + nqCO2                                          !--- Number of tracers passed to phytrac
+      nqtrue = nbtr + nqo                                            !--- Total number of "true" tracers
+      IF(ALL([2,3] /= nqo)) CALL abort_gcm(modname, 'Only 2 or 3 water phases allowed ; found nqo='//TRIM(int2str(nqo)), 1)
+      ALLOCATE(hadv(nqtrue), hadv_inca(nqINCA), conv_flg_inca(nqINCA), solsym_inca(nqINCA))
+      ALLOCATE(vadv(nqtrue), vadv_inca(nqINCA),  pbl_flg_inca(nqINCA))
+      CALL init_transport(solsym_inca, conv_flg_inca, pbl_flg_inca, hadv_inca, vadv_inca)
+      ALLOCATE(ttr(nqtrue))
+      ttr(1:nqo+nqCO2)                  = tracers
+      ttr(1    :      nqo   )%component = 'lmdz'
+      ttr(1+nqo:nqCO2+nqo   )%component = 'co2i'
+      ttr(1+nqo+nqCO2:nqtrue)%component = 'inca'
+      ttr(1+nqo      :nqtrue)%name      = [('CO2     ', iq=1, nqCO2), solsym_inca]
+      ttr(1+nqo+nqCO2:nqtrue)%parent    = tran0
+      ttr(1+nqo+nqCO2:nqtrue)%phase     = 'g'
+      lerr = getKey('hadv', had, ky=tracers(:)%keys)
+      lerr = getKey('vadv', vad, ky=tracers(:)%keys)
+      hadv(1:nqo+nqCO2) = had(:); hadv(1+nqo+nqCO2:nqtrue) = hadv_inca
+      vadv(1:nqo+nqCO2) = vad(:); vadv(1+nqo+nqCO2:nqtrue) = vadv_inca
+      CALL MOVE_ALLOC(FROM=ttr, TO=tracers)
+      DO iq = 1, nqtrue
+         t1 => tracers(iq)
+         CALL addKey('name',      t1%name,      t1%keys)
+         CALL addKey('component', t1%component, t1%keys)
+         CALL addKey('parent',    t1%parent,    t1%keys)
+         CALL addKey('phase',     t1%phase,     t1%keys)
+      END DO
+      IF(setGeneration(tracers)) CALL abort_gcm(modname,'See above',1) !- SET FIELDS %iGeneration, %gen0Name
+      DEALLOCATE(had, hadv_inca, vad, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca)
+#endif
+   !---------------------------------------------------------------------------------------------------------------------------
+   ELSE                                                              !=== OTHER CASES (OLD OR NEW FORMAT, NO INCA MODULE)
+   !---------------------------------------------------------------------------------------------------------------------------
+      nqo    =        COUNT(delPhase(tracers(:)%name)     == 'H2O' &
+                               .AND. tracers(:)%component == 'lmdz') !--- Number of water phases
+      nqtrue = SIZE(tracers)                                         !--- Total number of "true" tracers
+      nbtr   = nqtrue-COUNT(delPhase(tracers(:)%gen0Name) == 'H2O' &
+                               .AND. tracers(:)%component == 'lmdz') !--- Number of tracers passed to phytrac
+#ifdef INCA
+      nqINCA = COUNT(tracers(:)%component == 'inca')
+#endif
+      lerr = getKey('hadv', hadv, ky=tracers(:)%keys)
+      lerr = getKey('vadv', vadv, ky=tracers(:)%keys)
+   !---------------------------------------------------------------------------------------------------------------------------
    END IF
-   CALL msg('No tracers description file(s) reading needed: already done', modname, .NOT.lInit.AND.is_master)
-!##############################################################################################################################
-
-   !--- POPULATE SOME EXPLICIT (ACCESSIBLE THROUGH "%") KEYS OF THE LOCAL TRACERS DESCRIPTION DERIVED TYPE
-   !    To be defined: iqParent, iq/nqDescen, nqChildren (in indexUpdate), longName, iso_i*, iadv (later)
-   ALLOCATE(tracers(SIZE(tra)))
-   DO iq = 1, SIZE(tra); t1 => tracers(iq)
-      t1%keys = tra(iq)
-      msg1 = '" for tracer nr. '//TRIM(int2str(iq))
-      ky='name       '; IF(getKey(ky, t1%name,        iq, tra)) CALL abort_gcm(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      msg1 = '" for "'//TRIM(t1%name)//'"'
-      ky='gen0Name   '; IF(getKey(ky, t1%gen0Name,    iq, tra)) CALL abort_gcm(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='parent     '; IF(getKey(ky, t1%parent,      iq, tra)) CALL abort_gcm(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='type       '; IF(getKey(ky, t1%type,        iq, tra)) CALL abort_gcm(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='phase      '; IF(getKey(ky, t1%phase,       iq, tra)) CALL abort_gcm(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='component  '; IF(getKey(ky, t1%component,   iq, tra)) CALL abort_gcm(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='iGeneration'; IF(getKey(ky, t1%iGeneration, iq, tra)) CALL abort_gcm(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-   END DO
-
-!==============================================================================================================================
-! 1) Get various numbers: "nqtrue" (first order only tracers), "nqo" (water phases), 'nbtr' (tracers passed to physics), etc.
-!==============================================================================================================================
-   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
-   nqCO2  =      COUNT( [type_trac == 'inco', type_trac == 'co2i'] )
-#ifdef INCA
-   nqINCA =      COUNT(tracers(:)%component == 'inca')
-#endif
+   !---------------------------------------------------------------------------------------------------------------------------
+
 #ifdef REPROBUS
-   CALL Init_chem_rep_trac(nbtr, nqo, tracers(:)%name)                         !--- Transfert the number of tracers to Reprobus
-#endif
-
+   !--- Transfert the number of tracers to Reprobus
+   CALL Init_chem_rep_trac(nbtr, nqo, tracers(:)%name)
+
+#endif
 !==============================================================================================================================
 ! 2) Calculate nqtot, number of tracers needed (greater if advection schemes 20 or 30 have been chosen).
 !==============================================================================================================================
-   IF(getKey('hadv', hadv, ky=tra)) CALL abort_gcm(modname, 'missing key "hadv"', 1)
-   IF(getKey('vadv', vadv, ky=tra)) CALL abort_gcm(modname, 'missing key "vadv"', 1)
    DO iq = 1, nqtrue
       IF( hadv(iq)<20 .OR. (ANY(hadv(iq)==[20,30]) .AND. hadv(iq)==vadv(iq)) ) CYCLE
@@ -378 +303 @@
 
 !==============================================================================================================================
-! 3) Determine the advection scheme choice for water and tracers "iadv" and the fields long name.
+! 3) Determine the advection scheme choice for water and tracers "iadv" and the fields long name, isAdvected.
 !     iadv = 1    "LMDZ-specific humidity transport" (for H2O vapour)          LMV
 !     iadv = 2    backward                           (for H2O liquid)          BAK
@@ -396 +321 @@
 !==============================================================================================================================
    ALLOCATE(ttr(nqtot))
-   jq = nqtrue+1
+   jq = nqtrue+1; tracers(:)%iadv = -1
    DO iq = 1, nqtrue
       t1 => tracers(iq)
@@ -407 +332 @@
       IF(iad == -1) CALL abort_gcm(modname, msg1, 1)
 
-      !--- SET FIELDS longName, iadv
+      !--- SET FIELDS %longName, %iadv, %isAdvected, %isInPhysics
+      t1%longName   = t1%name; IF(iad > 0) t1%longName=TRIM(t1%name)//descrq(iad)
       t1%iadv       = iad
-      t1%longName   = t1%name; IF(iad > 0) t1%longName=TRIM(t1%name)//descrq(iad)
+      t1%isAdvected = iad >= 0
+      t1%isInPhysics= delPhase(t1%gen0Name) /= 'H2O' &
+                          .OR. t1%component /= 'lmdz' !=== OTHER EXCEPTIONS TO BE ADDED: CO2i, SURSATURATED WATER CLOUD...
       ttr(iq)       = t1
 
@@ -419 +347 @@
       ttr(jq+1:jq+nm)             = t1
       ttr(jq+1:jq+nm)%name        = [ (TRIM(t1%name)    //'-'//TRIM(suff(im)), im=1, nm) ]
-      ttr(jq+1:jq+nm)%gen0Name    = [ (TRIM(t1%name)    //'-'//TRIM(suff(im)), im=1, nm) ]
       ttr(jq+1:jq+nm)%parent      = [ (TRIM(t1%parent)  //'-'//TRIM(suff(im)), im=1, nm) ]
       ttr(jq+1:jq+nm)%longName    = [ (TRIM(t1%longName)//'-'//TRIM(suff(im)), im=1, nm) ]
       ttr(jq+1:jq+nm)%iadv        = [ (-iad,    im=1, nm) ]
+      ttr(jq+1:jq+nm)%isAdvected  = [ (.FALSE., im=1, nm) ]
       jq = jq + nm
    END DO
@@ -428 +356 @@
    CALL MOVE_ALLOC(FROM=ttr, TO=tracers)
 
-   !--- SET FIELDS iqParent, iqDescen, nqDescen, nqChildren
-   IF(indexUpdate(tracers%keys)) CALL abort_gcm(modname, 'problem with tracers indices update', 1)
-   k => tracers(:)%keys
-   DO iq = 1, SIZE(tracers); t1 => tracers(iq); msg1 = '" for "'//TRIM(t1%name)//'"'
-      ky='iqParent  '; IF(getKey(ky, t1%iqParent,   iq, k)) CALL abort_gcm(modname, 'missing key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='iqDescen  '; IF(getKey(ky, t1%iqDescen,   iq, k)) CALL abort_gcm(modname, 'missing key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='nqDescen  '; IF(getKey(ky, t1%nqDescen,   iq, k)) CALL abort_gcm(modname, 'missing key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='nqChildren'; IF(getKey(ky, t1%nqChildren, iq, k)) CALL abort_gcm(modname, 'missing key "'//TRIM(ky)//TRIM(msg1), 1)
+   !--- SET FIELDS %iqParent, %nqChildren, %iGeneration, %iqDescen, %nqDescen
+   IF(indexUpdate(tracers)) CALL abort_gcm(modname, 'problem with tracers indices update', 1)
+
+   !=== TEST ADVECTION SCHEME
+   DO iq=1,nqtot ; t1 => tracers(iq); iad = t1%iadv
+
+      !--- ONLY TESTED VALUES FOR TRACERS FOR NOW:               iadv = 14, 10 (and 0 for non-transported tracers)
+      IF(ALL([10,14,0] /= iad)) &
+         CALL abort_gcm(modname, 'Not tested for iadv='//TRIM(int2str(iad))//' ; 10 or 14 only are allowed !', 1)
+
+      !--- ONLY TESTED VALUES FOR PARENTS HAVING CHILDS FOR NOW: iadv = 14, 10 (PARENTS: TRACERS OF GENERATION 1)
+      IF(ALL([10,14] /= iad) .AND. t1%iGeneration == 1 .AND. ANY(tracers(:)%iGeneration > 1)) &
+         CALL abort_gcm(modname, 'iadv='//TRIM(int2str(iad))//' not implemented for parents ; 10 or 14 only are allowed !', 1)
+
+      !--- ONLY TESTED VALUES FOR CHILDS FOR NOW:                iadv = 10     (CHILDS:  TRACERS OF GENERATION GREATER THAN 1)
+      IF(fmsg('WARNING ! iadv='//TRIM(int2str(iad))//' not implemented for childs. Setting iadv=10 for "'//TRIM(t1%name)//'"',&
+         modname, iad /= 10 .AND. t1%iGeneration > 1)) t1%iadv = 10
+
+      !--- ONLY VALID SCHEME NUMBER FOR WATER VAPOUR:            iadv = 14
+      ll = t1%name /= addPhase('H2O','g')
+      IF(fmsg('WARNING ! iadv=14 is valid for water vapour only. Setting iadv=10 for "'//TRIM(t1%name)//'".', &
+         modname, iad == 14 .AND. ll))                 t1%iadv = 10
    END DO
 
-   !=== TEST ADVECTION SCHEME
-   DO iq = 1, nqtot ; t1 => tracers(iq)
-      iad = t1%iadv
-      ig  = t1%iGeneration
-      nam = t1%name
-      val = 'iadv='//TRIM(int2str(iad))
-
-      !--- ONLY TESTED VALUES FOR TRACERS FOR NOW:               iadv = 14, 10 (and 0 for non-transported tracers)
-      IF(ALL([10,14,0] /= iad)) CALL abort_gcm(modname, TRIM(val)//' has not been tested yet ; 10 or 14 only are allowed !', 1)
-
-      !--- ONLY TESTED VALUES SO FAR FOR PARENTS HAVING CHILDREN: iadv = 14, 10 (PARENTS: TRACERS OF GENERATION 0)
-      IF(ALL([10,14] /= iad) .AND. ig == 0 .AND. ANY(tracers(:)%parent==nam)) &
-         CALL abort_gcm(modname, TRIM(val)//' is not implemented for parents ; 10 or 14 only are allowed !', 1)
-
-      !--- ONLY TESTED VALUES SO FAR FOR DESCENDANTS (TRACERS OF GENERATION > 0): iadv = 10 ; WATER VAPOUR: iadv = 14
-      lerr = iad /= 10 .AND. ig > 0;                     IF(lerr) tracers(iq)%iadv = 10
-      CALL msg('WARNING! '//TRIM(val)//  ' not implemented for children. Setting iadv=10 for "'//TRIM(nam)//'"', modname, lerr)
-      lerr = iad == 14 .AND. nam /= addPhase('H2O','g'); IF(lerr) tracers(iq)%iadv = 10
-      CALL msg('WARNING! '//TRIM(val)//' is valid for water vapour only. Setting iadv=10 for "'//TRIM(nam)//'"', modname, lerr)
-   END DO
-
-   !=== DETERMINE ISOTOPES RELATED PARAMETERS ; DEFINE THE EXPLICIT KEYS iso_i*
-   IF(processIsotopes(tracers%keys, iso)) CALL abort_gcm(modname, 'problem while processing isotopes parameters', 1)
-
-   !--- POPULATE SOME EXPLICIT (ACCESSIBLE THROUGH "%") KEYS OF THE LOCAL ISOTOPES DESCRIPTION DERIVED TYPE
-   nbIso = SIZE(iso)
-   ALLOCATE(isotopes(nbIso))
-   IF(nbIso /= 0) THEN
-      k => tracers(:)%keys
-      IF(getKey('iso_iGroup', itmp, ky=k)) CALL abort_gcm(modname, 'missing key "iso_iGroup"', 1); tracers%iso_iGroup=itmp
-      IF(getKey('iso_iName',  itmp, ky=k)) CALL abort_gcm(modname, 'missing key "iso_iName"',  1); tracers%iso_iName =itmp
-      IF(getKey('iso_iZone',  itmp, ky=k)) CALL abort_gcm(modname, 'missing key "iso_iZone"',  1); tracers%iso_iZone =itmp
-      IF(getKey('iso_iPhas',  itmp, ky=k)) CALL abort_gcm(modname, 'missing key "iso_iPhas"',  1); tracers%iso_iPhase=itmp
-      isotopes(:)%name  = iso(:)%name                           !--- Isotopes family name (ex: H2O)
-      isotopes(:)%phase = iso(:)%phase                          !--- Phases list: [g][l][s]              (length: nphas)
-      isotopes(:)%niso  = iso(:)%niso                           !--- Number of isotopes, excluding tagging tracers
-      isotopes(:)%ntiso = iso(:)%ntiso                          !--- Number of isotopes, including tagging tracers
-      isotopes(:)%nzone = iso(:)%nzone                          !--- Number of geographic tagging zones
-      isotopes(:)%nphas = iso(:)%nphas                          !--- Number of phases
-      isotopes(:)%check = .FALSE.                               !--- Flag for checking routines triggering
-      CALL getin('ok_iso_verif', isotopes(:)%check)
-      DO it = 1, nbIso
-         isotopes(it)%keys     = iso(it)%keys                   !--- Isotopes keys/values pairs list     (length: niso)
-         isotopes(it)%trac     = iso(it)%trac                   !--- Isotopes + tagging tracers list     (length: ntiso)
-         isotopes(it)%zone     = iso(it)%zone                   !--- Geographic tagging zones names list (length: nzone)
-         isotopes(it)%iqIsoPha = iso(it)%iqIsoPha(:,:)          !--- Idx in "tracers(1:nqtot)" = f(name(1:ntiso)),phas)
-         isotopes(it)%itZonIso = iso(it)%itZonIso(:,:)          !--- Idx in "tracers(1:ntiso)" = f(  zone,name(1:niso))
-      END DO
-      IF(isoSelect(1, .TRUE.)) CALL abort_gcm(modname, "Can't select the first isotopes family", 1)
-      IF(.NOT.isoSelect('H2O', .TRUE.)) iH2O = ixIso
-   END IF
-   isoFamilies = isotopes(:)%name
+   !=== READ PHYSICAL PARAMETERS FOR ISOTOPES ; DONE HERE BECAUSE dynetat0 AND iniacademic NEED "tnat" AND "alpha_ideal"
+   niso = 0; nzone = 0; nphas = nqo; ntiso = 0; isoCheck = .FALSE.
+   IF(processIsotopes()) CALL abort_gcm(modname, 'problem when processing isotopes parameters', 1)
 
    !--- Convection / boundary layer activation for all tracers
-   IF(.NOT.ALLOCATED(conv_flg)) ALLOCATE(conv_flg(nbtr)); conv_flg(1:nbtr) = 1
-   IF(.NOT.ALLOCATED( pbl_flg)) ALLOCATE( pbl_flg(nbtr));  pbl_flg(1:nbtr) = 1
+   ALLOCATE(conv_flg(nbtr)); conv_flg(1:nbtr) = 1
+   ALLOCATE( pbl_flg(nbtr));  pbl_flg(1:nbtr) = 1
 
    !--- Note: nqtottr can differ from nbtr when nmom/=0
@@ -501 +394 @@
 
    !=== DISPLAY THE RESULTS
-   IF(.NOT.is_master) RETURN
    CALL msg('nqo    = '//TRIM(int2str(nqo)),    modname)
    CALL msg('nbtr   = '//TRIM(int2str(nbtr)),   modname)
@@ -513 +405 @@
 #endif
    t => tracers
-   CALL msg('Information stored in '//TRIM(modname)//': ', modname)
-   IF(dispTable('isssssssiiiiiiiii', ['iq  ', 'name', 'lNam', 'g0Nm', 'prnt', 'type', 'phas', 'comp',      &
-                              'iAdv', 'iGen', 'iqPr', 'nqDe', 'nqCh', 'iGrp', 'iNam', 'iZon', 'iPha'],     &
-      cat(t%name, t%longName, t%gen0Name, t%parent, t%type, t%phase, t%component),                         &
+   CALL msg('Information stored in infotrac :', modname)
+
+   IF(dispTable('isssssssssiiiiiiiii', ['iq  ', 'name', 'lNam', 'g0Nm', 'prnt', 'type', 'phas', 'comp',    &
+                'isPh', 'isAd', 'iadv', 'iGen', 'iqPr', 'nqDe', 'nqCh', 'iGrp', 'iNam', 'iZon', 'iPha'],   &
+      cat(t%name, t%longName, t%gen0Name, t%parent, t%type, t%phase, t%component, bool2str(t%isInPhysics), &
+                                                                                  bool2str(t%isAdvected)), &
       cat([(iq, iq=1, nqtot)], t%iadv, t%iGeneration, t%iqParent, t%nqDescen, t%nqChildren, t%iso_iGroup,  &
                   t%iso_iName, t%iso_iZone, t%iso_iPhase), nColMax=maxTableWidth, nHead=2, sub=modname))   &
       CALL abort_gcm(modname, "problem with the tracers table content", 1)
-   CALL msg('No isotopes identified.', modname, nbIso == 0)
-   IF(nbIso == 0) RETURN
-   DO it = 1, nbIso
-      IF(isoSelect(it, .TRUE.)) CALL abort_gcm(modname, 'Problem when selecting isotopes class', 1)
-      CALL msg('For isotopes family "'//TRIM(isoFamilies(it))//'":', modname)
-      CALL msg('  isoName = '//strStack(isotope%trac),  modname)
-      CALL msg('  isoZone = '//strStack(isotope%zone),  modname)
-      CALL msg('  isoPhas = '//    TRIM(isotope%phase), modname)
-   END DO
-   IF(isoSelect('H2O', .TRUE.)) THEN
-      IF(isoSelect(1,  .TRUE.)) CALL abort_gcm(modname, 'Problem when selecting isotopes class', 1)
+   IF(niso > 0) THEN
+      CALL msg('Where, for isotopes family "'//TRIM(isotope%parent)//'":', modname)
+      CALL msg('  isoKeys%name = '//strStack(isoKeys%name), modname)
+      CALL msg('  isoName = '//strStack(isoName),      modname)
+      CALL msg('  isoZone = '//strStack(isoZone),      modname)
+      CALL msg('  isoPhas = '//TRIM(isoPhas),          modname)
    ELSE
-      iH2O = ixIso
+      CALL msg('No isotopes identified.', modname)
    END IF
-   IF(ALLOCATED(isotope%keys(ixIso)%key)) &
-     CALL msg('  isoKeys('//TRIM(int2str(ixIso))//') = '//TRIM(strStack(isotope%keys(ixIso)%key)), modname)
+   CALL msg('end', modname)
 
 END SUBROUTINE init_infotrac
 
-!==============================================================================================================================
-LOGICAL FUNCTION isoSelectByName(iClass, lVerbose) RESULT(lerr)
-   IMPLICIT NONE
-   CHARACTER(LEN=*),  INTENT(IN) :: iClass
-   LOGICAL, OPTIONAL, INTENT(IN) :: lVerbose
-   INTEGER :: iIso
-   LOGICAL :: lV
-   lV = .FALSE.; IF(PRESENT(lVerbose)) lV = lVerbose
-   iIso = strIdx(isotopes(:)%name, iClass)
-   lerr = iIso == 0
-   IF(lerr) THEN
-      niso = 0; ntiso = 0; nzone = 0; nphas = 0; isoCheck=.FALSE.
-      CALL msg('no isotope family named "'//TRIM(iClass)//'"', ll=lV)
-      RETURN
-   END IF
-   lerr = isoSelectByIndex(iIso, lV)
-END FUNCTION isoSelectByName
-!==============================================================================================================================
-LOGICAL FUNCTION isoSelectByIndex(iIso, lVerbose) RESULT(lerr)
-   IMPLICIT NONE
-   INTEGER,           INTENT(IN) :: iIso
-   LOGICAL, OPTIONAL, INTENT(IN) :: lVerbose
-   LOGICAL :: lV
-   lV = .FALSE.;  IF(PRESENT(lVerbose)) lV = lVerbose
-   lerr = .FALSE.
-   IF(iIso == ixIso) RETURN                                          !--- Nothing to do if the index is already OK
-   lerr = iIso<=0 .OR. iIso>SIZE(isotopes)
-   CALL msg('Inconsistent isotopes family index '//TRIM(int2str(iIso))//': should be > 0 and <= '&
-          //TRIM(int2str(SIZE(isotopes)))//'"', ll = lerr .AND. lV)
-   IF(lerr) RETURN
-   ixIso = iIso                                                      !--- Update currently selected family index
-   isotope  => isotopes(ixIso)                                       !--- Select corresponding component
-   isoKeys  => isotope%keys;     niso     = isotope%niso
-   isoName  => isotope%trac;     ntiso    = isotope%ntiso
-   isoZone  => isotope%zone;     nzone    = isotope%nzone
-   isoPhas  => isotope%phase;    nphas    = isotope%nphas
-   itZonIso => isotope%itZonIso; isoCheck = isotope%check
-   iqIsoPha => isotope%iqIsoPha
-END FUNCTION isoSelectByIndex
-!==============================================================================================================================
-
 END MODULE infotrac

LMDZ6/trunk/libf/dyn3d_common/iso_verif_dyn.F

@@ -64 +64 @@
         function iso_verif_aberrant_nostop
      :           (x,iso,q,err_msg)
-#ifdef CPP_IOIPSL
-        USE IOIPSL, ONLY: getin
-#else
-        USE ioipsl_getincom, ONLY: getin
-#endif
-        USE iso_params_mod, ONLY: tnat_HDO
+        USE infotrac, ONLY: isoName, getKey
         implicit none
         
@@ -79 +74 @@
         ! locals
         real qmin,deltaD
-        real deltaDmax,deltaDmin
+        real deltaDmax,deltaDmin,tnat
         parameter (qmin=1e-11)
         parameter (deltaDmax=200.0,deltaDmin=-999.9)
-        LOGICAL       :: ltnat1
-        LOGICAL, SAVE :: lFirst=.TRUE.
-        REAL,    SAVE :: tnat
 
         ! output
         integer iso_verif_aberrant_nostop
 
-        IF(lFirst) THEN
-           ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
-           tnat = tnat_HDO; IF(ltnat1) tnat = 1.0
-           lFirst = .FALSE.
-        END IF
         iso_verif_aberrant_nostop=0
 
         ! verifier que HDO est raisonable
          if (q.gt.qmin) then
+             IF(getKey('tnat', tnat, isoName(iso))) THEN
+                  err_msg = 'Missing isotopic parameter "tnat"'
+                  iso_verif_aberrant_nostop=1
+                  RETURN
+             END IF
              deltaD=(x/q/tnat-1)*1000
              if ((deltaD.gt.deltaDmax).or.(deltaD.lt.deltaDmin)) then

LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F90

@@ -3 +3 @@
    USE strings_mod, ONLY: maxlen, msg, strIdx, strStack, int2str, real2str
    USE infotrac,    ONLY: nqtot, niso, nphas, isotope, isoCheck, iqIsoPha, isoSelect, &
-                          ntiso, iH2O, nzone, tracers, isoName,  itZonIso
-   USE iso_params_mod, ONLY: tnat_H216O, tnat_H217O, tnat_H218O, tnat_HDO, tnat_HTO
-#ifdef CPP_IOIPSL
-   USE ioipsl,          ONLY: getin
-#else
-   USE ioipsl_getincom, ONLY: getin
-#endif
+                          ntiso, iH2O, nzone, tracers, isoName,  itZonIso, getKey
    IMPLICIT NONE
    include "dimensions.h"
@@ -27 +21 @@
                       deltaDmin =-999.0, &
                       ridicule  = 1e-12
-   INTEGER, SAVE :: iso_eau, iso_HDO, iso_O18, iso_O17, iso_HTO
-!$OMP THREADPRIVATE(iso_eau, iso_HDO, iso_O18, iso_O17, iso_HTO)
-   LOGICAL       :: ltnat1
+   INTEGER, SAVE :: iso_eau, iso_HDO, iso_O18, & !--- OpenMP shared variables
+                             iso_O17, iso_HTO
    LOGICAL, SAVE :: first=.TRUE.
+   LOGICAL, PARAMETER :: tnat1=.TRUE.
 !$OMP THREADPRIVATE(first)
 
@@ -38 +32 @@
    IF(niso == 0)        RETURN                   !--- No isotopes => finished
    IF(first) THEN
-      ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
-      iso_eau = strIdx(isoName,'H216O'); IF(iso_eau /= 0) tnat(iso_eau) = tnat_H216O
-      iso_O17 = strIdx(isoName,'H217O'); IF(iso_O17 /= 0) tnat(iso_O17) = tnat_H217O
-      iso_O18 = strIdx(isoName,'H218O'); IF(iso_O18 /= 0) tnat(iso_O18) = tnat_H218O
-      iso_HDO = strIdx(isoName,'HDO');   IF(iso_HDO /= 0) tnat(iso_HDO) = tnat_HDO
-      iso_HTO = strIdx(isoName,'HTO');   IF(iso_HTO /= 0) tnat(iso_HTO) = tnat_HTO
-      IF(ltnat1) tnat(:) = 1.0
+!$OMP MASTER
+      iso_eau = strIdx(isoName,'H216O')
+      iso_HDO = strIdx(isoName,'HDO')
+      iso_O18 = strIdx(isoName,'H218O')
+      iso_O17 = strIdx(isoName,'H217O')
+      iso_HTO = strIdx(isoName,'HTO')
+      if (tnat1) then
+              tnat(:)=1.0
+      else
+         IF(getKey('tnat', tnat)) CALL abort_gcm(modname, 'missing isotopic parameter', 1)
+      endif
+!$OMP END MASTER
+!$OMP BARRIER
       first = .FALSE.
    END IF

LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

@@ -7 +7 @@
 !-------------------------------------------------------------------------------
   USE parallel_lmdz
-  USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName, &
-                         new2oldH2O, newHNO3, oldHNO3
+  USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName
   USE strings_mod, ONLY: maxlen, msg, strStack, real2str, int2str, strIdx
   USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQUIRE_DIMENSION, NF90_INQ_VARID, &
                          NF90_CLOSE, NF90_GET_VAR, NF90_INQUIRE_VARIABLE,  NF90_NoErr
+  USE readTracFiles_mod, ONLY: new2oldH2O, newHNO3, oldHNO3, getKey
   USE control_mod, ONLY: planet_type
   USE assert_eq_m, ONLY: assert_eq
@@ -20 +20 @@
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
-#ifdef CPP_IOIPSL
-  USE IOIPSL,   ONLY: getin
-#else
-  USE ioipsl_getincom, ONLY: getin
-#endif
-  USE iso_params_mod   ! tnat_* and alpha_ideal_*
 
   IMPLICIT NONE
@@ -53 +47 @@
   REAL,             ALLOCATABLE :: ucov_glo(:,:),    q_glo(:,:), phis_glo(:)
   REAL,             ALLOCATABLE :: teta_glo(:,:)
-  LOGICAL :: lSkip, ll, ltnat1
+  LOGICAL :: lSkip, ll
+  LOGICAL,PARAMETER :: tnat1=.TRUE.
 !-------------------------------------------------------------------------------
   modname="dynetat0_loc"
@@ -163 +158 @@
   ll = NF90_INQ_VARID(fID, 'HNO3tot', vID) /= NF90_NoErr                                 !--- DETECT OLD REPRO start.nc FILE
 #endif
-  ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
   DO iq=1,nqtot
     var = tracers(iq)%name
@@ -179 +173 @@
     !--------------------------------------------------------------------------------------------------------------------------
     ELSE IF(NF90_INQ_VARID(fID, oldVar, vID) == NF90_NoErr) THEN                         !=== TRY WITH ALTERNATE NAME
-      CALL msg('Missing tracer <'//TRIM(var)//'> => initialized to <'//TRIM(oldVar)//'>', modname)
+      CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to <'//TRIM(oldVar)//'>', modname)
       CALL get_var2(oldVar, q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:)
     !--------------------------------------------------------------------------------------------------------------------------
@@ -187 +181 @@
       iqParent = tracers(iq)%iqParent
       IF(tracers(iq)%iso_iZone == 0) THEN
-         IF(ltnat1) THEN
-            tnat = 1.0
-            alpha_ideal = 1.0
-            CALL msg(' !!!  Beware: alpha_ideal put to 1  !!!', modname)
-         ELSE
-            SELECT CASE(isoName(iName))
-              CASE('H216O'); tnat = tnat_H216O; alpha_ideal = alpha_ideal_H216O
-              CASE('H217O'); tnat = tnat_H217O; alpha_ideal = alpha_ideal_H217O
-              CASE('H218O'); tnat = tnat_H218O; alpha_ideal = alpha_ideal_H218O
-              CASE('HDO');   tnat = tnat_HDO;   alpha_ideal = alpha_ideal_HDO
-              CASE('HTO');   tnat = tnat_HTO;   alpha_ideal = alpha_ideal_HTO
-              CASE DEFAULT; CALL abort_gcm(TRIM(modname),'unknown isotope "'//TRIM(isoName(iName))//'" ; check tracer.def file',1)
-            END SELECT
-         END IF
-         CALL msg('Missing tracer <'//TRIM(var)//'> => initialized with a simplified Rayleigh distillation law.', modname)
+         if (tnat1) then
+                 tnat=1.0
+                 alpha_ideal=1.0
+                 write(*,*) 'attention dans dynetat0: les alpha_ideal sont a 1'
+         else
+          IF(getKey('tnat', tnat, isoName(iName)) .OR. getKey('alpha', alpha_ideal, isoName(iName))) &
+            CALL abort_gcm(TRIM(modname), 'missing isotopic parameters', 1)
+         endif
+         CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized with a simplified Rayleigh distillation law.', modname)
          q(ijb_u:ije_u,:,iq) = q(ijb_u:ije_u,:,iqParent)*tnat*(q(ijb_u:ije_u,:,iqParent)/30.e-3)**(alpha_ideal-1.)
          ! Camille 9 mars 2023: point de vigilence: initialisation incohérente
          ! avec celle de xt_ancien dans la physiq.
       ELSE
-         CALL msg('Missing tracer <'//TRIM(var)//'> => initialized to its parent isotope concentration.', modname)
+         CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to its parent isotope concentration.', modname)
          ! Camille 9 mars 2023: attention!! seuls les tags qui correspondent à
          ! izone=izone_init (définie dans isotrac_mod) sont initialisés comme
@@ -220 +208 @@
     !--------------------------------------------------------------------------------------------------------------------------
     ELSE                                                                                 !=== MISSING: SET TO 0
-      CALL msg('missing tracer <'//TRIM(var)//'> => initialized to zero', modname)
+      CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to zero', modname)
       q(ijb_u:ije_u,:,iq)=0.
     !--------------------------------------------------------------------------------------------------------------------------

LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.F90

@@ -5 +5 @@
 
   USE filtreg_mod, ONLY: inifilr
-  USE infotrac,    ONLY: nqtot, niso, iqIsoPha, tracers, addPhase, isoName
+  USE infotrac,    ONLY: nqtot, niso, iqIsoPha, tracers, getKey, isoName
   USE control_mod, ONLY: day_step,planet_type
   use exner_hyb_m, only: exner_hyb
@@ -22 +22 @@
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+  USE readTracFiles_mod, ONLY: addPhase
   use netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID
   use netcdf, only : NF90_CLOSE, NF90_GET_VAR
-  USE iso_params_mod   ! tnat_* and alpha_ideal_*
 
 
@@ -85 +85 @@
 
   REAL zdtvr, tnat, alpha_ideal
-  LOGICAL :: ltnat1
+  LOGICAL,PARAMETER :: tnat1=.true.
   
   character(len=*),parameter :: modname="iniacademic"
@@ -311 +311 @@
         ! bulk initialization of tracers
         if (planet_type=="earth") then
-           ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
            ! Earth: first two tracers will be water
            do iq=1,nqtot
@@ -325 +324 @@
               iqParent = tracers(iq)%iqParent
               IF(tracers(iq)%iso_iZone == 0) THEN
-                 IF(ltnat1) THEN
-                    tnat = 1.0
-                    alpha_ideal = 1.0
-                    WRITE(lunout, *) 'In '//TRIM(modname)//': !!!  Beware: alpha_ideal put to 1  !!!'
-                 ELSE
-                    SELECT CASE(isoName(iName))
-                      CASE('H216O'); tnat = tnat_H216O; alpha_ideal = alpha_ideal_H216O
-                      CASE('H217O'); tnat = tnat_H217O; alpha_ideal = alpha_ideal_H217O
-                      CASE('H218O'); tnat = tnat_H218O; alpha_ideal = alpha_ideal_H218O
-                      CASE('HDO');   tnat = tnat_HDO;   alpha_ideal = alpha_ideal_HDO
-                      CASE('HTO');   tnat = tnat_HTO;   alpha_ideal = alpha_ideal_HTO
-                      CASE DEFAULT
-                         CALL abort_gcm(TRIM(modname),'unknown isotope "'//TRIM(isoName(iName))//'" ; check tracer.def file',1)
-                    END SELECT
-                 END IF
+                 if (tnat1) then
+                         tnat=1.0
+                         alpha_ideal=1.0
+                         write(*,*) 'Attention dans iniacademic: alpha_ideal=1'
+                 else
+                    IF(getKey('tnat', tnat, isoName(iName)) .OR. getKey('alpha', alpha_ideal, isoName(iName))) &
+                    CALL abort_gcm(TRIM(modname), 'missing isotopic parameters', 1)
+                 endif
                  q(ijb_u:ije_u,:,iq) = q(ijb_u:ije_u,:,iqParent)*tnat*(q(ijb_u:ije_u,:,iqParent)/30.e-3)**(alpha_ideal-1.)
               ELSE !IF(tracers(iq)%iso_iZone == 0) THEN

LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.F

@@ -4 +4 @@
       SUBROUTINE qminimum_loc( q,nqtot,deltap )
       USE parallel_lmdz
-      USE infotrac, ONLY: niso, ntiso, iqIsoPha, tracers, addPhase,
+      USE infotrac, ONLY: niso, ntiso, iqIsoPha, tracers, 
      &                    isoCheck, min_qParent
       USE strings_mod, ONLY: strIdx
+      USE readTracFiles_mod, ONLY: addPhase
       IMPLICIT none
 c

LMDZ6/trunk/libf/dynphy_lonlat/calfis.F

@@ -29 +29 @@
 c    Auteur :  P. Le Van, F. Hourdin 
 c   .........
-      USE infotrac_phy, ONLY: nqtot, tracers
+      USE infotrac, ONLY: nqtot, tracers
       USE control_mod, ONLY: planet_type, nsplit_phys
 #ifdef CPP_PHYS

LMDZ6/trunk/libf/dynphy_lonlat/calfis_loc.F

@@ -47 +47 @@
       USE Times
 #endif
-      USE infotrac_phy, ONLY: nqtot, tracers
+      USE infotrac, ONLY: nqtot, tracers
       USE control_mod, ONLY: planet_type, nsplit_phys
 #ifdef CPP_PHYS

LMDZ6/trunk/libf/misc/readTracFiles_mod.f90

@@ -10 +10 @@
 
   PUBLIC :: maxlen                                              !--- PARAMETER FOR CASUAL STRING LENGTH
-  PUBLIC :: keys_type, tracers, setGeneration, indexUpdate      !--- TRACERS  DESCRIPTION DATABASE + ASSOCIATED TOOLS
+  PUBLIC :: trac_type, tracers, setGeneration, indexUpdate      !--- TRACERS  DESCRIPTION DATABASE + ASSOCIATED TOOLS
   PUBLIC :: testTracersFiles, readTracersFiles                  !--- TRACERS FILES READING ROUTINES
   PUBLIC :: getKeysDBase, setKeysDBase                          !--- TOOLS TO GET/SET THE DATABASE (tracers & isotopes)
   PUBLIC :: addTracer, delTracer                                !--- ADD/REMOVE A TRACER FROM
-  PUBLIC :: addKey,    delKey,    getKey                        !--- TOOLS TO SET/DEL/GET KEYS FROM/TO  tracers & isotopes
+  PUBLIC :: addKey,    delKey,    getKey,    keys_type          !--- TOOLS TO SET/DEL/GET KEYS FROM/TO  tracers & isotopes
   PUBLIC :: addPhase,  delPhase,  getPhase,  getiPhase,  &      !--- FUNCTIONS RELATED TO THE PHASES
    nphases, old_phases, phases_sep, known_phases, phases_names  !--- + ASSOCIATED VARIABLES
@@ -35 +35 @@
   PUBLIC :: itZonIso                                            !--- Idx IN isoName(1:niso) = f(tagging idx, isotope idx)
   PUBLIC :: iqIsoPha                                            !--- Idx IN qx(1:nqtot)     = f(isotope idx,   phase idx)
-  PUBLIC :: iqWIsoPha                                           !--- SAME AS iqIsoPha BUT ISOTOPES LIST STARTS WITH PARENT TRAC
+  PUBLIC :: iqWIsoPha                                           !--- Idx IN qx(1:nqtot)     = f(isotope idx,   phase idx) but with normal water first
   PUBLIC :: isoCheck                                            !--- FLAG TO RUN ISOTOPES CHECKING ROUTINES
 
@@ -41 +41 @@
 !------------------------------------------------------------------------------------------------------------------------------
   TYPE :: keys_type                                             !=== TYPE FOR A SET OF KEYS ASSOCIATED TO AN ELEMENT
+    CHARACTER(LEN=maxlen)              :: name                  !--- Tracer name
     CHARACTER(LEN=maxlen), ALLOCATABLE :: key(:)                !--- Keys string list
     CHARACTER(LEN=maxlen), ALLOCATABLE :: val(:)                !--- Corresponding values string list
   END TYPE keys_type
 !------------------------------------------------------------------------------------------------------------------------------
-  TYPE :: isot_type                                             !=== TYPE FOR AN ISOTOPES FAMILY DESCENDING ON TRACER "name"
-    CHARACTER(LEN=maxlen)              :: name                  !--- Isotopes family name (example: H2O)
+  TYPE :: trac_type                                             !=== TYPE FOR A SINGLE TRACER NAMED "name"
+    CHARACTER(LEN=maxlen) :: name        = ''                   !--- Name of the tracer
+    TYPE(keys_type)       :: keys                               !--- <key>=<val> pairs vector
+    CHARACTER(LEN=maxlen) :: gen0Name    = ''                   !--- First generation ancestor name
+    CHARACTER(LEN=maxlen) :: parent      = ''                   !--- Parent name
+    CHARACTER(LEN=maxlen) :: longName    = ''                   !--- Long name (with advection scheme suffix)
+    CHARACTER(LEN=maxlen) :: type        = 'tracer'             !--- Type  (so far: 'tracer' / 'tag')
+    CHARACTER(LEN=maxlen) :: phase       = 'g'                  !--- Phase ('g'as / 'l'iquid / 's'olid)
+    CHARACTER(LEN=maxlen) :: component   = ''                   !--- Coma-separated list of components (Ex: lmdz,inca)
+    INTEGER               :: iGeneration = -1                   !--- Generation number (>=0)
+    INTEGER               :: iqParent    = 0                    !--- Parent index
+    INTEGER,  ALLOCATABLE :: iqDescen(:)                        !--- Descendants index (in growing generation order)
+    INTEGER               :: nqDescen    = 0                    !--- Number of descendants (all generations)
+    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  = 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(:)
+    INTEGER               :: iso_iPhase  = 0                    !--- Isotope  phase index in isotopes(iso_iGroup)%phase
+  END TYPE trac_type
+!------------------------------------------------------------------------------------------------------------------------------
+  TYPE :: isot_type                                             !=== TYPE FOR AN ISOTOPES FAMILY DESCENDING ON TRACER "parent"
+    CHARACTER(LEN=maxlen)              :: parent                !--- Isotopes family name (parent tracer name ; ex: H2O)
     TYPE(keys_type),       ALLOCATABLE :: keys(:)               !--- Isotopes keys/values pairs list     (length: niso)
     LOGICAL                            :: check=.FALSE.         !--- Flag for checking routines triggering
@@ -64 +88 @@
   TYPE :: dataBase_type                                         !=== TYPE FOR TRACERS SECTION
     CHARACTER(LEN=maxlen) :: name                               !--- Section name
-    TYPE(keys_type), ALLOCATABLE :: trac(:)                     !--- Tracers descriptors
+    TYPE(trac_type), ALLOCATABLE :: trac(:)                     !--- Tracers descriptors
   END TYPE dataBase_type
 !------------------------------------------------------------------------------------------------------------------------------
@@ -115 +139 @@
 
   !=== TRACERS AND ISOTOPES DESCRIPTORS, USED BY getKey
-  TYPE(keys_type), ALLOCATABLE, TARGET, SAVE ::  tracers(:)
+  TYPE(trac_type), ALLOCATABLE, TARGET, SAVE ::  tracers(:)
   TYPE(isot_type), ALLOCATABLE, TARGET, SAVE :: isotopes(:)
 
@@ -169 +193 @@
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=*),                               INTENT(IN)  :: type_trac     !--- List of components used
-  TYPE(keys_type), ALLOCATABLE, TARGET, OPTIONAL, INTENT(OUT) :: tracs(:)      !--- Tracers descriptor for external storage
+  TYPE(trac_type), ALLOCATABLE, TARGET, OPTIONAL, INTENT(OUT) :: tracs(:)      !--- Tracers descriptor for external storage
   LOGICAL,                              OPTIONAL, INTENT(IN)  :: lRepr         !--- Activate the HNO3 exceptions for REPROBUS
   CHARACTER(LEN=maxlen),  ALLOCATABLE :: s(:), sections(:), trac_files(:)
-  CHARACTER(LEN=maxlen) :: str, fname, tname, pname, cname, ttype
+  CHARACTER(LEN=maxlen) :: str, fname, tname, pname, cname
   INTEGER               :: nsec, ierr, it, ntrac, ns, ip, ix, fType
   INTEGER, ALLOCATABLE  :: iGen(:)
@@ -208 +232 @@
         CALL msg('This file is for air tracers only',           modname, ns == 3 .AND. it == 1)
         CALL msg('This files specifies the transporting fluid', modname, ns == 4 .AND. it == 1)
-        k => tracers(it)
+        k => tracers(it)%keys
 
         !=== NAME OF THE TRACER
@@ -214 +238 @@
         ix = strIdx(oldHNO3, s(3))
         IF(ix /= 0 .AND. lRep) tname = newHNO3(ix)                   !--- Exception for HNO3 (REPROBUS ONLY)
-        CALL addKey('name', tname, tracers)                          !--- Set the name of the tracer
-!        tracers(it)%name = tname                                     !--- Copy tracers names in keys components
+        tracers(it)%name = tname                                     !--- Set the name of the tracer
+        CALL addKey('name', tname, k)                                !--- Set the name of the tracer
+        tracers(it)%keys%name = tname                                !--- Copy tracers names in keys components
 
         !=== NAME OF THE COMPONENT
         cname = type_trac                                            !--- Name of the model component
         IF(ANY([(addPhase('H2O', ip), ip = 1, nphases)] == tname)) cname = 'lmdz'
-        CALL addKey('component', cname, tracers)                     !--- Set the name of the model component
+        tracers(it)%component = cname                                !--- Set component
+        CALL addKey('component', cname, k)                           !--- Set the name of the model component
 
         !=== NAME OF THE PARENT
@@ -229 +255 @@
           IF(ix /= 0 .AND. lRep) pname = newHNO3(ix)                 !--- Exception for HNO3 (REPROBUS ONLY)
         END IF
-        CALL addKey('parent', pname, tracers)                        !--- Set the parent name
+        tracers(it)%parent = pname                                   !--- Set the parent name
+        CALL addKey('parent', pname, k)
 
         !=== PHASE AND ADVECTION SCHEMES NUMBERS
-        CALL addKey('phase', known_phases(ip:ip), tracers)           !--- Set the phase of the tracer (default: "g"azeous)
+        tracers(it)%phase = known_phases(ip:ip)                      !--- Set the phase of the tracer (default: "g"azeous)
+        CALL addKey('phase', known_phases(ip:ip), k)                 !--- Set the phase of the tracer (default: "g"azeous)
         CALL addKey('hadv', s(1),  k)                                !--- Set the horizontal advection schemes number
         CALL addKey('vadv', s(2),  k)                                !--- Set the vertical   advection schemes number
@@ -238 +266 @@
       CLOSE(90)
       lerr = setGeneration(tracers); IF(lerr) RETURN                 !--- Set iGeneration and gen0Name
-      lerr = getKey('iGeneration', iGen, tracers(:))                 !--- Generation number
+      lerr = getKey('iGeneration', iGen, tracers(:)%keys)            !--- Generation number
+      WHERE(iGen == 2) tracers(:)%type = 'tag'                       !--- Set type:      'tracer' or 'tag'
       DO it = 1, ntrac
-        ttype = 'tracer'; IF(iGen(it) == 2) ttype = 'tag'
-        CALL addKey('type', ttype, tracers(it))                 !--- Set the type of tracer
+        CALL addKey('type', tracers(it)%type, tracers(it)%keys)      !--- Set the type of tracer
       END DO
       lerr = checkTracers(tracers, fname, fname); IF(lerr) RETURN    !--- Detect orphans and check phases
@@ -263 +291 @@
   END IF
   lerr = indexUpdate(tracers); IF(lerr) RETURN                       !--- Set iqParent, iqDescen, nqDescen, nqChildren
-  IF(PRESENT(tracs)) tracs = tracers
+  IF(PRESENT(tracs)) CALL MOVE_ALLOC(FROM=tracers, TO=tracs)
 END FUNCTION readTracersFiles
 !==============================================================================================================================
@@ -311 +339 @@
 ! Purpose: Read the sections "snames(is)" (pipe-separated list) from each "fnames(is)"
 !   file and create the corresponding tracers set descriptors in the database "dBase":
-! * dBase(id)%name           : section name
-! * dBase(id)%trac(:)        : tracers descriptor (the key "name" of tracers(i) is the name of the ith tracer)
-! * dBase(id)%trac(it)%key(:): names  of keys associated to tracer dBase(id)%trac(it)%name
-! * dBase(id)%trac(it)%val(:): values of keys associated to tracer dBase(id)%trac(it)%name
+! * dBase(id)%name                : section name
+! * dBase(id)%trac(:)%name        : tracers names
+! * dBase(id)%trac(it)%keys%key(:): names  of keys associated to tracer dBase(id)%trac(it)%name
+! * dBase(id)%trac(it)%keys%val(:): values of keys associated to tracer dBase(id)%trac(it)%name
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=*), INTENT(IN)  :: fnames(:)                         !--- Files names
@@ -367 +395 @@
   ndb= SIZE(dBase)                                                   !--- Current number of sections in the database
   IF(PRESENT(defName)) THEN                                          !--- Add default values to all the tracers
-    DO idb=n0,ndb                                                    !--- and remove the virtual tracer "defName"
-       lerr = addDefault(dBase(idb)%trac, defName); IF(lerr) RETURN
-    END DO
+    DO idb=n0,ndb; CALL addDefault(dBase(idb)%trac, defName); END DO !--- and remove the virtual tracer "defName"
   END IF
   ll = strParse(snam, '|', keys = sec)                               !--- Requested sections names
@@ -382 +408 @@
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen), ALLOCATABLE ::  s(:), v(:)
-  TYPE(keys_type),       ALLOCATABLE :: tt(:)
+  TYPE(trac_type),       ALLOCATABLE :: tt(:)
+  TYPE(trac_type)       :: tmp
   CHARACTER(LEN=1024)   :: str, str2
   CHARACTER(LEN=maxlen) :: secn
@@ -418 +445 @@
       tt = dBase(ndb)%trac(:)
       v(1) = s(1); s(1) = 'name'                                     !--- Convert "name" into a regular key
-      dBase(ndb)%trac = [tt(:), keys_type(s(:), v(:))]
-      DEALLOCATE(tt)
+      tmp%name = v(1); tmp%keys = keys_type(v(1), s(:), v(:))        !--- Set %name and %keys
+      dBase(ndb)%trac = [tt(:), tmp]
+      DEALLOCATE(tt, tmp%keys%key, tmp%keys%val)
     END IF
   END DO
@@ -432 +460 @@
 
 !==============================================================================================================================
-LOGICAL FUNCTION addDefault(t, defName) RESULT(lerr)
+SUBROUTINE addDefault(t, defName)
 !------------------------------------------------------------------------------------------------------------------------------
 ! Purpose: Add the keys from virtual tracer named "defName" (if any) and remove this virtual tracer.
 !------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type), ALLOCATABLE, TARGET, INTENT(INOUT) :: t(:)
+  TYPE(trac_type), ALLOCATABLE, TARGET, INTENT(INOUT) :: t(:)
   CHARACTER(LEN=*),                     INTENT(IN)    :: defName
   INTEGER :: jd, it, k
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:)
-  TYPE(keys_type),       ALLOCATABLE :: tt(:)
-  lerr = getKey('name', tname, t(:)); IF(lerr) RETURN
-  jd = strIdx(tname(:), defName)
+  TYPE(keys_type), POINTER :: ky
+  TYPE(trac_type), ALLOCATABLE :: tt(:)
+  jd = strIdx(t(:)%name, defName)
   IF(jd == 0) RETURN
-  DO k = 1, SIZE(t(jd)%key)                                          !--- Loop on the keys of the tracer named "defName"
-!   CALL addKey(t(jd)%key(k), t(jd)%val(k), t(:), .FALSE.)           !--- Add key to all the tracers (no overwriting)
-    DO it = 1, SIZE(t); CALL addKey(t(jd)%key(k), t(jd)%val(k), t(it), .FALSE.); END DO
+  ky => t(jd)%keys
+  DO k = 1, SIZE(ky%key)                                             !--- Loop on the keys of the tracer named "defName"
+!   CALL addKey(ky%key(k), ky%val(k), t(:)%keys, .FALSE.)            !--- Add key to all the tracers (no overwriting)
+    DO it = 1, SIZE(t); CALL addKey(ky%key(k), ky%val(k), t(it)%keys, .FALSE.); END DO
   END DO
   tt = [t(1:jd-1),t(jd+1:SIZE(t))]; CALL MOVE_ALLOC(FROM=tt, TO=t)   !--- Remove the virtual tracer named "defName"
-END FUNCTION addDefault
-!==============================================================================================================================
-
-!==============================================================================================================================
-LOGICAL FUNCTION subDefault(t, defName, lSubLocal) RESULT(lerr)
+END SUBROUTINE addDefault
+!==============================================================================================================================
+
+!==============================================================================================================================
+SUBROUTINE subDefault(t, defName, lSubLocal)
 !------------------------------------------------------------------------------------------------------------------------------
 ! Purpose: Substitute the keys from virtual tracer named "defName" (if any) and remove this virtual tracer.
 !          Substitute the keys locally (for the current tracer) if the flag "lSubLocal" is .TRUE.
 !------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type), ALLOCATABLE, TARGET, INTENT(INOUT) :: t(:)
+  TYPE(trac_type), ALLOCATABLE, TARGET, INTENT(INOUT) :: t(:)
   CHARACTER(LEN=*),                     INTENT(IN)    :: defName
   LOGICAL,                              INTENT(IN)    :: lSubLocal
   INTEGER :: i0, it, ik
-  TYPE(keys_type),       ALLOCATABLE :: tt(:)
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:)
-  lerr = getKey('name', tname, t(:)); IF(lerr) RETURN
-  i0 = strIdx(tname(:), defName)
+  TYPE(keys_type), POINTER     :: k0, ky
+  TYPE(trac_type), ALLOCATABLE :: tt(:)
+  i0 = strIdx(t(:)%name, defName)
   IF(i0 == 0) RETURN
+  k0 => t(i0)%keys 
   DO it = 1, SIZE(t); IF(it == i0) CYCLE                             !--- Loop on the tracers
+    ky => t(it)%keys
 
     !--- Substitute in the values of <key>=<val> pairs the keys defined in the virtual tracer "defName"
-    DO ik = 1, SIZE(t(i0)%key); CALL strReplace(t(it)%val, t(i0)%key(ik), t(i0)%val(ik), .TRUE.); END DO
+    DO ik = 1, SIZE(k0%key); CALL strReplace(ky%val, k0%key(ik), k0%val(ik), .TRUE.); END DO
 
     IF(.NOT.lSubLocal) CYCLE
     !--- Substitute in the values of <key>=<val> pairs the keys defined locally (in the current tracer)
-    DO ik = 1, SIZE(t(it)%key); CALL strReplace(t(it)%val, t(it)%key(ik), t(it)%val(ik), .TRUE.); END DO
+    DO ik = 1, SIZE(ky%key); CALL strReplace(ky%val, ky%key(ik), ky%val(ik), .TRUE.); END DO
   END DO
   tt = [t(1:i0-1),t(i0+1:SIZE(t))]; CALL MOVE_ALLOC(FROM=tt, TO=t)   !--- Remove the virtual tracer named "defName"
 
-END FUNCTION subDefault
+END SUBROUTINE subDefault
 !==============================================================================================================================
 
@@ -489 +518 @@
 !        * Default values are provided for these keys because they are necessary.
 !------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type), ALLOCATABLE, INTENT(INOUT) :: tr(:)                 !--- Tracer derived type vector
+  TYPE(trac_type), ALLOCATABLE, INTENT(INOUT) :: tr(:)                 !--- Tracer derived type vector
   CHARACTER(LEN=*),             INTENT(IN)    :: sname                 !--- Current section name
   CHARACTER(LEN=*), OPTIONAL,   INTENT(IN)    :: fname                 !--- Tracers description file name
-  TYPE(keys_type),       ALLOCATABLE :: ttr(:)
+  TYPE(trac_type),       ALLOCATABLE :: ttr(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: ta(:), pa(:), tname(:), parent(:), dType(:)
   CHARACTER(LEN=maxlen) :: msg1, modname
@@ -500 +529 @@
   lerr = .FALSE.
   nt = SIZE(tr)
-  lerr = getKey('name',   tname,  tr(:));                 IF(lerr) RETURN
-  lerr = getKey('parent', parent, tr(:), def = tran0);    IF(lerr) RETURN
-  lerr = getKey('type',   dType,  tr(:), def = 'tracer'); IF(lerr) RETURN
+  lerr = getKey('name',   tname,  tr(:)%keys);                 IF(lerr) RETURN
+  lerr = getKey('parent', parent, tr(:)%keys, def = tran0);    IF(lerr) RETURN
+  lerr = getKey('type',   dType,  tr(:)%keys, def = 'tracer'); IF(lerr) RETURN
   nq = 0
   !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -508 +537 @@
   !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     !--- Extract useful keys: parent name, type, component name
-    CALL addKey('component', sname,  tr(it))
+    tr(it)%component = sname
+    CALL addKey('component', sname,  tr(it)%keys)
 
     !--- Determine the number of tracers and parents ; coherence checking
@@ -535 +565 @@
     DO ipr = 1, npr                                                  !--- Loop on parents list elts
       DO itr = 1, ntr                                                !--- Loop on tracers list elts
-        ttr(iq)%key  = tr(it)%key
-        ttr(iq)%val  = tr(it)%val
-        CALL addKey('name',    ta(itr), ttr(iq))
-        CALL addKey('parent',  pa(ipr), ttr(iq))
-        CALL addKey('type',  dType(it), ttr(iq))
-        CALL addKey('component', sname, ttr(iq))
+        ttr(iq)%keys%name = TRIM(ta(itr))
+        ttr(iq)%keys%key  = tr(it)%keys%key
+        ttr(iq)%keys%val  = tr(it)%keys%val
+        ttr(iq)%name      = TRIM(ta(itr))
+        ttr(iq)%parent    = TRIM(pa(ipr))
+        ttr(iq)%type      = dType(it)
+        ttr(iq)%component = sname
+        CALL addKey('name',      ta(itr),   ttr(iq)%keys)
+        CALL addKey('parent',    pa(ipr),   ttr(iq)%keys)
+        CALL addKey('type',      dType(it), ttr(iq)%keys)
+        CALL addKey('component', sname,     ttr(iq)%keys)
         iq = iq + 1
       END DO
@@ -562 +597 @@
 !          Check also for orphan tracers (tracers without parent).
 !------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type),     INTENT(INOUT) :: tr(:)                        !--- Tracer derived type vector
+  TYPE(trac_type),     INTENT(INOUT) :: tr(:)                        !--- Tracer derived type vector
   INTEGER                            :: iq, jq, ig
   CHARACTER(LEN=maxlen), ALLOCATABLE :: parent(:), tname(:)
@@ -568 +603 @@
   CHARACTER(LEN=maxlen) :: modname
   modname = 'setGeneration'
-  lerr = getKey('name',   tname,  ky=tr(:)); IF(lerr) RETURN
-  lerr = getKey('parent', parent, ky=tr(:)); IF(lerr) RETURN
+  lerr = getKey('name',   tname,  ky=tr(:)%keys); IF(lerr) RETURN
+  lerr = getKey('parent', parent, ky=tr(:)%keys); IF(lerr) RETURN
   DO iq = 1, SIZE(tr)
     jq = iq; ig = 0
@@ -578 +613 @@
       ig = ig + 1
     END DO
-    CALL addKey('iGeneration',    ig,  tr(iq))
-    CALL addKey('gen0Name', tname(jq), tr(iq))
+    tr(iq)%gen0Name = tname(jq)
+    tr(iq)%iGeneration = ig
+    CALL addKey('iGeneration',   ig,  tr(iq)%keys)
+    CALL addKey('gen0Name', tname(jq), tr(iq)%keys)
   END DO
 END FUNCTION setGeneration
@@ -592 +629 @@
 !   * check wether the phases are known or not (elements of "known_phases")
 !------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type),            INTENT(IN) :: tr(:)                    !--- Tracers description vector
+  TYPE(trac_type),            INTENT(IN) :: tr(:)                    !--- Tracer derived type vector
   CHARACTER(LEN=*),           INTENT(IN) :: sname                    !--- Section name
   CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: fname                    !--- File name
@@ -607 +644 @@
   mesg = 'Check section "'//TRIM(sname)//'"'
   IF(PRESENT(fname)) mesg=TRIM(mesg)//' in file "'//TRIM(fname)//'"'
-  lerr = getKey('iGeneration', iGen, tr(:));                    IF(lerr) RETURN
-  lerr = getKey('name',       tname, tr(:));                    IF(lerr) RETURN
+  lerr = getKey('iGeneration', iGen, tr(:)%keys);               IF(lerr) RETURN
+  lerr = getKey('name',       tname, tr(:)%keys);               IF(lerr) RETURN
 
   !=== CHECK FOR ORPHAN TRACERS
@@ -615 +652 @@
   !=== CHECK PHASES
   DO iq = 1, nq; IF(iGen(iq) /= 0) CYCLE                             !--- Generation O only is checked
-    IF(getKey(['phases','phase '], pha, iq, tr(:), lDisp=.FALSE.)) pha = 'g'   !--- Phase
+    IF(getKey(['phases','phase '], pha, iq, tr(:)%keys, lDisp=.FALSE.)) pha = 'g'   !--- Phase
     np = LEN_TRIM(pha); bp(iq)=' '
     DO ip = 1, np; p = pha(ip:ip); IF(INDEX(known_phases, p) == 0) bp(iq) = TRIM(bp(iq))//p; END DO
@@ -630 +667 @@
 ! Purpose: Make sure that tracers are not repeated.
 !------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type),            INTENT(IN) :: tr(:)                    !--- Tracers description vector
+  TYPE(trac_type),            INTENT(IN) :: tr(:)                    !--- Tracer derived type vector
   CHARACTER(LEN=*),           INTENT(IN) :: sname                    !--- Section name
   CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: fname                    !--- File name
@@ -647 +684 @@
   nq=SIZE(tr,DIM=1); lerr=.FALSE.                                    !--- Number of lines ; error flag
   tdup(:) = ''
-  lerr = getKey('name',       tname, tr); IF(lerr) RETURN
-  lerr = getKey('type',       dType, tr); IF(lerr) RETURN
-  lerr = getKey('iGeneration', iGen, tr); IF(lerr) RETURN
+  lerr = getKey('name',       tname, tr%keys); IF(lerr) RETURN
+  lerr = getKey('type',       dType, tr%keys); IF(lerr) RETURN
+  lerr = getKey('iGeneration', iGen, tr%keys); IF(lerr) RETURN
   DO iq = 1, nq
     IF(dType(iq) == 'tag') CYCLE                                     !--- Tags can be repeated
@@ -661 +698 @@
         DO k = 1, nq
           IF(.NOT.ll(k)) CYCLE                                       !--- Skip tracers different from current one
-          IF(getKey(['phases','phase '], phase, k, tr, lDisp=.FALSE.)) phase='g'!--- Get current phases
+          IF(getKey(['phases','phase '], phase, k, tr%keys, lDisp=.FALSE.)) phase='g'!--- Get current phases
           IF(INDEX(phase, p) /= 0) np = np + 1                       !--- One more appearance of current tracer with phase "p"
         END DO
@@ -681 +718 @@
 ! Purpose: Expand the phases in the tracers descriptor "tr". Phases are not repeated for a tracer, thanks to "checkUnique".
 !------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type), ALLOCATABLE, INTENT(INOUT) :: tr(:)               !--- Tracers description vector
-!------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type),       ALLOCATABLE :: ttr(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(INOUT) :: tr(:)               !--- Tracer derived type vector
+!------------------------------------------------------------------------------------------------------------------------------
+  TYPE(trac_type),       ALLOCATABLE :: ttr(:)
   INTEGER,               ALLOCATABLE ::  i0(:), iGen(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:), gen0N(:), phase(:), parents(:), dType(:)
@@ -695 +732 @@
   nq = SIZE(tr, DIM=1)
   nt = 0
-  lerr = getKey('name',       tname, tr); IF(lerr) RETURN            !--- Names of the tracers
-  lerr = getKey('gen0Name',   gen0N, tr); IF(lerr) RETURN            !--- Names of the tracers of first generation
-  lerr = getKey('iGeneration', iGen, tr); IF(lerr) RETURN            !--- Generation number
-  lerr = getKey('phases',     phase, tr); IF(lerr) RETURN            !--- Phases names
-  lerr = getKey('parent',   parents, tr); IF(lerr) RETURN            !--- Parents names
-  lerr = getKey('type',       dType, tr); IF(lerr) RETURN            !--- Tracers types ('tracer' or 'tag')
+  lerr = getKey('name',       tname, tr%keys); IF(lerr) RETURN       !--- Names of the tracers
+  lerr = getKey('gen0Name',   gen0N, tr%keys); IF(lerr) RETURN       !--- Names of the tracers of first generation
+  lerr = getKey('iGeneration', iGen, tr%keys); IF(lerr) RETURN       !--- Generation number
+  lerr = getKey('phases',     phase, tr%keys); IF(lerr) RETURN       !--- Phases names
+  lerr = getKey('parent',   parents, tr%keys); IF(lerr) RETURN       !--- Parents names
+  lerr = getKey('type',       dType, tr%keys); IF(lerr) RETURN       !--- Tracers types ('tracer' or 'tag')
   DO iq = 1, nq                                                      !--- GET THE NUMBER OF TRACERS
     IF(iGen(iq) /= 0) CYCLE                                          !--- Only deal with generation 0 tracers
@@ -726 +763 @@
         IF(lTag) nam = TRIM(nam)//'_'//TRIM(tname(iq))               !--- <parent>_<name> for tags
         ttr(it) = tr(iq)                                             !--- Same <key>=<val> pairs
-        CALL addKey('name', nam, ttr(it))                            !--- Name with possibly phase suffix
-        CALL addKey('phase', p,  ttr(it))                            !--- Single phase entry
+        ttr(it)%name      = TRIM(nam)                                !--- Name with possibly phase suffix
+        ttr(it)%keys%name = TRIM(nam)                                !--- Name inside the keys decriptor
+        ttr(it)%phase     = p                                        !--- Single phase entry
+        CALL addKey('name', nam, ttr(it)%keys)
+        CALL addKey('phase', p,  ttr(it)%keys)
         IF(lExt) THEN
           parent = parents(iq); IF(iGen(iq) > 0) parent = addPhase(parent, p)
           gen0Nm =   gen0N(iq); IF(iGen(iq) > 0) gen0Nm = addPhase(gen0Nm, p)
-          CALL addKey('parent',   parent, ttr(it))
-          CALL addKey('gen0Name', gen0Nm, ttr(it))
+          ttr(it)%parent   = parent
+          ttr(it)%gen0Name = gen0Nm
+          CALL addKey('parent',   parent, ttr(it)%keys)
+          CALL addKey('gen0Name', gen0Nm, ttr(it)%keys)
         END IF
         it = it+1
@@ -740 +782 @@
   END DO
   CALL MOVE_ALLOC(FROM=ttr, TO=tr)
-  CALL delKey(['phases'], tr)                                        !--- Remove "phases" key, useless since "phase" is defined
+  CALL delKey(['phases'],tr)                                         !--- Remove few keys entries
 
 END FUNCTION expandPhases
@@ -755 +797 @@
 !   TO BE ADDED IF NECESSARY: HIGHER MOMENTS AT THE END
 !------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type), INTENT(INOUT) :: tr(:)                            !--- Tracers description vector
-!------------------------------------------------------------------------------------------------------------------------------
-  TYPE(keys_type),       ALLOCATABLE :: tr2(:)
-  INTEGER,               ALLOCATABLE :: iy(:), iz(:), iGen(:)
+  TYPE(trac_type), INTENT(INOUT) :: tr(:)                            !--- Tracer derived type vector
+!------------------------------------------------------------------------------------------------------------------------------
+  TYPE(trac_type),       ALLOCATABLE :: tr2(:)
+  INTEGER,               ALLOCATABLE :: iy(:), iz(:)
+  INTEGER,               ALLOCATABLE ::  iGen(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:), gen0N(:)
   INTEGER :: ig, ng, iq, jq, ip, nq, n, ix(SIZE(tr)), k
@@ -764 +807 @@
 !  tr2 is introduced in order to cope with a bug in gfortran 4.8.5 compiler
 !------------------------------------------------------------------------------------------------------------------------------
-  lerr = getKey('iGeneration', iGen, tr); IF(lerr) RETURN            !--- Generation number
+  lerr = getKey('iGeneration', iGen, tr%keys); IF(lerr) RETURN       !--- Generation number
   nq = SIZE(tr)
   DO ip = nphases, 1, -1
-    lerr = getKey('name',     tname, tr); IF(lerr) RETURN            !--- Names of the tracers of first generation
+    lerr = getKey('name',     tname, tr%keys); IF(lerr) RETURN       !--- Names of the tracers of first generation
     iq = strIdx(tname, addPhase('H2O', ip))
     IF(iq == 0) CYCLE
@@ -783 +826 @@
     END DO
   ELSE
-    lerr = getKey('gen0Name', gen0N, tr); IF(lerr) RETURN            !--- Names of the tracers    iq = 1
+    lerr = getKey('gen0Name',   gen0N, tr%keys); IF(lerr) RETURN     !--- Names of the tracers    iq = 1
     DO jq = 1, nq                                                    !--- Loop on generation 0 tracers
       IF(iGen(jq) /= 0) CYCLE                                        !--- Skip generations /= 0
@@ -805 +848 @@
 LOGICAL FUNCTION mergeTracers(sections, tr) RESULT(lerr)
   TYPE(dataBase_type),  TARGET, INTENT(IN)  :: sections(:)
-  TYPE(keys_type), ALLOCATABLE, INTENT(OUT) ::       tr(:)
-  TYPE(keys_type), POINTER ::   t1(:),   t2(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(OUT) ::       tr(:)
+  TYPE(trac_type), POINTER ::   t1(:),   t2(:)
+  TYPE(keys_type), POINTER ::   k1(:),   k2(:)
   INTEGER,     ALLOCATABLE :: ixct(:), ixck(:)
   INTEGER :: is, ik, ik1, ik2, nk2, i1, i2, nt2
@@ -814 +858 @@
   lerr = .FALSE.
   keys = ['parent     ', 'type       ', 'iGeneration']               !--- Mandatory keys
-  t1 => sections(1)%trac(:)                                          !--- Alias: first tracers section
-  lerr = getKey('name', n1, t1); IF(lerr) RETURN                     !--- Names of the tracers
+  t1 => sections(1)%trac(:); k1 => t1(:)%keys                        !--- Alias: first tracers section, corresponding keys
+  lerr = getKey('name', n1, k1); IF(lerr) RETURN                     !--- Names of the tracers
   tr = t1
   !----------------------------------------------------------------------------------------------------------------------------
@@ -821 +865 @@
   !----------------------------------------------------------------------------------------------------------------------------
     t2  => sections(is)%trac(:)                                      !--- Alias: current tracers section
-    lerr = getKey('name', n2, t2); IF(lerr) RETURN                   !--- Names of the tracers
+    k2  => t2(:)%keys
+    lerr = getKey('name', n2, k2); IF(lerr) RETURN                   !--- Names of the tracers
     nt2  = SIZE(t2(:), DIM=1)                                        !--- Number of tracers in section
     ixct = strIdx(n1(:), n2(:))                                      !--- Indexes of common tracers
@@ -829 +874 @@
     CALL msg(n1(PACK(ixct, MASK = ixct/=0)), modname, nmax=128)      !--- Display duplicates (the 128 first at most)
     !--------------------------------------------------------------------------------------------------------------------------
-    DO i2=1,nt2; tnam = TRIM(n2(i2))                                 !=== LOOP ON COMMON TRACERS
+    DO i2=1,nt2; tnam = TRIM(t2(i2)%name)                            !=== LOOP ON COMMON TRACERS
     !--------------------------------------------------------------------------------------------------------------------------
       i1 = ixct(i2); IF(i1 == 0) CYCLE                               !--- Idx in t1(:) ; skip new tracers
@@ -836 +881 @@
       s1=' of "'//TRIM(tnam)//'" in "'//TRIM(sections(is)%name)//'" not matching previous value'
       DO ik = 1, SIZE(keys)
-        lerr = getKey(keys(ik), v1, i1, t1)
-        lerr = getKey(keys(ik), v2, i2, t2)
+        lerr = getKey(keys(ik), v1, i1, k1)
+        lerr = getKey(keys(ik), v2, i2, k2)
         lerr = v1 /= v2; IF(fmsg(TRIM(keys(ik))//TRIM(s1), modname, lerr)) RETURN
       END DO
 
-      !=== GET THE INDICES IN tr(i2)%key(:) OF THE KEYS ALSO PRESENT IN tr(i1)%key(:)
-      nk2  =   SIZE(t2(i2)%key(:))                                   !--- Keys number in current section
-      ixck = strIdx(t1(i1)%key(:), t2(i2)%key(:))                    !--- Common keys indexes
-      !--- APPEND THE NEW KEYS PAIRS IN tr(i1)%key(:)
-      tr(i1)%key = [ tr(i1)%key, PACK(tr(i2)%key, MASK = ixck==0)]
-      tr(i1)%val = [ tr(i1)%val, PACK(tr(i2)%val, MASK = ixck==0)]
+      !=== GET THE INDICES IN tr(i2)%keys%key(:) OF THE KEYS ALSO PRESENT IN tr(i1)%keys%key(:)
+      nk2  =   SIZE(k2(i2)%key(:))                                   !--- Keys number in current section
+      ixck = strIdx(k1(i1)%key(:), k2(i2)%key(:))                    !--- Common keys indexes
+      !--- APPEND THE NEW KEYS PAIRS IN tr(i1)%keys%key(:)
+      tr(i1)%keys%key = [ tr(i1)%keys%key, PACK(tr(i2)%keys%key, MASK = ixck==0)]
+      tr(i1)%keys%val = [ tr(i1)%keys%val, PACK(tr(i2)%keys%val, MASK = ixck==0)]
 
       !=== KEEP TRACK OF THE COMPONENTS NAMES: COMA-SEPARATED LIST
-      lerr = getKey('component', v1, i1, t1)
-      lerr = getKey('component', v2, i2, t2)
-      CALL addKey('component', TRIM(v1)//','//TRIM(v2), tr(i1))
+      lerr = getKey('component', v1, i1, k1)
+      lerr = getKey('component', v2, i2, k2)
+      tr(i1)%component = TRIM(v1)//','//TRIM(v2)
+      CALL addKey('component', TRIM(v1)//','//TRIM(v2), tr(i1)%keys)
 
       !=== FOR TRACERS COMMON TO PREVIOUS AND CURRENT SECTIONS: CHECK WETHER SOME KEYS HAVE DIFFERENT VALUES ; KEEP OLD ONE
       DO ik2 = 1, nk2                                                !--- Collect the corresponding indices
         ik1 = ixck(ik2); IF(ik1 == 0) CYCLE
-        IF(t1(i1)%val(ik1) == t2(i2)%val(ik2)) ixck(ik2)=0
+        IF(k1(i1)%val(ik1) == k2(i2)%val(ik2)) ixck(ik2)=0
       END DO
       IF(ALL(ixck==0)) CYCLE                                         !--- No identical keys with /=values => nothing to display
       CALL msg('Key(s)'//TRIM(s1), modname)                          !--- Display the  keys with /=values (names list)
       DO ik2 = 1, nk2                                                !--- Loop on keys found in both t1(:) and t2(:)
-        knam = t2(i2)%key(ik2)                                       !--- Name of the current key
+        knam = k2(i2)%key(ik2)                                       !--- Name of the current key
         ik1 = ixck(ik2)                                              !--- Corresponding index in t1(:)
         IF(ik1 == 0) CYCLE                                           !--- New keys are skipped
-        v1 = t1(i1)%val(ik1); v2 = t2(i2)%val(ik2)                   !--- Key values in t1(:) and t2(:)
+        v1 = k1(i1)%val(ik1); v2 = k2(i2)%val(ik2)                   !--- Key values in t1(:) and t2(:)
         CALL msg(' * '//TRIM(knam)//'='//TRIM(v2)//' ; previous value kept:'//TRIM(v1), modname)
       END DO
@@ -879 +925 @@
 LOGICAL FUNCTION cumulTracers(sections, tr, lRename) RESULT(lerr)
   TYPE(dataBase_type),  TARGET, INTENT(IN)  :: sections(:)
-  TYPE(keys_type), ALLOCATABLE, INTENT(OUT) ::       tr(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(OUT) ::       tr(:)
   LOGICAL,            OPTIONAL, INTENT(IN)  :: lRename               !--- .TRUE.: add a section suffix to identical names
   CHARACTER(LEN=maxlen)  :: tnam_new, modname
@@ -888 +934 @@
   tr = [( sections(is)%trac(:), is = 1, SIZE(sections) )]            !--- Concatenated tracers vector
   IF(PRESENT(lRename)) THEN; IF(lRename) RETURN; END IF              !--- No renaming: finished
-  lerr = getKey('name',     tname, tr); IF(lerr) RETURN              !--- Names
-  lerr = getKey('parent',  parent, tr); IF(lerr) RETURN              !--- Parents
-  lerr = getKey('component', comp, tr); IF(lerr) RETURN              !--- Component name
+  lerr = getKey('name',     tname, tr%keys); IF(lerr) RETURN         !--- Names
+  lerr = getKey('parent',  parent, tr%keys); IF(lerr) RETURN         !--- Parents
+  lerr = getKey('component', comp, tr%keys); IF(lerr) RETURN         !--- Component name
   !----------------------------------------------------------------------------------------------------------------------------
   DO iq = 1, SIZE(tr); IF(COUNT(tname == tname(iq)) == 1) CYCLE      !=== LOOP ON TRACERS
   !----------------------------------------------------------------------------------------------------------------------------
     tnam_new = TRIM(tname(iq))//'_'//TRIM(comp(iq))                  !--- Same with section extension
-    CALL addKey('name', tnam_new, tr(iq))                            !--- Modify tracer name
+    CALL addKey('name', tnam_new, tr(iq)%keys)                       !--- Modify tracer name
+    tr(iq)%name = TRIM(tnam_new)                                     !--- Modify tracer name
     !--------------------------------------------------------------------------------------------------------------------------
     DO jq = 1, SIZE(tr); IF(parent(jq) /= tname(iq)) CYCLE           !=== LOOP ON TRACERS PARENTS
     !--------------------------------------------------------------------------------------------------------------------------
-      CALL addKey('parent', tnam_new, tr(jq))                        !--- Modify tracer name
+      CALL addKey('parent', tnam_new, tr(jq)%keys)                   !--- Modify tracer name
+      tr(jq)%parent = TRIM(tnam_new)                                 !--- Modify tracer name
     !--------------------------------------------------------------------------------------------------------------------------
     END DO
@@ -946 +994 @@
     tmp = int2str([(iq, iq=1, nq)])
   ELSE
-    lerr = getKey(nam, tmp, dBase(idb)%trac(:), lDisp=lMandatory)
+    lerr = getKey(nam, tmp, dBase(idb)%trac(:)%keys, lDisp=lMandatory)
   END IF
   IF(lerr) THEN; lerr = lMandatory; RETURN; END IF
@@ -965 +1013 @@
 LOGICAL FUNCTION aliasTracer(tname, trac, alias) RESULT(lerr)                  !=== TRACER NAMED "tname" - SCALAR
   CHARACTER(LEN=*),         INTENT(IN)  :: tname
-  TYPE(keys_type), TARGET,  INTENT(IN)  :: trac(:)
-  TYPE(keys_type), POINTER, INTENT(OUT) :: alias
+  TYPE(trac_type), TARGET,  INTENT(IN)  :: trac(:)
+  TYPE(trac_type), POINTER, INTENT(OUT) :: alias
   INTEGER :: it
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tnames(:)
   alias => NULL()
-  lerr = getKey('name', tnames, trac(:))
+  lerr = getKey('name', tnames, trac(:)%keys)
   it = strIdx(tnames, tname)
   lerr = it /= 0; IF(.NOT.lerr) alias => trac(it)
@@ -976 +1024 @@
 !==============================================================================================================================
 LOGICAL FUNCTION trSubset_Indx(trac, idx, alias) RESULT(lerr)                  !=== TRACERS WITH INDICES "idx(:)" - VECTOR
-  TYPE(keys_type), ALLOCATABLE, INTENT(IN)  ::  trac(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(IN)  ::  trac(:)
   INTEGER,                      INTENT(IN)  ::   idx(:)
-  TYPE(keys_type), ALLOCATABLE, INTENT(OUT) :: alias(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(OUT) :: alias(:)
   alias = trac(idx)
   lerr = indexUpdate(alias)
@@ -984 +1032 @@
 !------------------------------------------------------------------------------------------------------------------------------
 LOGICAL FUNCTION trSubset_Name(trac, tname, alias) RESULT(lerr)                !=== TRACERS NAMED "tname(:)" - VECTOR
-  TYPE(keys_type), ALLOCATABLE, INTENT(IN)  ::  trac(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(IN)  ::  trac(:)
   CHARACTER(LEN=*),             INTENT(IN)  :: tname(:)
-  TYPE(keys_type), ALLOCATABLE, INTENT(OUT) :: alias(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(OUT) :: alias(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tnames(:)
-  lerr = getKey('name', tnames, trac(:))
+  lerr = getKey('name', tnames, trac(:)%keys)
   alias = trac(strIdx(tnames, tname))
   lerr = indexUpdate(alias)
@@ -994 +1042 @@
 !==============================================================================================================================
 LOGICAL FUNCTION trSubset_gen0Name(trac, gen0Nm, alias) RESULT(lerr)           !=== TRACERS OF COMMON 1st GENERATION ANCESTOR
-  TYPE(keys_type), ALLOCATABLE, INTENT(IN)  :: trac(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(IN)  :: trac(:)
   CHARACTER(LEN=*),             INTENT(IN)  :: gen0Nm
-  TYPE(keys_type), ALLOCATABLE, INTENT(OUT) :: alias(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(OUT) :: alias(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: gen0N(:)
-  lerr = getKey('gen0Name', gen0N, trac(:))
+  lerr = getKey('gen0Name', gen0N, trac(:)%keys)
   alias = trac(strFind(delPhase(gen0N), gen0Nm))
   lerr = indexUpdate(alias)
@@ -1006 +1054 @@
 
 !==============================================================================================================================
-!=== UPDATE THE INDEXES iqParent, iqDescen, nqDescen, nqChildren IN THE TRACERS DESCRIPTOR LIST "tr" ==========================
+!=== UPDATE THE INDEXES iqParent, iqDescend AND iGeneration IN THE TRACERS DESCRIPTOR LIST "tr" (USEFULL FOR SUBSETS) =========
 !==============================================================================================================================
 LOGICAL FUNCTION indexUpdate(tr) RESULT(lerr)
-  TYPE(keys_type), INTENT(INOUT) :: tr(:)
+  TYPE(trac_type), INTENT(INOUT) :: tr(:)
   INTEGER :: iq, jq, nq, ig, nGen
   INTEGER,               ALLOCATABLE :: iqDescen(:), ix(:), iy(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tnames(:), parent(:)
   INTEGER,       DIMENSION(SIZE(tr)) :: iqParent, iGen
-  lerr = getKey('name',   tnames, tr); IF(lerr) RETURN               !--- Names
-  lerr = getKey('parent', parent, tr); IF(lerr) RETURN               !--- Parents
+  lerr = getKey('name',   tnames, tr%keys); IF(lerr) RETURN          !--- Names
+  lerr = getKey('parent', parent, tr%keys); IF(lerr) RETURN          !--- Parents
   nq = SIZE(tr)
 
-  !=== iqParent
+  !=== iqParent, iGeneration
   DO iq = 1, nq; iGen(iq) = 0; jq = iq
     iqParent(iq) = strIdx(tnames, parent(iq))
     DO; jq = strIdx(tnames, parent(jq)); IF(jq == 0) EXIT; iGen(iq) = iGen(iq) + 1; END DO
-    CALL addKey('iqParent', iqParent(iq), tr(iq))
+    CALL addKey('iqParent',   parent(iq), tr(iq)%keys)
+    CALL addKey('iqGeneration', iGen(iq), tr(iq)%keys)
   END DO
 
@@ -1029 +1078 @@
   DO iq = 1, nq
     ix = [iq]; ALLOCATE(iqDescen(0))
-    CALL addKey('nqChildren', 0, tr(iq))
     DO ig = iGen(iq)+1, nGen
       iy = find(iqParent, ix); iqDescen = [iqDescen, iy]; ix = iy
       IF(ig /= iGen(iq)+1) CYCLE
-      CALL addKey('nqChildren', SIZE(iqDescen), tr(iq))
+      CALL addKey('nqChildren', SIZE(iqDescen), tr(iq)%keys)
+      tr(iq)%nqChildren = SIZE(iqDescen)
     END DO
-    CALL addKey('iqDescen', strStack(int2str(iqDescen)), tr(iq))
-    CALL addKey('nqDescen',             SIZE(iqDescen),  tr(iq))
+    CALL addKey('iqDescen', strStack(int2str(iqDescen)), tr(iq)%keys)
+    CALL addKey('nqDescen',             SIZE(iqDescen),  tr(iq)%keys)
+    tr(iq)%iqDescen =      iqDescen
+    tr(iq)%nqDescen = SIZE(iqDescen)
     DEALLOCATE(iqDescen)
   END DO
@@ -1044 +1095 @@
   
 !==============================================================================================================================
-!=== READ FILE "fnam" TO APPEND THE "dBase" TRACERS DATABASE WITH AS MUCH SECTIONS AS ISOTOPES CLASSES IN "isot(:)%name":  ====
-!===  * Each section dBase(i)%name contains the isotopes "dBase(i)%trac(:)" descending on "dBase(i)%name"="iso(i)%name"    ====
+!=== READ FILE "fnam" TO APPEND THE "dBase" TRACERS DATABASE WITH AS MUCH SECTIONS AS PARENTS NAMES IN "isot(:)%parent":   ====
+!===  * Each section dBase(i)%name contains the isotopes "dBase(i)%trac(:)" descending on "dBase(i)%name"="iso(i)%parent"  ====
 !===  * For each isotopes class, the <key>=<val> vector of each tracer is moved into the isotopes descriptor "isot"        ====
 !=== NOTES:                                                                                                                ====
 !===  * Most of the "isot" components have been defined in the calling routine (processIsotopes):                          ====
-!===      name,  nzone, zone(:),  niso, keys(:)%name,  ntiso, trac(:),  nphas, phas,  iqIsoPha(:,:),  itZonPhi(:,:)        ====
+!===      parent,  nzone, zone(:),  niso, keys(:)%name,  ntiso, trac(:),  nphas, phas,  iqIsoPha(:,:),  itZonPhi(:,:)      ====
 !===  * Same syntax for isotopes file and "tracer.def": a tracers section contains one line for each of its isotopes       ====
 !===  * Each tracers section can contain a "params" virtual isotope line of isotopes parameters default values             ====
@@ -1058 +1109 @@
 LOGICAL FUNCTION readIsotopesFile(fnam, isot) RESULT(lerr)
   CHARACTER(LEN=*),        INTENT(IN)    :: fnam                     !--- Input file name
-  TYPE(isot_type), TARGET, INTENT(INOUT) :: isot(:)                  !--- Isotopes descriptors (field %name must be defined!)
+  TYPE(isot_type), TARGET, INTENT(INOUT) :: isot(:)                  !--- Isotopes descriptors (field %parent must be defined!)
   LOGICAL :: lFound
   INTEGER :: is, iis, it, idb, ndb, nb0
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: vals(:), tname(:), iname(:)
+  CHARACTER(LEN=maxlen), ALLOCATABLE :: vals(:)
   CHARACTER(LEN=maxlen)              :: modname
-  TYPE(keys_type),           POINTER ::   t
+  TYPE(trac_type),           POINTER ::   tt(:), t
   TYPE(dataBase_type),   ALLOCATABLE ::  tdb(:)
   modname = 'readIsotopesFile'
 
   !--- THE INPUT FILE MUST BE PRESENT
-  INQUIRE(FILE=TRIM(fnam), EXIST=lFound)
-  lerr = .NOT.lFound
-  CALL msg('Missing isotopes parameters file "'//TRIM(fnam)//'"', modname, lerr)
-  IF(lerr) RETURN
-
-  !--- READ THE FILE SECTIONS, ONE EACH ISOTOPES CLASS (FIEDL %name)
+  INQUIRE(FILE=TRIM(fnam), EXIST=lFound); lerr = .NOT.lFound
+  IF(fmsg('Missing isotopes parameters file "'//TRIM(fnam)//'"', modname, lerr)) RETURN
+
+  !--- READ THE FILE SECTIONS, ONE EACH PARENT TRACER
   nb0 = SIZE(dBase, DIM=1)+1                                         !--- Next database element index
-  lerr = readSections(fnam,strStack(isot(:)%name,'|')); IF(lerr) RETURN !--- Read sections, one each isotopes class %name
+  lerr = readSections(fnam,strStack(isot(:)%parent,'|')); IF(lerr) RETURN !--- Read sections, one each parent tracer
   ndb = SIZE(dBase, DIM=1)                                           !--- Current database size
   DO idb = nb0, ndb
@@ -1081 +1130 @@
 
     !--- GET FEW GLOBAL KEYS FROM "def" FILES AND ADD THEM TO THE 'params' SECTION
-!    lerr = addKeysFromDef(dBase(idb)%trac, 'params');     IF(lerr) RETURN
+    CALL addKeysFromDef(dBase(idb)%trac, 'params')
 
     !--- SUBSTITUTE THE KEYS DEFINED IN THE 'params' VIRTUAL TRACER ; SUBSTITUTE LOCAL KEYS ; REMOVE 'params' VIRTUAL TRACER
-    lerr = subDefault(dBase(idb)%trac, 'params', .TRUE.); IF(lerr) RETURN
+    CALL subDefault(dBase(idb)%trac, 'params', .TRUE.)
+
+    tt => dBase(idb)%trac
 
     !--- REDUCE THE EXPRESSIONS TO OBTAIN SCALARS AND TRANSFER THEM TO THE "isot" ISOTOPES DESCRIPTORS VECTOR
-    lerr = getKey('name', tname, dBase(idb)%trac);        IF(lerr) RETURN
-    lerr = getKey('name', iname, isot(iis)%keys);         IF(lerr) RETURN
     DO it = 1, SIZE(dBase(idb)%trac)
       t => dBase(idb)%trac(it)
-      is = strIdx(iname, tname(it))                                  !--- Index in "iname(:)" of isotope "tname(it)"
+      is = strIdx(isot(iis)%keys(:)%name, t%name)                    !--- Index in "isot(iis)%keys(:)%name" of isotope "t%name"
       IF(is == 0) CYCLE
-      lerr = ANY(reduceExpr(t%val, vals)); IF(lerr) RETURN           !--- Reduce expressions ; detect non-numerical elements
-      isot(iis)%keys(is)%key = t%key
+      lerr = ANY(reduceExpr(t%keys%val, vals)); IF(lerr) RETURN      !--- Reduce expressions ; detect non-numerical elements
+      isot(iis)%keys(is)%key = t%keys%key
       isot(iis)%keys(is)%val = vals
     END DO
 
     !--- CHECK FOR MISSING ISOTOPES (NO KEYS ALLOCATED)
-    lerr = checkList(iname, .NOT.[( ALLOCATED(isot(iis)%keys(is)%key), is=1, SIZE(isot(iis)%keys) )], &
+    lerr = checkList(isot(iis)%keys(:)%name, .NOT.[( ALLOCATED(isot(iis)%keys(is)%key), is=1, SIZE(isot(iis)%keys) )], &
                      'Check file "'//TRIM(fnam)//'" in section "'//TRIM(dBase(idb)%name)//'"', 'isotopes', 'missing')
     IF(lerr) RETURN
@@ -1112 +1161 @@
 
   !--- GET THE isoCheck ENTRY FROM THE *.DEF FILES (MIGHT BE CHANGED TO A CLASS-DEPENDANT KEYWORD)
-  CALL get_in('ok_iso_verif', isot(strIdx(iname, 'H2O'))%check, .FALSE.)
+  CALL get_in('ok_iso_verif', isot(strIdx(isot%parent, 'H2O'))%check, .FALSE.)
 
   lerr = dispIsotopes()
@@ -1122 +1171 @@
   INTEGER :: ik, nk, ip, it, nt
   CHARACTER(LEN=maxlen) :: prf
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: ttl(:), val(:,:), tname(:)
+  CHARACTER(LEN=maxlen), ALLOCATABLE :: ttl(:), val(:,:)
   CALL msg('Isotopes parameters read from file "'//TRIM(fnam)//'":', modname)
-  DO ip = 1, SIZE(isot)                                              !--- Loop on isotopes classes
-    IF(SIZE(isot(ip)%keys) == 0) CYCLE
+  DO ip = 1, SIZE(isot)                                              !--- Loop on parents tracers
     nk = SIZE(isot(ip)%keys(1)%key)                                  !--- Same keys for each isotope
     nt = SIZE(isot(ip)%keys)                                         !--- Number of isotopes
@@ -1131 +1179 @@
     ALLOCATE(ttl(nk+2), val(nt,nk+1))
     ttl(1:2) = ['it  ','name']; ttl(3:nk+2) = isot(ip)%keys(1)%key(:)!--- Titles line with keys names
-    lerr = getKey('name', tname, isot(ip)%keys); IF(lerr) RETURN
-    val(:,1) = tname                                                 !--- Values table 1st column: isotopes names
+    val(:,1) = isot(ip)%keys(:)%name                                 !--- Values table 1st column: isotopes names  
     DO ik = 1, nk
       DO it = 1, nt
@@ -1152 +1199 @@
 !=== IF ISOTOPES (2ND GENERATION TRACERS) ARE DETECTED:                                                                     ===
 !===    * COMPUTE MOST OF THE RELATED QUANTITIES ("isot" COMPONENTS).                                                       ===
-!===    * COMPUTE FEW ISOTOPES-DEDICATED "trac" COMPONENTS (defined by "keys(:)")                                           ===
-!===    * CALL readIsotopesFile TO GET PHYSICAL QUANTITIES (<key>=<val> PAIRS)     /!\ DISABLED FUNCTION /!\                ===
-!==============================================================================================================================
-LOGICAL FUNCTION processIsotopes(keys, isot, iClasses) RESULT(lerr)
-  TYPE(keys_type),  TARGET,              OPTIONAL, INTENT(INOUT) ::   keys(:)
-  TYPE(isot_type),  TARGET, ALLOCATABLE, OPTIONAL, INTENT(OUT)   ::   isot(:)
-  CHARACTER(LEN=*), TARGET,              OPTIONAL, INTENT(IN)    :: iClasses(:)
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: str1(:), str2(:)             !--- Temporary storage
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:), parent(:), dType(:), phase(:), gen0N(:), iCla(:)
-  CHARACTER(LEN=maxlen) :: iClass, modname
-  CHARACTER(LEN=1)      :: ph                                        !--- Phase
-  LOGICAL,  ALLOCATABLE :: ll(:)                                     !--- Mask
-  INTEGER,  ALLOCATABLE :: iGen(:)
-  INTEGER :: ic, ip, iq, ii, it, iz
-  TYPE(isot_type), POINTER :: i1
-  TYPE(keys_type), POINTER :: k(:)
+!===    * COMPUTE FEW ISOTOPES-DEDICATED "trac" COMPONENTS                                                                  ===
+!===    * CALL readIsotopesFile TO GET PHYSICAL QUANTITIES (<key>=<val> PAIRS)                                              ===
+!===      NOTE: THIS IS DONE HERE (IN A ROUTINE CALLED BY THE DYNAMIC), BECAUSE THE DYNAMIC NEEDS FEW PHYSICAL PARAMETERS.  ===
+!==============================================================================================================================
+LOGICAL FUNCTION processIsotopes(iNames) RESULT(lerr)
+  CHARACTER(LEN=maxlen), TARGET, OPTIONAL, INTENT(IN)  :: iNames(:)
+  CHARACTER(LEN=maxlen), ALLOCATABLE :: p(:), str(:)                 !--- Temporary storage
+  CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:), parent(:), dType(:), phase(:), gen0N(:)
+  CHARACTER(LEN=maxlen) :: iName, modname
+  CHARACTER(LEN=1)   :: ph                                           !--- Phase
+  INTEGER, ALLOCATABLE ::  iGen(:)
+  INTEGER :: ic, ip, iq, it, iz
+  LOGICAL, ALLOCATABLE :: ll(:)                                      !--- Mask
+  TYPE(trac_type), POINTER   ::  t(:), t1
+  TYPE(isot_type), POINTER   ::  i
 
   lerr = .FALSE.
   modname = 'readIsotopesFile'
-  k => tracers; IF(PRESENT(keys )) k => keys
-  lerr = getKey('name',       tname, k); IF(lerr) RETURN             !--- Names
-  lerr = getKey('parent',    parent, k); IF(lerr) RETURN             !--- Parents
-  lerr = getKey('type',       dType, k); IF(lerr) RETURN             !--- Tracer type
-  lerr = getKey('phase',      phase, k); IF(lerr) RETURN             !--- Phase
-  lerr = getKey('gen0Name',   gen0N, k); IF(lerr) RETURN             !--- 1st generation ancestor name
-  lerr = getKey('iGeneration', iGen, k); IF(lerr) RETURN             !--- Generation number
-
-  !--- INITIALIZATION IF ISOTOPES-SPECIFIC KEYS (MUST BE DEFINED EVEN WITHOUT ISOTOPES)
-  DO iq = 1, SIZE(k)
-    CALL addKey('iso_iGroup',0, k(iq))                               !--- Family       idx in list "isotopes(:)%parent"
-    CALL addKey('iso_iName', 0, k(iq))                               !--- Isotope      idx in effective isotopes list
-    CALL addKey('iso_iZone', 0, k(iq))                               !--- Tagging zone idx in effective zones    list
-    CALL addKey('iso_iPhas', 0, k(iq))                               !--- Phase        idx in effective phases   list
-  END DO
+
+  t => tracers
+
+  lerr = getKey('name',       tname, t%keys); IF(lerr) RETURN       !--- Names
+  lerr = getKey('parent',    parent, t%keys); IF(lerr) RETURN       !--- Parents
+  lerr = getKey('type',       dType, t%keys); IF(lerr) RETURN       !--- Tracer type
+  lerr = getKey('phase',      phase, t%keys); IF(lerr) RETURN       !--- Phase
+  lerr = getKey('gen0Name',   gen0N, t%keys); IF(lerr) RETURN       !--- 1st generation ancestor name
+  lerr = getKey('iGeneration', iGen, t%keys); IF(lerr) RETURN       !--- Generation number
 
   !--- GET FROM "tracers" THE FULL LIST OF AVAILABLE ISOTOPES CLASSES
-  iCla = PACK(delPhase(parent), MASK = dType=='tracer' .AND. iGen==1)
-  CALL strReduce(iCla)
-
-  !--- CHECK WHETHER NEEDED ISOTOPES CLASSES "iClasses" ARE AVAILABLE OR NOT
-  IF(PRESENT(iClasses)) THEN
-    DO it = 1, SIZE(iClasses)
-      lerr = ALL(iCla /= iClasses(it))
-      IF(fmsg('No isotopes class "'//TRIM(iClasses(it))//'" found among tracers', modname, lerr)) RETURN
+  p = PACK(delPhase(parent), MASK = dType=='tracer' .AND. iGen==1)
+  CALL strReduce(p, nbIso)
+
+  !--- CHECK WHETHER NEEDED ISOTOPES CLASSES "iNames" ARE AVAILABLE OR NOT
+  IF(PRESENT(iNames)) THEN
+    DO it = 1, SIZE(iNames)
+      lerr = ALL(p /= iNames(it))
+      IF(fmsg('No isotopes class "'//TRIM(iNames(it))//'" found among tracers', modname, lerr)) RETURN
     END DO
-    iCla = iClasses
+    p = iNames; nbIso = SIZE(p)
   END IF
-  nbIso = SIZE(iCla)
-
-  !--- USE THE ARGUMENT "isot" TO STORE THE ISOTOPIC DATABASE OR THE LOCAL VECTOR "isotopes"
-  IF(PRESENT(isot)) THEN
-    ALLOCATE(    isot(nbIso))
-  ELSE
-    IF(ALLOCATED(isotopes)) DEALLOCATE(isotopes)
-    ALLOCATE(isotopes(nbIso))
-  END IF
+  IF(ALLOCATED(isotopes)) DEALLOCATE(isotopes)
+  ALLOCATE(isotopes(nbIso))
+
   IF(nbIso==0) RETURN                                                !=== NO ISOTOPES: FINISHED
 
   !--- ISOTOPES RELATED VARIABLES ; NULL OR EMPTY IF NO ISOTOPES
-  DO ic = 1, nbIso                                                   !--- Loop on isotopes classes
-    IF(     PRESENT(isot)) i1 => isot    (ic)
-    IF(.NOT.PRESENT(isot)) i1 => isotopes(ic)
-    iClass = iCla(ic)                                                !--- Current isotopes class name (parent tracer name)
-    i1%name = iClass
-
-    !=== Isotopes children of tracer "iClass": mask, names, number (same for each phase of "iClass")
-    ll = dType=='tracer' .AND. delPhase(parent) == iClass .AND. phase == 'g'
-    str1 = PACK(delPhase(tname), MASK = ll)                          !--- Effectively found isotopes of "iClass"
-    i1%niso = SIZE(str1)                                             !--- Number of "effectively found isotopes of "iname"
-    ALLOCATE(i1%keys(i1%niso))
-    DO it = 1, i1%niso; CALL addKey('name', str1(it), i1%keys(it)); END DO
-
-    !=== Geographic tagging tracers descending on tracer "iClass": mask, names, number
-    ll = dType=='tag'    .AND. delPhase(gen0N) == iClass .AND. iGen == 2
-    i1%zone = PACK(strTail(tname, '_', .TRUE.), MASK = ll)           !--- Tagging zones names  for isotopes category "iname"
-    CALL strReduce(i1%zone)
-    i1%nzone = SIZE(i1%zone)                                         !--- Tagging zones number for isotopes category "iClass"
-
-    !=== Geographic tracers of the isotopes children of tracer "iClass" (same for each phase of "iClass")
+  isotopes(:)%parent = p
+  DO ic = 1, SIZE(p)                                                 !--- Loop on isotopes classes
+    i => isotopes(ic)
+    iname = i%parent                                                 !--- Current isotopes class name (parent tracer name)
+
+    !=== Isotopes children of tracer "iname": mask, names, number (same for each phase of "iname")
+    ll = dType=='tracer' .AND. delPhase(parent) == iname .AND. phase == 'g'
+    str = PACK(delPhase(tname), MASK = ll)                           !--- Effectively found isotopes of "iname"
+    i%niso = SIZE(str)                                               !--- Number of "effectively found isotopes of "iname"
+    ALLOCATE(i%keys(i%niso))
+    FORALL(it = 1:i%niso) i%keys(it)%name = str(it)
+
+    !=== Geographic tagging tracers descending on tracer "iname": mask, names, number
+    ll = dType=='tag'    .AND. delPhase(gen0N) == iname .AND. iGen == 2
+    i%zone = PACK(strTail(tname,'_',.TRUE.), MASK = ll)              !--- Tagging zones names  for isotopes category "iname"
+    CALL strReduce(i%zone)
+    i%nzone = SIZE(i%zone)                                           !--- Tagging zones number for isotopes category "iname"
+
+    !=== Geographic tracers of the isotopes children of tracer "iname" (same for each phase of "iname")
     !    NOTE: One might like to create a similar variable for 2nd generation tagging tracers (tagging the gen1 tracers)
-    str2 = PACK(delPhase(tname), MASK=ll)
-    CALL strReduce(str2)
-    i1%ntiso = i1%niso + SIZE(str2)                                  !--- Number of isotopes + their geographic tracers [ntiso]
-    ALLOCATE(i1%trac(i1%ntiso))
-    DO it =         1, i1%niso;  i1%trac(it) = str1(it);         END DO
-    DO it = i1%niso+1, i1%ntiso; i1%trac(it) = str2(it-i1%niso); END DO
-
-    !=== Phases for tracer "iClass"
-    i1%phase = ''
-    DO ip = 1, nphases; ph = known_phases(ip:ip); IF(ANY(tname == addPhase(iClass, ph))) i1%phase = TRIM(i1%phase)//ph; END DO
-    i1%nphas = LEN_TRIM(i1%phase)                                       !--- Equal to "nqo" for water
+    str = PACK(delPhase(tname), MASK=ll)
+    CALL strReduce(str)
+    i%ntiso = i%niso + SIZE(str)                                     !--- Number of isotopes + their geographic tracers [ntiso]
+    ALLOCATE(i%trac(i%ntiso))
+    FORALL(it = 1:i%niso) i%trac(it) = i%keys(it)%name
+    FORALL(it = i%niso+1:i%ntiso) i%trac(it) = str(it-i%niso)
+
+    !=== Phases for tracer "iname"
+    i%phase = ''
+    DO ip = 1, nphases; ph = known_phases(ip:ip); IF(strIdx(t%name,addPhase(iname, ph)) /= 0) i%phase = TRIM(i%phase)//ph; END DO
+    i%nphas = LEN_TRIM(i%phase)                                       !--- Equal to "nqo" for water
 
     !=== Tables giving the index in a table of effectively found items for each dynamical tracer (1<=iq<=nqtot)
-    DO iq = 1, SIZE(tracers)
-      ii = strIdx(i1%trac, strHead(delPhase(tname(iq)), '_', .TRUE.))
-      iz = strIdx(i1%zone, strTail(         tname(iq),  '_', .TRUE.))
-      ip =  INDEX(i1%phase,            TRIM(phase(iq)              ))
-      IF(delPhase(gen0N(iq)) /= iClass .OR. iGen(iq) == 0) CYCLE     !--- Only deal with tracers descending on "iClass"
-      CALL addKey('iso_iGroup',ic, k(iq))                            !--- Family       idx in list "isotopes(:)%name"
-      CALL addKey('iso_iName', ii, k(iq))                            !--- Isotope      idx in effective isotopes list
-      CALL addKey('iso_iZone', iz, k(iq))                            !--- Tagging zone idx in effective zones    list
-      CALL addKey('iso_iPhas', ip, k(iq))                            !--- Phase        idx in effective phases   list
-      IF(iGen(iq) /= 2) CALL addKey('iso_iZone', 0, k(iq))           !--- Skip possible generation 1 tagging tracers
+    DO iq = 1, SIZE(t)
+      t1 => tracers(iq)
+      IF(delPhase(t1%gen0Name)/=iname .OR. t1%iGeneration==0) CYCLE  !--- Only deal with tracers descending on "iname"
+      t1%iso_iGroup = ic                                             !--- Isotopes family       idx in list "isotopes(:)%parent"
+      t1%iso_iName  = strIdx(i%trac, strHead(delPhase(t1%name),'_',.TRUE.)) !--- Current isotope       idx in effective isotopes list
+      t1%iso_iZone  = strIdx(i%zone,          strTail(t1%name, '_',.TRUE.)) !--- Current isotope zone  idx in effective zones    list
+      t1%iso_iPhase =  INDEX(i%phase,TRIM(t1%phase))                 !--- Current isotope phase idx in effective phases   list
+      IF(t1%iGeneration /= 2) t1%iso_iZone = 0                       !--- Skip possible generation 1 tagging tracers
     END DO
 
     !=== Table used to get iq (index in dyn array, size nqtot) from the isotope and phase indexes ; the full isotopes list
     !    (including tagging tracers) is sorted this way:  iso1, iso2, ..., iso1_zone1, iso2_zone1, ..., iso1_zoneN, iso2_zoneN
-    i1%iqIsoPha = RESHAPE( [( (strIdx(tname,  addPhase(i1%trac(it),i1%phase(ip:ip))),         it=1, i1%ntiso), ip=1, i1%nphas)], &
-                         [i1%ntiso, i1%nphas] )
+    i%iqIsoPha = RESHAPE( [( (strIdx(t%name,  addPhase(i%trac(it),i%phase(ip:ip))),       it=1, i%ntiso), ip=1, i%nphas)], &
+                         [i%ntiso, i%nphas] )
     !=== Table used to get iq (index in dyn array, size nqtot) from the water and isotope and phase indexes ; the full isotopes list
     !    (including tagging tracers) is sorted this way:  iso1, iso2, ..., iso1_zone1, iso2_zone1, ..., iso1_zoneN, iso2_zoneN
-    i1%iqWIsoPha = RESHAPE( [( [strIdx(tname, addPhase('H2O',      i1%phase(ip:ip))), i1%iqIsoPha(:,ip)],      ip=1, i1%nphas)], &
-                         [1+i1%ntiso, i1%nphas] )
+    i%iqWIsoPha = RESHAPE( [( [strIdx(t%name,   addPhase('H2O',i%phase(ip:ip))), i%iqIsoPha(:,ip)], ip=1,i%nphas)], &
+                         [1+i%ntiso, i%nphas] )
     !=== Table used to get ix (index in tagging tracers isotopes list, size ntiso) from the zone and isotope indexes
-    i1%itZonIso = RESHAPE( [( (strIdx(i1%trac(:), TRIM(i1%trac(it))//'_'//TRIM(i1%zone(iz))), iz=1, i1%nzone), it=1, i1%niso )], &
-                         [i1%nzone, i1%niso] )
+    i%itZonIso = RESHAPE( [( (strIdx(i%trac(:), TRIM(i%trac(it))//'_'//TRIM(i%zone(iz))), iz=1, i%nzone), it=1, i%niso )], &
+                         [i%nzone, i%niso] )
   END DO
 
-  !=== READ PHYSICAL PARAMETERS FROM isoFile FILE (COMMENTED => DISABLED)
-!  IF(     PRESENT(isot)) lerr = readIsotopesFile(isoFile, isot)
-!  IF(.NOT.PRESENT(isot)) lerr = readIsotopesFile(isoFile, isotopes)
-!  IF(lerr) RETURN
+  !=== READ PHYSICAL PARAMETERS FROM isoFile FILE
+!  lerr = readIsotopesFile(isoFile, isotopes); IF(lerr) RETURN! on commente pour ne pas chercher isotopes_params.def
 
   !--- GET THE isoCheck ENTRY FROM THE *.DEF FILES (MIGHT BE CHANGED TO A CLASS-DEPENDANT KEYWORD)
@@ -1282 +1311 @@
 
   !=== SELECT WATER ISOTOPES CLASS OR, IF UNFOUND, THE FIRST ISOTOPES CLASS
-  IF(isoSelect('H2O', lVerbose=.TRUE.)) THEN
-    iH2O = ixIso
-  ELSE
-    lerr = isoSelect(1, lVerbose=.TRUE.)
-  END IF
+  IF(isoSelect('H2O', .TRUE.)) THEN; iH2O = ixIso; ELSE; lerr = isoSelect(1, .TRUE.); END IF
 
 CONTAINS
@@ -1294 +1319 @@
 !------------------------------------------------------------------------------------------------------------------------------
   INTEGER :: ix, it, ip, np, iz, nz, npha, nzon
+  TYPE(isot_type), POINTER :: i
   DO ix = 1, nbIso
-    IF(     PRESENT(isot)) i1 => isot    (ix)
-    IF(.NOT.PRESENT(isot)) i1 => isotopes(ix)
+    i => isotopes(ix)
     !--- Check whether each isotope and tagging isotopic tracer is present in the same number of phases
-    DO it = 1, i1%ntiso; npha = i1%nphas
-      np = SUM([(COUNT(tname(:) == addPhase(i1%trac(it), i1%phase(ip:ip))), ip=1, npha)])
+    DO it = 1, i%ntiso; npha = i%nphas
+      np = SUM([(COUNT(tracers(:)%name == addPhase(i%trac(it), i%phase(ip:ip))), ip=1, npha)])
       lerr = np /= npha
-      CALL msg(TRIM(int2str(np))//       ' phases instead of '//TRIM(int2str(npha))//' for '//TRIM(i1%trac(it)), modname, lerr)
+      CALL msg(TRIM(int2str(np))//' phases instead of '//TRIM(int2str(npha))//' for '//TRIM(i%trac(it)), modname, lerr)
       IF(lerr) RETURN
     END DO
-    DO it = 1, i1%niso; nzon = i1%nzone
-      nz = SUM([(COUNT(i1%trac == TRIM(i1%trac(it))//'_'//i1%zone(iz)), iz=1, nzon)])
+    DO it = 1, i%niso; nzon = i%nzone
+      nz = SUM([(COUNT(i%trac == TRIM(i%trac(it))//'_'//i%zone(iz)), iz=1, nzon)])
       lerr = nz /= nzon
-      CALL msg(TRIM(int2str(nz))//' tagging zones instead of '//TRIM(int2str(nzon))//' for '//TRIM(i1%trac(it)), modname, lerr)
+      CALL msg(TRIM(int2str(nz))//' tagging zones instead of '//TRIM(int2str(nzon))//' for '//TRIM(i%trac(it)), modname, lerr)
       IF(lerr) RETURN
     END DO
@@ -1320 +1345 @@
 !==============================================================================================================================
 !=== THE ROUTINE isoSelect IS USED TO SWITCH FROM AN ISOTOPE FAMILY TO ANOTHER: ISOTOPES DEPENDENT PARAMETERS ARE UPDATED
-!     Single generic "isoSelect" routine, using the predefined index of the class (fast version) or its name (first call).
-!==============================================================================================================================
-LOGICAL FUNCTION isoSelectByName(iClass, isot, lVerbose) RESULT(lerr)
+!     Single generic "isoSelect" routine, using the predefined index of the parent (fast version) or its name (first call).
+!==============================================================================================================================
+LOGICAL FUNCTION isoSelectByName(iName, lVerbose) RESULT(lerr)
    IMPLICIT NONE
-   CHARACTER(LEN=*),                  INTENT(IN) :: iClass
-   TYPE(isot_type), OPTIONAL, TARGET, INTENT(IN) :: isot(:)
-   LOGICAL,         OPTIONAL,         INTENT(IN) :: lVerbose
-   TYPE(isot_type), POINTER :: iso(:)
+   CHARACTER(LEN=*),  INTENT(IN) :: iName
+   LOGICAL, OPTIONAL, INTENT(IN) :: lVerbose
    INTEGER :: iIso
    LOGICAL :: lV
-   lV = .FALSE.;    IF(PRESENT(lVerbose)) lV = lVerbose
-   iso => isotopes; IF(PRESENT(isot))    iso => isot
-   iIso = strIdx(iso(:)%name, iClass)
+   lV = .FALSE.; IF(PRESENT(lVerbose)) lV = lVerbose
+   iIso = strIdx(isotopes(:)%parent, iName)
    lerr = iIso == 0
    IF(lerr) THEN
       niso = 0; ntiso = 0; nzone = 0; nphas = 0; isoCheck=.FALSE.
-      CALL msg('no isotope family named "'//TRIM(iClass)//'"', ll=lV)
+      CALL msg('no isotope family named "'//TRIM(iName)//'"', ll=lV)
       RETURN
    END IF
-   lerr = isoSelectByIndex(iIso, iso, lV)
+   lerr = isoSelectByIndex(iIso, lV)
 END FUNCTION isoSelectByName
 !==============================================================================================================================
-LOGICAL FUNCTION isoSelectByIndex(iIso, isot, lVerbose) RESULT(lerr)
+LOGICAL FUNCTION isoSelectByIndex(iIso, lVerbose) RESULT(lerr)
    IMPLICIT NONE
-   INTEGER,                           INTENT(IN)    :: iIso
-   TYPE(isot_type), TARGET, OPTIONAL, INTENT(INOUT) :: isot(:)
-   LOGICAL,                 OPTIONAL, INTENT(IN)    :: lVerbose
-   TYPE(isot_type), POINTER :: i(:)
+   INTEGER,           INTENT(IN) :: iIso
+   LOGICAL, OPTIONAL, INTENT(IN) :: lVerbose
    LOGICAL :: lV
-   lV = .FALSE.;  IF(PRESENT(lVerbose)) lV = lVerbose
-   i => isotopes; IF(PRESENT(isot))      i => isot
+   lv = .FALSE.; IF(PRESENT(lVerbose)) lv = lVerbose
    lerr = .FALSE.
    IF(iIso == ixIso) RETURN                                          !--- Nothing to do if the index is already OK
-   lerr = iIso<=0 .OR. iIso>SIZE(i)
+   lerr = iIso<=0 .OR. iIso>SIZE(isotopes)
    CALL msg('Inconsistent isotopes family index '//TRIM(int2str(iIso))//': should be > 0 and <= '&
-          //TRIM(int2str(SIZE(i)))//'"', ll = lerr .AND. lV)
+          //TRIM(int2str(SIZE(isotopes)))//'"', ll = lerr .AND. lV)
    IF(lerr) RETURN
    ixIso = iIso                                                      !--- Update currently selected family index
-   isotope  => i(ixIso)                                              !--- Select corresponding component
+   isotope  => isotopes(ixIso)                                       !--- Select corresponding component
    isoKeys  => isotope%keys;     niso     = isotope%niso
    isoName  => isotope%trac;     ntiso    = isotope%ntiso
@@ -1365 +1384 @@
    itZonIso => isotope%itZonIso; isoCheck = isotope%check
    iqIsoPha => isotope%iqIsoPha
-   iqWIsoPha=> isotope%iqWIsoPha
+   iqWIsoPha => isotope%iqWIsoPha
 END FUNCTION isoSelectByIndex
 !==============================================================================================================================
@@ -1509 +1528 @@
 !=== OVERWRITE THE KEYS OF THE TRACER NAMED "tr0" WITH THE VALUES FOUND IN THE *.def FILES, IF ANY. ===========================
 !==============================================================================================================================
-LOGICAL FUNCTION addKeysFromDef(t, tr0) RESULT(lerr)
-  TYPE(keys_type), ALLOCATABLE, INTENT(INOUT) :: t(:)
+SUBROUTINE addKeysFromDef(t, tr0)
+  TYPE(trac_type), ALLOCATABLE, INTENT(INOUT) :: t(:)
   CHARACTER(LEN=*),             INTENT(IN)    :: tr0
 !------------------------------------------------------------------------------------------------------------------------------
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:)
   CHARACTER(LEN=maxlen) :: val
   INTEGER               :: ik, jd
-  lerr = getKey('name', tname, t); IF(lerr) RETURN
-  jd = strIdx(tname(:), tr0)
+  jd = strIdx(t%name, tr0)
   IF(jd == 0) RETURN
-  DO ik = 1, SIZE(t(jd)%key)
-    CALL get_in(t(jd)%key(ik), val, '*none*')
-    IF(val /= '*none*') CALL addKey(t(jd)%key(ik), val, t(jd), .TRUE.)
+  DO ik = 1, SIZE(t(jd)%keys%key)
+    CALL get_in(t(jd)%keys%key(ik), val, '*none*')
+    IF(val /= '*none*') CALL addKey(t(jd)%keys%key(ik), val, t(jd)%keys, .TRUE.)
   END DO
-END FUNCTION addKeysFromDef
+END SUBROUTINE addKeysFromDef
 !==============================================================================================================================
 
@@ -1533 +1550 @@
   INTEGER,          INTENT(IN)    :: itr
   CHARACTER(LEN=*), INTENT(IN)    :: keyn(:)
-  TYPE(keys_type),  INTENT(INOUT) :: ky(:)
+  TYPE(trac_type),  INTENT(INOUT) :: ky(:)
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen), ALLOCATABLE :: k(:), v(:)
@@ -1539 +1556 @@
   INTEGER :: iky
   IF(itr<=0 .OR. itr>SIZE(ky, DIM=1)) RETURN                          !--- Index is out of range
-  ll = [( ALL(keyn/=ky(itr)%key(iky)), iky=1, SIZE(ky(itr)%key) )]
-  k = PACK(ky(itr)%key, MASK=ll); CALL MOVE_ALLOC(FROM=k, TO=ky(itr)%key)
-  v = PACK(ky(itr)%val, MASK=ll); CALL MOVE_ALLOC(FROM=v, TO=ky(itr)%val)
+  ll = [( ALL(keyn/=ky(itr)%keys%key(iky)), iky=1, SIZE(ky(itr)%keys%key) )]
+  k = PACK(ky(itr)%keys%key, MASK=ll); CALL MOVE_ALLOC(FROM=k, TO=ky(itr)%keys%key)
+  v = PACK(ky(itr)%keys%val, MASK=ll); CALL MOVE_ALLOC(FROM=v, TO=ky(itr)%keys%val)
 END SUBROUTINE delKey_1
 !==============================================================================================================================
 SUBROUTINE delKey(keyn, ky)
   CHARACTER(LEN=*), INTENT(IN)    :: keyn(:)
-  TYPE(keys_type),  INTENT(INOUT) :: ky(:)
+  TYPE(trac_type),  INTENT(INOUT) :: ky(:)
 !------------------------------------------------------------------------------------------------------------------------------
   INTEGER :: iky
@@ -1594 +1611 @@
 !=== TRY TO GET THE KEY NAMED "key" FOR THE "itr"th TRACER IN:                                                              ===
 !===  * ARGUMENT "ky" DATABASE IF SPECIFIED ; OTHERWISE:                                                                    ===
-!===  * IN INTERNAL TRACERS DATABASE "tracers(:)" (IF UNFOUND, IN INTERNAL ISOTOPES DATABASE "isotope%keys(:)")             ===
+!===  * IN INTERNAL TRACERS DATABASE "tracers(:)%keys" (IF UNFOUND, IN INTERNAL ISOTOPES DATABASE "isotope%keys(:)")        ===
 !=== THE RETURNED VALUE (STRING, AN INTEGER, A REAL OR A LOGICAL) CAN BE EITHER:                                            ===
 !===  * A SCALAR                                                                                                            ===
@@ -1660 +1677 @@
   lerr = .TRUE.
   IF(lerr .AND. PRESENT(ky))         val = fgetKey(ky)                                   !--- "ky"
-  IF(lerr .AND. ALLOCATED (tracers)) val = fgetKey(tracers(:))                           !--- "tracers"
+  IF(lerr .AND. ALLOCATED (tracers)) val = fgetKey(tracers(:)%keys)                      !--- "tracers"
   IF(lerr .AND. ASSOCIATED(isotope)) val = fgetKey(isotope%keys(:))                      !--- "isotope"
   IF(lerr .AND. PRESENT(def)) THEN
@@ -1765 +1782 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   val = str2int(svals)
-  lerr = ANY(val == -HUGE(1)) .AND. sval /= ''
+  lerr = ANY(val == -HUGE(1))
   s = 'key "'//TRIM(keyn)//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
   CALL msg(TRIM(s)//' an integer: '//TRIM(sval), modname, lerr)
@@ -1785 +1802 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   val = str2real(svals)
-  lerr = ANY(val == -HUGE(1.)) .AND. sval /= ''
+  lerr = ANY(val == -HUGE(1.))
   s = 'key "'//TRIM(keyn)//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
   CALL msg(TRIM(s)//' a real: '//TRIM(sval), modname, lerr)
@@ -1806 +1823 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   ivals = str2bool(svals)
-  lerr = ANY(ivals == -1) .AND. sval /= ''
+  lerr = ANY(ivals == -1)
   s = 'key "'//TRIM(keyn)//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(sval), modname, lerr)
@@ -1843 +1860 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   val = str2int(svals)
-  lerr = ANY(val == -HUGE(1)) .AND. sval /= ''
+  lerr = ANY(val == -HUGE(1))
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
   CALL msg(TRIM(s)//' an integer: '//TRIM(sval), modname, lerr)
@@ -1864 +1881 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   val = str2real(svals)
-  lerr = ANY(val == -HUGE(1.)) .AND. sval /= ''
+  lerr = ANY(val == -HUGE(1.))
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
   CALL msg(TRIM(s)//' a real: '//TRIM(sval), modname, lerr)
@@ -1886 +1903 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   ivals = str2bool(svals)
-  lerr = ANY(ivals == -1) .AND. sval /= ''
+  lerr = ANY(ivals == -1)
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(sval), modname, lerr)
@@ -1893 +1910 @@
 !==============================================================================================================================
 !==============================================================================================================================
-LOGICAL FUNCTION getKeyByIndex_s1mm(keyn, val, ky, def, lDisp) RESULT(lerr)
-  CHARACTER(LEN=*),                   INTENT(IN)  :: keyn
-  CHARACTER(LEN=maxlen), ALLOCATABLE, INTENT(OUT) :: val(:)
-  TYPE(keys_type),       OPTIONAL,    INTENT(IN)  ::  ky(:)
-  CHARACTER(LEN=*),      OPTIONAL,    INTENT(IN)  :: def
-  LOGICAL,               OPTIONAL,    INTENT(IN)  :: lDisp
-  lerr = getKeyByIndex_smmm([keyn], val, ky, def, lDisp)
+LOGICAL FUNCTION getKeyByIndex_s1mm(keyn, val, ky, nam, def, lDisp) RESULT(lerr)
+  CHARACTER(LEN=*),                             INTENT(IN)  :: keyn
+  CHARACTER(LEN=maxlen),           ALLOCATABLE, INTENT(OUT) :: val(:)
+  TYPE(keys_type),       OPTIONAL,              INTENT(IN)  ::  ky(:)
+  CHARACTER(LEN=maxlen), OPTIONAL, ALLOCATABLE, INTENT(OUT) :: nam(:)
+  CHARACTER(LEN=*),      OPTIONAL,              INTENT(IN)  :: def
+  LOGICAL,               OPTIONAL,              INTENT(IN)  :: lDisp
+  lerr = getKeyByIndex_smmm([keyn], val, ky, nam, def, lDisp)
 END FUNCTION getKeyByIndex_s1mm
 !==============================================================================================================================
-LOGICAL FUNCTION getKeyByIndex_i1mm(keyn, val, ky, def, lDisp) RESULT(lerr)
-  CHARACTER(LEN=*),                   INTENT(IN)  :: keyn
-  INTEGER,               ALLOCATABLE, INTENT(OUT) :: val(:)
-  TYPE(keys_type),       OPTIONAL,    INTENT(IN)  ::  ky(:)
-  INTEGER,               OPTIONAL,    INTENT(IN)  :: def
-  LOGICAL,               OPTIONAL,    INTENT(IN)  :: lDisp
-  lerr = getKeyByIndex_immm([keyn], val, ky, def, lDisp)
+LOGICAL FUNCTION getKeyByIndex_i1mm(keyn, val, ky, nam, def, lDisp) RESULT(lerr)
+  CHARACTER(LEN=*),                             INTENT(IN)  :: keyn
+  INTEGER,                         ALLOCATABLE, INTENT(OUT) :: val(:)
+  TYPE(keys_type),       OPTIONAL,              INTENT(IN)  ::  ky(:)
+  CHARACTER(LEN=maxlen), OPTIONAL, ALLOCATABLE, INTENT(OUT) :: nam(:)
+  INTEGER,               OPTIONAL,              INTENT(IN)  :: def
+  LOGICAL,               OPTIONAL,              INTENT(IN)  :: lDisp
+  lerr = getKeyByIndex_immm([keyn], val, ky, nam, def, lDisp)
 END FUNCTION getKeyByIndex_i1mm
 !==============================================================================================================================
-LOGICAL FUNCTION getKeyByIndex_r1mm(keyn, val, ky, def, lDisp) RESULT(lerr)
-  CHARACTER(LEN=*),                   INTENT(IN)  :: keyn
-  REAL,                  ALLOCATABLE, INTENT(OUT) :: val(:)
-  TYPE(keys_type),       OPTIONAL,    INTENT(IN)  ::  ky(:)
-  REAL,                  OPTIONAL,    INTENT(IN)  :: def
-  LOGICAL,               OPTIONAL,    INTENT(IN)  :: lDisp
-  lerr = getKeyByIndex_rmmm([keyn], val, ky, def, lDisp)
+LOGICAL FUNCTION getKeyByIndex_r1mm(keyn, val, ky, nam, def, lDisp) RESULT(lerr)
+  CHARACTER(LEN=*),                             INTENT(IN)  :: keyn
+  REAL,                            ALLOCATABLE, INTENT(OUT) :: val(:)
+  TYPE(keys_type),       OPTIONAL,              INTENT(IN)  ::  ky(:)
+  CHARACTER(LEN=maxlen), OPTIONAL, ALLOCATABLE, INTENT(OUT) :: nam(:)
+  REAL,                  OPTIONAL,              INTENT(IN)  :: def
+  LOGICAL,               OPTIONAL,              INTENT(IN)  :: lDisp
+  lerr = getKeyByIndex_rmmm([keyn], val, ky, nam, def, lDisp)
 END FUNCTION getKeyByIndex_r1mm
 !==============================================================================================================================
-LOGICAL FUNCTION getKeyByIndex_l1mm(keyn, val, ky, def, lDisp) RESULT(lerr)
-  CHARACTER(LEN=*),                   INTENT(IN)  :: keyn
-  LOGICAL,               ALLOCATABLE, INTENT(OUT) :: val(:)
-  TYPE(keys_type),       OPTIONAL,    INTENT(IN)  ::  ky(:)
-  LOGICAL,               OPTIONAL,    INTENT(IN)  :: def
-  LOGICAL,               OPTIONAL,    INTENT(IN)  :: lDisp
-  lerr = getKeyByIndex_lmmm([keyn], val, ky, def, lDisp)
+LOGICAL FUNCTION getKeyByIndex_l1mm(keyn, val, ky, nam, def, lDisp) RESULT(lerr)
+  CHARACTER(LEN=*),                             INTENT(IN)  :: keyn
+  LOGICAL,                         ALLOCATABLE, INTENT(OUT) :: val(:)
+  TYPE(keys_type),       OPTIONAL,              INTENT(IN)  ::  ky(:)
+  CHARACTER(LEN=maxlen), OPTIONAL, ALLOCATABLE, INTENT(OUT) :: nam(:)
+  LOGICAL,               OPTIONAL,              INTENT(IN)  :: def
+  LOGICAL,               OPTIONAL,              INTENT(IN)  :: lDisp
+  lerr = getKeyByIndex_lmmm([keyn], val, ky, nam, def, lDisp)
 END FUNCTION getKeyByIndex_l1mm
 !==============================================================================================================================
 !==============================================================================================================================
-LOGICAL FUNCTION getKeyByIndex_smmm(keyn, val, ky, def, lDisp) RESULT(lerr)
-  CHARACTER(LEN=*),                   INTENT(IN)  :: keyn(:)
-  CHARACTER(LEN=maxlen), ALLOCATABLE, INTENT(OUT) ::  val(:)
-  TYPE(keys_type),       OPTIONAL,    INTENT(IN)  ::   ky(:)
-  CHARACTER(LEN=*),      OPTIONAL,    INTENT(IN)  ::  def
-  LOGICAL,               OPTIONAL,    INTENT(IN)  :: lDisp
+LOGICAL FUNCTION getKeyByIndex_smmm(keyn, val, ky, nam, def, lDisp) RESULT(lerr)
+  CHARACTER(LEN=*),                             INTENT(IN)  :: keyn(:)
+  CHARACTER(LEN=maxlen),           ALLOCATABLE, INTENT(OUT) ::  val(:)
+  TYPE(keys_type),       OPTIONAL,              INTENT(IN)  ::   ky(:)
+  CHARACTER(LEN=maxlen), OPTIONAL, ALLOCATABLE, INTENT(OUT) ::  nam(:)
+  CHARACTER(LEN=*),      OPTIONAL,              INTENT(IN)  ::  def
+  LOGICAL,               OPTIONAL,              INTENT(IN)  :: lDisp
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: s
+  CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:)
   INTEGER :: iq, nq(3), k
   LOGICAL :: lD, l(3)
@@ -1944 +1967 @@
   lerr = .TRUE.
   IF(PRESENT(ky)) THEN;                 val = fgetKey(ky)                                !--- "ky"
-  ELSE IF(ALLOCATED(tracers)) THEN;     val = fgetKey(tracers(:))                        !--- "tracers"
+  ELSE IF(ALLOCATED(tracers)) THEN;     val = fgetKey(tracers(:)%keys)                   !--- "tracers"
      IF(lerr .AND. ASSOCIATED(isotope)) val = fgetKey(isotope%keys(:))                   !--- "isotope"
   END IF
-  IF(.NOT.lerr) RETURN
+  IF(.NOT.lerr) THEN; IF(PRESENT(nam)) nam = tname; RETURN; END IF
   IF(.NOT.PRESENT(def)) THEN; CALL msg('No '//TRIM(s)//' found', modname, lD); RETURN; END IF
 
@@ -1968 +1991 @@
   INTEGER :: iq
   lerr = SIZE(ky) == 0; IF(lerr) RETURN
+  tname = ky%name
   val = [(fgetKeyIdx(iq, keyn(:), ky, ler(iq)), iq = 1, SIZE(ky))]
   lerr = ANY(ler)
@@ -1974 +1998 @@
 END FUNCTION getKeyByIndex_smmm
 !==============================================================================================================================
-LOGICAL FUNCTION getKeyByIndex_immm(keyn, val, ky, def, lDisp) RESULT(lerr)
-  CHARACTER(LEN=*),          INTENT(IN)  :: keyn(:)
-  INTEGER,      ALLOCATABLE, INTENT(OUT) ::  val(:)
-  TYPE(keys_type), OPTIONAL, INTENT(IN)  ::   ky(:)
-  INTEGER,         OPTIONAL, INTENT(IN)  ::  def
-  LOGICAL,         OPTIONAL, INTENT(IN)  :: lDisp
+LOGICAL FUNCTION getKeyByIndex_immm(keyn, val, ky, nam, def, lDisp) RESULT(lerr)
+  CHARACTER(LEN=*),                             INTENT(IN)  :: keyn(:)
+  INTEGER,                         ALLOCATABLE, INTENT(OUT) ::  val(:)
+  TYPE(keys_type),       OPTIONAL,              INTENT(IN)  ::   ky(:)
+  CHARACTER(LEN=maxlen), OPTIONAL, ALLOCATABLE, INTENT(OUT) ::  nam(:)
+  INTEGER,               OPTIONAL,              INTENT(IN)  ::  def
+  LOGICAL,               OPTIONAL,              INTENT(IN)  :: lDisp
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:), tname(:)
   LOGICAL,               ALLOCATABLE ::    ll(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, int2str(def), lDisp)
-  IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, lDisp=lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, int2str(def), lDisp)
+  IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, lDisp=lDisp)
   IF(lerr) RETURN
   val = str2int(svals)
-  ll = val == -HUGE(1) .AND. (SIZE(svals) /=1 .OR. svals(1) /= '')
-  lerr = ANY(ll); IF(.NOT.lerr) RETURN
-  IF(getKeyByIndex_smmm(['name'], tname, ky)) RETURN
+  ll = val == -HUGE(1)
+  lerr = ANY(ll); IF(.NOT.lerr) THEN; IF(PRESENT(nam)) nam = tname; RETURN; END IF
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(strStack(PACK(tname, MASK=ll)))//' is not'
   CALL msg(TRIM(s)//' an integer: '//TRIM(strStack(svals, MASK=ll)), modname, lerr)
+  IF(.NOT.lerr .AND. PRESENT(nam)) nam = tname
 END FUNCTION getKeyByIndex_immm
 !==============================================================================================================================
-LOGICAL FUNCTION getKeyByIndex_rmmm(keyn, val, ky, def, lDisp) RESULT(lerr)
-  CHARACTER(LEN=*),          INTENT(IN)  :: keyn(:)
-  REAL,         ALLOCATABLE, INTENT(OUT) ::  val(:)
-  TYPE(keys_type), OPTIONAL, INTENT(IN)  ::   ky(:)
-  REAL,            OPTIONAL, INTENT(IN)  ::  def
-  LOGICAL,         OPTIONAL, INTENT(IN)  :: lDisp
+LOGICAL FUNCTION getKeyByIndex_rmmm(keyn, val, ky, nam, def, lDisp) RESULT(lerr)
+  CHARACTER(LEN=*),                             INTENT(IN)  :: keyn(:)
+  REAL,                            ALLOCATABLE, INTENT(OUT) ::  val(:)
+  TYPE(keys_type),       OPTIONAL,              INTENT(IN)  ::   ky(:)
+  CHARACTER(LEN=maxlen), OPTIONAL, ALLOCATABLE, INTENT(OUT) ::  nam(:)
+  REAL,                  OPTIONAL,              INTENT(IN)  ::  def
+  LOGICAL,               OPTIONAL,              INTENT(IN)  :: lDisp
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:), tname(:)
   LOGICAL,               ALLOCATABLE ::    ll(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, real2str(def), lDisp)
-  IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, lDisp=lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, real2str(def), lDisp)
+  IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, lDisp=lDisp)
   IF(lerr) RETURN
   val = str2real(svals)
-  ll = val == -HUGE(1.) .AND. (SIZE(svals) /=1 .OR. svals(1) /= '')
-  lerr = ANY(ll); IF(.NOT.lerr) RETURN
-  IF(getKeyByIndex_smmm(['name'], tname, ky)) RETURN
+  ll = val == -HUGE(1.)
+  lerr = ANY(ll); IF(.NOT.lerr) THEN; IF(PRESENT(nam)) nam = tname; RETURN; END IF
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(strStack(PACK(tname, MASK=ll)))//' is not a'
   CALL msg(TRIM(s)//' a real: '//TRIM(strStack(svals, MASK=ll)), modname)
 END FUNCTION getKeyByIndex_rmmm
 !==============================================================================================================================
-LOGICAL FUNCTION getKeyByIndex_lmmm(keyn, val, ky, def, lDisp) RESULT(lerr)
-  CHARACTER(LEN=*),          INTENT(IN)  :: keyn(:)
-  LOGICAL,      ALLOCATABLE, INTENT(OUT) ::  val(:)
-  TYPE(keys_type), OPTIONAL, INTENT(IN)  ::   ky(:)
-  LOGICAL,         OPTIONAL, INTENT(IN)  ::  def
-  LOGICAL,         OPTIONAL, INTENT(IN)  :: lDisp
+LOGICAL FUNCTION getKeyByIndex_lmmm(keyn, val, ky, nam, def, lDisp) RESULT(lerr)
+  CHARACTER(LEN=*),                             INTENT(IN)  :: keyn(:)
+  LOGICAL,                         ALLOCATABLE, INTENT(OUT) ::  val(:)
+  TYPE(keys_type),       OPTIONAL,              INTENT(IN)  ::   ky(:)
+  CHARACTER(LEN=maxlen), OPTIONAL, ALLOCATABLE, INTENT(OUT) ::  nam(:)
+  LOGICAL,               OPTIONAL,              INTENT(IN)  ::  def
+  LOGICAL,               OPTIONAL,              INTENT(IN)  :: lDisp
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: s
@@ -2027 +2053 @@
   LOGICAL,               ALLOCATABLE ::    ll(:)
   INTEGER,               ALLOCATABLE :: ivals(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, bool2str(def), lDisp)
-  IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, lDisp=lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, bool2str(def), lDisp)
+  IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, lDisp=lDisp)
   IF(lerr) RETURN
   ivals = str2bool(svals)
-  ll = ivals == -1 .AND. (SIZE(svals) /=1 .OR. svals(1) /= '')
-  lerr = ANY(ll); IF(.NOT.lerr) RETURN
-  IF(getKeyByIndex_smmm(['name'], tname, ky)) RETURN
+  ll = ivals == -1
+  lerr = ANY(ll); IF(.NOT.lerr) THEN; val = ivals == 1; IF(PRESENT(nam)) nam = tname; RETURN; END IF
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(strStack(tname, MASK=ll))//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(strStack(svals, MASK=ll)), modname)
-  IF(.NOT.lerr) val = ivals == 1
 END FUNCTION getKeyByIndex_lmmm
 !==============================================================================================================================
@@ -2047 +2071 @@
 !=== TRY TO GET THE KEY NAMED "key" FOR THE TRACER NAMED "tname" IN:                                                        ===
 !===  * ARGUMENT "ky" DATABASE IF SPECIFIED ; OTHERWISE:                                                                    ===
-!===  * IN INTERNAL TRACERS DATABASE "tracers(:)" (IF UNFOUND, IN INTERNAL ISOTOPES DATABASE "isotope%keys(:)")             ===
+!===  * IN INTERNAL TRACERS DATABASE "tracers(:)%keys" (IF UNFOUND, IN INTERNAL ISOTOPES DATABASE "isotope%keys(:)")        ===
 !=== THE RETURNED VALUE (STRING, AN INTEGER, A REAL OR A LOGICAL) CAN BE EITHER:                                            ===
 !===  * A SCALAR                                                                                                            ===
@@ -2109 +2133 @@
   tnam = strHead(delPhase(tname),'_',.TRUE.)                                             !--- Remove phase and tag
   IF(lerr .AND. PRESENT(ky))         val = fgetKey(ky)                                   !--- "ky"
-  IF(lerr .AND. ALLOCATED (tracers)) val = fgetKey(tracers(:))                           !--- "tracers"
+  IF(lerr .AND. ALLOCATED (tracers)) val = fgetKey(tracers(:)%keys)                      !--- "tracers"
   IF(lerr .AND. ASSOCIATED(isotope)) val = fgetKey(isotope%keys(:))                      !--- "isotope"
   IF(lerr .AND. PRESENT(def)) THEN
@@ -2121 +2145 @@
  CHARACTER(LEN=maxlen) FUNCTION fgetKey(ky) RESULT(val)
   TYPE(keys_type),  INTENT(IN)  :: ky(:)
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: tname_all(:)
-  lerr = SIZE(ky) == 0;                 IF(lerr) RETURN
-  lerr = getKey('name', tname_all, ky); IF(lerr) RETURN
-           val = fgetKeyIdx(strIdx(tname_all, tname), [keyn], ky, lerr)
-  IF(lerr) val = fgetKeyIdx(strIdx(tname_all, tnam ), [keyn], ky, lerr)
+  lerr = SIZE(ky) == 0
+  IF(lerr) RETURN
+           val = fgetKeyIdx(strIdx(ky%name, tname), [keyn], ky, lerr)
+  IF(lerr) val = fgetKeyIdx(strIdx(ky%name, tnam ), [keyn], ky, lerr)
+
 END FUNCTION fgetKey
 
@@ -2142 +2166 @@
   IF(lerr) RETURN
   val = str2int(sval)
-  lerr = val == -HUGE(1) .AND. sval /= ''
+  lerr = val == -HUGE(1)
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(tname)//' is not'
   CALL msg(TRIM(s)//' an integer: '//TRIM(sval), modname, lerr)
@@ -2159 +2183 @@
   IF(lerr) RETURN
   val = str2real(sval)
-  lerr = val == -HUGE(1.) .AND. sval /= ''
+  lerr = val == -HUGE(1.)
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(tname)//' is not'
   CALL msg(TRIM(s)//' a real: '//TRIM(sval), modname, lerr)
@@ -2177 +2201 @@
   IF(lerr) RETURN
   ival = str2bool(sval)
-  lerr = ival == -1 .AND. sval /= ''
+  lerr = ival == -1
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(tname)//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(sval), modname, lerr)
@@ -2212 +2236 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   val = str2int(svals)
-  lerr = ANY(val == -HUGE(1)) .AND. sval /= ''
+  lerr = ANY(val == -HUGE(1))
   s = 'key "'//TRIM(keyn)//'" of '//TRIM(tname)//' is not'
   CALL msg(TRIM(s)//' an integer: '//TRIM(sval), modname, lerr)
@@ -2232 +2256 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   val = str2real(svals)
-  lerr = ANY(val == -HUGE(1.)) .AND. sval /= ''
+  lerr = ANY(val == -HUGE(1.))
   s = 'key "'//TRIM(keyn)//'" of '//TRIM(tname)//' is not'
   CALL msg(TRIM(s)//' a real: '//TRIM(sval), modname, lerr)
@@ -2253 +2277 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   ivals = str2bool(svals)
-  lerr = ANY(ivals == -1) .AND. sval /= ''
+  lerr = ANY(ivals == -1)
   s = 'key "'//TRIM(keyn)//'" of '//TRIM(tname)//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(sval), modname, lerr)
@@ -2288 +2312 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   val = str2int(svals)
-  lerr = ANY(val == -HUGE(1)) .AND. sval /= ''
+  lerr = ANY(val == -HUGE(1))
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(tname)//' is not'
   CALL msg(TRIM(s)//' an integer: '//TRIM(sval), modname, lerr)
@@ -2308 +2332 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   val = str2real(svals)
-  lerr = ANY(val == -HUGE(1.)) .AND. sval /= ''
+  lerr = ANY(val == -HUGE(1.))
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(tname)//' is not'
   CALL msg(TRIM(s)//' a real: '//TRIM(sval), modname, lerr)
@@ -2329 +2353 @@
   IF(fmsg('can''t parse '//TRIM(sval), modname, lerr)) RETURN
   ivals = str2bool(svals)
-  lerr = ANY(ivals == -1) .AND. sval /= ''
+  lerr = ANY(ivals == -1)
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(tname)//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(sval), modname, lerr)
@@ -2388 +2412 @@
   lerr = .TRUE.
   IF(PRESENT(ky)) THEN;                 val = fgetKey(ky)                                !--- "ky"
-  ELSE IF(ALLOCATED(tracers)) THEN;     val = fgetKey(tracers(:))                        !--- "tracers"
+  ELSE IF(ALLOCATED(tracers)) THEN;     val = fgetKey(tracers(:)%keys)                   !--- "tracers"
      IF(lerr .AND. ASSOCIATED(isotope)) val = fgetKey(isotope%keys(:))                   !--- "isotope"
   END IF
@@ -2403 +2427 @@
   TYPE(keys_type),       INTENT(IN)  :: ky(:)
   LOGICAL,               ALLOCATABLE :: ler(:)
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: tname_all(:)
-  lerr = SIZE(ky) == 0;                 IF(lerr) RETURN
-  lerr = getKey('name', tname_all, ky); IF(lerr) RETURN
+  lerr = SIZE(ky) == 0; IF(lerr) RETURN
   ALLOCATE(ler(SIZE(tname)))
-  val = [(fgetKeyIdx(strIdx(tname_all, tname(iq)), keyn, ky, ler(iq)), iq = 1, SIZE(tname))]
+  val = [(fgetKeyIdx(strIdx(ky(:)%name, tname(iq)), keyn, ky, ler(iq)), iq = 1, SIZE(tname))]
   lerr = ANY(ler)
 END FUNCTION fgetKey
@@ -2427 +2449 @@
   IF(lerr) RETURN
   val = str2int(svals)
-  ll = val == -HUGE(1) .AND. (SIZE(svals) /=1 .OR. svals(1) /= '')
+  ll = val == -HUGE(1)
   lerr = ANY(ll); IF(.NOT.lerr) RETURN
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(strStack(tname, MASK=ll))//' is not'
@@ -2447 +2469 @@
   IF(lerr) RETURN
   val = str2real(svals)
-  ll = val == -HUGE(1.) .AND. (SIZE(svals) /=1 .OR. svals(1) /= '')
+  ll = val == -HUGE(1.)
   lerr = ANY(ll); IF(.NOT.lerr) RETURN
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(strStack(tname, MASK=ll))//' is not'
@@ -2468 +2490 @@
   IF(lerr) RETURN
   ivals = str2bool(svals)
-  ll = ivals == -1 .AND. (SIZE(svals) /=1 .OR. svals(1) /= '')
+  ll = ivals == -1
   lerr = ANY(ll); IF(.NOT.lerr) THEN; val = ivals == 1; RETURN; END IF
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(strStack(tname, MASK=ll))//' is not'
@@ -2480 +2502 @@
 !==============================================================================================================================
 SUBROUTINE setKeysDBase(tracers_, isotopes_, isotope_)
-  TYPE(keys_type), OPTIONAL, INTENT(IN) ::  tracers_(:)
+  TYPE(trac_type), OPTIONAL, INTENT(IN) ::  tracers_(:)
   TYPE(isot_type), OPTIONAL, INTENT(IN) :: isotopes_(:)
   TYPE(isot_type), OPTIONAL, INTENT(IN) :: isotope_
@@ -2489 +2511 @@
   IF(PRESENT(isotopes_)) THEN; isotopes = isotopes_; ELSE; ALLOCATE(isotopes(0)); END IF
   IF(PRESENT(isotope_ )) THEN
-    ix = strIdx(isotopes(:)%name, isotope_%name)
+    ix = strIdx(isotopes(:)%parent, isotope_%parent)
     IF(ix /= 0) THEN
       isotopes(ix) = isotope_
@@ -2500 +2522 @@
 !==============================================================================================================================
 SUBROUTINE getKeysDBase(tracers_, isotopes_, isotope_)
-  TYPE(keys_type), OPTIONAL, ALLOCATABLE, INTENT(OUT) ::  tracers_(:)
+  TYPE(trac_type), OPTIONAL, ALLOCATABLE, INTENT(OUT) ::  tracers_(:)
   TYPE(isot_type), OPTIONAL, ALLOCATABLE, INTENT(OUT) :: isotopes_(:)
   TYPE(isot_type), OPTIONAL,              INTENT(OUT) :: isotope_
@@ -2507 +2529 @@
   IF(PRESENT( tracers_)) THEN;  tracers_ =  tracers; ELSE; ALLOCATE( tracers_(0)); END IF
   IF(PRESENT(isotopes_)) THEN; isotopes_ = isotopes; ELSE; ALLOCATE(isotopes_(0)); END IF
-  IF(PRESENT(isotope_ )) THEN; ix = strIdx(isotopes(:)%name, isotope%name); IF(ix /= 0) isotope_=isotopes(ix); END IF
+  IF(PRESENT(isotope_ )) THEN; ix = strIdx(isotopes(:)%parent, isotope%parent); IF(ix /= 0) isotope_=isotopes(ix); END IF
 END SUBROUTINE getKeysDBase
 !==============================================================================================================================
@@ -2583 +2605 @@
   CHARACTER(LEN=*),             INTENT(IN)    :: tname
   TYPE(keys_type),              INTENT(IN)    ::  keys
-  TYPE(keys_type), ALLOCATABLE, INTENT(INOUT) :: tracs(:)
-  TYPE(keys_type), ALLOCATABLE :: tr(:)
+  TYPE(trac_type), ALLOCATABLE, INTENT(INOUT) :: tracs(:)
+  TYPE(trac_type), ALLOCATABLE :: tr(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tnames(:)
   INTEGER :: nt, ix
   IF(ALLOCATED(tracs)) THEN
-     lerr = getKey('name', tnames, ky=tracs(:)); IF(lerr) RETURN
+     lerr = getKey('name', tnames, ky=tracs(:)%keys); IF(lerr) RETURN
      nt = SIZE(tracs)
      ix = strIdx(tnames, tname)
@@ -2600 +2622 @@
      ix = 1; ALLOCATE(tracs(1))
   END IF
-  CALL addKey('name', tname, tracs(ix))
-  tracs(ix) = keys
+  CALL addKey('name', tname, tracs(ix)%keys)
+  tracs(ix)%name = tname
+  tracs(ix)%keys = keys
 
 END FUNCTION addTracer_1
@@ -2616 +2639 @@
 LOGICAL FUNCTION delTracer_1(tname, tracs) RESULT(lerr)
   CHARACTER(LEN=*),                     INTENT(IN)    :: tname
-  TYPE(keys_type), ALLOCATABLE, TARGET, INTENT(INOUT) :: tracs(:)
-  TYPE(keys_type), ALLOCATABLE :: tr(:)
+  TYPE(trac_type), ALLOCATABLE, TARGET, INTENT(INOUT) :: tracs(:)
+  TYPE(trac_type), ALLOCATABLE :: tr(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tnames(:)
   INTEGER :: nt, ix
@@ -2623 +2646 @@
   IF(fmsg('Can''t remove tracer "'//TRIM(tname)//'" from an empty tracers descriptor', modname, lerr)) RETURN
   nt = SIZE(tracs)
-  lerr = getKey('name', tnames, ky=tracs(:)); IF(lerr) RETURN
+  lerr = getKey('name', tnames, ky=tracs(:)%keys); IF(lerr) RETURN
   ix = strIdx(tnames, tname)
   CALL msg('Removing tracer "'             //TRIM(tname)//'"', modname, ix /= 0)
@@ -2667 +2690 @@
 
 !==============================================================================================================================
-!======== CONVERT WATER-DERIVED NAMES FROM FORMER TO CURRENT CONVENTION & VICE VERSA ; OTHER NAMES ARE LEFT UNTOUCHED =========
-!===== OLD NAMES STRUCTURE:  H2O[<phase>][_<isotope>][_<tag>] (<phase> from "old_phases",        <isotope> from "oldH2OIso") ==
-!====  NEW NAMES STRUCTURE: <var>[<phase_sep><phase>][_<tag>] (<phase> from "known_phases", <var>='H2O' or from "newH2OIso") ==
+!============ CONVERT WATER-DERIVED NAMES FROM FORMER TO CURRENT CONVENTION ; OTHER NAMES ARE LEFT UNTOUCHED ==================
+!======= NAMES STRUCTURE: H2O[<phase>][_<isotope>][_<tag>] (<phase> from "old_phases", <isotope> from "oldH2OIso") ============
 !==============================================================================================================================
 CHARACTER(LEN=maxlen) FUNCTION old2newH2O_1(oldName, iPhase) RESULT(newName)
@@ -2702 +2724 @@
 END FUNCTION old2newH2O_m
 !==============================================================================================================================
+
+
+!==============================================================================================================================
+!============ CONVERT WATER-DERIVED NAMES FROM CURRENT TO FORMER CONVENTION ; OTHER NAMES ARE LEFT UNTOUCHED ==================
+!==== NAMES STRUCTURE: <var>[<phase_sep><phase>][_<tag>] (<phase> from "known_phases", <var> = 'H2O' or from "newH2OIso") =====
+!==============================================================================================================================
 CHARACTER(LEN=maxlen) FUNCTION new2oldH2O_1(newName, iPhase) RESULT(oldName)
   CHARACTER(LEN=*),  INTENT(IN)  :: newName

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -3 +3 @@
 MODULE infotrac_phy
 
-   USE       strings_mod, ONLY: msg, maxlen, cat, dispTable, int2str, bool2str, strStack, strParse, strCount, strIdx
-   USE readTracFiles_mod, ONLY: readTracersFiles, maxTableWidth,  tisot=>isot_type, addPhase, addKey, iH2O, &
-        indexUpdate, keys_type, testTracersFiles, processIsotopes, trac=>tracers,   delPhase, getKey, tran0
-   USE readTracFiles_mod, ONLY: new2oldH2O
-
+   USE       strings_mod, ONLY: msg, fmsg, maxlen, cat, dispTable, int2str, bool2str, strStack, strParse, strIdx
+   USE readTracFiles_mod, ONLY: trac_type, readTracersFiles, tracers, setGeneration, itZonIso, nzone, tran0, isoZone, &
+        delPhase, niso, getKey, isot_type, processIsotopes,  isotope, maxTableWidth, iqIsoPha, nphas, ixIso, isoPhas, &
+        addPhase, iH2O, addKey, isoSelect, testTracersFiles, isoKeys, indexUpdate,  iqWIsoPha, nbIso, ntiso, isoName, isoCheck
    IMPLICIT NONE
 
@@ -17 +16 @@
    PUBLIC :: nqtot,   nbtr,   nqo,   nqCO2,   nqtottr      !--- Main dimensions
    PUBLIC :: conv_flg, pbl_flg                             !--- Convection & boundary layer activation keys
-   PUBLIC :: new2oldH2O                                    !--- For backwards compatibility in phyetat0
-   PUBLIC :: addPhase, delPhase                            !--- Add/remove the phase from the name of a tracer
-#if defined CPP_StratAer || defined REPROBUS
+#ifdef CPP_StratAer
    PUBLIC :: nbtr_bin, nbtr_sulgas                         !--- Number of aerosols bins and sulfur gases for StratAer model
    PUBLIC :: id_OCS_strat, id_SO2_strat, id_H2SO4_strat, id_BIN01_strat, id_TEST_strat
 #endif
 
+   !=== FOR WATER
+   PUBLIC :: ivap, iliq, isol
    !=== FOR ISOTOPES: General
    PUBLIC :: isot_type, nbIso                              !--- Derived type, full isotopes families database + nb of families
-   PUBLIC :: isoSelect, ixIso, isoFamilies                 !--- Isotopes families selection tool + selected index + list
+   PUBLIC :: isoSelect, ixIso                              !--- Isotopes family selection tool + selected family index
    !=== FOR ISOTOPES: Specific to water
-   PUBLIC :: iH2O                                          !--- Value of "ixIso" for "H2O" isotopes class
-   PUBLIC :: ivap, iliq, isol
+   PUBLIC :: iH2O                                          !--- H2O isotopes class index
    !=== FOR ISOTOPES: Depending on the selected isotopes family
-   PUBLIC :: isotope                                       !--- Selected isotopes database (argument of getKey)
-   PUBLIC :: isoKeys, isoName, isoZone, isoPhas            !--- Isotopes keys & names, tagging zones names, phases
-   PUBLIC ::    niso,   ntiso,   nzone,   nphas            !--- Number of   "   "
-   PUBLIC :: itZonIso                                      !--- index "it" in "isoName(1:niso)" = f(tagging idx, isotope idx)
-   PUBLIC :: iqIsoPha                                      !--- index "iq" in "qx"              = f(isotope idx,   phase idx)
-   PUBLIC :: iqWIsoPha                                     !--- Same as iqIsoPha but with normal water phases
+   PUBLIC :: isotope, isoKeys                              !--- Selected isotopes database + associated keys (cf. getKey)
+   PUBLIC :: isoName, isoZone, isoPhas                     !--- Isotopes and tagging zones names, phases
+   PUBLIC :: niso,    nzone,   nphas,   ntiso              !---  " " numbers + isotopes & tagging tracers number
+   PUBLIC :: itZonIso                                      !--- idx "it" (in "isoName(1:niso)") = function(tagging idx, isotope idx)
+   PUBLIC :: iqIsoPha                                      !--- idx "iq" (in "qx") = function(isotope idx, phase idx) + aliases
+   PUBLIC :: iqWIsoPha                                      !--- Same as iqIsoPha but with normal water phases
+
    PUBLIC :: isoCheck                                      !--- Run isotopes checking routines
    !=== FOR BOTH TRACERS AND ISOTOPES
@@ -44 +43 @@
 !  |--------------------+-----------------------+-----------------+---------------+----------------------------|
 !  | water in different |    water tagging      |  water isotopes | other tracers | additional tracers moments |
-!  | phases: H2O_[glsrb]|      isotopes         |                 |               |  for higher order schemes  |
+!  | phases: H2O_[gls]  |      isotopes         |                 |               |  for higher order schemes  |
 !  |--------------------+-----------------------+-----------------+---------------+----------------------------|
 !  |                    |                       |                 |               |                            |
@@ -58 +57 @@
 !  |-----------------------------------------------------------------------------------------------------------|
 !  NOTES FOR THIS TABLE:
-!  * Used "niso", "nzone" and "ntiso" are components of "isotopes(ip)" for water (isotopes(ip)%name == 'H2O'),
+!  * Used "niso", "nzone" and "ntiso" are components of "isotopes(ip)" for water (isotopes(ip)%parent == 'H2O'),
 !    since water is so far the sole tracers family, except passive CO2, removed from the main tracers table.
 !  * For water, "nqo" is equal to the more general field "isotopes(ip)%nphas".
 !  * "niso", "nzone", "ntiso", "nphas" are defined for other isotopic tracers families, if any.
-!  * If you deal with an isotopes family other than "H2O" ("Sulf" in the example), a good practice is to keep
-!    track of the isotopes class (of its index) before switching to it at the beginning of the dedicated code:
-!  - first time (use selection by name and compute the corresponding index iSulf) :
-!  i0=ixIso; IF(.NOT.isoSelect('Sulf')) CALL abort_physic("Can't select isotopes class", modname, 1); iS=ixIso
-!  - next times (use selection by index - "iS" has been computed at first call):
-!  i0=ixIso; IF(.NOT.isoSelect(iS))     CALL abort_physic("Can't select isotopes class", modname, 1)
-!    and to switch back to the original category when you're done with "Sulf":
-!            IF(.NOT.isoSelect(i0))     CALL abort_physic("Can't select isotopes class", modname, 1)
-!    to restore the original isotopes category (before dealing with "Sulf" (most of the time "H2O").
 !
 !=== DERIVED TYPE EMBEDDING MOST OF THE TRACERS-RELATED QUANTITIES (LENGTH: nqtot)
@@ -78 +68 @@
 !  |-------------+------------------------------------------------------+-------------+------------------------+
 !  | name        | Name (short)                                         | tname       |                        |
-!  | keys        | key/val pairs accessible with "getKey" routine       | /           |                        |
 !  | gen0Name    | Name of the 1st generation ancestor                  | /           |                        |
 !  | parent      | Name of the parent                                   | /           |                        |
 !  | longName    | Long name (with adv. scheme suffix) for outputs      | ttext       |                        |
 !  | type        | Type (so far: tracer or tag)                         | /           | tracer,tag             |
-!  | phase       | Phases list ("g"as / "l"iquid / "s"olid              |             | [g|l|s|r|b]            |
-!  |             |              "r"(cloud) / "b"lowing)                 | /           |                        |
+!  | phase       | Phases list ("g"as / "l"iquid / "s"olid)             | /           | [g][l][s]              |
 !  | component   | Name(s) of the merged/cumulated section(s)           | /           | coma-separated names   |
 !  | iGeneration | Generation (>=1)                                     | /           |                        |
@@ -91 +79 @@
 !  | nqDescen    | Number of the descendants   (all generations)        | nqdesc      | 1:nqtot                |
 !  | nqChildren  | Number of childs            (1st generation only)    | nqfils      | 1:nqtot                |
-!  | isAdvected  | Advected tracers flag (.TRUE. if iadv >= 0)          | /           | nqtrue  .TRUE. values  |
-!  | isInPhysics | Tracers not extracted from the main table in physics | /           | nqtottr .TRUE. values  |
+!  | keys        | key/val pairs accessible with "getKey" routine       | /           |                        |
+!  | isAdvected  | advected tracers flag (.TRUE. if iadv >= 0)          | /           | nqtrue  .TRUE. values  |
+!  | isInPhysics | tracers not extracted from the main table in physics | /           | nqtottr .TRUE. values  |
 !  | iso_iGroup  | Isotopes group index in isotopes(:)                  | /           | 1:nbIso                |
 !  | iso_iName   | Isotope  name  index in isotopes(iso_iGroup)%trac(:) | iso_indnum  | 1:niso                 |
@@ -104 +93 @@
 !  |  entry | length | Meaning                                          |    Former name     | Possible values |
 !  |-----------------+--------------------------------------------------+--------------------+-----------------+
-!  | name            | Name of the isotopes class (family)              |                    |                 |
+!  | parent          | Parent tracer (isotopes family name)             |                    |                 |
 !  | keys   | niso   | Isotopes keys/values pairs list + number         |                    |                 |
 !  | trac   | ntiso  | Isotopes + tagging tracers list + number         | / | ntraciso       |                 |
 !  | zone   | nzone  | Geographic tagging zones   list + number         | / | ntraceurs_zone |                 |
-!  | phase  | nphas  | Phases                     list + number         |                    | [g|l|s|r|b] 1:5 |
+!  | phase  | nphas  | Phases                     list + number         |                    | [g][l][s], 1:3  |
 !  | iqIsoPha        | Index in "qx"           = f(name(1:ntiso)),phas) | iqiso              | 1:nqtot         |
-!  | iqWIsoPha       | Index in "qx"       = f(name(1:ntiso+nqo)),phas) |   ?                | 1:nqtot         |
+!  | iqWIsoPha       | Index in "qx"           = f(name(1:ntiso)),phas) | iqiso              | 1:nqtot         |
 !  | itZonIso        | Index in "trac(1:ntiso)"= f(zone, name(1:niso))  | index_trac         | 1:ntiso         |
 !  +-----------------+--------------------------------------------------+--------------------+-----------------+
 
-!------------------------------------------------------------------------------------------------------------------------------
-   TYPE :: trac_type                                            !=== TYPE FOR A SINGLE TRACER NAMED "name"
-     CHARACTER(LEN=maxlen) :: name        = ''                  !--- Name of the tracer
-     TYPE(keys_type)       :: keys                              !--- <key>=<val> pairs vector (general container)
-     CHARACTER(LEN=maxlen) :: gen0Name    = ''                  !--- First generation ancestor name
-     CHARACTER(LEN=maxlen) :: parent      = ''                  !--- Parent name
-     CHARACTER(LEN=maxlen) :: longName    = ''                  !--- Long name (with advection scheme suffix)
-     CHARACTER(LEN=maxlen) :: type        = 'tracer'            !--- Type  (so far: 'tracer' / 'tag')
-     CHARACTER(LEN=maxlen) :: phase       = 'g'                 !--- Phase ('g'as / 'l'iquid / 's'olid)
-     CHARACTER(LEN=maxlen) :: component   = ''                  !--- Coma-separated list of components (Ex: lmdz,inca)
-     INTEGER               :: iGeneration = -1                  !--- Generation number (>=0)
-     INTEGER               :: iqParent    = 0                   !--- Parent index
-     INTEGER,  ALLOCATABLE :: iqDescen(:)                       !--- Descendants index (in growing generation order)
-     INTEGER               :: nqDescen    = 0                   !--- Number of descendants (all generations)
-     INTEGER               :: nqChildren  = 0                   !--- Number of children  (first generation)
-     LOGICAL               :: isAdvected  = .FALSE.             !--- "true" tracers: iadv > 0.   COUNT(isAdvected )=nqtrue
-     LOGICAL               :: isInPhysics = .TRUE.              !--- "true" tracers: in tr_seri. COUNT(isInPhysics)=nqtottr
-     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(:)
-     INTEGER               :: iso_iPhase  = 0                   !--- Isotope  phase index in isotopes(iso_iGroup)%phase
-   END TYPE trac_type
-!------------------------------------------------------------------------------------------------------------------------------
-  TYPE :: isot_type                                             !=== TYPE FOR THE ISOTOPES FAMILY DESCENDING ON TRACER "name"
-    CHARACTER(LEN=maxlen)              :: name                  !--- Isotopes family name (ex: H2O)
-    TYPE(keys_type),       ALLOCATABLE :: keys(:)               !--- Isotopes keys/values pairs list     (length: niso)
-    LOGICAL                            :: check=.FALSE.         !--- Flag for checking routines triggering
-    CHARACTER(LEN=maxlen), ALLOCATABLE :: trac(:)               !--- Isotopes + tagging tracers list     (length: ntiso)
-    CHARACTER(LEN=maxlen), ALLOCATABLE :: zone(:)               !--- Geographic tagging zones names list (length: nzone)
-    CHARACTER(LEN=maxlen)              :: phase = 'g'           !--- Phases list: [g|l|s|r|b]            (length: nphas)
-    INTEGER                            :: niso  = 0             !--- Number of isotopes, excluding tagging tracers
-    INTEGER                            :: ntiso = 0             !--- Number of isotopes, including tagging tracers
-    INTEGER                            :: nzone = 0             !--- Number of geographic tagging zones
-    INTEGER                            :: nphas = 0             !--- Number of phases
-    INTEGER,               ALLOCATABLE :: iqIsoPha(:,:)         !--- Idx in "tracers(1:nqtot)" = f(     name(1:ntiso) ,phas)
-    INTEGER,               ALLOCATABLE :: iqWIsoPha(:,:)        !--- Idx in "tracers(1:nqtot)" = f([H2O,name(1:ntiso)],phas)
-    INTEGER,               ALLOCATABLE :: itZonIso(:,:)         !--- Idx in "trac(1:ntiso)"    = f(zone,name(1:niso))
-  END TYPE isot_type
-!------------------------------------------------------------------------------------------------------------------------------
-  INTERFACE isoSelect; MODULE PROCEDURE isoSelectByIndex, isoSelectByName; END INTERFACE isoSelect
-!------------------------------------------------------------------------------------------------------------------------------
-
-   !=== INDICES FOR WATER
-   INTEGER, SAVE :: ivap, iliq, isol
-!$OMP THREADPRIVATE(ivap, iliq, isol)
-
    !=== DIMENSIONS OF THE TRACERS TABLES AND OTHER SCALAR VARIABLES
-   INTEGER,               SAVE :: nqtot,   &                    !--- Tracers nb in dynamics (incl. higher moments + H2O)
-                                  nbtr,    &                    !--- Tracers nb in physics  (excl. higher moments + H2O)
-                                  nqo,     &                    !--- Number of water phases
+   INTEGER,               SAVE :: nqtot,  &                     !--- Tracers nb in dynamics (incl. higher moments + H2O)
+                                  nbtr,   &                     !--- Tracers nb in physics  (excl. higher moments + H2O)
+                                  nqo,    &                     !--- Number of water phases
                                   nqtottr, &                    !--- Number of tracers passed to phytrac (TO BE DELETED ?)
                                   nqCO2                         !--- Number of tracers of CO2  (ThL)
@@ -169 +112 @@
 !$OMP THREADPRIVATE(nqtot, nbtr, nqo, nqtottr, nqCO2, type_trac)
 
-   !=== NUMBER AND LIST OF DEFINED ISOTOPES FAMILIES
-   INTEGER,               SAVE              :: nbIso            !--- Number of defined isotopes classes
-   CHARACTER(LEN=maxlen), SAVE, ALLOCATABLE :: isoFamilies(:)   !--- Generation 0 tracer name for each isotopes family (nbIso)
-!$OMP THREADPRIVATE(isoFamilies)
-
-   !=== QUANTITIES RELATED TO THE CURRENTLY SELECTED ISOTOPES CLASS (USUALLY H2O)
-   TYPE(isot_type),       SAVE, POINTER :: isotope              !--- Selected isotopes database (=isotopes(ixIso))
-   TYPE(keys_type),       SAVE, POINTER :: isoKeys(:)           !--- Database to get isotopes keys using "getKey"       (niso)
-   CHARACTER(LEN=maxlen), SAVE, POINTER :: isoName(:),      &   !--- Isotopes list including tagging tracers, no phase (ntiso)
-                                           isoZone(:),      &   !--- Geographic tagging zones list                     (nzone)
-                                           isoPhas              !--- Used phases names ([g|l|s|r|b])                   (nphas)
-   INTEGER,               SAVE, POINTER :: itZonIso(:,:),   &   !--- Idx "it" in isoName(1:niso) = f(tagging idx, isotope idx)
-                                           iqIsoPha(:,:),   &   !--- Idx "iq" in qx              = f(isotope idx,   phase idx)
-                                           iqWIsoPha(:,:)       !--- Idx "iq" in qx = f([parent trac,isotope idx],  phase idx)
-   INTEGER,               SAVE          :: ixIso,           &   !--- Idx in "isoFamilies" of currently selectd class
-                                           niso,            &   !--- Number of isotopes
-                                           ntiso,           &   !--- Number of isotopes + tagging tracers
-                                           nzone,           &   !--- Number of tagging zones
-                                           nphas                !--- Number of phases
-   LOGICAL,               SAVE          :: isoCheck             !--- Isotopes checking routines triggering flag
-!$OMP THREADPRIVATE(isotope, isoKeys, isoName, isoZone, isoPhas, itZonIso, iqIsoPha, iqWIsoPha, niso, ntiso, nzone, nphas, isoCheck)
+   !=== INDICES OF WATER
+   INTEGER,               SAVE :: ivap,iliq,isol ! Indices for vap, liq and ice
+!$OMP THREADPRIVATE(ivap,iliq,isol)
 
    !=== VARIABLES FOR INCA
-   INTEGER, DIMENSION(:), SAVE, ALLOCATABLE :: &
-                    conv_flg, pbl_flg                           !--- Convection / boundary layer activation (nbtr)
+   INTEGER,               SAVE, ALLOCATABLE :: conv_flg(:), &   !--- Convection     activation ; needed for INCA        (nbtr)
+                                                pbl_flg(:)      !--- Boundary layer activation ; needed for INCA        (nbtr)
 !$OMP THREADPRIVATE(conv_flg, pbl_flg)
 
-   !=== TRACERS/ISOTOPES DESCRIPTORS: EFFECTIVE STORAGE (LOCAL DERIVED TYPES)
-   TYPE(trac_type), SAVE, ALLOCATABLE, TARGET ::  tracers(:)
-   TYPE(isot_type), SAVE, ALLOCATABLE, TARGET :: isotopes(:)
-!$OMP THREADPRIVATE(tracers, isotopes)
-
-#if defined CPP_StratAer || defined REPROBUS
+#ifdef CPP_StratAer
   !=== SPECIFIC TO STRATOSPHERIC AEROSOLS (CK/OB)
   INTEGER, SAVE ::  nbtr_bin, nbtr_sulgas         !--- number of aerosols bins and sulfur gases for StratAer model
@@ -213 +133 @@
 SUBROUTINE init_infotrac_phy
    USE ioipsl_getin_p_mod, ONLY: getin_p
-   USE mod_phys_lmdz_para, ONLY: is_master, is_omp_master
 #ifdef REPROBUS
    USE CHEM_REP, ONLY: Init_chem_rep_trac
@@ -242 +161 @@
 !------------------------------------------------------------------------------------------------------------------------------
 ! Local variables
-   INTEGER, ALLOCATABLE :: hadv(:), vadv(:), itmp(:)                 !--- Horizontal/vertical transport scheme number
+   INTEGER, ALLOCATABLE :: hadv(:), vadv(:)                          !--- Horizontal/vertical transport scheme number
 #ifdef INCA
    INTEGER, ALLOCATABLE :: had (:), hadv_inca(:), conv_flg_inca(:), &!--- Variables specific to INCA
@@ -254 +173 @@
    CHARACTER(LEN=2)      ::   suff(9)                                !--- Suffixes for schemes of order 3 or 4 (Prather)
    CHARACTER(LEN=3)      :: descrq(30)                               !--- Advection scheme description tags
-   CHARACTER(LEN=maxlen) :: msg1, texp, ttp, ky                      !--- Strings for messages and expanded tracers type
+   CHARACTER(LEN=maxlen) :: msg1, texp, ttp                          !--- String for messages and expanded tracers type
    INTEGER :: fType                                                  !--- Tracers description file type ; 0: none
                                                                      !--- 1/2/3: "traceur.def"/"tracer.def"/"tracer_*.def"
    INTEGER :: nqtrue                                                 !--- Tracers nb from tracer.def (no higher order moments)
    INTEGER :: iad                                                    !--- Advection scheme number
-   INTEGER :: iq, jq, it, nt, im, nm                                 !--- Indexes and temporary variables
-   LOGICAL :: lInit
-   TYPE(keys_type), ALLOCATABLE, TARGET :: tra(:)                    !--- Tracers  descriptor as in readTracFiles_mod
-   TYPE(tisot),     ALLOCATABLE         :: iso(:)                    !--- Isotopes descriptor as in readTracFiles_mod
+   INTEGER :: iq, jq, nt, im, nm, k                                 !--- Indexes and temporary variables
+   LOGICAL :: lerr, lInit
    TYPE(trac_type), ALLOCATABLE, TARGET :: ttr(:)
-   TYPE(trac_type), POINTER             :: t(:), t1
-   TYPE(keys_type), POINTER             :: k(:)
-   CHARACTER(LEN=maxlen),   ALLOCATABLE :: types_trac(:)             !--- Keywords for tracers type(s), parsed version
+   TYPE(trac_type), POINTER             :: t1, t(:)
+   CHARACTER(LEN=maxlen),   ALLOCATABLE :: types_trac(:)  !--- Keyword for tracers type(s), parsed version
+   
    CHARACTER(LEN=*), PARAMETER :: modname="init_infotrac_phy"
 !------------------------------------------------------------------------------------------------------------------------------
@@ -278 +195 @@
 
    CALL getin_p('type_trac',type_trac)
-   CALL msg('type_trac = "'//TRIM(type_trac)//'"', modname, is_master)
-   IF(strCount(type_trac, '|', nt)) CALL abort_physic(modname, 'Could''nt parse the "type_trac" string with delimiter "|"', 1)
-   IF(nt >= 3) CALL abort_physic(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
-   IF(strParse(type_trac, '|', types_trac, n=nt)) CALL abort_physic(modname, "couldn't parse "//'"type_trac"', 1)
-   IF(nt == 2) type_trac = types_trac(2) ! TO BE DELETED SOON
-
-   lInit = .NOT.ALLOCATED(trac)
-
-!##############################################################################################################################
-   IF(lInit .AND. is_master) THEN                                    !=== SKIPED IF ALREADY DONE
+
+   lerr=strParse(type_trac, '|', types_trac, n=nt)
+   IF (nt .GT. 1) THEN
+      IF (nt .GT. 2) CALL abort_physic(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
+      IF (nt .EQ. 2) type_trac=types_trac(2)
+   ENDIF
+
+   
+   CALL msg('type_trac = "'//TRIM(type_trac)//'"', modname)
+   lInit = .NOT.ALLOCATED(tracers)
+
+!##############################################################################################################################
+   IF(lInit) THEN                                                    !=== SKIPED IF ALREADY DONE IN dyn3d_common/infotrac  ####
 !##############################################################################################################################
    !--- MESSAGE ABOUT THE CHOSEN CONFIGURATION
@@ -320 +240 @@
 !##############################################################################################################################
 
-!==============================================================================================================================
-! 0) DETERMINE THE TYPE OF THE INPUT TRACERS DESCRIPTION FILE AND READ IT ; TRANSFER THE NEEDED QUANTITIES TO LOCAL "tracers".
-!==============================================================================================================================
-   texp = type_trac                                                            !=== EXPANDED (WITH "|" SEPARATOR) "type_trac"
+   nqCO2 = COUNT( [type_trac == 'inco', type_trac == 'co2i'] )
+
+!==============================================================================================================================
+! 1) Get the numbers of: true (first order only) tracers "nqtrue", water tracers "nqo" (vapor/liquid/solid)
+!==============================================================================================================================
+   texp = type_trac                                                  !=== EXPANDED VERSION OF "type_trac", WITH "|" SEPARATOR
    IF(texp == 'inco') texp = 'co2i|inca'
    IF(texp /= 'lmdz') texp = 'lmdz|'//TRIM(texp)
-   IF(testTracersFiles(modname, texp, fType, lInit.AND.is_master)) CALL abort_physic(modname, 'problem with tracers file(s)',1)
+
+   !=== DETERMINE THE TYPE OF THE INPUT TRACERS DESCRIPTION FILE
+   IF(testTracersFiles(modname, texp, fType, lInit)) CALL abort_physic(modname, 'problem with tracers file(s)',1)
+
    ttp = type_trac; IF(fType /= 1) ttp = texp
-   !---------------------------------------------------------------------------------------------------------------------------
-   IF(fType == 0) CALL abort_physic(modname, 'Missing "traceur.def", "tracer.def" or "tracer_<keyword>.def tracers file.',1)
-   !---------------------------------------------------------------------------------------------------------------------------
-   IF(fType == 1 .AND. ANY(['inca', 'inco'] == type_trac)) &                   !=== FOUND OLD STYLE INCA "traceur.def"
-      CALL abort_physic(modname, 'retro-compatibility with old-style INCA traceur.def files has been disabled.', 1)
-   !---------------------------------------------------------------------------------------------------------------------------
-
-!##############################################################################################################################
-   IF(lInit .AND. is_omp_master) THEN
-      IF(readTracersFiles(ttp, tra, type_trac == 'repr')) CALL abort_physic(modname, 'problem with tracers file(s)',1)
+
+!##############################################################################################################################
+   IF(lInit) THEN
+      IF(readTracersFiles(ttp, lRepr=type_trac=='repr')) CALL abort_physic(modname, 'problem with tracers file(s)',1)
    ELSE
-      tra = trac
-   END IF
-   CALL msg('No tracers description file(s) reading needed: already done', modname, .NOT.lInit.AND.is_master)
-!##############################################################################################################################
-
-   !--- POPULATE SOME EXPLICIT (ACCESSIBLE THROUGH "%") KEYS OF THE LOCAL TRACERS DESCRIPTION DERIVED TYPE
-   !    To be defined: iqParent, iq/nqDescen, nqChildren (in indexUpdate), longName, iso_i*, isAdvected, isInPhysics (later)
-   ALLOCATE(tracers(SIZE(tra)))
-   DO iq = 1, SIZE(tra); t1 => tracers(iq)
-      t1%keys = tra(iq)
-      msg1 = '" for tracer nr. '//TRIM(int2str(iq))
-      ky='name       '; IF(getKey(ky, t1%name,        iq, tra)) CALL abort_physic(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      msg1 = '" for "'//TRIM(t1%name)//'"'
-      ky='gen0Name   '; IF(getKey(ky, t1%gen0Name,    iq, tra)) CALL abort_physic(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='parent     '; IF(getKey(ky, t1%parent,      iq, tra)) CALL abort_physic(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='type       '; IF(getKey(ky, t1%type,        iq, tra)) CALL abort_physic(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='phase      '; IF(getKey(ky, t1%phase,       iq, tra)) CALL abort_physic(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='component  '; IF(getKey(ky, t1%component,   iq, tra)) CALL abort_physic(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='iGeneration'; IF(getKey(ky, t1%iGeneration, iq, tra)) CALL abort_physic(modname, 'No key "'//TRIM(ky)//TRIM(msg1), 1)
-   END DO
-
-!==============================================================================================================================
-! 1) Get various numbers: "nqtrue" (first order only tracers), "nqo" (water phases), 'nbtr' (tracers passed to physics), etc.
-!==============================================================================================================================
-   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
-   nqCO2  =      COUNT( [type_trac == 'inco', type_trac == 'co2i'] )
+      CALL msg('No tracers description file(s) reading needed: already done in the dynamics', modname)
+   END IF
+!##############################################################################################################################
+
+   !---------------------------------------------------------------------------------------------------------------------------
+   IF(fType == 0) CALL abort_physic(modname, 'Missing tracers file: "traceur.def", "tracer.def" or "tracer_<keyword>.def file.',1)
+   !---------------------------------------------------------------------------------------------------------------------------
+   IF(fType == 1 .AND. ANY(['inca','inco']==type_trac) .AND. lInit) THEN  !=== FOUND OLD STYLE INCA "traceur.def"
+   !---------------------------------------------------------------------------------------------------------------------------
 #ifdef INCA
-   nqINCA =      COUNT(tracers(:)%component == 'inca')
-#endif
+      nqo = SIZE(tracers) - nqCO2
+      CALL Init_chem_inca_trac(nqINCA)                               !--- Get nqINCA from INCA
+      nbtr = nqINCA + nqCO2                                          !--- Number of tracers passed to phytrac
+      nqtrue = nbtr + nqo                                            !--- Total number of "true" tracers
+      IF(ALL([2,3] /= nqo)) CALL abort_physic(modname, 'Only 2 or 3 water phases allowed ; found nqo='//TRIM(int2str(nqo)), 1)
+      ALLOCATE(hadv(nqtrue), hadv_inca(nqINCA), conv_flg_inca(nqINCA), solsym_inca(nqINCA))
+      ALLOCATE(vadv(nqtrue), vadv_inca(nqINCA),  pbl_flg_inca(nqINCA))
+      CALL init_transport(solsym_inca, conv_flg_inca, pbl_flg_inca, hadv_inca, vadv_inca)
+      ALLOCATE(ttr(nqtrue))
+      ttr(1:nqo+nqCO2)                  = tracers
+      ttr(1    :      nqo   )%component = 'lmdz'
+      ttr(1+nqo:nqCO2+nqo   )%component = 'co2i'
+      ttr(1+nqo+nqCO2:nqtrue)%component = 'inca'
+      ttr(1+nqo      :nqtrue)%name      = [('CO2     ', k=1, nqCO2), solsym_inca]
+      ttr(1+nqo+nqCO2:nqtrue)%parent    = tran0
+      ttr(1+nqo+nqCO2:nqtrue)%phase     = 'g'
+      lerr = getKey('hadv', had, ky=tracers(:)%keys)
+      lerr = getKey('vadv', vad, ky=tracers(:)%keys)
+      hadv(1:nqo+nqCO2) = had(:); hadv(1+nqo+nqCO2:nqtrue) = hadv_inca
+      vadv(1:nqo+nqCO2) = vad(:); vadv(1+nqo+nqCO2:nqtrue) = vadv_inca
+      CALL MOVE_ALLOC(FROM=ttr, TO=tracers)
+      DO iq = 1, nqtrue
+         t1 => tracers(iq)
+         CALL addKey('name',      t1%name,      t1%keys)
+         CALL addKey('component', t1%component, t1%keys)
+         CALL addKey('parent',    t1%parent,    t1%keys)
+         CALL addKey('phase',     t1%phase,     t1%keys)
+      END DO
+      IF(setGeneration(tracers)) CALL abort_physic(modname,'See below',1) !- SET FIELDS %iGeneration, %gen0Name
+      DEALLOCATE(had, hadv_inca, vad, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca)
+#endif
+   !---------------------------------------------------------------------------------------------------------------------------
+   ELSE                                                              !=== OTHER CASES (OLD OR NEW FORMAT, NO INCA MODULE)
+   !---------------------------------------------------------------------------------------------------------------------------
+      nqo    =        COUNT(delPhase(tracers(:)%name)     == 'H2O' &
+                               .AND. tracers(:)%component == 'lmdz') !--- Number of water phases
+      nqtrue = SIZE(tracers)                                         !--- Total number of "true" tracers
+      nbtr   = nqtrue-COUNT(delPhase(tracers(:)%gen0Name) == 'H2O' &
+                               .AND. tracers(:)%component == 'lmdz') !--- Number of tracers passed to phytrac
+#ifdef INCA
+      nqINCA = COUNT(tracers(:)%component == 'inca')
+#endif
+      lerr = getKey('hadv', hadv, ky=tracers(:)%keys)
+      lerr = getKey('vadv', vadv, ky=tracers(:)%keys)
+   !---------------------------------------------------------------------------------------------------------------------------
+   END IF
+   !---------------------------------------------------------------------------------------------------------------------------
+
+   !--- Transfert the number of tracers to Reprobus
 #ifdef REPROBUS
-   CALL Init_chem_rep_trac(nbtr, nqo, tracers(:)%name)                         !--- Transfert the number of tracers to Reprobus
-#endif
+   CALL Init_chem_rep_trac(nbtr, nqo, tracers(:)%name)
+#endif
+
+!##############################################################################################################################
+   IF(lInit) THEN                                                    !=== SKIPED IF ALREADY DONE IN dyn3d_common/infotrac  ####
+!##############################################################################################################################
 
 !==============================================================================================================================
 ! 2) Calculate nqtot, number of tracers needed (greater if advection schemes 20 or 30 have been chosen).
 !==============================================================================================================================
-   IF(getKey('hadv', hadv, ky=tra)) CALL abort_physic(modname, 'missing key "hadv"', 1)
-   IF(getKey('vadv', vadv, ky=tra)) CALL abort_physic(modname, 'missing key "vadv"', 1)
    DO iq = 1, nqtrue
       IF( hadv(iq)<20 .OR. (ANY(hadv(iq)==[20,30]) .AND. hadv(iq)==vadv(iq)) ) CYCLE
@@ -399 +348 @@
 !==============================================================================================================================
    ALLOCATE(ttr(nqtot))
-   jq = nqtrue+1
+   jq = nqtrue+1; tracers(:)%iadv = -1
    DO iq = 1, nqtrue
       t1 => tracers(iq)
@@ -410 +359 @@
       IF(iad == -1) CALL abort_physic(modname, msg1, 1)
 
-      !--- SET FIELDS longName, isAdvected, isInPhysics
+      !--- SET FIELDS %longName, %isAdvected, %isInPhysics
       t1%longName   = t1%name; IF(iad > 0) t1%longName=TRIM(t1%name)//descrq(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' !=== OTHER EXCEPTIONS TO BE ADDED: CO2i, SURSATURATED WATER CLOUD...
       ttr(iq)       = t1
 
@@ -422 +372 @@
       IF(nm == 0) CYCLE                                              !--- No higher moments
       ttr(jq+1:jq+nm)             = t1
-      ttr(jq+1:jq+nm)%name        = [ (TRIM(t1%name)    //'-'//TRIM(suff(im)), im=1, nm) ]
-      ttr(jq+1:jq+nm)%gen0Name    = [ (TRIM(t1%name)    //'-'//TRIM(suff(im)), im=1, nm) ]
-      ttr(jq+1:jq+nm)%parent      = [ (TRIM(t1%parent)  //'-'//TRIM(suff(im)), im=1, nm) ]
-      ttr(jq+1:jq+nm)%longName    = [ (TRIM(t1%longName)//'-'//TRIM(suff(im)), im=1, nm) ]
-      ttr(jq+1:jq+nm)%isAdvected  = [ (.FALSE., im=1, nm) ]
-      ttr(jq+1:jq+nm)%isInPhysics = [ (.FALSE., im=1, nm) ]
+      ttr(jq+1:jq+nm)%name        = [(TRIM(t1%name)    //'-'//TRIM(suff(im)), im=1, nm) ]
+      ttr(jq+1:jq+nm)%parent      = [(TRIM(t1%parent)  //'-'//TRIM(suff(im)), im=1, nm) ]
+      ttr(jq+1:jq+nm)%longName    = [(TRIM(t1%longName)//'-'//TRIM(suff(im)), im=1, nm) ]
+      ttr(jq+1:jq+nm)%isAdvected  = [(.FALSE., im=1, nm) ]
       jq = jq + nm
    END DO
@@ -433 +381 @@
    CALL MOVE_ALLOC(FROM=ttr, TO=tracers)
 
-   !--- SET FIELDS iqParent, iqDescen, nqDescen, nqChildren
-   IF(indexUpdate(tracers%keys)) CALL abort_physic(modname, 'problem with tracers indices update', 1)
-   k => tracers(:)%keys
-   DO iq = 1, SIZE(tracers); t1 => tracers(iq); msg1 = '" for "'//TRIM(t1%name)//'"'
-      ky='iqParent  '; IF(getKey(ky, t1%iqParent,   iq, k)) CALL abort_physic(modname, 'missing key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='iqDescen  '; IF(getKey(ky, t1%iqDescen,   iq, k)) CALL abort_physic(modname, 'missing key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='nqDescen  '; IF(getKey(ky, t1%nqDescen,   iq, k)) CALL abort_physic(modname, 'missing key "'//TRIM(ky)//TRIM(msg1), 1)
-      ky='nqChildren'; IF(getKey(ky, t1%nqChildren, iq, k)) CALL abort_physic(modname, 'missing key "'//TRIM(ky)//TRIM(msg1), 1)
-   END DO
-
-   !=== DETERMINE ISOTOPES RELATED PARAMETERS ; DEFINE THE EXPLICIT KEYS iso_i*
-   IF(processIsotopes(tracers%keys, iso)) CALL abort_physic(modname, 'problem while processing isotopes parameters', 1)
-
-   !--- POPULATE SOME EXPLICIT (ACCESSIBLE THROUGH "%") KEYS OF THE LOCAL ISOTOPES DESCRIPTION DERIVED TYPE
-   nbIso = SIZE(iso)
-   ALLOCATE(isotopes(nbIso))
-   IF(nbIso /= 0) THEN
-      k => tracers(:)%keys
-      IF(getKey('iso_iGroup', itmp, ky=k)) CALL abort_physic(modname, 'missing key "iso_iGroup"', 1); tracers%iso_iGroup = itmp
-      IF(getKey('iso_iName',  itmp, ky=k)) CALL abort_physic(modname, 'missing key "iso_iName"',  1); tracers%iso_iName  = itmp
-      IF(getKey('iso_iZone',  itmp, ky=k)) CALL abort_physic(modname, 'missing key "iso_iZone"',  1); tracers%iso_iZone  = itmp
-      IF(getKey('iso_iPhas',  itmp, ky=k)) CALL abort_physic(modname, 'missing key "iso_iPhas"',  1); tracers%iso_iPhase = itmp
-      isotopes(:)%name  = iso(:)%name                           !--- Isotopes family name (ex: H2O)
-      isotopes(:)%phase = iso(:)%phase                          !--- Phases list: [g][l][s]              (length: nphas)
-      isotopes(:)%niso  = iso(:)%niso                           !--- Number of isotopes, excluding tagging tracers
-      isotopes(:)%ntiso = iso(:)%ntiso                          !--- Number of isotopes, including tagging tracers
-      isotopes(:)%nzone = iso(:)%nzone                          !--- Number of geographic tagging zones
-      isotopes(:)%nphas = iso(:)%nphas                          !--- Number of phases
-      isotopes(:)%check = .FALSE.                               !--- Flag for checking routines triggering
-      CALL getin_p('ok_iso_verif', isotopes(:)%check)
-      DO it = 1, nbIso
-         isotopes(it)%keys     = iso(it)%keys                   !--- Isotopes keys/values pairs list     (length: niso)
-         isotopes(it)%trac     = iso(it)%trac                   !--- Isotopes + tagging tracers list     (length: ntiso)
-         isotopes(it)%zone     = iso(it)%zone                   !--- Geographic tagging zones names list (length: nzone)
-         isotopes(it)%iqIsoPha = iso(it)%iqIsoPha(:,:)          !--- Idx in "tracers(1:nqtot)" = f(name(1:ntiso)),phas)
-         isotopes(it)%iqWIsoPha= iso(it)%iqWIsoPha(:,:)         !--- Idx in "tracers(1:nqtot)" = f([trPrnt,name(1:ntiso)],phas)
-         isotopes(it)%itZonIso = iso(it)%itZonIso(:,:)          !--- Idx in "tracers(1:ntiso)" = f(  zone,name(1:niso))
-      END DO
-      IF(isoSelect(1, .TRUE.)) CALL abort_physic(modname, "Can't select the first isotopes family", 1)
-      IF(.NOT.isoSelect('H2O', .TRUE.)) iH2O = ixIso
-   END IF
-   isoFamilies = isotopes(:)%name
-
+   !--- SET FIELDS %iqParent, %nqChildren, %iGeneration, %iqDescen, %nqDescen
+   IF(indexUpdate(tracers)) CALL abort_gcm(modname, 'problem when processing isotopes parameters', 1)
+
+!##############################################################################################################################
+   END IF
+!##############################################################################################################################
+
+!##############################################################################################################################
+   IF(.NOT.lInit) THEN
+!##############################################################################################################################
+     nqtot = SIZE(tracers)
+!##############################################################################################################################
+   ELSE
+!##############################################################################################################################
+
+   !=== READ PHYSICAL PARAMETERS FOR ISOTOPES
+   niso = 0; nzone = 0; nphas = nqo; ntiso = 0; isoCheck = .FALSE.
+   IF(processIsotopes()) CALL abort_physic(modname, 'Problem when processing isotopes parameters', 1)
+
+!##############################################################################################################################
+   END IF
+!##############################################################################################################################
    !--- Convection / boundary layer activation for all tracers
-   IF(.NOT.ALLOCATED(conv_flg)) ALLOCATE(conv_flg(nbtr)); conv_flg(1:nbtr) = 1
-   IF(.NOT.ALLOCATED( pbl_flg)) ALLOCATE( pbl_flg(nbtr));  pbl_flg(1:nbtr) = 1
+   IF (.NOT.ALLOCATED(conv_flg)) ALLOCATE(conv_flg(nbtr)); conv_flg(1:nbtr) = 1
+   IF (.NOT.ALLOCATED(pbl_flg)) ALLOCATE( pbl_flg(nbtr));  pbl_flg(1:nbtr) = 1
 
    !--- Note: nqtottr can differ from nbtr when nmom/=0
@@ -486 +413 @@
 
    !=== DISPLAY THE RESULTS
-   IF(.NOT.is_master) RETURN
    CALL msg('nqo    = '//TRIM(int2str(nqo)),    modname)
    CALL msg('nbtr   = '//TRIM(int2str(nbtr)),   modname)
@@ -498 +424 @@
 #endif
    t => tracers
-   CALL msg('Information stored in '//TRIM(modname)//': ', modname)
-   IF(dispTable('isssssssssiiiiiiii', ['iq  ', 'name', 'lNam', 'g0Nm', 'prnt', 'type', 'phas', 'comp',     &
-                       'isPh', 'isAd', 'iGen', 'iqPr', 'nqDe', 'nqCh', 'iGrp', 'iNam', 'iZon', 'iPha'],    &
-      cat(t%name, t%longName, t%gen0Name, t%parent, t%type, t%phase, t%component,                          &
-                                                         bool2str(t%isInPhysics), bool2str(t%isAdvected)), &
+   CALL msg('Information stored in infotrac_phy :', modname)
+   IF(dispTable('issssssssiiiiiiii', ['iq  ', 'name', 'lNam', 'g0Nm', 'prnt', 'type', 'phas', 'comp',      &
+                              'isPh', 'iGen', 'iqPr', 'nqDe', 'nqCh', 'iGrp', 'iNam', 'iZon', 'iPha'],     &
+      cat(t%name, t%longName, t%gen0Name, t%parent, t%type, t%phase, t%component, bool2str(t%isInPhysics)),&
       cat([(iq, iq=1, nqtot)], t%iGeneration, t%iqParent, t%nqDescen, t%nqChildren, t%iso_iGroup,          &
                   t%iso_iName, t%iso_iZone, t%iso_iPhase), nColMax=maxTableWidth, nHead=2, sub=modname))   &
       CALL abort_physic(modname, "problem with the tracers table content", 1)
+   IF(niso > 0) THEN
+      CALL msg('Where, for isotopes family "'//TRIM(isotope%parent)//'":', modname)
+      CALL msg('  isoKeys%name = '//strStack(isoKeys%name), modname)
+      CALL msg('  isoName = '//strStack(isoName),      modname)
+      CALL msg('  isoZone = '//strStack(isoZone),      modname)
+      CALL msg('  isoPhas = '//TRIM(isoPhas),          modname)
+   ELSE
+      CALL msg('No isotopes identified.', modname)
+   END IF
+
+#ifdef ISOVERIF
+   CALL msg('iso_iName = '//strStack(int2str(PACK(tracers(:)%iso_iName, MASK=tracers(:)%iso_iGroup==iH2O))), modname)
+#endif
 #ifdef CPP_StratAer
    IF (type_trac == 'coag') THEN
@@ -525 +463 @@
    END IF
 #endif
-   CALL msg('No isotopes identified.', modname, nbIso == 0)
-   IF(nbIso == 0) RETURN
-   DO it = 1, nbIso
-      IF(isoSelect(it, .TRUE.)) CALL abort_physic(modname, 'Problem when selecting isotopes class', 1)
-      CALL msg('For isotopes family "'//TRIM(isoFamilies(it))//'":', modname)
-      CALL msg('  isoName = '//strStack(isotope%trac),  modname)
-      CALL msg('  isoZone = '//strStack(isotope%zone),  modname)
-      CALL msg('  isoPhas = '//    TRIM(isotope%phase), modname)
-   END DO
-   IF(isoSelect('H2O', .TRUE.)) THEN
-      IF(isoSelect(1,  .TRUE.)) CALL abort_physic(modname, 'Problem when selecting isotopes class', 1)
-   ELSE
-      iH2O = ixIso
-   END IF
-   IF(ALLOCATED(isotope%keys(ixIso)%key)) &
-      CALL msg('  isoKeys('//TRIM(int2str(ixIso))//') = '//TRIM(strStack(isotope%keys(ixIso)%key)), modname)
-#ifdef ISOVERIF
-   CALL msg('iso_iName(H2O) = '//TRIM(strStack(int2str(PACK(tracers%iso_iName, MASK=tracers%iso_iGroup==iH2O)))),modname)
-#endif
+   CALL msg('end', modname)
 
 END SUBROUTINE init_infotrac_phy
 
-!==============================================================================================================================
-LOGICAL FUNCTION isoSelectByName(iClass, lVerbose) RESULT(lerr)
-   IMPLICIT NONE
-   CHARACTER(LEN=*),  INTENT(IN) :: iClass
-   LOGICAL, OPTIONAL, INTENT(IN) :: lVerbose
-   INTEGER :: iIso
-   LOGICAL :: lV
-   lV = .FALSE.; IF(PRESENT(lVerbose)) lV = lVerbose
-   iIso = strIdx(isotopes(:)%name, iClass)
-   lerr = iIso == 0
-   IF(lerr) THEN
-      niso = 0; ntiso = 0; nzone = 0; nphas = 0; isoCheck=.FALSE.
-      CALL msg('no isotope family named "'//TRIM(iClass)//'"', ll=lV)
-      RETURN
-   END IF
-   lerr = isoSelectByIndex(iIso, lV)
-END FUNCTION isoSelectByName
-!==============================================================================================================================
-LOGICAL FUNCTION isoSelectByIndex(iIso, lVerbose) RESULT(lerr)
-   IMPLICIT NONE
-   INTEGER,           INTENT(IN) :: iIso
-   LOGICAL, OPTIONAL, INTENT(IN) :: lVerbose
-   LOGICAL :: lV
-   lV = .FALSE.;  IF(PRESENT(lVerbose)) lV = lVerbose
-   lerr = .FALSE.
-   IF(iIso == ixIso) RETURN                                          !--- Nothing to do if the index is already OK
-   lerr = iIso<=0 .OR. iIso>SIZE(isotopes)
-   CALL msg('Inconsistent isotopes family index '//TRIM(int2str(iIso))//': should be > 0 and <= '&
-          //TRIM(int2str(SIZE(isotopes)))//'"', ll = lerr .AND. lV)
-   IF(lerr) RETURN
-   ixIso = iIso                                                      !--- Update currently selected family index
-   isotope  => isotopes(ixIso)                                       !--- Select corresponding component
-   isoKeys  => isotope%keys;     niso     = isotope%niso
-   isoName  => isotope%trac;     ntiso    = isotope%ntiso
-   isoZone  => isotope%zone;     nzone    = isotope%nzone
-   isoPhas  => isotope%phase;    nphas    = isotope%nphas
-   itZonIso => isotope%itZonIso; isoCheck = isotope%check
-   iqIsoPha => isotope%iqIsoPha
-   iqWIsoPha=> isotope%iqWIsoPha
-END FUNCTION isoSelectByIndex
-!==============================================================================================================================
-
 END MODULE infotrac_phy

LMDZ6/trunk/libf/phylmd/phyetat0_mod.F90

@@ -32 +32 @@
   USE geometry_mod,     ONLY: longitude_deg, latitude_deg
   USE iostart,          ONLY: close_startphy, get_field, get_var, open_startphy
-  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, tracers, new2oldH2O
-  USE strings_mod,      ONLY: maxlen
+  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, tracers
+  USE readTracFiles_mod,ONLY: maxlen, new2oldH2O
   USE traclmdz_mod,     ONLY: traclmdz_from_restart
   USE carbon_cycle_mod, ONLY: carbon_cycle_init, carbon_cycle_cpl, carbon_cycle_tr, carbon_cycle_rad, co2_send, RCO2_glo

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -39 +39 @@
     USE ioipsl_getin_p_mod, ONLY : getin_p
     USE indice_sol_mod
-    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac, addPhase
+    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac
+    USE readTracFiles_mod, ONLY: addPhase
     USE strings_mod,  ONLY: strIdx
     USE iophy

LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90

@@ -4 +4 @@
 MODULE isotopes_mod
    USE strings_mod,  ONLY: msg, real2str, int2str, bool2str, maxlen, strIdx, strStack
-   USE infotrac_phy, ONLY: isoName, isoSelect, niso, ntiso, nbIso, isoFamilies
-   USE iso_params_mod
+   USE infotrac_phy, ONLY: isoName
    IMPLICIT NONE
    INTERFACE get_in; MODULE PROCEDURE getinp_s, getinp_i, getinp_r, getinp_l;  END INTERFACE get_in
@@ -12 +11 @@
   !--- Contains all isotopic variables + their initialization
   !--- Isotopes-specific routines are in isotopes_routines_mod to avoid circular dependencies with isotopes_verif_mod.
-
-   !--- Negligible lower thresholds: no need to check for absurd values under these lower limits
-   REAL, PARAMETER :: &
-      ridicule      = 1e-12,              & ! For mixing ratios
-      ridicule_rain = 1e-8,               & ! For rain fluxes (rain, zrfl...) in kg/s <-> 1e-3 mm/day
-      ridicule_evap = ridicule_rain*1e-2, & ! For evaporations                in kg/s <-> 1e-3 mm/day
-      ridicule_qsol = ridicule_rain,      & ! For qsol                        in kg <-> 1e-8 kg
-      ridicule_snow = ridicule_qsol         ! For snow                        in kg <-> 1e-8 kg
-   REAL, PARAMETER :: expb_max = 30.0
-
-   !--- Fractionation coefficients for H217O
-   REAL, PARAMETER :: fac_coeff_eq17_liq = 0.529,    &
-                      fac_coeff_eq17_ice = 0.529
-
-   !--- H218O reference
-   REAL, PARAMETER :: fac_enrichoce18 = 0.0005,  alpha_liq_sol_O18 = 1.00291,                    &
-                      talph1_O18 = 1137.,        talps1_O18 = 11.839,     tkcin0_O18 = 0.006,    &
-                      talph2_O18 = -0.4156,      talps2_O18 = -0.028244,  tkcin1_O18 = 0.000285, &
-                      talph3_O18 = -2.0667E-3,  tdifrel_O18 = 1./0.9723,  tkcin2_O18 = 0.00082
-
-   !--- Parameters that do not depend on the nature of water isotopes:
-   REAL, PARAMETER :: pxtmelt = 273.15           !--- temperature at which ice formation starts
-   REAL, PARAMETER :: pxtice  = 273.15 -  10.0   !--- temperature at which all condensate is ice:
-   REAL, PARAMETER :: pxtmin  = 273.15 - 120.0   !--- computation done only under -120°C
-   REAL, PARAMETER :: pxtmax  = 273.15 +  60.0   !--- computation done only  over  +60°C
-   REAL, PARAMETER :: tdifexp = 0.58             !--- a constant for alpha_eff for equilibrium below cloud base:
-   REAL, PARAMETER :: tv0cin  = 7.0              !--- wind threshold (m/s) for smooth/rough regime (Merlivat and Jouzel 1979)
-   REAL, PARAMETER :: musi    = 1.0              !--- facteurs lambda et mu dans Si=musi-lambda*T
-   REAL, PARAMETER :: Kd      = 2.5e-9    ! m2/s !--- diffusion in soil
-   REAL, PARAMETER :: rh_cste_surf_cond = 0.6    !--- cste_surf_cond case: rhs and/or Ts set to constants
-   REAL, PARAMETER :: T_cste_surf_cond = 288.0
 
    !--- Isotopes indices (in [1,niso] ; non-existing => 0 index)
@@ -121 +89 @@
    !--- Vectors of length "niso"
    REAL, ALLOCATABLE, DIMENSION(:), SAVE :: &
-                    alpha, tnat, toce, tcorr, tdifrel
-!$OMP THREADPRIVATE(alpha, tnat, toce, tcorr, tdifrel)
+                    tnat, toce, tcorr, tdifrel
+!$OMP THREADPRIVATE(tnat, toce, tcorr, tdifrel)
    REAL, ALLOCATABLE, DIMENSION(:), SAVE :: &
                     talph1, talph2, talph3, talps1, talps2
@@ -132 +100 @@
                     alpha_liq_sol, Rdefault, Rmethox
 !$OMP THREADPRIVATE(alpha_liq_sol, Rdefault, Rmethox)
+!   REAL, SAVE ::    fac_coeff_eq17_liq, fac_coeff_eq17_ice
+!!$OMP THREADPRIVATE(fac_coeff_eq17_liq, fac_coeff_eq17_ice)
+
+   !--- H2[18]O reference
+   REAL, PARAMETER :: fac_enrichoce18=0.0005
+   REAL, PARAMETER :: alpha_liq_sol_O18=1.00291
+   REAL, PARAMETER :: talph1_O18=1137.
+   REAL, PARAMETER :: talph2_O18=-0.4156
+   REAL, PARAMETER :: talph3_O18=-2.0667E-3
+   REAL, PARAMETER :: talps1_O18=11.839
+   REAL, PARAMETER :: talps2_O18=-0.028244
+   REAL, PARAMETER :: tdifrel_O18=1./0.9723
+   REAL, PARAMETER :: tkcin0_O18=0.006
+   REAL, PARAMETER :: tkcin1_O18=0.000285
+   REAL, PARAMETER :: tkcin2_O18=0.00082
+   REAL, PARAMETER :: fac_coeff_eq17_liq=0.529
+   REAL, PARAMETER :: fac_coeff_eq17_ice=0.529
+
+   !---- Parameters that do not depend on the nature of water isotopes:
+   REAL, PARAMETER :: pxtmelt = 273.15 ! temperature at which ice formation starts
+   REAL, PARAMETER :: pxtice  = 273.15-10.0 ! -- temperature at which all condensate is ice:
+   REAL, PARAMETER :: pxtmin = 273.15 - 120.0   ! On ne calcule qu'au dessus de -120°C
+   REAL, PARAMETER :: pxtmax = 273.15 +  60.0   ! On ne calcule qu'au dessus de +60°C
+   REAL, PARAMETER :: tdifexp = 0.58 ! -- a constant for alpha_eff for equilibrium below cloud base:
+   REAL, PARAMETER :: tv0cin  = 7.0 ! wind threshold (m/s) for smooth/rough regime (Merlivat and Jouzel 1979)
+   REAL, PARAMETER :: musi=1.0  ! facteurs lambda et mu dans Si=musi-lambda*T
+   REAL, PARAMETER :: Kd=2.5e-9 ! m2/s ! diffusion dans le sol
+   REAL, PARAMETER :: rh_cste_surf_cond = 0.6 ! cas où cste_surf_cond: on met rhs ou/et Ts cste pour voir
+   REAL, PARAMETER :: T_cste_surf_cond = 288.0
+
+
+   !--- Negligible lower thresholds: no need to check for absurd values under these lower limits
+   REAL, PARAMETER :: &
+      ridicule      = 1e-12,              & ! For mixing ratios
+      ridicule_rain = 1e-8,               & ! For rain fluxes (rain, zrfl...) in kg/s <-> 1e-3 mm/day
+      ridicule_evap = ridicule_rain*1e-2, & ! For evaporations                in kg/s <-> 1e-3 mm/day
+      ridicule_qsol = ridicule_rain,      & ! For qsol                        in kg <-> 1e-8 kg
+      ridicule_snow = ridicule_qsol         ! For snow                        in kg <-> 1e-8 kg
+   REAL, PARAMETER :: expb_max = 30.0
 
    !--- Specific to HTO:
@@ -148 +155 @@
 
 SUBROUTINE iso_init()
+   USE infotrac_phy,       ONLY: ntiso, niso, getKey
+    USE strings_mod,       ONLY: maxlen
    IMPLICIT NONE
 
    !=== Local variables:
-   INTEGER :: ixt, ii, is
-   LOGICAL :: ltnat1
-   CHARACTER(LEN=maxlen) :: modname, sxt
+   INTEGER :: ixt
+
  
    !--- For H2[17]O
@@ -162 +170 @@
    LOGICAL, PARAMETER ::   ok_nocinsat = .FALSE. ! if T: no sursaturation effect for ice
    LOGICAL, PARAMETER :: Rdefault_smow = .FALSE. ! if T: Rdefault=smow; if F: nul
+   LOGICAL, PARAMETER :: tnat1 = .TRUE. ! If T: all tnats are 1.
 
    !--- For [3]H
    INTEGER :: iessai
+
+   CHARACTER(LEN=maxlen) :: modname, sxt
 
    modname = 'iso_init'
@@ -176 +187 @@
    CALL msg('64: niso = '//TRIM(int2str(niso)), modname)
 
-   DO ii = 1, nbIso
-      CALL msg('Can''t select isotopes class "'//TRIM(isoFamilies(ii))//'"', modname, isoSelect(ii, lVerbose=.TRUE.))
-
-!==============================================================================================================================
-      IF(isoFamilies(ii) == 'H2O') THEN
-!==============================================================================================================================
-         !--- Init de ntracisoOR: on ecrasera en cas de traceurs de tagging isotopiques
-         !                     (nzone>0) si complications avec ORCHIDEE
-         ntracisoOR = ntiso
-
-         !--- Type of water isotopes:
-         iso_eau = strIdx(isoName, 'H216O'); CALL msg('iso_eau='//int2str(iso_eau), modname)
-         iso_HDO = strIdx(isoName, 'HDO');   CALL msg('iso_HDO='//int2str(iso_HDO), modname)
-         iso_O18 = strIdx(isoName, 'H218O'); CALL msg('iso_O18='//int2str(iso_O18), modname)
-         iso_O17 = strIdx(isoName, 'H217O'); CALL msg('iso_O17='//int2str(iso_O17), modname)
-         iso_HTO = strIdx(isoName, 'HTO');   CALL msg('iso_HTO='//int2str(iso_HTO), modname)
-
-         !--- Initialisation: reading the isotopic parameters.
-         CALL get_in('lambda',     lambda_sursat, 0.004); IF(ok_nocinsat) lambda_sursat = 0.
-         CALL get_in('thumxt1',    thumxt1,       0.75*1.2)
-         CALL get_in('ntot',       ntot,          20,  .FALSE.)
-         CALL get_in('h_land_ice', h_land_ice,    20., .FALSE.)
-         CALL get_in('P_veg',      P_veg,         1.0, .FALSE.)
-         CALL get_in('bidouille_anti_divergence', bidouille_anti_divergence, .FALSE.)
-         CALL get_in('essai_convergence',         essai_convergence,         .FALSE.)
-         CALL get_in('initialisation_iso',        initialisation_iso,        0)
-
-!        IF(nzone>0 .AND. initialisation_iso==0) &
-!           CALL get_in('initialisation_isotrac',initialisation_isotrac)
-         CALL get_in('modif_sst',      modif_sst,         0)
-         CALL get_in('deltaTtest',     deltaTtest,      0.0)     !--- For modif_sst>=1
-         CALL get_in('deltaTtestpoles',deltaTtestpoles, 0.0)     !--- For modif_sst>=2
-         CALL get_in( 'sstlatcrit',    sstlatcrit,     30.0)     !--- For modif_sst>=3
-         CALL get_in('dsstlatcrit',   dsstlatcrit,      0.0)     !--- For modif_sst>=3
+   !--- Init de ntracisoOR: on ecrasera en cas de traceurs de tagging isotopiques
+   !                     (nzone>0) si complications avec ORCHIDEE
+   ntracisoOR = ntiso  
+
+   !--- Type of water isotopes:
+   iso_eau = strIdx(isoName, 'H216O'); CALL msg('iso_eau='//int2str(iso_eau), modname)
+   iso_HDO = strIdx(isoName, 'HDO');   CALL msg('iso_HDO='//int2str(iso_HDO), modname)
+   iso_O18 = strIdx(isoName, 'H218O'); CALL msg('iso_O18='//int2str(iso_O18), modname)
+   iso_O17 = strIdx(isoName, 'H217O'); CALL msg('iso_O17='//int2str(iso_O17), modname)
+   iso_HTO = strIdx(isoName, 'HTO');   CALL msg('iso_HTO='//int2str(iso_HTO), modname)
+
+   !--- Initialiaation: reading the isotopic parameters.
+   CALL get_in('lambda',     lambda_sursat, 0.004)
+   CALL get_in('thumxt1',    thumxt1,       0.75*1.2)
+   CALL get_in('ntot',       ntot,          20,  .FALSE.)
+   CALL get_in('h_land_ice', h_land_ice,    20., .FALSE.)
+   CALL get_in('P_veg',      P_veg,         1.0, .FALSE.)
+   CALL get_in('bidouille_anti_divergence', bidouille_anti_divergence, .FALSE.)
+   CALL get_in('essai_convergence',         essai_convergence,         .FALSE.)
+   CALL get_in('initialisation_iso',        initialisation_iso,        0)
+
+!  IF(nzone>0 .AND. initialisation_iso==0) &
+!      CALL get_in('initialisation_isotrac',initialisation_isotrac)
+   CALL get_in('modif_sst',      modif_sst,         0)
+   CALL get_in('deltaTtest',     deltaTtest,      0.0)     !--- For modif_sst>=1
+   CALL get_in('deltaTtestpoles',deltaTtestpoles, 0.0)     !--- For modif_sst>=2
+   CALL get_in( 'sstlatcrit',    sstlatcrit,     30.0)     !--- For modif_sst>=3
+   CALL get_in('dsstlatcrit',   dsstlatcrit,      0.0)     !--- For modif_sst>=3
 #ifdef ISOVERIF
-         CALL msg('iso_init 270:  sstlatcrit='//real2str( sstlatcrit), modname, sstlatcrit < 0.0) !--- For modif_sst>=2
-         CALL msg('iso_init 279: dsstlatcrit='//real2str(dsstlatcrit), modname, sstlatcrit < 0.0) !--- For modif_sst>=3
-         IF(modif_sst >= 2 .AND. sstlatcrit < 0.0) STOP
+   CALL msg('iso_init 270:  sstlatcrit='//real2str( sstlatcrit), modname, sstlatcrit < 0.0) !--- For modif_sst>=2
+   CALL msg('iso_init 279: dsstlatcrit='//real2str(dsstlatcrit), modname, sstlatcrit < 0.0) !--- For modif_sst>=3
+   IF(modif_sst >= 2 .AND. sstlatcrit < 0.0) STOP
 #endif              
 
-         CALL get_in('modif_sic', modif_sic,  0)
-         IF(modif_sic >= 1) &
-         CALL get_in('deltasic',  deltasic, 0.1)
-
-         CALL get_in('albedo_prescrit', albedo_prescrit, 0)
-         IF(albedo_prescrit == 1) THEN
-            CALL get_in('lon_min_albedo', lon_min_albedo, -200.)
-            CALL get_in('lon_max_albedo', lon_max_albedo,  200.)
-            CALL get_in('lat_min_albedo', lat_min_albedo, -100.)
-            CALL get_in('lat_max_albedo', lat_max_albedo,  100.)
-         END IF
-         CALL get_in('deltaO18_oce',        deltaO18_oce,   0.0)
-         CALL get_in('deltaP_BL',           deltaP_BL,     10.0)
-         CALL get_in('ruissellement_pluie', ruissellement_pluie, 0)
-         CALL get_in('alphak_stewart',      alphak_stewart,      1)
-         CALL get_in('tdifexp_sol',         tdifexp_sol,      0.67)
-         CALL get_in('calendrier_guide',    calendrier_guide,    0)
-         CALL get_in('cste_surf_cond',      cste_surf_cond,      0)
-         CALL get_in('mixlen',              mixlen,           35.0)
-         CALL get_in('evap_cont_cste',      evap_cont_cste,      0)
-         CALL get_in('deltaO18_evap_cont',  deltaO18_evap_cont,0.0)
-         CALL get_in('d_evap_cont',         d_evap_cont,       0.0)
-         CALL get_in('nudge_qsol',          nudge_qsol,          0)
-         CALL get_in('region_nudge_qsol',   region_nudge_qsol,   1)
-         nlevmaxO17 = 50
-         CALL msg('nlevmaxO17='//TRIM(int2str(nlevmaxO17)))
-         CALL get_in('no_pce',   no_pce,     0)
-         CALL get_in('A_satlim', A_satlim, 1.0)
-         CALL get_in('ok_restrict_A_satlim', ok_restrict_A_satlim, 0)
+   CALL get_in('modif_sic', modif_sic,  0)
+   IF(modif_sic >= 1) &
+   CALL get_in('deltasic',  deltasic, 0.1)
+
+   CALL get_in('albedo_prescrit', albedo_prescrit, 0)
+   IF(albedo_prescrit == 1) THEN
+      CALL get_in('lon_min_albedo', lon_min_albedo, -200.)
+      CALL get_in('lon_max_albedo', lon_max_albedo,  200.)
+      CALL get_in('lat_min_albedo', lat_min_albedo, -100.)
+      CALL get_in('lat_max_albedo', lat_max_albedo,  100.)
+   END IF
+   CALL get_in('deltaP_BL',           deltaP_BL,     10.0)
+   CALL get_in('ruissellement_pluie', ruissellement_pluie, 0)
+   CALL get_in('alphak_stewart',      alphak_stewart,      1)
+   CALL get_in('tdifexp_sol',         tdifexp_sol,      0.67)
+   CALL get_in('calendrier_guide',    calendrier_guide,    0)
+   CALL get_in('cste_surf_cond',      cste_surf_cond,      0)
+   CALL get_in('mixlen',              mixlen,           35.0)
+   CALL get_in('evap_cont_cste',      evap_cont_cste,      0)
+   CALL get_in('deltaO18_evap_cont',  deltaO18_evap_cont,0.0)
+   CALL get_in('d_evap_cont',         d_evap_cont,       0.0)
+   CALL get_in('nudge_qsol',          nudge_qsol,          0)
+   CALL get_in('region_nudge_qsol',   region_nudge_qsol,   1)
+   nlevmaxO17 = 50
+   CALL msg('nlevmaxO17='//TRIM(int2str(nlevmaxO17)))
+   CALL get_in('no_pce',   no_pce,     0)
+   CALL get_in('A_satlim', A_satlim, 1.0)
+   CALL get_in('ok_restrict_A_satlim', ok_restrict_A_satlim, 0)
 #ifdef ISOVERIF
-         CALL msg(' 315: A_satlim='//real2str(A_satlim), modname, A_satlim > 1.0)
-         IF(A_satlim > 1.0) STOP
+   CALL msg(' 315: A_satlim='//real2str(A_satlim), modname, A_satlim > 1.0)
+   IF(A_satlim > 1.0) STOP
 #endif
-!        CALL get_in('slope_limiterxy',   slope_limiterxy,  2.0) 
-!        CALL get_in('slope_limiterz',    slope_limiterz,   2.0) 
-         CALL get_in('modif_ratqs',       modif_ratqs,        0)
-         CALL get_in('Pcrit_ratqs',       Pcrit_ratqs,    500.0)
-         CALL get_in('ratqsbasnew',       ratqsbasnew,     0.05)
-         CALL get_in('fac_modif_evaoce',  fac_modif_evaoce, 1.0)
-         CALL get_in('ok_bidouille_wake', ok_bidouille_wake,  0)
-         ! si oui, la temperature de cond est celle de l'environnement, pour eviter
-         ! bugs quand temperature dans ascendances convs est mal calculee
-         CALL get_in('cond_temp_env',        cond_temp_env,        .FALSE.)
-         IF(ANY(isoName == 'HTO')) &
-         CALL get_in('ok_prod_nucl_tritium', ok_prod_nucl_tritium, .FALSE., .FALSE.)
-         CALL get_in('tnateq1', ltnat1, .TRUE.)
-
-         CALL msg('iso_O18, iso_HDO, iso_eau = '//TRIM(strStack(int2str([iso_O18, iso_HDO, iso_eau]))), modname)
-
-         !--------------------------------------------------------------
-         ! Parameters that depend on the nature of water isotopes:
-         !--------------------------------------------------------------
-         ALLOCATE(tnat (niso), talph1(niso),  talps1(niso), tkcin0(niso), tdifrel (niso), alpha        (niso))
-         ALLOCATE(toce (niso), talph2(niso),  talps2(niso), tkcin1(niso), Rdefault(niso), alpha_liq_sol(niso))
-         ALLOCATE(tcorr(niso), talph3(niso),                tkcin2(niso), Rmethox (niso))
-
-         !=== H216O
-         is = iso_eau
-         IF(is /= 0) THEN
-            tdifrel (is) = 1.0
-            alpha   (is) = alpha_ideal_H216O
-            tnat    (is) = tnat_H216O; IF(ltnat1) tnat(is) = 1.0
-            toce    (is) = tnat(is)
-            tcorr   (is) = 1.0
-            talph1  (is) = 0.0;  talps1(is) = 0.0;  tkcin0(is)  = 0.0
-            talph2  (is) = 0.0;  talps2(is) = 0.0;  tkcin1(is)  = 0.0
-            talph3  (is) = 0.0;                     tkcin2(is)  = 0.0
-            Rdefault(is) = tnat(is)*1.0
-            Rmethox (is) = 1.0
-            alpha_liq_sol(is) = 1.0
-         END IF
-
-         !=== H217O
-         is = iso_O17
-         IF(is /= 0) THEN; pente_MWL = 0.528
-            tdifrel (is) = 1./0.98555  ! used in 1D and in LdG model ; tdifrel=1./0.985452: from Amaelle
-            alpha   (is) = alpha_ideal_H217O
-            tnat    (is) = tnat_H217O; IF(ltnat1) tnat(is) = 1.0
-            toce    (is) = tnat(is)*(1.0+deltaO18_oce/1000.0)**pente_MWL
-            tcorr   (is) = 1.0+fac_enrichoce18*pente_MWL
-            fac_kcin = (tdifrel(is)-1.0)/(tdifrel_O18-1.0)           ! fac_kcin=0.5145:     from Amaelle
-            talph1  (is) = talph1_O18;  talps1(is) = talps1_O18;  tkcin0(is) = tkcin0_O18*fac_kcin
-            talph2  (is) = talph2_O18;  talps2(is) = talps2_O18;  tkcin1(is) = tkcin1_O18*fac_kcin
-            talph3  (is) = talph3_O18;                            tkcin2(is) = tkcin2_O18*fac_kcin
-            Rdefault(is) = tnat(is)*(1.0-3.15/1000.)
-            Rmethox (is) = tnat(is)*(1.0+230./1000.)
-            alpha_liq_sol(is) = alpha_liq_sol_O18**fac_coeff_eq17_liq
-         END IF
-
-         !=== H218O
-         is = iso_O18
-         IF(is /= 0) THEN
-            tdifrel (is) = tdifrel_O18
-            alpha   (is) = alpha_ideal_H218O
-            tnat    (is) = tnat_H218O; IF(ltnat1) tnat(is) = 1.0
-            toce    (is) = tnat(is)*(1.0+deltaO18_oce/1000.0)
-            tcorr   (is) = 1.0+fac_enrichoce18
-            talph1  (is) = talph1_O18;  talps1(is) = talps1_O18;  tkcin0(is) = tkcin0_O18
-            talph2  (is) = talph2_O18;  talps2(is) = talps2_O18;  tkcin1(is) = tkcin1_O18
-            talph3  (is) = talph3_O18;                            tkcin2(is) = tkcin2_O18
-            Rdefault(is) = tnat(is)*(1.0-6.00/1000.)
-            Rmethox (is) = tnat(is)*(1.0+130./1000.)  ! Zahn & al. 2006
-            alpha_liq_sol(is) = alpha_liq_sol_O18
-         END IF
-
-         !=== HDO
-         is = iso_HDO
-         IF(is /= 0) THEN; pente_MWL = 8.0
-            tdifrel (is) = 1./0.9755                  ! fac_kcin=0.88
-            alpha   (is) = alpha_ideal_HDO
-            tnat    (is) = tnat_HDO; IF(ltnat1) tnat(is) = 1.0
-            toce    (is) = tnat(is)*(1.0+deltaO18_oce/1000.0*pente_MWL)
-            tcorr   (is) = 1.0+fac_enrichoce18*pente_MWL
-            fac_kcin = (tdifrel(is)-1.0)/(tdifrel_O18-1.0)
-            talph1  (is) = 24844.;      talps1(is) = 16288.;      tkcin0(is) = tkcin0_O18*fac_kcin
-            talph2  (is) = -76.248;     talps2(is) = -0.0934;     tkcin1(is) = tkcin1_O18*fac_kcin
-            talph3  (is) = 52.612E-3;                             tkcin2(is) = tkcin2_O18*fac_kcin
-            Rdefault(is) = tnat(is)*(1.0+(10.0-6.0*pente_MWL)/1000.)
-            Rmethox (is) = tnat(is)*(1.0-25.0/1000.)
-            alpha_liq_sol(is) = 1.0212      ! Lehmann & Siegenthaler, 1991, Jo. of Glaciology, vol 37, p 23
-                                            ! alpha_liq_sol=1.0192: Weston, Ralph, 1955
-         END IF
-
-         !=== HTO
-         is = iso_HTO
-         IF(is /= 0) THEN
-            tdifrel (is) = 1./0.968
-            alpha   (is) = alpha_ideal_HTO
-            tnat    (is) = tnat_HTO; IF(ltnat1) tnat(is) = 1.0
-            toce    (is) = 4.0E-19          ! ratio T/H = 0.2 TU Dreisigacker & Roether 1978
-            tcorr   (is) = 1.0
-            talph1  (is) = 46480.;      talps1(is) = 46480.;      tkcin0(is) = 0.01056
-            talph2  (is) = -103.87;     talps2(is) = -103.87;     tkcin1(is) = 0.0005016
-            talph3  (is) = 0.0;                                   tkcin2(is) = 0.0014432
-            Rdefault(is) = 0.0
-            Rmethox (is) = 0.0
-            alpha_liq_sol(is) = 1.0
-         END IF
-
-         IF(.NOT. Rdefault_smow) THEN
-            Rdefault(:) = 0.0; IF(iso_eau > 0) Rdefault(iso_eau) = 1.0
-         END IF
-         WRITE(*,*) 'Rdefault = ',Rdefault
-         WRITE(*,*) 'toce = ', toce
-
-         !--- Sensitivity test: no kinetic effect in sfc evaporation
-         IF(ok_nocinsfc) THEN
-            tkcin0(1:niso) = 0.0
-            tkcin1(1:niso) = 0.0
-            tkcin2(1:niso) = 0.0
-         END IF
-
-         CALL msg('285: verif initialisation:', modname)
-         DO ixt=1,niso
-            sxt=int2str(ixt)
-            CALL msg(' * isoName('//TRIM(sxt)//') = <'//TRIM(isoName(ixt))//'>',  modname)
-            CALL msg(  '    tnat('//TRIM(sxt)//') = '//TRIM(real2str(tnat(ixt))), modname)
-!           CALL msg('    alpha_liq_sol('//TRIM(sxt)//') = '//TRIM(real2str(alpha_liq_sol(ixt))), modname)
-!           CALL msg(        '   tkcin0('//TRIM(sxt)//') = '//TRIM(real2str(tkcin0(ixt))),        modname)
-!           CALL msg(       '   tdifrel('//TRIM(sxt)//') = '//TRIM(real2str(tdifrel(ixt))),       modname)
-         END DO
-         CALL msg('69:     lambda = '//TRIM(real2str(lambda_sursat)), modname)
-         CALL msg('69:    thumxt1 = '//TRIM(real2str(thumxt1)),       modname)
-         CALL msg('69: h_land_ice = '//TRIM(real2str(h_land_ice)),    modname)
-         CALL msg('69:      P_veg = '//TRIM(real2str(P_veg)),         modname)
-!==============================================================================================================================
-      ELSE
-!==============================================================================================================================
-         CALL abort_physic('"isotopes_mod" is not set up yet for isotopes family "'//TRIM(isoFamilies(ii))//'"', modname, 1)
-!==============================================================================================================================
-      END IF
-!==============================================================================================================================
+!  CALL get_in('slope_limiterxy',   slope_limiterxy,  2.0) 
+!  CALL get_in('slope_limiterz',    slope_limiterz,   2.0) 
+   CALL get_in('modif_ratqs',       modif_ratqs,        0)
+   CALL get_in('Pcrit_ratqs',       Pcrit_ratqs,    500.0)
+   CALL get_in('ratqsbasnew',       ratqsbasnew,     0.05)
+   CALL get_in('fac_modif_evaoce',  fac_modif_evaoce, 1.0)
+   CALL get_in('ok_bidouille_wake', ok_bidouille_wake,  0)
+   ! si oui, la temperature de cond est celle de l'environnement, pour eviter
+   ! bugs quand temperature dans ascendances convs est mal calculee
+   CALL get_in('cond_temp_env',        cond_temp_env,        .FALSE.)
+   IF(ANY(isoName == 'HTO')) &
+   CALL get_in('ok_prod_nucl_tritium', ok_prod_nucl_tritium, .FALSE., .FALSE.)
+
+   ! Ocean composition
+   CALL get_in('deltaO18_oce',  deltaO18_oce, 0.0)
+   
+   CALL msg('iso_O18, iso_HDO, iso_eau = '//TRIM(strStack(int2str([iso_O18, iso_HDO, iso_eau]))), modname)
+
+   !--------------------------------------------------------------
+   ! Isotope fractionation factors and a few isotopic constants
+   !--------------------------------------------------------------
+   ALLOCATE(tkcin0(niso))
+   ALLOCATE(tkcin1(niso))
+   ALLOCATE(tkcin2(niso))
+   ALLOCATE(tnat(niso))
+   ALLOCATE(tdifrel(niso))
+   ALLOCATE(toce(niso))
+   ALLOCATE(tcorr(niso))
+   ALLOCATE(talph1(niso))
+   ALLOCATE(talph2(niso))
+   ALLOCATE(talph3(niso))
+   ALLOCATE(talps1(niso))
+   ALLOCATE(talps2(niso))
+   ALLOCATE(alpha_liq_sol(niso))
+   ALLOCATE(Rdefault(niso))
+   ALLOCATE(Rmethox(niso))
+
+   do ixt=1,niso
+     if (ixt.eq.iso_HTO) then  ! Tritium
+       tkcin0(ixt) = 0.01056
+       tkcin1(ixt) = 0.0005016
+       tkcin2(ixt) = 0.0014432
+       if (tnat1) then 
+               tnat(ixt)=1 
+       else 
+               tnat(ixt)=0.
+       endif
+       toce(ixt)=4.0E-19 ! rapport T/H = 0.2 TU Dreisigacker and Roether 1978
+       tcorr(ixt)=1.
+       tdifrel(ixt)=1./0.968
+       talph1(ixt)=46480.
+       talph2(ixt)=-103.87
+       talph3(ixt)=0.
+       talps1(ixt)=46480.
+       talps2(ixt)=-103.87
+       alpha_liq_sol(ixt)=1. 
+       Rmethox(ixt)=0.0
+     endif
+     if (ixt.eq.iso_O17) then  ! O17
+       pente_MWL=0.528 
+       tdifrel(ixt)=1./0.98555 ! valeur utilisée en 1D et dans modèle de LdG ! tdifrel(ixt)=1./0.985452 ! donné par Amaelle
+       fac_kcin= (tdifrel(ixt)-1.0)/(tdifrel_O18-1.0) ! fac_kcin=0.5145 ! donné par Amaelle
+       tkcin0(ixt) = tkcin0_O18*fac_kcin
+       tkcin1(ixt) = tkcin1_O18*fac_kcin
+       tkcin2(ixt) = tkcin2_O18*fac_kcin
+       if (tnat1) then 
+               tnat(ixt)=1 
+       else 
+               tnat(ixt)=0.004/100. ! O17 représente 0.004% de l'oxygène
+       endif
+       toce(ixt)=tnat(ixt)*(1.0+deltaO18_oce/1000.0)**pente_MWL
+       tcorr(ixt)=1.0+fac_enrichoce18*pente_MWL ! donné par Amaelle            
+       talph1(ixt)=talph1_O18
+       talph2(ixt)=talph2_O18
+       talph3(ixt)=talph3_O18
+       talps1(ixt)=talps1_O18
+       talps2(ixt)=talps2_O18     
+       alpha_liq_sol(ixt)=(alpha_liq_sol_O18)**fac_coeff_eq17_liq 
+       Rdefault(ixt)=tnat(ixt)*(-3.15/1000.0+1.0)
+       Rmethox(ixt)=(230./1000.+1.)*tnat(ixt) !Zahn et al 2006
+     endif
+     if (ixt.eq.iso_O18) then  ! Oxygene18
+       tkcin0(ixt) = tkcin0_O18
+       tkcin1(ixt) = tkcin1_O18
+       tkcin2(ixt) = tkcin2_O18
+       if (tnat1) then
+               tnat(ixt)=1 
+       else 
+               tnat(ixt)=2005.2E-6
+       endif
+       toce(ixt)=tnat(ixt)*(1.0+deltaO18_oce/1000.0)
+       tcorr(ixt)=1.0+fac_enrichoce18
+       tdifrel(ixt)=tdifrel_O18
+       talph1(ixt)=talph1_O18
+       talph2(ixt)=talph2_O18
+       talph3(ixt)=talph3_O18
+       talps1(ixt)=talps1_O18
+       talps2(ixt)=talps2_O18
+       alpha_liq_sol(ixt)=alpha_liq_sol_O18   
+       Rdefault(ixt)=tnat(ixt)*(-6.0/1000.0+1.0)
+       Rmethox(ixt)=(130./1000.+1.)*tnat(ixt) !Zahn et al 2006  
+     endif
+     if (ixt.eq.iso_HDO) then ! Deuterium
+       pente_MWL=8.0
+       tdifrel(ixt)=1./0.9755 !          fac_kcin=0.88
+       fac_kcin= (tdifrel(ixt)-1)/(tdifrel_O18-1)
+       tkcin0(ixt) = tkcin0_O18*fac_kcin
+       tkcin1(ixt) = tkcin1_O18*fac_kcin
+       tkcin2(ixt) = tkcin2_O18*fac_kcin
+       if (tnat1) then 
+               tnat(ixt)=1
+       else
+               tnat(ixt)=155.76E-6
+       endif
+       toce(ixt)=tnat(ixt)*(1.0+pente_MWL*deltaO18_oce/1000.0)
+       tcorr(ixt)=1.0+fac_enrichoce18*pente_MWL          
+       talph1(ixt)=24844.
+       talph2(ixt)=-76.248
+       talph3(ixt)=52.612E-3
+       talps1(ixt)=16288.
+       talps2(ixt)=-0.0934
+       !ZXalpha_liq_sol=1.0192 ! Weston, Ralph, 1955
+       alpha_liq_sol(ixt)=1.0212 
+       ! valeur de Lehmann & Siegenthaler, 1991, Journal of
+       ! Glaciology, vol 37, p 23
+       Rdefault(ixt)=tnat(ixt)*((-6.0*pente_MWL+10.0)/1000.0+1.0)
+       Rmethox(ixt)=tnat(ixt)*(-25.0/1000.+1.) ! Zahn et al 2006
+     endif
+     if (ixt.eq.iso_eau) then ! Oxygene16
+       tkcin0(ixt) = 0.0
+       tkcin1(ixt) = 0.0
+       tkcin2(ixt) = 0.0
+       tnat(ixt)=1.
+       toce(ixt)=tnat(ixt)
+       tcorr(ixt)=1.0
+       tdifrel(ixt)=1.
+       talph1(ixt)=0.
+       talph2(ixt)=0.
+       talph3(ixt)=0.
+       talps1(ixt)=0.
+       talph3(ixt)=0.
+       alpha_liq_sol(ixt)=1.
+       Rdefault(ixt)=tnat(ixt)*1.0
+       Rmethox(ixt)=1.0
+     endif
+   enddo ! ixt=1,niso
+
+   IF(.NOT.Rdefault_smow) then
+        Rdefault(:) = 0.0
+        if (iso_eau.gt.0) Rdefault(iso_eau) = 1.0 ! correction Camille 30 mars 2023
+   ENDIF
+   write(*,*) 'Rdefault=',Rdefault
+   write(*,*) 'toce=',toce
+
+   !--- Sensitivity test: no kinetic effect in sfc evaporation
+   IF(ok_nocinsfc) THEN
+      tkcin0(1:niso) = 0.0
+      tkcin1(1:niso) = 0.0
+      tkcin2(1:niso) = 0.0
+   END IF
+
+   CALL msg('285: verif initialisation:', modname)
+   DO ixt=1,niso
+      sxt=int2str(ixt)
+      CALL msg(' * isoName('//TRIM(sxt)//') = <'//TRIM(isoName(ixt))//'>',  modname)
+      CALL msg(  '    tnat('//TRIM(sxt)//') = '//TRIM(real2str(tnat(ixt))), modname)
+!     CALL msg('    alpha_liq_sol('//TRIM(sxt)//') = '//TRIM(real2str(alpha_liq_sol(ixt))), modname)
+!     CALL msg(        '   tkcin0('//TRIM(sxt)//') = '//TRIM(real2str(tkcin0(ixt))),        modname)
+!     CALL msg(       '   tdifrel('//TRIM(sxt)//') = '//TRIM(real2str(tdifrel(ixt))),       modname)
    END DO
+   CALL msg('69:     lambda = '//TRIM(real2str(lambda_sursat)), modname)
+   CALL msg('69:    thumxt1 = '//TRIM(real2str(thumxt1)),       modname)
+   CALL msg('69: h_land_ice = '//TRIM(real2str(h_land_ice)),    modname)
+   CALL msg('69:      P_veg = '//TRIM(real2str(P_veg)),         modname)
 
 END SUBROUTINE iso_init

LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

@@ -16419 +16419 @@
    USE isotopes_mod,      ONLY: isoName,iso_HDO,iso_eau
    USE phyetat0_get_mod,  ONLY: phyetat0_get, phyetat0_srf
-   USE infotrac_phy,      ONLY: new2oldH2O
-   USE strings_mod,       ONLY: strIdx, strHead, strTail, maxlen, msg, int2str
+   USE readTracFiles_mod, ONLY: new2oldH2O
+   USE strings_mod,       ONLY: strIdx, strTail, maxlen, msg, int2str
 #ifdef ISOVERIF
    USE isotopes_verif_mod
@@ -16459 +16459 @@
       outiso = isoName(ixt)
       oldIso = strTail(new2oldH2O(outiso), '_')            !--- Remove "H2O_" from "H2O_<iso>[_<tag>]"
-      oldIso2= TRIM(strHead(outiso,'_'))//strTail(outiso,'_') ! CR 2023: most recent possibility
+      i = INDEX(outiso, '_', .TRUE.)
+      oldIso2 = outiso(1:i-1)//outiso(i+1:LEN_TRIM(outiso)) ! CR 2023: on ajoute cette possibilité aussi, elle correspond au cas le plus récent.
 !      write(*,*) 'tmp 16541:'
 !      write(*,*) 'outiso=',outiso

LMDZ6/trunk/libf/phylmdiso/isotrac_mod.F90

@@ -3 +3 @@
 
 MODULE isotrac_mod
-  USE infotrac_phy, ONLY: niso, ntiso, nzone, delPhase
-  USE isotopes_mod, ONLY: ridicule, get_in
+  USE infotrac_phy,      ONLY: niso, ntiso, nzone
+  USE readTracFiles_mod, ONLY: delPhase
+  USE isotopes_mod,      ONLY: ridicule, get_in
 
   IMPLICIT NONE

LMDZ6/trunk/libf/phylmdiso/phyetat0_mod.F90

@@ -40 +40 @@
   USE geometry_mod,     ONLY: longitude_deg, latitude_deg
   USE iostart,          ONLY: close_startphy, get_field, get_var, open_startphy
-  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, tracers, new2oldH2O
-  USE strings_mod,      ONLY: maxlen
+  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, tracers
+  USE readTracFiles_mod,ONLY: maxlen, new2oldH2O
   USE traclmdz_mod,     ONLY: traclmdz_from_restart
   USE carbon_cycle_mod, ONLY: carbon_cycle_init, carbon_cycle_cpl, carbon_cycle_tr, carbon_cycle_rad, co2_send, RCO2_glo

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -39 +39 @@
     USE ioipsl_getin_p_mod, ONLY : getin_p
     USE indice_sol_mod
-    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac,addPhase, ivap, iliq, isol
+    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac,ivap,iliq,isol
+    USE readTracFiles_mod, ONLY: addPhase
     USE strings_mod,  ONLY: strIdx
     USE iophy
@@ -2623 +2624 @@
        ENDDO
     ENDDO
-    
-    ! Lea Raillard qs_ini for cloud phase param.
-    qs_ini(:,:)=qs_seri(:,:)
 
     ! C Risi: dispatcher les isotopes dans les xt_seri
@@ -7144 +7142 @@
        ENDDO
     ENDDO
+    
+    ! Lea Raillard qs_ini for cloud phase param.
+    qs_ini(:,:)=qs_seri(:,:)
 
     ! C Risi: dispatcher les isotopes dans les xt_seri