Changeset 4203 for LMDZ6/branches/LMDZ_ECRad/libf/dyn3d_common/infotrac.F90

Timestamp:

Jul 19, 2022, 1:33:28 PM (2 years ago)

Author:

lguez

Message:

Sync latest trunk changes to branch LMDZ_ECRad.

Location:

LMDZ6/branches/LMDZ_ECRad

Files:

• . (modified) (1 prop)
• libf/dyn3d_common/infotrac.F90 (modified) (4 diffs)

LMDZ6/branches/LMDZ_ECRad/libf/dyn3d_common/infotrac.F90

@@ -7 +7 @@
    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
+                                keys_type, initIsotopes,     getPhase, known_phases, getKey, setGeneration, &
+                                maxTableWidth
    IMPLICIT NONE
 
@@ -274 +275 @@
       ttr(1+nqo+nqCO2:nqtrue)%parent      = tran0
       ttr(1+nqo+nqCO2:nqtrue)%phase       = 'g'
-      lerr = getKey('hadv', had, ky=ttr(:)%keys); hadv(:) = [had, hadv_inca]
-      lerr = getKey('vadv', vad, ky=ttr(:)%keys); vadv(:) = [vad, vadv_inca]
+      lerr = getKey('hadv', had, ky=tracers(:)%keys)
+      lerr = getKey('vadv', vad, ky=tracers(:)%keys)
+      hadv(1:nqo) = had(:); hadv(nqo+1:nqtrue) = hadv_inca
+      vadv(1:nqo) = vad(:); vadv(nqo+1:nqtrue) = vadv_inca
       CALL MOVE_ALLOC(FROM=ttr, TO=tracers)
       CALL setGeneration(tracers)                                    !--- SET FIELDS %iGeneration, %gen0Name
@@ -402 +405 @@
 
    niso = 0; nzone=0; nphas=nqo; ntiso = 0; isoCheck=.FALSE.
-   CALL initIsotopes(tracers, isotopes)
+   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')
@@ -461 +464 @@
                                                                                   bool2str(t%isInPhysics)),&
       cat([(iq, iq=1, nqtot)], t%iadv, t%iGeneration, t%iqParent, t%nqDescen, t%nqChilds, t%iso_iGroup,    &
-                                                    t%iso_iName, t%iso_iZone, t%iso_iPhase), sub=modname)) &
+                  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)
    IF(niso > 0) THEN