Merge pull request #648 from dlgeorge/parse_values_error

error when nw==11

Author: mandli

src/2d/shallow/qinit_module.f90

@@ -265,7 +265,7 @@ subroutine read_force_dry(fname)
         use utility_module, only: parse_values
         character(len=*), intent(in) :: fname
         integer :: iunit,i,j,n
-        real(kind=8) :: values(10), nodata_value
+        real(kind=8) :: values(16), nodata_value
         character(len=80) :: str
 
         iunit = 8

src/2d/shallow/test_parse_values.f90

@@ -12,7 +12,7 @@ program test_parse_values
     implicit none
     character(len=150) str,fname
     integer :: n,i,topo_type,mx,my
-    real(kind=8) :: values(10), xll,yll,xhi,yhi,dx,dy
+    real(kind=8) :: values(16), xll,yll,xhi,yhi,dx,dy
 
     if (.true.) then
         write(6,*) 'input line with mix of character strings and numbers...'

src/2d/shallow/topo_module.f90

@@ -434,7 +434,7 @@ subroutine read_topo_file(mx,my,topo_type,fname,xll,yll,topo)
         logical, parameter :: maketype2 = .false.
         integer :: missing,status,n
         real(kind=8) :: no_data_value,x,y,topo_temp
-        real(kind=8) :: values(10)
+        real(kind=8) :: values(16)
         character(len=80) :: str
         integer(kind=8) :: i, j, mtot
 
@@ -730,7 +730,7 @@ subroutine read_topo_header(fname,topo_type,mx,my,xll,yll,xhi,yhi,dx,dy)
         integer :: topo_size, status, n
         real(kind=8) :: x,y,z,nodata_value
         logical :: found_file
-        real(kind=8) :: values(10)
+        real(kind=8) :: values(16)
         character(len=80) :: str
         logical :: verbose
         logical :: xll_registered, yll_registered

src/2d/shallow/utility_module.f90

@@ -63,10 +63,10 @@ subroutine parse_values(str, n, values)
 
     character(len=*), intent(in) :: str
     integer, intent(out) :: n
-    real(kind=8), intent(out) :: values(10)
+    real(kind=8), intent(out) :: values(16)
 
     integer :: pos2,nw,i,e
-    character(len=80) :: word(10), str2
+    character(len=80) :: word(16), str2
     real(kind=8) :: x
 
     ! First break into words / tokens based on white space.  
@@ -84,13 +84,14 @@ subroutine parse_values(str, n, values)
            endif
 
         nw = nw + 1
-        word(nw) = trim(adjustl(str2(1:pos2-1)))
-        str2 = trim(adjustl(str2(pos2+1:)))
-        if (nw == 10) then
+        if (nw == 17) then
             write(6,*) '*** too many words on line, str = '
             write(6,*) str
             stop
             endif
+        word(nw) = trim(adjustl(str2(1:pos2-1)))
+        str2 = trim(adjustl(str2(pos2+1:)))
+
         enddo
 
     ! now extract numerical values: