Changes in trunk/src/readcommand.f90 [20:30]

File:

• trunk/src/readcommand.f90 (modified) (12 diffs)

trunk/src/readcommand.f90

@@ -29 +29 @@
   !                                                                            *
   !     18 May 1996                                                            *
+  !     HSO, 1 July 2014                                                       *
+  !     Added optional namelist input                                          *
   !                                                                            *
   !*****************************************************************************
@@ -80 +82 @@
   character(len=50) :: line
   logical :: old
-  logical :: 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, &
+  lnetcdfout, &
+  surf_only    
 
   ! Presetting namelist command
-  ldirect=1
+  ldirect=0
   ibdate=20000101
   ibtime=0
@@ -137 +139 @@
   nested_output=0
   linit_cond=0
+  lnetcdfout=0
   surf_only=0 
 
@@ -142 +145 @@
   ! Namelist input first: try to read as namelist file
   !**************************************************************************
-  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
-
+  open(unitcommand,file=path(1)(1:length(1))//'COMMAND',status='old',form='formatted',err=999)
+
+  ! try namelist input (default)
   read(unitcommand,command,iostat=readerror)
   close(unitcommand)
 
-  ! If error in namelist format, try to open with old input code
-  if (readerror.ne.0) then
-
-    open(unitcommand,file=path(1)(1:length(1))//'COMMAND',status='old', &
-         err=999)
+  ! distinguish namelist from fixed text input
+  if ((readerror.ne.0).or.(ldirect.eq.0)) then ! parse as text file format
+ 
+    open(unitcommand,file=path(1)(1:length(1))//'COMMAND',status='old', err=999)
 
     ! Check the format of the COMMAND file (either in free format,
@@ -173 +166 @@
     if (index(line,'LDIRECT') .eq. 0) then
       old = .false.
+      write(*,*) 'COMMAND in old short format, please update to namelist format'
     else
       old = .true.
+      write(*,*) 'COMMAND in old long format, please update to namelist format'
     endif
     rewind(unitcommand)
 
+
     ! Read parameters
     !****************
@@ -183 +179 @@
     call skplin(7,unitcommand)
     if (old) call skplin(1,unitcommand)
-
     read(unitcommand,*) ldirect
     if (old) call skplin(3,unitcommand)
@@ -231 +226 @@
     if (old) call skplin(3,unitcommand)
     read(unitcommand,*) linit_cond
+    if (old) call skplin(3,unitcommand)
+    read(unitcommand,*) surf_only
     close(unitcommand)
 
@@ -237 +234 @@
   ! 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)
     close(unitcommand)
-     ! open(unitheader,file=path(2)(1:length(2))//'header_nml',status='new',err=999)
-     ! write(unitheader,NML=COMMAND)
-     !close(unitheader) 
   endif
 
@@ -353 +346 @@
   endif
 
+!  check for netcdf output switch (use for non-namelist input only!)
+  if (iout.ge.8) then
+     lnetcdfout = 1
+     iout = iout - 8
+#ifndef NETCDF_OUTPUT
+     print*,'ERROR: netcdf output not activated during compile time but used in COMMAND file!'
+     print*,'Please recompile with netcdf library or use standard output format.'
+     stop
+#endif
+  endif
+
   ! Check whether a valid option for gridded model output has been chosen
   !**********************************************************************
@@ -358 +362 @@
   if ((iout.lt.1).or.(iout.gt.5)) then
     write(*,*) ' #### FLEXPART MODEL ERROR! FILE COMMAND:     #### '
-    write(*,*) ' #### IOUT MUST BE 1, 2, 3, 4, OR 5!          #### '
+    write(*,*) ' #### IOUT MUST BE 1, 2, 3, 4, OR 5 FOR       #### '
+    write(*,*) ' #### STANDARD FLEXPART OUTPUT OR  9 - 13     #### '
+    write(*,*) ' #### FOR NETCDF OUTPUT                       #### '
     stop
   endif
@@ -370 +376 @@
     stop
   endif
-
 
 
@@ -592 +597 @@
 
 1000   write(*,*) ' #### FLEXPART MODEL ERROR! FILE "COMMAND"    #### '
-       write(*,*) ' #### CANNOT BE OPENED IN THE DIRECTORY       #### '
-        write(*,'(a)') path(2)(1:length(1))
-        stop
+  write(*,*) ' #### CANNOT BE OPENED IN THE DIRECTORY       #### '
+  write(*,'(a)') path(2)(1:length(1))
+  stop
 end subroutine readcommand