Changeset 957 for trunk/LMDZ.COMMON/libf

Timestamp:

May 10, 2013, 3:00:01 PM (12 years ago)

Author:

emillour

Message:

Common dynamics:

• Add possibility to read a traceur.def with a different format; ie: traceur.def file with lines such as "name hadv vadv" where hadv and vadv are advection scheme number , or even just "name" on each line (advections shceme then defaults to 10, the standard VanLeer? scheme)
• Add the "-s" (number of radiatively active scatterres) and "-b" (number of bands in the IR and visible) options to scripts makelmdz and makelmdz_fcm. Using these options only makes sense if compiling with generic physics.

EM

Location:

trunk/LMDZ.COMMON/libf

Files:

• dyn3d/infotrac.F90 (modified) (2 diffs)
• dyn3dpar/infotrac.F90 (modified) (2 diffs)

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

@@ -67 +67 @@
   
     INTEGER :: nqtrue  ! number of tracers read from tracer.def, without higer order of moment
-    INTEGER :: iq, new_iq, iiq, jq, ierr
+    INTEGER :: iq, new_iq, iiq, jq, ierr, ierr2, ierr3
+    
+    character(len=80) :: line ! to store a line of text
  
     character(len=*),parameter :: modname="infotrac_init"
@@ -269 +271 @@
           ! Continue to read tracer.def
           DO iq=1,nqtrue
-             READ(90,*) hadv(iq),vadv(iq),tnom_0(iq)
-          END DO
+             !READ(90,*) hadv(iq),vadv(iq),tnom_0(iq)
+            ! try to be smart when reading traceur.def
+            read(90,'(80a)') line ! store the line from traceur.def
+            ! assume format is hadv,vadv,tnom_0
+            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)
+                hadv(iq)=10
+                vadv(iq)=10
+              endif
+            endif ! of if(ierr2.ne.0)
+          END DO ! of DO iq=1,nqtrue
           CLOSE(90)  
        ELSE ! Without tracer.def

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

@@ -67 +67 @@
   
     INTEGER :: nqtrue  ! number of tracers read from tracer.def, without higer order of moment
-    INTEGER :: iq, new_iq, iiq, jq, ierr
+    INTEGER :: iq, new_iq, iiq, jq, ierr, ierr2, ierr3
+    
+    character(len=80) :: line ! to store a line of text
  
     character(len=*),parameter :: modname="infotrac_init"
@@ -269 +271 @@
           ! Continue to read tracer.def
           DO iq=1,nqtrue
-             READ(90,*) hadv(iq),vadv(iq),tnom_0(iq)
-          END DO
+             !READ(90,*) hadv(iq),vadv(iq),tnom_0(iq)
+            ! try to be smart when reading traceur.def
+            read(90,'(80a)') line ! store the line from traceur.def
+            ! assume format is hadv,vadv,tnom_0
+            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)
+                hadv(iq)=10
+                vadv(iq)=10
+              endif
+            endif ! of if(ierr2.ne.0)
+          END DO ! of DO iq=1,nqtrue
           CLOSE(90)  
        ELSE ! Without tracer.def