Changeset 5004

Timestamp:

Jul 1, 2024, 5:14:11 PM (3 days ago)

Author:

dcugnet

Message:

"addKey_{irl}mm" contains a loop calling addKey_{irl}11.
For some reason, it crashes when returning to the calling routine (no crash for "addKey_smm" !).
No fix yet, so "addKey_{irl}mm" calls in "indexUpdate" are replaced by "addKey_{irl}11" in loops.

File:

• LMDZ6/trunk/libf/misc/readTracFiles_mod.f90 (modified) (6 diffs)

LMDZ6/trunk/libf/misc/readTracFiles_mod.f90

@@ -289 +289 @@
   END IF
   lerr = indexUpdate(tracers); IF(lerr) RETURN                       !--- Set iqParent, iqDescen, nqDescen, nqChildren
-
   IF(PRESENT(tracs)) CALL MOVE_ALLOC(FROM=tracers, TO=tracs)
 END FUNCTION readTracersFiles
@@ -473 +472 @@
   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_s11(ky%key(k), ky%val(k), t(it)%keys, .FALSE.); END DO
+    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"
@@ -598 +597 @@
   TYPE(trac_type),     INTENT(INOUT) :: tr(:)                        !--- Tracer derived type vector
   INTEGER                            :: iq, jq, ig
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: parent(:), name(:)
+  CHARACTER(LEN=maxlen), ALLOCATABLE :: parent(:), tname(:)
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: modname
   modname = 'setGeneration'
-  lerr = getKey('name',   name,   ky=tr(:)%keys); 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
     DO WHILE(parent(jq) /= tran0)
-      jq = strIdx(name(:), parent(jq))
+      jq = strIdx(tname(:), parent(jq))
       lerr = jq == 0
-      IF(fmsg('Orphan tracer "'//TRIM(name(iq))//'"', modname, lerr)) RETURN
+      IF(fmsg('Orphan tracer "'//TRIM(tname(iq))//'"', modname, lerr)) RETURN
       ig = ig + 1
     END DO
-    tr(iq)%gen0Name = name(jq)
+    tr(iq)%gen0Name = tname(jq)
     tr(iq)%iGeneration = ig
     CALL addKey('iGeneration',   ig,  tr(iq)%keys)
-    CALL addKey('gen0Name', name(jq), tr(iq)%keys)
+    CALL addKey('gen0Name', tname(jq), tr(iq)%keys)
   END DO
 END FUNCTION setGeneration
@@ -896 +895 @@
       lerr = getKey('component', v2, i2, k2)
       tr(i1)%component = TRIM(v1)//','//TRIM(v2)
-      CALL addKey_s11('component', TRIM(v1)//','//TRIM(v2), tr(i1)%keys)
+      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
@@ -1065 +1064 @@
   nq = SIZE(tr)
 
-  !=== iqParent
-  DO iq = 1, nq; iqParent(iq) = strIdx(tnames, parent(iq)); END DO
-  CALL addKey('iqParent', iqParent, tr(:)%keys)
-
-  !=== iGeneration
+  !=== 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',   parent(iq), tr(iq)%keys)
+    CALL addKey('iqGeneration', iGen(iq), tr(iq)%keys)
   END DO
-  CALL addKey('iGeneration', iGen, tr(:)%keys)
-
-  !=== iqDescen
+
+  !=== nqChildren, iqDescen, nqDescen
   nGen = MAXVAL(iGen, MASK=.TRUE.)
   DO iq = 1, nq
@@ -1539 +1536 @@
   DO ik = 1, SIZE(t(jd)%keys%key)
     CALL get_in(t(jd)%keys%key(ik), val, '*none*')
-    IF(val /= '*none*') CALL addKey_s11(t(jd)%keys%key(ik), val, t(jd)%keys, .TRUE.)
+    IF(val /= '*none*') CALL addKey(t(jd)%keys%key(ik), val, t(jd)%keys, .TRUE.)
   END DO
 END SUBROUTINE addKeysFromDef