Changeset 4143 for LMDZ6/trunk/libf/misc

Timestamp:

May 9, 2022, 12:35:40 PM (3 years ago)

Author:

dcugnet

Message:

• Some variables are renamed or replaced by direct equivalents:
  • iso_indnum -> tracers(:)%iso_iName
  • niso_possibles -> niso
  • iqiso -> iqIsoPha ; index_trac -> itZonIso
  • ok_iso_verif -> isoCheck
  • ntraceurs_zone -> nzone ; ntraciso -> ntiso
  • qperemin -> min_qparent ; masseqmin -> min_qmass ; ratiomin -> min_ratio
• Some renamed variables are only aliased with the older name (using USE <module>, ONLY: <oldName> => <newName>) in routines where they are repeated many times.
• Few hard-coded indexes are now computed (examples: ilic, iso, ivap, irneb, iq_vap, iq_liq, iso_H2O, iso_HDO, iso_HTO, iso_O17, iso_O18).
• The IF(isoCheck) test is now embedded in the check_isotopes_seq and check_isotopes_loc routines (lighter calling).

Location:

LMDZ6/trunk/libf/misc

Files:

• readTracFiles_mod.f90 (modified) (4 diffs)
• trac_types_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/misc/readTracFiles_mod.f90

@@ -866 +866 @@
 !=== NOTES:                                                                                                                ====
 !===  * Most of the "isot" components have been defined in the calling routine (initIsotopes):                             ====
-!===      parent,  nzone, zone(:),  niso, keys(:)%name,  ntiso, trac(:),  nphas, phas,  iqTraPha(:,:),  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             ====
@@ -986 +986 @@
     str = PACK(delPhase(t(:)%name), MASK=ll)
     CALL strReduce(str)
-    i%ntiso = i%niso + SIZE(str)                                     !--- Number of isotopes + their geographic tracers [ntraciso]
+    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
@@ -1009 +1009 @@
     !=== 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
-    i%iqTraPha = RESHAPE( [( (strIdx(t%name,  addPhase(i%trac(it),i%phase(ip:ip))),    it=1, i%ntiso), ip=1, i%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 ix (index in tagging tracers isotopes list, size ntiso) from the zone and isotope indexes
@@ -1407 +1407 @@
   IF(PRESENT(iPhase)) iPhase = 1                                               !--- Default: gaseous phase
   lH2O=.FALSE.
-  IF(LEN_TRIM(oldName)>3) THEN
-    lH2O = oldName(1:3)=='H2O' .AND. INDEX(old_phases,oldName(4:4))/=0     !---H2O<phase>*, with phase=="v", "l", "i" or "r"
-    IF(LEN_TRIM(oldName) > 4) lH2O = lH2O .AND. oldName(5:5)=='_'          !---H2O<phase>_*, with phase=="v", "l", "i" or "r"
+  IF(LEN_TRIM(oldName) > 3) THEN
+    lH2O = oldName(1:3)=='H2O' .AND. INDEX(old_phases,oldName(4:4))/=0         !--- H2O<phase>*,  with phase=="v", "l", "i" or "r"
+    IF(LEN_TRIM(oldName) > 4) lH2O = lH2O .AND. oldName(5:5) == '_'            !--- H2O<phase>_*, with phase=="v", "l", "i" or "r"
   END IF
   IF(.NOT.lH2O) RETURN
   IF(LEN_TRIM(oldName)>3) THEN; IF(INDEX(old_Phases,oldName(4:4))==0) RETURN; END IF 
-
-
   lerr = strParse(oldName, '_', tmp, n=nt)
   ip = strIdx([('H2O'//old_phases(ip:ip), ip=1, nphases)], tmp(1))             !--- Phase index (/=0 if any)

LMDZ6/trunk/libf/misc/trac_types_mod.F90

@@ -47 +47 @@
     INTEGER                            :: ntiso = 0        !--- Number of isotopes, including tagging tracers
     INTEGER                            :: nphas = 0        !--- Number phases
-    INTEGER,               ALLOCATABLE :: iqTraPha(:,:)    !--- Idx in "tracers(1:nqtot)" = f(name(1:ntiso)),phas)
-                                                           !---        "iqTraPha" former name: "iqiso"
+    INTEGER,               ALLOCATABLE :: iqIsoPha(:,:)    !--- Idx in "tracers(1:nqtot)" = f(name(1:ntiso)),phas)
+                                                           !---        "iqIsoPha" former name: "iqiso"
     INTEGER,               ALLOCATABLE :: itZonIso(:,:)    !--- Idx in "trac(1:ntiso)" = f(zone, name(1:niso))
                                                            !---        "itZonIso" former name: "index_trac"