optimize array decl

Author: scivision

cmake/Modules/FindHDF5.cmake

@@ -688,7 +688,7 @@ if(NOT HDF5MPI_ROOT AND DEFINED ENV{HDF5MPI_ROOT})
 endif()
 
 if(NOT HDF5_ROOT)
-  if(HDF5MPI_ROOT)
+  if(HDF5MPI_ROOT AND parallel IN_LIST HDF5_FIND_COMPONENTS)
     set(HDF5_ROOT ${HDF5MPI_ROOT})
   elseif(DEFINED ENV{HDF5_ROOT})
     set(HDF5_ROOT $ENV{HDF5_ROOT})

cmake/Modules/FindNetCDF.cmake

@@ -98,18 +98,20 @@ if(PkgConfig_FOUND AND NOT NetCDF_Fortran_LIBRARY)
 endif()
 
 find_path(NetCDF_Fortran_INCLUDE_DIR
-  names netcdf.mod
-  HINTS ${pc_ncf_INCLUDE_DIRS}
-  DOC "NetCDF Fortran Include")
+names netcdf.mod
+HINTS ${pc_ncf_INCLUDE_DIRS}
+DOC "NetCDF Fortran Include"
+)
 
 if(NOT NetCDF_Fortran_INCLUDE_DIR)
   return()
 endif()
 
 find_library(NetCDF_Fortran_LIBRARY
-  NAMES netcdff
-  HINTS ${pc_ncf_LIBRARY_DIRS} ${pc_ncf_LIBDIR}
-  DOC "NetCDF Fortran library")
+NAMES netcdff
+HINTS ${pc_ncf_LIBRARY_DIRS} ${pc_ncf_LIBDIR}
+DOC "NetCDF Fortran library"
+)
 
 if(NOT NetCDF_Fortran_LIBRARY)
   return()
@@ -163,8 +165,10 @@ mark_as_advanced(NetCDF_C_INCLUDE_DIR NetCDF_Fortran_INCLUDE_DIR NetCDF_C_LIBRAR
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(NetCDF
-  REQUIRED_VARS _ncdf_req
-  HANDLE_COMPONENTS)
+REQUIRED_VARS _ncdf_req
+HANDLE_COMPONENTS
+HANDLE_VERSION_RANGE
+)
 
 if(NetCDF_FOUND)
   set(NetCDF_C_INCLUDE_DIRS ${NetCDF_C_INCLUDE_DIR})

cmake/netcdf.cmake

@@ -41,6 +41,8 @@ set(netcdf_c_cmake_args
 -DENABLE_DAP:BOOL=OFF
 -DENABLE_DAP2:BOOL=OFF
 -DENABLE_DAP4:BOOL=OFF
+-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
 )
 
 ExternalProject_Add(NETCDF_C

src/interface.f90

@@ -66,49 +66,49 @@ module subroutine nc_write_1d(self, dname, value, dims)
 class(netcdf_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:)
-character(*), intent(in), optional :: dims(:)
+character(*), intent(in), optional :: dims(1)
 end subroutine nc_write_1d
 
 module subroutine nc_write_2d(self, dname, value, dims)
 class(netcdf_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:)
-character(*), intent(in), optional :: dims(:)
+character(*), intent(in), optional :: dims(2)
 end subroutine nc_write_2d
 
 module subroutine nc_write_3d(self, dname, value, dims)
 class(netcdf_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:)
-character(*), intent(in), optional :: dims(:)
+character(*), intent(in), optional :: dims(3)
 end subroutine nc_write_3d
 
 module subroutine nc_write_4d(self, dname, value, dims)
 class(netcdf_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:,:)
-character(*), intent(in), optional :: dims(:)
+character(*), intent(in), optional :: dims(4)
 end subroutine nc_write_4d
 
 module subroutine nc_write_5d(self, dname, value, dims)
 class(netcdf_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:,:,:)
-character(*), intent(in), optional :: dims(:)
+character(*), intent(in), optional :: dims(5)
 end subroutine nc_write_5d
 
 module subroutine nc_write_6d(self, dname, value, dims)
 class(netcdf_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:,:,:,:)
-character(*), intent(in), optional :: dims(:)
+character(*), intent(in), optional :: dims(6)
 end subroutine nc_write_6d
 
 module subroutine nc_write_7d(self, dname, value, dims)
 class(netcdf_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:,:,:,:,:)
-character(*), intent(in), optional :: dims(:)
+character(*), intent(in), optional :: dims(7)
 end subroutine nc_write_7d
 
 end interface

src/reader_template.f90

@@ -7,9 +7,8 @@
 
 ier = nf90_inquire_variable(self%ncid, varid, ndims=drank)
 if(drank /= rank(value)) then
-  ier = NF90_EDIMSIZE
-  write(stderr,*) 'ERROR: ' // dname // ' rank ', drank, ' /= variable rank ',rank(value)
-  return
+  write(stderr,*) 'ERROR:nc4fortran:read ' // dname // ' rank ', drank, ' /= variable rank ',rank(value)
+  error stop
 endif
 if (check_error(ier, dname)) error stop 'nc4fortran:read inquire ' // dname // ' in ' // self%filename
 

src/tests/test_array.f90

@@ -69,11 +69,6 @@ subroutine test_basic_array()
 call h%read('int32-2d', i2_8(2:5,3:6))
 if (.not.all(i2_8(2:5,3:6) == i2)) error stop 'read into larger array fail'
 
-!> check error for reading array dimension mismatch
-
-!> check that 1D disk into 2D raises error
-call h%read('int32-1d', i2)
-
 !> real
 call h%shape('real32-2d',dims)
 allocate(rr2(dims(1), dims(2)))

src/tests/test_exist.f90

@@ -39,7 +39,7 @@ subroutine test_exist()
 call h%close()
 if(.not.is_netcdf(fn)) error stop 'file does not exist'
 
-call h%open(fn)
+call h%open(fn, "r")
 if (.not.h%is_open) error stop 'file is open'
 if (.not. h%exist('x')) error stop 'x exists'