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

Timestamp:

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

Author:

abarral

Message:

Merge r5200

Location:

LMDZ6/branches/Amaury_dev

Files:

• . (modified) (1 prop)
• libf/dyn3d/iniacademic.F90 (modified) (3 diffs)
• libf/dyn3d/lmdz_check_isotopes.f90 (modified) (3 diffs)
• libf/dyn3d/lmdz_dynetat0.f90 (modified) (4 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3d/iniacademic.F90

@@ -76 +76 @@
 
   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
@@ -305 +305 @@
       ! 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(:, :, iq) = 0.
@@ -311 +311 @@
           IF(tracers(iq)%name == addPhase('H2O', 'l')) q(:, :, 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(:, :, iq) = q(:, :, iqParent) * tnat * (q(:, :, iqParent) / 30.e-3)**(alpha_ideal - 1.)
-          ELSE !IF(tracers(iq)%iso_iZone == 0) THEN
-            IF(tracers(iq)%iso_iZone == 1) THEN
-              ! 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(:, :, iq) = q(:, :, iqIsoPha(iName, iPhase))
-            else !IF(tracers(iq)%iso_iZone == 1) THEN
-              q(:, :, iq) = 0.
-            endif !IF(tracers(iq)%iso_iZone == 1) THEN
-          END IF !IF(tracers(iq)%iso_iZone == 0) THEN
-        enddo
-      else
-        q(:, :, :) = 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(:,:,iq) = q(:,:,iqParent)*tnat*(q(:,:,iqParent)/30.e-3)**(alpha_ideal-1.)
+              ELSE !IF(tracers(iq)%iso_iZone == 0) THEN
+                 IF(tracers(iq)%iso_iZone == 1) THEN
+                    ! 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(:,:,iq) = q(:,:,iqIsoPha(iName,iPhase))
+                 else !IF(tracers(iq)%iso_iZone == 1) THEN
+                    q(:,:,iq) = 0.
+                 endif !IF(tracers(iq)%iso_iZone == 1) THEN
+              END IF !IF(tracers(iq)%iso_iZone == 0) THEN
+           enddo
+        else
+           q(:,:,:)=0
+        endif ! of if (planet_type=="earth")
 
       CALL check_isotopes_seq(q, ip1jmp1, 'iniacademic_loc')

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

@@ -29 +29 @@
             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'
@@ -39 +37 @@
     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
+      IF(ltnat1) THEN
         tnat(:) = 1.0
-      else
+      ELSE
         IF(getKey('tnat', tnat)) CALL abort_gcm(modname, 'missing isotopic parameter', 1)
-      endif
+      END IF
       first = .FALSE.
     END IF
@@ -60 +60 @@
         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)

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.)