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

Timestamp:

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

Author:

abarral

Message:

Merge r5200

Location:

LMDZ6/branches/Amaury_dev

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/check_isotopes_loc.F90 (modified) (3 diffs)
• libf/dyn3dmem/dynetat0_loc.f90 (modified) (6 diffs)
• libf/dyn3dmem/iniacademic_loc.F90 (modified) (3 diffs)
• libf/dyn3dmem/qminimum_loc.f90 (modified) (1 diff)

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

@@ -24 +24 @@
                       deltaDmin =-999.0, &
                       ridicule  = 1e-12
-   INTEGER, SAVE :: iso_eau, iso_HDO, iso_O18, & !--- OpenMP shared variables
-                             iso_O17, iso_HTO
+   INTEGER, SAVE :: iso_eau, iso_HDO, iso_O18, iso_O17, iso_HTO
+!$OMP THREADPRIVATE(iso_eau, iso_HDO, iso_O18, iso_O17, iso_HTO)
+   LOGICAL       :: ltnat1
    LOGICAL, SAVE :: first=.TRUE.
-   LOGICAL, PARAMETER :: tnat1=.TRUE.
 !$OMP THREADPRIVATE(first)
 
@@ -36 +36 @@
    IF(first) THEN
 !$OMP MASTER
+      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
 !$OMP END MASTER
 !$OMP BARRIER
@@ -60 +62 @@
          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, 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.
       !--------------------------------------------------------------------------------------------------------------------------

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

@@ -78 +78 @@
 
   REAL zdtvr, tnat, alpha_ideal
-  LOGICAL, PARAMETER :: tnat1 = .TRUE.
-
-  CHARACTER(LEN = *), parameter :: modname = "iniacademic"
-  CHARACTER(LEN = 80) :: abort_message
+  LOGICAL :: ltnat1
+  
+  CHARACTER(LEN=*),parameter :: modname="iniacademic"
+  CHARACTER(LEN=80) :: abort_message
 
   ! Sanity check: verify that options selected by user are not incompatible
@@ -304 +304 @@
       ! bulk initialization of tracers
       IF (planet_type=="earth") THEN
-        ! Earth: first two tracers will be water
+        ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1)! Earth: first two tracers will be water
         DO iq = 1, nqtot
           q(ijb_u:ije_u, :, iq) = 0.
@@ -310 +310 @@
           IF(tracers(iq)%name == addPhase('H2O', 'l')) q(ijb_u:ije_u, :, iq) = 1.e-15
 
-          ! CRisi: init des isotopes
-          ! distill de Rayleigh très simplifiée
-          iName = tracers(iq)%iso_iName
-          IF (niso <= 0 .OR. iName <= 0) CYCLE
-          iPhase = tracers(iq)%iso_iPhase
-          iqParent = tracers(iq)%iqParent
-          IF(tracers(iq)%iso_iZone == 0) THEN
-            IF (tnat1) THEN
-              tnat = 1.0
-              alpha_ideal = 1.0
-              WRITE(*, *) 'Attention dans iniacademic: alpha_ideal=1'
-            else
-              IF(getKey('tnat', tnat, isoName(iName)) .OR. getKey('alpha', alpha_ideal, isoName(iName))) &
-                      CALL abort_gcm(TRIM(modname), 'missing isotopic parameters', 1)
-            endif
-            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.)
-          ELSE !IF(tracers(iq)%iso_iZone == 0) THEN
-            IF(tracers(iq)%iso_iZone == 1) THEN ! a verifier.
-              ! correction le 14 mai 2024 pour que tous les traceurs soient de la couleur 1.
-              ! Sinon, on va avoir des porblèmes de conservation de masse de traceurs.
-              q(ijb_u:ije_u, :, iq) = q(ijb_u:ije_u, :, iqIsoPha(iName, iPhase))
-            else !IF(tracers(iq)%iso_iZone == 1) THEN
-              q(ijb_u:ije_u, :, iq) = 0.0
-            endif !IF(tracers(iq)%iso_iZone == 1) THEN
-          END IF !IF(tracers(iq)%iso_iZone == 0) THEN
-        enddo
-      else
-        q(ijb_u:ije_u, :, :) = 0
-      endif ! of if (planet_type=="earth")
+              ! CRisi: init des isotopes
+              ! distill de Rayleigh très simplifiée
+              iName    = tracers(iq)%iso_iName
+              if (niso <= 0 .OR. iName <= 0) CYCLE
+              iPhase   = tracers(iq)%iso_iPhase
+              iqParent = tracers(iq)%iqParent
+              IF(tracers(iq)%iso_iZone == 0) THEN
+                 IF(ltnat1) THEN
+                    tnat = 1.0
+                    alpha_ideal = 1.0
+                    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)
+                 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.)
+              ELSE !IF(tracers(iq)%iso_iZone == 0) THEN
+                 IF(tracers(iq)%iso_iZone == 1) THEN ! a verifier.
+                    ! correction le 14 mai 2024 pour que tous les traceurs soient de la couleur 1.
+                    ! Sinon, on va avoir des porblèmes de conservation de masse de traceurs.
+                    q(ijb_u:ije_u,:,iq) = q(ijb_u:ije_u,:,iqIsoPha(iName,iPhase))
+                 else !IF(tracers(iq)%iso_iZone == 1) THEN
+                    q(ijb_u:ije_u,:,iq) = 0.0
+                 endif !IF(tracers(iq)%iso_iZone == 1) THEN
+              END IF !IF(tracers(iq)%iso_iZone == 0) THEN
+           enddo
+        else
+           q(ijb_u:ije_u,:,:)=0
+        endif ! of if (planet_type=="earth")
 
       CALL check_isotopes(q, ijb_u, ije_u, 'iniacademic_loc')

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

@@ -7 +7 @@
   USE lmdz_strings, ONLY: strIdx
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
 
   USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm