Changeset 4fbe7a5 in flexpart.git for src/readcommand.f90

Timestamp:

May 23, 2014, 11:48:41 AM (10 years ago)

Author:

Ignacio Pisso <ip@…>

Branches:

master, 10.4.1_pesei, FPv9.3.1, FPv9.3.1b_testing, FPv9.3.2, GFS_025, NetCDF, bugfixes+enhancements, deposition, dev, fp9.3.1-20161214-nc4, grib2nc4_repair, inputlist, laptop, release-10, release-10.4.1, scaling-bug, svn-petra, svn-trunk, univie

Children:

0aded10

Parents:

f13406c

Message:

version 9.2 beta. Changes from HH, AST, MC, NIK, IP. Changes in vert transform. New SPECIES input includes scavenging coefficients

git-svn-id: ​http://flexpart.flexpart.eu:8088/svn/FlexPart90/trunk@24 ef8cc7e1-21b7-489e-abab-c1baa636049d

File:

• src/readcommand.f90 (modified) (5 diffs)

src/readcommand.f90

@@ -80 +80 @@
   character(len=50) :: line
   logical :: old
-  logical :: nmlout=.true. !.false.
+  logical :: nml_COMMAND=.true. , nmlout=.true.  !.false.
   integer :: readerror
 
   namelist /command/ &
-    ldirect, &
-    ibdate,ibtime, &
-    iedate,ietime, &
-    loutstep, &
-    loutaver, &
-    loutsample, &
-    itsplit, &
-    lsynctime, &
-    ctl, &
-    ifine, &
-    iout, &
-    ipout, &
-    lsubgrid, &
-    lconvection, &
-    lagespectra, &
-    ipin, &
-    ioutputforeachrelease, &
-    iflux, &
-    mdomainfill, &
-    ind_source, &
-    ind_receptor, &
-    mquasilag, &
-    nested_output, &
-    linit_cond, &
-    surf_only    
+  ldirect, &
+  ibdate,ibtime, &
+  iedate,ietime, &
+  loutstep, &
+  loutaver, &
+  loutsample, &
+  itsplit, &
+  lsynctime, &
+  ctl, &
+  ifine, &
+  iout, &
+  ipout, &
+  lsubgrid, &
+  lconvection, &
+  lagespectra, &
+  ipin, &
+  ioutputforeachrelease, &
+  iflux, &
+  mdomainfill, &
+  ind_source, &
+  ind_receptor, &
+  mquasilag, &
+  nested_output, &
+  linit_cond, &
+  surf_only    
 
   ! Presetting namelist command
@@ -144 +144 @@
   open(unitcommand,file=path(1)(1:length(1))//'COMMAND',status='old', &
          form='formatted',iostat=readerror)
-  ! If fail, check if file does not exist
-  if (readerror.ne.0) then
-    
-    print*,'***ERROR: file COMMAND not found in ' 
-    print*, path(1)(1:length(1))//'COMMAND'
-    print*, 'Check your pathnames file.'
-    stop
-
-  endif
-
-  read(unitcommand,command,iostat=readerror)
+   ! If fail, check if file does not exist
+   if (readerror.ne.0) then
+     print*,'***ERROR: file COMMAND not found in ' 
+     print*, path(1)(1:length(1))//'COMMAND'
+     print*, 'Check your pathnames file.'
+     stop
+   endif
+
+   ! print error code
+   !write(*,*) 'readcommand > readerror open=' , readerror
+   !probe first line  
+   read (unitcommand,901) line
+   !write(*,*) 'index(line,COMMAND) =', index(line,'COMMAND') 
+
+ 
+   !default is namelist input 
+   ! distinguish namelist from fixed text input
+   if (index(line,'COMMAND') .eq. 0) then
+   nml_COMMAND = .false. 
+   !write(*,*) 'COMMAND file does not contain the string COMMAND in the first line'      
+   endif
+   !write(*,*) 'readcommand > read as namelist? ' , nml_COMMAND
+   rewind(unitcommand)
+   read(unitcommand,command,iostat=readerror)
+
   close(unitcommand)
 
+  !write(*,*) 'readcommand > readerror read=' , readerror
   ! If error in namelist format, try to open with old input code
-  if (readerror.ne.0) then
+  ! if (readerror.ne.0) then
+  ! IP 21/5/2014 the previous line cause the old long format 
+  ! to be confused with namelist input
+  
+  ! use text input 
+  if (nml_COMMAND .eqv. .false.) then 
 
     open(unitcommand,file=path(1)(1:length(1))//'COMMAND',status='old', &
@@ -173 +193 @@
     if (index(line,'LDIRECT') .eq. 0) then
       old = .false.
+    !write(*,*) 'readcommand old short'
     else
       old = .true.
+    !write(*,*) 'readcommand old long'
     endif
     rewind(unitcommand)
 
+
     ! Read parameters
     !****************
@@ -231 +254 @@
     if (old) call skplin(3,unitcommand)
     read(unitcommand,*) linit_cond
+    if (old) call skplin(3,unitcommand)
+    read(unitcommand,*) surf_only
     close(unitcommand)
 
@@ -237 +262 @@
   ! write command file in namelist format to output directory if requested
   if (nmlout.eqv..true.) then
-    !open(unitcommand,file=path(2)(1:length(2))//'COMMAND.namelist.out',status='new',err=1000)
     open(unitcommand,file=path(2)(1:length(2))//'COMMAND.namelist',err=1000)
     write(unitcommand,nml=command)