Changeset 5203 for LMDZ6/branches/cirrus/libf/dyn3d/check_isotopes.F90

Timestamp:

Sep 20, 2024, 1:10:18 PM (8 weeks ago)

Author:

Laurent Fairhead

Message:

Merge with trunk revision 5202 before reintegration to trunk

Location:

LMDZ6/branches/cirrus

Files:

• . (modified) (1 prop)
• libf/dyn3d/check_isotopes.F90 (modified) (4 diffs)

LMDZ6/branches/cirrus/libf/dyn3d/check_isotopes.F90

@@ -3 +3 @@
    USE infotrac,    ONLY: nqtot, niso, nphas, isotope, isoCheck, iqIsoPha, isoSelect, &
                           ntiso, iH2O, nzone, tracers, isoName,  itZonIso, getKey
+#ifdef CPP_IOIPSL
+   USE ioipsl,          ONLY: getin
+#else
+   USE ioipsl_getincom, ONLY: getin
+#endif
    IMPLICIT NONE
    include "dimensions.h"
@@ -20 +25 @@
                       deltaDmin =-999.0, &
                       ridicule  = 1e-12
-   INTEGER, SAVE :: iso_eau, iso_HDO, iso_O18, &
-                             iso_O17, iso_HTO
-   LOGICAL, SAVE :: first=.TRUE.
-   LOGICAL, PARAMETER :: tnat1=.TRUE.
+   INTEGER, SAVE :: iso_eau, iso_O17, iso_O18, iso_HDO, iso_HTO
+   LOGICAL, SAVE :: ltnat1, first=.TRUE.
 
    modname='check_isotopes'
@@ -30 +33 @@
    IF(niso == 0)        RETURN                   !--- No isotopes => finished
    IF(first) THEN
+      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_O18 = strIdx(isoName,'H218O')
-      iso_O17 = strIdx(isoName,'H217O')
       iso_HTO = strIdx(isoName,'HTO')
-      if (tnat1) then
-              tnat(:)=1.0
-      else
+      IF(ltnat1) THEN
+         tnat(:)=1.0
+      ELSE
          IF(getKey('tnat', tnat)) CALL abort_gcm(modname, 'missing isotopic parameter', 1)
-      endif
+      END IF
       first = .FALSE.
    END IF
@@ -51 +56 @@
          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)