Changeset 5229 for LMDZ6/branches/Amaury_dev/libf/dyn3d/lmdz_check_isotopes.f90

Timestamp:

Sep 25, 2024, 12:03:08 PM (7 weeks ago)

Author:

abarral

Message:

Merge r5214

File:

• LMDZ6/branches/Amaury_dev/libf/dyn3d/lmdz_check_isotopes.f90 (modified) (4 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3d/lmdz_check_isotopes.f90

@@ -9 +9 @@
     USE lmdz_strings, ONLY: maxlen, msg, strIdx, strStack, int2str, real2str
     USE lmdz_infotrac, ONLY: nqtot, niso, nphas, isotope, isoCheck, iqIsoPha, isoSelect, &
-            ntiso, iH2O, nzone, tracers, isoName, itZonIso, getKey
+            ntiso, iH2O, nzone, tracers, isoName, itZonIso
+    USE iso_params_mod, ONLY: tnat_H216O, tnat_H217O, tnat_H218O, tnat_HDO, tnat_HTO
 
     USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
@@ -31 +32 @@
             ridicule = 1e-12
     INTEGER, SAVE :: iso_eau, iso_O17, iso_O18, iso_HDO, iso_HTO
-    LOGICAL, SAVE :: ltnat1, first = .TRUE.
+    LOGICAL :: ltnat1
+    LOGICAL, SAVE :: first = .TRUE.
 
     modname = 'check_isotopes'
@@ -40 +42 @@
       ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
       ALLOCATE(tnat(niso))
-      iso_eau = strIdx(isoName, 'H216O')
-      iso_O17 = strIdx(isoName, 'H217O')
-      iso_O18 = strIdx(isoName, 'H218O')
-      iso_HDO = strIdx(isoName, 'HDO')
-      iso_HTO = strIdx(isoName, 'HTO')
-      IF(ltnat1) THEN
-        tnat(:) = 1.0
-      ELSE
-        IF(getKey('tnat', tnat)) CALL abort_gcm(modname, 'missing isotopic parameter', 1)
-      END IF
+      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.
       first = .FALSE.
     END IF
@@ -61 +59 @@
         DO k = 1, llm
           DO i = 1, ip1jmp1
-            IF(ABS(q(i, k, iq)) <= borne) CYCLE
+            IF(ABS(q(i, k, iq)) < borne) CYCLE
             WRITE(msg1, '(s,"(",i0,",",i0,",",i0,") = ",ES12.4)')TRIM(isoName(ixt)), i, k, iq, q(i, k, iq)
             CALL msg(msg1, modname)