diff --git a/.gitignore b/.gitignore index c3b5630..0b84fa9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -build/ +build*/ # Prerequisites *.d diff --git a/CMakeLists.txt b/CMakeLists.txt index 17354d3..d5af9e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT CMAKE_BUILD_TYPE) endif() project(nc4fortran LANGUAGES Fortran - VERSION 0.4.1 + VERSION 0.4.2 DESCRIPTION "thin, light, easy NetCDF4 Fortran interface" HOMEPAGE_URL https://github.com/scivision/nc4fortran) enable_testing() diff --git a/cmake/Modules/FindNetCDF.cmake b/cmake/Modules/FindNetCDF.cmake index 8409f67..db84224 100644 --- a/cmake/Modules/FindNetCDF.cmake +++ b/cmake/Modules/FindNetCDF.cmake @@ -3,7 +3,7 @@ function(netcdf_c) -pkg_check_modules(NC netcdf) # C / CXX +pkg_check_modules(NC netcdf QUIET) # C / CXX find_path(NetCDF_INCLUDE_DIR NAMES netcdf.h @@ -36,9 +36,9 @@ if(NOT CMAKE_Fortran_COMPILER) return() endif() -pkg_check_modules(NC netcdf-fortran) +pkg_check_modules(NC netcdf-fortran QUIET) if(NOT NC_FOUND) # homebrew - pkg_check_modules(NC netcdf) + pkg_check_modules(NC netcdf QUIET) endif() find_path(NetCDF_Fortran_INCLUDE_DIR diff --git a/meson.build b/meson.build index 2814ced..a1d03fa 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('nc4fortran', 'fortran', meson_version : '>=0.52.0', - version: '0.4.1', + version: '0.4.2', default_options : ['default_library=static', 'buildtype=release', 'warning_level=3']) subdir('meson') diff --git a/src/interface.f90 b/src/interface.f90 index f12f17b..db3cf6b 100644 --- a/src/interface.f90 +++ b/src/interface.f90 @@ -278,8 +278,10 @@ logical function check_error(code, dname) select case (code) case (NF90_NOERR) check_error = .false. +case (NF90_EHDFERR) + m = 'ERROR: ' // dname // ' an error was reported by the HDF5 layer.' case (NF90_EBADNAME) - m = 'ERROR: ' // dname // ' is the name of another existing variable' + m = 'ERROR: ' // dname // ' Name contains illegal characters.' case (NF90_EBADTYPE) m = 'ERROR: ' // dname // ' specified type is not a valid netCDF type' case (NF90_EBADDIM) @@ -287,13 +289,13 @@ logical function check_error(code, dname) case (NF90_EBADGRPID) m = 'ERROR: ' // dname // ' bad group ID in ncid' case (NF90_EBADID) - m = 'ERROR: ' // dname // ' type ID not found' + m = 'ERROR: ' // dname // ' Bad group id or ncid invalid' case (NF90_ENOTVAR) m = 'ERROR: ' // dname // ' variable not found' case (NF90_ENOTNC) m = 'ERROR: ' // dname // ' not a NetCDF file' case (NF90_ENAMEINUSE) - m = 'ERROR: ' // dname // ' string match to name in use' + m = 'ERROR: ' // dname // ' That name is in use. Compound type names must be unique in the data file.' case (NF90_ECHAR) m = 'ERROR: ' // dname // ' attempt to convert between text & numbers' case (NF90_EEDGE)