Changeset 18 for readTracFiles_mod.f90

Timestamp:

May 19, 2022, 12:00:22 PM (3 years ago)

Author:

dcugnet

Message:

• Replace the "addKey_m" calling in readTracFiles_mod:addDefault with several "addKey_1" callings to avoid a gfortran-specific crash.
• Replace the derived type constructor usage "keys_type" with individual components evaluation.
• "iqTraPha" is renamed "iqIsoPha"
• Corrections in "old2newName" function to take correctly into account tracers different from water with names starting with H2O.

File:

• readTracFiles_mod.f90 (modified) (6 diffs)

readTracFiles_mod.f90

@@ -321 +321 @@
   ky => t(jd)%keys
   DO k = 1, SIZE(ky%key)                                             !--- Loop on the keys of the tracer named "defName"
-    CALL addKey_m(ky%key(k), ky%val(k), t(:)%keys)                   !--- Add key to all the tracers (no overwriting)
+!   CALL addKey_m(ky%key(k), ky%val(k), t(:)%keys)                   !--- Add key to all the tracers (no overwriting)
+    DO it = 1, SIZE(t); CALL addKey_1(ky%key(k), ky%val(k), t(it)%keys); 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"
@@ -413 +414 @@
         ttr(i)%name   = TRIM(ta(itr))
         ttr(i)%parent = TRIM(pa(ipr))
-        ttr(i)%keys   = keys_type(ta(itr), tr(it)%keys%key, tr(it)%keys%val)
+        ttr(i)%keys%name = ta(itr)
+        ttr(i)%keys%key  = tr(it)%keys%key
+        ttr(i)%keys%val  = tr(it)%keys%val
+!        ttr(i)%keys   = keys_type(ta(itr), tr(it)%keys%key, tr(it)%keys%val)
       END DO
     END DO
@@ -863 +867 @@
 !=== 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             ====
@@ -983 +987 @@
     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
@@ -1006 +1010 @@
     !=== 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
@@ -1400 +1404 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tmp(:)
   INTEGER :: ix, ip, it, nt
-  LOGICAL :: lerr
+  LOGICAL :: lerr, lH2O
   newName = oldName
   IF(PRESENT(iPhase)) iPhase = 1                                               !--- Default: gaseous phase
-  IF(oldName(1:MIN(3,LEN_TRIM(oldName))) /= 'H2O') RETURN                      !--- Not a water descendant
+  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"
+  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)