Changeset 4325 for LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F90

Timestamp:

Nov 7, 2022, 3:09:43 AM (19 months ago)

Author:

dcugnet

Message:

• simplify the parser usage:
  • the getKey_init routine is now embedded in the readTracersFile routine.
  • the initIsotopes routine is now embedded in the readIsotopesFile routine.
  • the database is now unique, but can be changed using the get/setKeysDBase.
  • the derived types descriptions, originally located in trac_types_mod, are moved to readTracFiles_mod.
  • few checkings moved from infotrac to the routine testIsotopes, contained in the readIsotopesFile function from readTracFiles_mod.
  • the readTracersFiles and readIsotopesFile routines no longer use a tracers/isotopes argument.
• remove tnat and alpha_ideal from infotrac ; use instead getKey to get them where they are used (check_isotopes, dynetat0, iniacademic)
• the trac_type field %Childs is renamed %Children
• move the isoSelect routine and the corresponding variables routine from infotrac and infotrac_phy to readTracFiles_mod
• infotrac_phy routine is now fully independant of the (very similar) routine infotrac (init_infotrac_phy has no arguments left).
• all the explicit keys of the trac_type are now included in the embedded keys database, accessible using the getKey function.
• the getKey/addKey routines are expanded to handle vectors of integers, reals, logicals or strings.
• few subroutines converted into functions with error return value.
• corrections for isotopic tagging tracers mode (to be continued).

File:

• LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F90

@@ -3 +3 @@
    USE strings_mod, ONLY: maxlen, msg, strIdx, strStack, int2str, real2str
    USE infotrac,    ONLY: nqtot, niso, nphas, isotope, isoCheck, iqIsoPha, isoSelect, &
-                          ntiso, iH2O, nzone, tracers, isoName,  itZonIso, tnat
+                          ntiso, iH2O, nzone, tracers, isoName,  itZonIso, getKey
    IMPLICIT NONE
    include "dimensions.h"
@@ -11 +11 @@
    CHARACTER(LEN=maxlen) :: modname, msg1, nm(2)
    INTEGER :: ixt, ipha, k, i, iq, iiso, izon, ieau, iqeau, iqpar
-   INTEGER, ALLOCATABLE :: ix(:)
+   INTEGER, ALLOCATABLE ::   ix(:)
+   REAL,    ALLOCATABLE :: tnat(:)               !--- OpenMP shared variable
    REAL    :: xtractot, xiiso, deltaD, q1, q2
    REAL, PARAMETER :: borne     = 1e19,  &
@@ -36 +37 @@
       iso_O17 = strIdx(isoName,'H2[17]O')
       iso_HTO = strIdx(isoName,'H[3]HO')
+      IF(getKey('tnat', tnat)) CALL abort_gcm(modname, 'missing isotopic parameter', 1)
 !$OMP END MASTER
 !$OMP BARRIER