Changeset 5229 for LMDZ6/branches/Amaury_dev/libf/dyn3dmem

Timestamp:

Sep 25, 2024, 12:03:08 PM (3 months ago)

Author:

abarral

Message:

Merge r5214

Location:

LMDZ6/branches/Amaury_dev/libf/dyn3dmem

Files:

• check_isotopes_loc.F90 (modified) (4 diffs)
• dynetat0_loc.f90 (modified) (3 diffs)
• iniacademic_loc.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/check_isotopes_loc.F90

@@ -3 +3 @@
    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
 
 
@@ -14 +15 @@
    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, SAVE :: tnat(:)         !--- OpenMP shared variable
-   REAL    :: xtractot, xiiso, deltaD, q1, q2
+   REAL :: xtractot, xiiso, deltaD, q1, q2
    REAL, PARAMETER :: borne     = 1e19,  &
                       errmax    = 1e-8,  &       !--- Max. absolute error
@@ -38 +39 @@
       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.0
 !$OMP END MASTER
 !$OMP BARRIER
@@ -62 +59 @@
          DO k = 1, llm
             DO i = ijb, ije
-               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)

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynetat0_loc.f90

@@ -8 +8 @@
   USE parallel_lmdz
   USE lmdz_infotrac, ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName, &
-          new2oldH2O, newHNO3, oldHNO3, getKey
+          new2oldH2O, newHNO3, oldHNO3
   USE lmdz_strings, ONLY: maxlen, msg, strStack, real2str, int2str, strIdx
   USE netcdf, ONLY: nf90_open, nf90_nowrite, nf90_inquire_dimension, nf90_inq_varid, &
@@ -23 +23 @@
   USE lmdz_iniprint, ONLY: lunout, prt_level
   USE lmdz_comgeom
+  USE iso_params_mod   ! tnat_* and alpha_ideal_*
 
   USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
@@ -188 +189 @@
           CALL msg(' !!!  Beware: alpha_ideal put to 1  !!!', modname)
         ELSE
-          IF(getKey('tnat', tnat, isoName(iName)) .OR. getKey('alpha', alpha_ideal, isoName(iName))) &
-                  CALL abort_gcm(TRIM(modname), 'missing isotopic parameters', 1)
+          SELECT CASE(isoName(iName))
+            CASE('H216O'); tnat = tnat_H216O; alpha_ideal = alpha_ideal_H216O
+            CASE('H217O'); tnat = tnat_H217O; alpha_ideal = alpha_ideal_H217O
+            CASE('H218O'); tnat = tnat_H218O; alpha_ideal = alpha_ideal_H218O
+            CASE('HDO');   tnat = tnat_HDO;   alpha_ideal = alpha_ideal_HDO
+            CASE('HTO');   tnat = tnat_HTO;   alpha_ideal = alpha_ideal_HTO
+            CASE DEFAULT; CALL abort_gcm(TRIM(modname), 'unknown isotope "' // TRIM(isoName(iName)) // '" ; check tracer.def file', 1)
+          END SELECT
         END IF
         CALL msg('Missing tracer <' // TRIM(var) // '> => initialized with a simplified Rayleigh distillation law.', modname)

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90

@@ -1 @@
-! $Id: iniacademic.F90 1625 2012-05-09 13:14:48Z lguez $
-
 SUBROUTINE iniacademic_loc(vcov, ucov, teta, q, masse, ps, phis, time_0)
 
   USE lmdz_filtreg, ONLY: inifilr
-  USE lmdz_infotrac, ONLY: nqtot, niso, iqIsoPha, tracers, getKey, isoName, addPhase
+  USE lmdz_infotrac, ONLY: nqtot, niso, iqIsoPha, tracers, isoName, addPhase
   USE control_mod, ONLY: day_step, planet_type
   USE exner_hyb_m, ONLY: exner_hyb
@@ -21 +19 @@
   USE lmdz_academic, ONLY: tetarappel, knewt_t, kfrict, knewt_g, clat4
   USE lmdz_comgeom
+  USE iso_params_mod   ! tnat_* and alpha_ideal_*
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -322 +321 @@
                     WRITE(lunout, *) 'In '//TRIM(modname)//': !!!  Beware: alpha_ideal put to 1  !!!'
                  ELSE
-                    IF(getKey('tnat', tnat, isoName(iName)) .OR. getKey('alpha', alpha_ideal, isoName(iName))) &
-                    CALL abort_gcm(TRIM(modname), 'missing isotopic parameters', 1)
+                    SELECT CASE(isoName(iName))
+                      CASE('H216O'); tnat = tnat_H216O; alpha_ideal = alpha_ideal_H216O
+                      CASE('H217O'); tnat = tnat_H217O; alpha_ideal = alpha_ideal_H217O
+                      CASE('H218O'); tnat = tnat_H218O; alpha_ideal = alpha_ideal_H218O
+                      CASE('HDO');   tnat = tnat_HDO;   alpha_ideal = alpha_ideal_HDO
+                      CASE('HTO');   tnat = tnat_HTO;   alpha_ideal = alpha_ideal_HTO
+                      CASE DEFAULT
+                         CALL abort_gcm(TRIM(modname),'unknown isotope "'//TRIM(isoName(iName))//'" ; check tracer.def file',1)
+                    END SELECT
                  END IF
                  q(ijb_u:ije_u,:,iq) = q(ijb_u:ije_u,:,iqParent)*tnat*(q(ijb_u:ije_u,:,iqParent)/30.e-3)**(alpha_ideal-1.)