Changeset 31674b5 in flexpart.git for src/skplin.f90

Timestamp:

Jul 15, 2015, 9:45:11 AM (9 years ago)

Author:

Ignacio Pisso <Ignacio.Pisso@…>

Branches:

svn-petra

Children:

3c1da52

Parents:

480164e

git-author:

Ignacio Pisso <Ignacio.Pisso@…> (07/15/15 09:19:44)

git-committer:

Ignacio Pisso <Ignacio.Pisso@…> (07/15/15 09:45:11)

Message:

from svn branch petra
r36 | pesei | 2015-02-16 19:21:09 +0100 (Mon, 16 Feb 2015) | 1 line
Changed paths:

A /branches/petra/changelog.txt
M /branches/petra/options/COMMAND
M /branches/petra/options/COMMAND.alternative
M /branches/petra/options/COMMAND.reference
M /branches/petra/options/surfdata.t
M /branches/petra/src/FLEXPART.f90
M /branches/petra/src/advance.f90
M /branches/petra/src/com_mod.f90
M /branches/petra/src/concoutput.f90
M /branches/petra/src/concoutput_nest.f90
M /branches/petra/src/concoutput_surf.f90
M /branches/petra/src/par_mod.f90
M /branches/petra/src/readcommand.f90
M /branches/petra/src/readpaths.f90
M /branches/petra/src/readreceptors.f90
M /branches/petra/src/readreleases.f90
M /branches/petra/src/readspecies.f90
M /branches/petra/src/readwind.f90
M /branches/petra/src/readwind_nests.f90
M /branches/petra/src/skplin.f90
M /branches/petra/src/writeheader.f90
M /branches/petra/src/writeheader_nest.f90
M /branches/petra/src/writeheader_txt.f90

Implement switch for incremental deposition, see ticket:113 and many small changes, see changelog.txt

File:

• src/skplin.f90 (modified) (3 diffs)

src/skplin.f90

@@ -1 +1 @@
 !**********************************************************************
-! Copyright 1998,1999,2000,2001,2002,2005,2007,2008,2009,2010         *
+! Copyright 1998-2015                                                 *
 ! Andreas Stohl, Petra Seibert, A. Frank, Gerhard Wotawa,             *
 ! Caroline Forster, Sabine Eckhardt, John Burkhart, Harald Sodemann   *
@@ -21 +21 @@
 
 subroutine skplin(nlines,iunit)
-  !                    i      i
+  !                 i      i  
   !*****************************************************************************
   !                                                                            *
@@ -38 +38 @@
   !                                                                            *
   !*****************************************************************************
+  ! PS 2/2015: catch EOF condition so that we can 
+  ! have optional parameters at end of list for compatibility
 
+  
   implicit none
 
-  integer :: i,iunit, nlines
+  integer, intent(in)  :: nlines, iunit
+  integer :: i, icmdstat
 
   do i=1,nlines
-    read(iunit,*)
+    read(iunit,*,iostat=icmdstat)
   end do
-
+   
 end subroutine skplin