Changeset ff050cd in flexpart.git for src_parallel/readcommand.f90

Timestamp:

Aug 15, 2013, 3:23:48 PM (11 years ago)

Author:

Harald Sodemann <harald.sodemann@…>

Branches:

flexpart91_hasod

Children:

31113de

Parents:

7c1fd44

Message:

ADD: namelist input implemented for all common input files

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

File:

• src_parallel/readcommand.f90 (modified) (7 diffs)

src_parallel/readcommand.f90

@@ -27 +27 @@
   !                                                                            *
   !     Author: A. Stohl                                                       *
-  !                                                                            *
   !     18 May 1996                                                            *
+  !     HSO, 14 August 2013
+  !     Added optional namelist input
   !                                                                            *
   !*****************************************************************************
@@ -83 +84 @@
   integer :: readerror
 
+  ! declaration of namelist
   namelist /command/ &
     ldirect, &
@@ -96 +98 @@
     iout, &
     ipout, &
+    lnetcdfout, &
     lsubgrid, &
     lconvection, &
@@ -109 +112 @@
     linit_cond
 
-  ! Presetting namelist command
+  ! Presetting the namelist command
   ldirect=0
-  ibdate=20000101
+  ibdate=0
   ibtime=0
-  iedate=20000102
+  iedate=0
   ietime=0
   loutstep=10800
@@ -124 +127 @@
   iout=3
   ipout=0
+  lnetcdfout=0
   lsubgrid=1
   lconvection=1
@@ -141 +145 @@
   !**************************************************************************
   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. Check your pathnames file.'
-    stop
-
-  endif
-
+         err=999)
+
+  ! try namelist input
   read(unitcommand,command,iostat=readerror)
-  close(unitcommand)
 
   ! If error in namelist format, try to open with old input code
   ! Failsafe detection with ldirect initial value change
-  if ((readerror.ne.0).or.(ldirect.ne.0)) then
-
-    open(unitcommand,file=path(1)(1:length(1))//'COMMAND',status='old', &
-         err=999)
+  if ((readerror.ne.0).or.(ldirect.eq.0)) then
+
+    rewind(unitcommand)
 
     ! Check the format of the COMMAND file (either in free format,
@@ -346 +342 @@
   endif
 
-!  check for netcdf output switch
-  lncdfout = .false.
+!  check for netcdf output switch (use for non-namelist input only!)
   if (iout.ge.8) then
-     lncdfout = .true.
+     lnetcdfout = 1
      iout = iout - 8
 #ifndef NETCDF_OUTPUT
-     print*,'ERROR: netcdf output not activated during compile time'
+     print*,'ERROR: netcdf output not activated during compile time but used in COMMAND file!'
 #endif
   endif