Changeset 2296 for trunk/LMDZ.COMMON/libf/dyn3d_common

Timestamp:

Apr 24, 2020, 6:55:59 PM (5 years ago)

Author:

mvals

Message:

Mars GCM:
dyn3dpar: Implementation in the parallel version of the dynamics of the dynamical transport of the isotopes using the same scheme as the one
implemented by Camille Risi in the Earth GCM (see LMDZ6/libf/dyn3dmem, and Risi et al. 2009: genealogy of the tracers+transport of the isotopic
ratio). This is added to prepare the future implementation of the HDO cycle in the GCM. These changes had been already added in the sequential part.
dyn3d: corrections to prevent from dividing by zero in the case of the use of the isotopes scheme.
traceur.def.isotopes: example of how to write the traceur.def if you want to use the new dynamics with the genealogy of the isotopes: air is the
father of all, H2O is the father of HDO.
MV

File:

• trunk/LMDZ.COMMON/libf/dyn3d_common/infotrac.F90 (modified) (2 diffs)

trunk/LMDZ.COMMON/libf/dyn3d_common/infotrac.F90

@@ -109 +109 @@
   
     INTEGER :: nqtrue  ! number of tracers read from tracer.def, without higer order of moment
-    INTEGER :: iq, new_iq, iiq, jq, ierr, ierr2, ierr3
+    INTEGER :: iq, new_iq, iiq, jq, ierr, ierr1, ierr2, ierr3, ierr4 !MVals: add ierr1 et ierr4 for the isotope case
     INTEGER :: ifils,ipere,generation ! CRisi
     LOGICAL :: continu,nouveau_traceurdef
@@ -533 +533 @@
             ! try to be smart when reading traceur.def
             read(90,'(80a)') line ! store the line from traceur.def
+            ! if format is hadv, vadv, tnom_0, tnom_transp
+            read(line,*,iostat=ierr1) hadv(iq),vadv(iq),tnom_0(iq),tnom_transp(iq)
+            if (ierr1.ne.0) then
             ! assume format is hadv,vadv,tnom_0
-            read(line,*,iostat=ierr2) hadv(iq),vadv(iq),tnom_0(iq)
-            if (ierr2.ne.0) then
+             read(line,*,iostat=ierr2) hadv(iq),vadv(iq),tnom_0(iq)
+             if (ierr2.ne.0) then
               ! maybe format is tnom0,hadv,vadv
               read(line,*,iostat=ierr3) tnom_0(iq),hadv(iq),vadv(iq)
-              if (ierr3.ne.0) then
-                ! assume only tnom0 is provided (havd and vad default to 10)
-                read(line,*) tnom_0(iq)
+               if (ierr3.ne.0) then
+                !assuming values of hadv et vadv
                 hadv(iq)=10
                 vadv(iq)=10
+                read(line,*, iostat=ierr4) tnom_0(iq), tnom_transp(iq)
+                if (ierr4.ne.0) then
+                ! assume only tnom0 is provided (havd and vad default to 10)
+                  read(line,*) tnom_0(iq)
+                  tnom_transp(iq)='air' 
+                endif
               endif
+             endif
+            !tnom_transp(iq)='air' ! no isotopes... for now... !LRossi: we now add the possibility to use isotopes (HDO cycle)
             endif ! of if(ierr2.ne.0)
-            tnom_transp(iq)='air' ! no isotopes... for now...
           END DO ! of DO iq=1,nqtrue
           CLOSE(90)