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

Timestamp:

Apr 30, 2020, 4:47:53 PM (5 years ago)

Author:

emillour

Message:

Common dynamics:
Small fix for cases when traceur.def contains lines such as "tnom0,hadv,vadv" or "hadv,vadv,tnom_0", tnom_transp() must also be initialized to "air".
EM

File:

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

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

@@ -541 +541 @@
               ! maybe format is tnom0,hadv,vadv
               read(line,*,iostat=ierr3) tnom_0(iq),hadv(iq),vadv(iq)
-               if (ierr3.ne.0) then
+              if (ierr3.ne.0) then
                 !assuming values of hadv et vadv
                 hadv(iq)=10
@@ -547 +547 @@
                 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)
+                ! assume only tnom0 is provided (hadv and vadv 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)
+              else
+                !format is tnom0,hadv,vadv
+                tnom_transp(iq)='air' ! no isotopes
+              endif ! of if (ierr3.ne.0)
+             else
+               ! format is hadv,vadv,tnom_0
+               tnom_transp(iq)='air' ! no isotopes
+             endif ! of if (ierr2.ne.0)
+            endif ! of if(ierr1.ne.0)
           END DO ! of DO iq=1,nqtrue
           CLOSE(90)