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

Timestamp:

Sep 15, 2024, 10:38:32 AM (2 months ago)

Author:

dcugnet

Message:

Revert to r5182 because r5183 still craches with gfortran for unclear reasons.
r5188 and r5189 have been included.

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
-   USE iso_params_mod, ONLY: tnat_H216O, tnat_H217O, tnat_H218O, tnat_HDO, tnat_HTO
-#ifdef CPP_IOIPSL
-   USE ioipsl,          ONLY: getin
-#else
-   USE ioipsl_getincom, ONLY: getin
-#endif
+                          ntiso, iH2O, nzone, tracers, isoName,  itZonIso, getKey
    IMPLICIT NONE
    include "dimensions.h"
@@ -27 +21 @@
                       deltaDmin =-999.0, &
                       ridicule  = 1e-12
-   INTEGER, SAVE :: iso_eau, iso_HDO, iso_O18, iso_O17, iso_HTO
-!$OMP THREADPRIVATE(iso_eau, iso_HDO, iso_O18, iso_O17, iso_HTO)
-   LOGICAL       :: ltnat1
+   INTEGER, SAVE :: iso_eau, iso_HDO, iso_O18, & !--- OpenMP shared variables
+                             iso_O17, iso_HTO
    LOGICAL, SAVE :: first=.TRUE.
+   LOGICAL, PARAMETER :: tnat1=.TRUE.
 !$OMP THREADPRIVATE(first)
 
@@ -38 +32 @@
    IF(niso == 0)        RETURN                   !--- No isotopes => finished
    IF(first) THEN
-      ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
-      iso_eau = strIdx(isoName,'H216O'); IF(iso_eau /= 0) tnat(iso_eau) = tnat_H216O
-      iso_O17 = strIdx(isoName,'H217O'); IF(iso_O17 /= 0) tnat(iso_O17) = tnat_H217O
-      iso_O18 = strIdx(isoName,'H218O'); IF(iso_O18 /= 0) tnat(iso_O18) = tnat_H218O
-      iso_HDO = strIdx(isoName,'HDO');   IF(iso_HDO /= 0) tnat(iso_HDO) = tnat_HDO
-      iso_HTO = strIdx(isoName,'HTO');   IF(iso_HTO /= 0) tnat(iso_HTO) = tnat_HTO
-      IF(ltnat1) tnat(:) = 1.0
+!$OMP MASTER
+      iso_eau = strIdx(isoName,'H216O')
+      iso_HDO = strIdx(isoName,'HDO')
+      iso_O18 = strIdx(isoName,'H218O')
+      iso_O17 = strIdx(isoName,'H217O')
+      iso_HTO = strIdx(isoName,'HTO')
+      if (tnat1) then
+              tnat(:)=1.0
+      else
+         IF(getKey('tnat', tnat)) CALL abort_gcm(modname, 'missing isotopic parameter', 1)
+      endif
+!$OMP END MASTER
+!$OMP BARRIER
       first = .FALSE.
    END IF