Changeset 5223 for LMDZ6/branches/Amaury_dev/libf/dyn3d/lmdz_dynetat0.f90

Timestamp:

Sep 23, 2024, 4:45:12 PM (8 hours ago)

Author:

abarral

Message:

Merge r5200

Location:

LMDZ6/branches/Amaury_dev

Files:

• . (modified) (1 prop)
• libf/dyn3d/lmdz_dynetat0.f90 (modified) (4 diffs)

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

@@ -12 +12 @@
     !-------------------------------------------------------------------------------
     USE lmdz_infotrac, ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName, &
-                         new2oldH2O, newHNO3, oldHNO3, getKey
+            new2oldH2O, newHNO3, oldHNO3, getKey
     USE lmdz_strings, ONLY: maxlen, msg, strStack, real2str, int2str
     USE netcdf, ONLY: nf90_open, nf90_nowrite, nf90_inq_varid, nf90_close, nf90_get_var, nf90_noerr
@@ -49 +49 @@
     INTEGER :: iq, fID, vID, idecal, iqParent, iName, iZone, iPhase, ix
     REAL :: time, tnat, alpha_ideal, tab_cntrl(length)    !--- RUN PARAMS TABLE
-    LOGICAL :: lSkip, ll
-    LOGICAL, PARAMETER :: tnat1 = .TRUE.
+    LOGICAL :: lSkip, ll, ltnat1
     !-------------------------------------------------------------------------------
     modname = "dynetat0"
@@ -140 +139 @@
       ll = nf90_inq_varid(fID, 'HNO3tot', vID) /= nf90_noerr                                 !--- DETECT OLD REPRO start.nc FILE
     END IF
+    ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)
     DO iq = 1, nqtot
       var = tracers(iq)%name
@@ -163 +163 @@
         iqParent = tracers(iq)%iqParent
         IF(tracers(iq)%iso_iZone == 0) THEN
-          IF (tnat1) THEN
+          IF(ltnat1) THEN
             tnat = 1.0
             alpha_ideal = 1.0
-            WRITE(*, *) 'attention dans dynetat0: les alpha_ideal sont a 1'
-          else
+            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)
-          endif
+          END IF
           CALL msg('Missing tracer <' // TRIM(var) // '> => initialized with a simplified Rayleigh distillation law.', modname)
           q(:, :, :, iq) = q(:, :, :, iqParent) * tnat * (q(:, :, :, iqParent) / 30.e-3)**(alpha_ideal - 1.)