Changeset 2436 for trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Timestamp:

Nov 25, 2020, 7:24:05 PM (4 years ago)

Author:

yjaziri

Message:

Generic GCM:
Implementation of an option for a new reading process of "traceur.def"
Use "#ModernTrac-v1" flag as first line of "traceur.def" to use this option
Further details in "LMDZ.GENERIC/deftank/traceur.def.modern"
YJ + JVO

Location:

trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Files:

• kcm1d.F90 (modified) (3 diffs)
• rcm1d.F (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/kcm1d.F90

@@ -90 +90 @@
   real :: latitude(1), longitude(1), cell_area(1), phisfi(1)
   
+  !     added by JVO and YJ to read modern traceur.def
+  character(len=500) :: line ! to store a line of text
+  LOGICAL :: moderntracdef=.false. ! JVO, YJ : modern traceur.def
+
   ! --------------
   ! Initialisation
@@ -162 +166 @@
         write(*,*) "kcm1d: Reading file traceur.def"
         ! read number of tracers:
-        read(90,*,iostat=ierr) nq
+        !! - Modif. by JVO and YJ for modern planetary traceur.def ---------------
+        READ(90,'(A)') line
+        IF (trim(line).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def
+           READ(line,*,iostat=ierr) nq ! Try standard traceur.def
+        ELSE
+           moderntracdef = .true.
+           DO
+             READ(90,'(A)',iostat=ierr) line
+             IF (ierr.eq.0) THEN
+               IF (index(line,'#').ne.1) THEN ! Allows arbitary number of comments lines in the header
+                 READ(line,*,iostat=ierr) nq
+                 EXIT
+               ENDIF
+             ELSE ! If pb, or if reached EOF without having found nbtr
+                write(*,*) "rcm1d: error reading number of tracers"
+                write(*,*) "   (first line of traceur.def) "
+                stop
+             ENDIF
+           ENDDO
+        ENDIF ! if modern or standard traceur.def
         if (ierr.ne.0) then
            write(*,*) "kcm1d: error reading number of tracers"
@@ -184 +207 @@
            endif
         enddo !of do iq=1,nq
+        close(90)
      endif
 

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -144 +144 @@
       real :: latitude(1), longitude(1), cell_area(1)
 
+      !     added by JVO and YJ to read modern traceur.def
+      character(len=500) :: line ! to store a line of text
+      LOGICAL :: moderntracdef=.false. ! JVO, YJ : modern traceur.def
+
 c=======================================================================
 c INITIALISATION
@@ -152 +156 @@
      &       iostat=ierr)
       if (ierr.eq.0) then
-        read(90,*,iostat=ierr) nq
+        ! read number of tracers:
+        !! - Modif. by JVO and YJ for modern planetary traceur.def ---------------
+            READ(90,'(A)') line
+            IF (trim(line).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def
+               READ(line,*,iostat=ierr) nq ! Try standard traceur.def
+            ELSE
+               moderntracdef = .true.
+               DO
+                 READ(90,'(A)',iostat=ierr) line
+                 IF (ierr.eq.0) THEN
+                   IF (index(line,'#').ne.1) THEN ! Allows arbitary number of comments lines in the header
+                     READ(line,*,iostat=ierr) nq
+                     EXIT
+                   ENDIF
+                 ELSE ! If pb, or if reached EOF without having found nbtr
+                    write(*,*) "rcm1d: error reading number of tracers"
+                    write(*,*) "   (first line of traceur.def) "
+                    stop
+                 ENDIF
+               ENDDO
+            ENDIF ! if modern or standard traceur.def
       else
         nq=0
@@ -243 +267 @@
           write(*,*) "rcm1d: Reading file traceur.def"
           ! read number of tracers:
-          read(90,*,iostat=ierr) nq
+          !! - Modif. by JVO and YJ for modern planetary traceur.def ---------------
+          READ(90,'(A)') line
+          IF (trim(line).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def
+             READ(line,*,iostat=ierr) nq ! Try standard traceur.def
+          ELSE
+             moderntracdef = .true.
+             DO
+               READ(90,'(A)',iostat=ierr) line
+               IF (ierr.eq.0) THEN
+                 IF (index(line,'#').ne.1) THEN ! Allows arbitary number of comments lines in the header
+                   READ(line,*,iostat=ierr) nq
+                   EXIT
+                 ENDIF
+               ELSE ! If pb, or if reached EOF without having found nbtr
+                  write(*,*) "rcm1d: error reading number of tracers"
+                  write(*,*) "   (first line of traceur.def) "
+                  stop
+               ENDIF
+             ENDDO
+          ENDIF ! if modern or standard traceur.def
           nqtot=nq ! set value of nqtot (in infotrac module) as nq
           if (ierr.ne.0) then