Changeset 5223 for LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynetat0_loc.f90

Timestamp:

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

Author:

abarral

Message:

Merge r5200

Location:

LMDZ6/branches/Amaury_dev

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/dynetat0_loc.f90 (modified) (6 diffs)

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, getKey
   USE lmdz_strings, ONLY: maxlen, msg, strStack, real2str, int2str, strIdx
   USE netcdf, ONLY: nf90_open, nf90_nowrite, nf90_inquire_dimension, nf90_inq_varid, &
@@ -49 +49 @@
   REAL, ALLOCATABLE :: ucov_glo(:, :), q_glo(:, :), phis_glo(:)
   REAL, ALLOCATABLE :: teta_glo(:, :)
-  LOGICAL :: lSkip, ll
-  LOGICAL, PARAMETER :: tnat1 = .TRUE.
+  LOGICAL :: lSkip, ll, ltnat1
   !-------------------------------------------------------------------------------
   modname = "dynetat0_loc"
@@ -160 +159 @@
     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
@@ -175 +175 @@
       !--------------------------------------------------------------------------------------------------------------------------
     ELSE IF(nf90_inq_varid(fID, oldVar, vID) == nf90_noerr) THEN                         !=== TRY WITH ALTERNATE NAME
-      CALL msg('Missing tracer <'//TRIM(var)//'> => initialized to <' // TRIM(oldVar) // '>', modname)
+      CALL msg('Missing tracer <' // TRIM(var) // '> => initialized to <' // TRIM(oldVar) // '>', modname)
       CALL get_var2(oldVar, q_glo); q(ijb_u:ije_u, :, iq) = q_glo(ijb_u:ije_u, :)
       !--------------------------------------------------------------------------------------------------------------------------
@@ -183 +183 @@
       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
-        CALL msg('Missing tracer <'//TRIM(var)//'> => initialized with a simplified Rayleigh distillation law.', modname)
+        END IF
+        CALL msg('Missing tracer <' // TRIM(var) // '> => initialized with a simplified Rayleigh distillation law.', modname)
         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.)
         ! Camille 9 mars 2023: point de vigilence: initialisation incohérente
         ! avec celle de xt_ancien dans la physiq.
       ELSE
-        CALL msg('Missing tracer <'//TRIM(var)//'> => initialized to its parent isotope concentration.', modname)
+        CALL msg('Missing tracer <' // TRIM(var) // '> => initialized to its parent isotope concentration.', modname)
         ! Camille 9 mars 2023: attention!! seuls les tags qui correspondent à
         ! izone=izone_init (définie dans isotrac_mod) sont initialisés comme
@@ -210 +210 @@
       !--------------------------------------------------------------------------------------------------------------------------
     ELSE                                                                                 !=== MISSING: SET TO 0
-      CALL msg('Missing tracer <'//TRIM(var)//'> => initialized to zero', modname)
+      CALL msg('Missing tracer <' // TRIM(var) // '> => initialized to zero', modname)
       q(ijb_u:ije_u, :, iq) = 0.
       !--------------------------------------------------------------------------------------------------------------------------