Changeset 4301 for LMDZ6/trunk/libf/dyn3d_common

Timestamp:

Oct 20, 2022, 1:57:21 PM (2 years ago)

Author:

dcugnet

Message:

• for REPROBUS: simplify (and fix) the handling of exceptions for old HNO3 convention.
• cleaning + comments added in readTracFiles_mod.

File:

• LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (modified) (8 diffs)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -5 +5 @@
    USE       strings_mod, ONLY: msg, find, strIdx,  strFind, strParse, dispTable, int2str,  reduceExpr, &
                           cat, fmsg, test, strTail, strHead, strStack, strReduce, bool2str, maxlen, testFile
-   USE readTracFiles_mod, ONLY: trac_type, readTracersFiles, addPhase, indexUpdate,  nphases, ancestor,  &
-                                isot_type, old2newName,      delPhase,               getKey_init, tran0, &
-                                keys_type, initIsotopes,     getPhase, known_phases, getKey, setGeneration, &
-                                maxTableWidth
+   USE readTracFiles_mod, ONLY: trac_type, readTracersFiles, indexUpdate, addPhase, getKey, maxTableWidth, keys_type, &
+                                isot_type, setGeneration,   initIsotopes, delPhase, getKey_init, ancestor, tran0
+                                
    IMPLICIT NONE
 
@@ -182 +181 @@
    INTEGER :: iad                                                    !--- Advection scheme number
    INTEGER :: ic, ip, np, iq, jq, it, nt, im, nm, ix, iz, nz, k      !--- Indexes and temporary variables
-   LOGICAL :: lerr, ll
+   LOGICAL :: lerr, ll, lRepr
    CHARACTER(LEN=1) :: p
    TYPE(trac_type), ALLOCATABLE, TARGET :: ttr(:)
    TYPE(trac_type), POINTER             :: t1, t(:)
    TYPE(isot_type), POINTER             :: iso
-
-   CHARACTER(LEN=maxlen), ALLOCATABLE :: tnom_0(:), tnom_transp(:)   !--- Tracer short name + transporting fluid name
-   CHARACTER(LEN=maxlen)              :: tchaine
    INTEGER :: ierr
 
@@ -247 +243 @@
          modname, ALL(types_trac /= 'inca') .AND. ALL(types_trac /= 'inco') .AND. config_inca /= 'none')) config_inca = 'none'
 
-   nqCO2 = 0; IF(ANY(types_trac == 'inco')) nqCO2 = 1
+   nqCO2 = COUNT( [ANY(types_trac == 'inco') .OR. (ANY(types_trac == 'co2i') .AND. ANY(types_trac == 'inca'))] )
 
 !==============================================================================================================================
 ! 1) Get the numbers of: true (first order only) tracers "nqtrue", water tracers "nqo" (vapor/liquid/solid)
 !==============================================================================================================================
-   IF(readTracersFiles(type_trac, fType, tracers)) CALL abort_gcm(modname, 'problem with tracers file(s)',1)
+   lRepr = ANY(types_trac(:) == 'repr')
+   IF(readTracersFiles(type_trac, fType, tracers, lRepr)) 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)
    !---------------------------------------------------------------------------------------------------------------------------
@@ -258 +256 @@
    !---------------------------------------------------------------------------------------------------------------------------
 #ifdef INCA
-      nqo = SIZE(tracers)
-      IF(nqCO2==1 .AND. nqo==4) nqo = 3                              !--- Force nqo to 3 (ThL)
+      nqo = SIZE(tracers) - nqCO2
       CALL Init_chem_inca_trac(nqINCA)                               !--- Get nqINCA from INCA
       nbtr = nqINCA + nqCO2                                          !--- Number of tracers passed to phytrac
@@ -284 +281 @@
 #endif
    !---------------------------------------------------------------------------------------------------------------------------
-   ELSE                                                              !=== FOUND NEW STYLE TRACERS CONFIGURATION FILE(S)
+   ELSE                                                              !=== OTHER CASES (OLD OR NEW FORMAT, NO INCA MODULE)
    !---------------------------------------------------------------------------------------------------------------------------
       nqo    =        COUNT(delPhase(tracers(:)%name)     == 'H2O' &
@@ -407 +404 @@
    IF(initIsotopes(tracers, isotopes)) CALL abort_gcm(modname, 'Problem when reading isotopes parameters', 1)
    nbIso = SIZE(isotopes)
-   nqtottr = nqtot - COUNT(tracers%gen0Name == 'H2O' .AND. tracers%component == 'lmdz')
+   nqtottr = nqtot - COUNT(delPhase(tracers%gen0Name) == 'H2O' .AND. tracers%component == 'lmdz')
    IF(nbIso/=0) THEN                        !--- ISOTOPES FOUND
 
@@ -442 +439 @@
 
    !--- Note: nqtottr can differ from nbtr when nmom/=0
-!   IF(COUNT(tracers%iso_iName == 0) - COUNT(delPhase(tracers%name) == 'H2O' .AND. tracers%component == 'lmdz') /= nqtottr) &
-!      CALL abort_gcm('infotrac_init', 'pb dans le calcul de nqtottr', 1)
+   IF(COUNT(tracers%iso_iName == 0) - COUNT(delPhase(tracers%name) == 'H2O' .AND. tracers%component == 'lmdz') /= nqtottr) &
+      CALL abort_gcm('infotrac_init', 'pb dans le calcul de nqtottr', 1)
 
    !=== DISPLAY THE RESULTS
@@ -486 +483 @@
 LOGICAL FUNCTION isoSelectByName(iName, lVerbose) RESULT(lerr)
    IMPLICIT NONE
-   CHARACTER(LEN=*),  INTENT(IN)  :: iName
+   CHARACTER(LEN=*),  INTENT(IN) :: iName
    LOGICAL, OPTIONAL, INTENT(IN) :: lVerbose
    INTEGER :: iIso