Changeset 77778f8 in flexpart.git for src/readcommand.f90

Timestamp:

Jun 13, 2018, 1:43:58 PM (6 years ago)

Author:

pesei <petra seibert at univie ac at>

Branches:

univie

Children:

1a8fbee

Parents:

505a96e

Message:

Introduce changelog.txt, update version string, make makefile more useful for use outside NILU, improve error msg in readcomma$

File:

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

src/readcommand.f90

@@ -29 +29 @@
   !                                                                            *
   !     18 May 1996                                                            *
-  !     HSO, 1 July 2014                                                       *
-  !     Added optional namelist input                                          *
+  !     Unknown, unknown: various                                              *
+  !     HSO, 1 July 2014: Added optional namelist input                        *
+  !     Unknown, unknown: various                                              *
+  !     Petra Seibert, 2018-06-08: improve error msgs                          *
   !                                                                            *
   !*****************************************************************************
@@ -153 +155 @@
   ! Namelist input first: try to read as namelist file
   !**************************************************************************
-  open(unitcommand,file=path(1)(1:length(1))//'COMMAND',status='old',form='formatted',err=999)
+  open(unitcommand,file=path(1)(1:length(1))//'COMMAND',status='old', &
+    form='formatted',err=999)
 
   ! try namelist input (default)
@@ -248 +251 @@
   ! write command file in namelist format to output directory if requested
   if (nmlout.and.lroot) then
-    open(unitcommand,file=path(2)(1:length(2))//'COMMAND.namelist',err=1000)
+    open(unitcommand,file=path(2)(1:length(2))//'COMMAND.namelist',err=998)
     write(unitcommand,nml=command)
     close(unitcommand)
@@ -635 +638 @@
     ideltas=nint((edate-bdate)*86400.)
   else
-    write(*,*) ' #### FLEXPART MODEL ERROR! DIRECTION IN      #### '
-    write(*,*) ' #### FILE "COMMAND" MUST BE EITHER -1 OR 1.  #### '
+    write(*,*) ' #### FLEXPART MODEL ERROR! DIRECTION IN'
+    write(*,*) ' #### FILE "COMMAND" MUST BE EITHER -1 OR 1.'
     stop
   endif
@@ -642 +645 @@
   return
 
-999   write(*,*) ' #### FLEXPART MODEL ERROR! FILE "COMMAND"    #### '
-  write(*,*) ' #### CANNOT BE OPENED IN THE DIRECTORY       #### '
-  write(*,'(a)') path(1)(1:length(1))
-  stop
-
-1000   write(*,*) ' #### FLEXPART MODEL ERROR! FILE "COMMAND"    #### '
-  write(*,*) ' #### CANNOT BE OPENED IN THE DIRECTORY       #### '
-  write(*,'(a)') path(2)(1:length(2))
-  stop
+998 write(*,900) ' #### FLEXPART MODEL ERROR! FILE "COMMAND.namelist"'
+  write(*,900)   ' #### CANNOT WRITE TO '// &
+    path(2)(1:length(2))//'COMMAND.namelist'
+  stop 'stopped in readcommand'
+999 write(*,900) ' #### FLEXPART MODEL ERROR! FILE "COMMAND"'
+  write(*,900)   ' #### CANNOT OPEN '//path(1)(1:length(1))//'COMMAND'
+  stop 'stopped in readcommand'
+900 format (a)
 end subroutine readcommand