Cleanup debug output and modify start/count element range checks.

Author: nusbaume

src/physics/utils/pio_reader.F90

@@ -326,8 +326,6 @@ subroutine get_netcdf_var_int_1d(this, varname, var, errmsg, errcode, start, cou
       if (do_subset) then
          !If subsetting is requested, then read only the specified
          !subset of the variable:
-         write(*,*) 'var size:', size(var), alloc_dims(:)
-         write(*,*) 'start/count:', start(:), count(:)
          errcode = pio_get_var(pio_file_handle, var_id, start, count, var(:))
       else
          !Otherwise, read the entire variable:
@@ -2258,12 +2256,12 @@ subroutine var_subset_check(varname, var_ndims, dim_sizes, do_subset, alloc_dims
 
       !Check that start indices are within bounds:
       do i = 1, file_var_dim_num
-         if ((start(i) < 0) .or. (start(i) >= dim_sizes(i))) then
+         if ((start(i) < 1) .or. (start(i) > dim_sizes(i))) then
             errcode = bad_subset_range_err
             write(errmsg, '(a,i0,3a,i0,a,i0,a)') &
                   "Element ", i, " of 'start' for variable '", &
-                  trim(varname), "' is out of bounds.  Expected 0 to ", &
-                  dim_sizes(i)-1, " but got ", start(i), "."
+                  trim(varname), "' is out of bounds.  Expected 1 to ", &
+                  dim_sizes(i), " but got ", start(i), "."
             return
          end if
       end do
@@ -2274,20 +2272,20 @@ subroutine var_subset_check(varname, var_ndims, dim_sizes, do_subset, alloc_dims
          !start + count is within bounds
          !for each dimension:
          do i = 1, file_var_dim_num
-            if (count(i) < 0) then
+            if ((count(i) < 1) .or. (count(i) > dim_sizes(i))) then
                errcode = bad_subset_range_err
                write(errmsg, '(a,i0,3a,i0,a,i0,a)') &
                      "Element ", i, " of 'count' for variable '", &
                      trim(varname), "' is out of bounds.  Expected 1 to ", &
                      dim_sizes(i), " but got ", count(i), "."
                return
-            else if (start(i) + count(i) > dim_sizes(i)) then
-               errcode = bad_subset_range_err
-               write(errmsg, '(a,i0,3a,i0,a,i0,a)') &
-                     "Element ", i, " of 'start' + 'count' for variable '", &
-                     trim(varname), "' is out of bounds.  Expected 1 to ", &
-                     dim_sizes(i), " but got ", start(i) + count(i), "."
-               return
+!            else if (start(i) + count(i) > dim_sizes(i)) then
+!               errcode = bad_subset_range_err
+!               write(errmsg, '(a,i0,3a,i0,a,i0,a)') &
+!                     "Element ", i, " of 'start' + 'count' for variable '", &
+!                     trim(varname), "' is out of bounds.  Expected 1 to ", &
+!                     dim_sizes(i), " but got ", start(i) + count(i), "."
+!               return
             end if
          end do
 

test/unit/fortran/src/pio_reader/test_pio_reader.pf

@@ -1618,14 +1618,14 @@ subroutine test_pio_reader_bad_count_element_range()
     call reader%open_file(fname, errmsg, errcode)
 
     ! Attempt to read variable with negative start element:
-    call reader%get_var("pressure", pressure, errmsg, errcode, start=(/0/), count=(/-6/))
+    call reader%get_var("pressure", pressure, errmsg, errcode, start=(/1/), count=(/-6/))
 
     ! Check that the correct error was raised:
     @assertNotEqual(0, errcode)
     @assertEqual(expected_err_msg_neg, trim(errmsg))
 
     ! Next attempt to read variable with too-large start element:
-    call reader%get_var("pressure", pressure, errmsg, errcode, start=(/1/), count=(/59/))
+    call reader%get_var("pressure", pressure, errmsg, errcode, start=(/1/), count=(/60/))
 
     ! Check that the correct error was raised:
     @assertNotEqual(0, errcode)