Changeset 4193 for LMDZ6/trunk/libf/dyn3d_common

Timestamp:

Jul 4, 2022, 11:45:46 PM (2 years ago)

Author:

dcugnet

Message:

• Modifications in readSections to allow a continuation line character "\": in both "tracer.def" and "isotopes_params.def", information for a single tracer or isotope can now be stored on several lines.
• Modifications in "dispTable" and associated routines to allow too wide tables to be displayed as several shorter sub-tables: each sub-table is at most "nMaxCol" characters wide (typically: number of characters displayable in a tandard screen window) and the first "nHead" columns (typically: name, index, etc.) are duplicated in each sub-table. A default value for nMaxCol, called maxTableWidth (currently = 192) is available in readTracFiles_mod.
• Subroutine "readIsotopesFile" becomes a function with a boolean returned error value "lerr" used to trigger an external aborting function (no STOP).

File:

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

LMDZ6/trunk/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
 
@@ -404 +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')
@@ -463 +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