Commit Graph

7843 Commits

Author SHA1 Message Date
Dennis Heimbigner
02bca8fae7 force tests to rerun 2021-04-02 19:05:58 -06:00
Dennis Heimbigner
0454d8e235 Addendum: This PR has been extended to include
interoperability fixed. We were given a Zarr format dataset
stored as a directory+file tree. This dataset uses the XArray
conventions and was generated by some non-Unidata Zarr implementation.
In attempting to process it with NCZarr, several interoperability
problems were discovered and fixed. This gives us more confidence
that NCZarr -- using pure zarr -- can interoperate with other
Zarr implementations.

Specific changes:
* Add test nczarr_test/run_interop.sh
* Support attributes with single value not enclosed in JSON array tags.
* Add mode inferencing and use it in nczarr_test/run_purezarr.sh
* Reduce size of tst_err_enddef.nc because it is more than 3 GB.
2021-04-02 18:39:50 -06:00
Dennis Heimbigner
727dd6861e Merge branch 'master' into nczarr_xarray.dmh 2021-04-02 18:29:39 -06:00
Ward Fisher
9bf69804a1
Merge pull request #1976 from Unidata/gh1969.wif
PR1970 + Release Notes
2021-04-02 11:22:34 -06:00
Ward Fisher
37f69e1f74 Updated release notes. 2021-04-02 10:54:24 -06:00
Ward Fisher
acc8e769ee Merge branch 'bzip2108.dmh' of https://github.com/DennisHeimbigner/netcdf-c into gh1969.wif 2021-04-02 10:53:31 -06:00
Dennis Heimbigner
e038553abe Update RELEASE_NOTES.md 2021-04-01 14:12:49 -06:00
Dennis Heimbigner
e7c4e7ead1 add zjson fix 2021-04-01 13:56:04 -06:00
Ward Fisher
f01e4f1027
Merge pull request #1975 from Unidata/gh1962.wif
Refactored the HDF5 version detection logic in CMakeLists.txt
2021-04-01 13:04:41 -06:00
Ward Fisher
ad51b0a79a Updated release notes, made if-block syntax more verbose. 2021-04-01 11:46:44 -06:00
Ward Fisher
35bf5f4b79 Corrected a typo. 2021-04-01 11:43:15 -06:00
Ward Fisher
17b4c2bebb Refactored the HDF5 version detection logic in CMakeLists.txt in support of https://github.com/Unidata/netcdf-c/issues/1962 2021-04-01 11:24:11 -06:00
Ward Fisher
5b40de1267
Merge pull request #1974 from gsjaardema/patch-49
Fix use of ininitialized CMake variable
2021-04-01 09:43:00 -06:00
Greg Sjaardema
6118776d60
Fix use of ininitialized CMake variable
The `ISCMAKE` was defined after its first use in a `configure_file` call.  Moved to before its first use.
2021-04-01 08:13:13 -06:00
Ward Fisher
790a1a2a06
Merge pull request #1961 from Unidata/4.8.0-wellspring.wif
Selectively merge relevant changes and updates back upstream from the 4.8.0 prep branch.
2021-03-30 16:40:55 -06:00
Dennis Heimbigner
395f47a9b3 Update the bzip library in plugins to version 1.0.8
re: Issue https://github.com/Unidata/netcdf-c/issues/1969
2021-03-30 15:27:24 -06:00
Ward Fisher
670fd2482f Corrected typo preventing success when running make dist or make distcheck 2021-03-30 14:08:00 -06:00
Ward Fisher
cf5fc9b0f7 Updated doxyfile to include libnczarr/zarr.c, also removed references to files that have been removed. 2021-03-30 13:53:16 -06:00
Ward Fisher
90c662c58f Corrected release date in preparation for today's release. 2021-03-30 10:08:05 -06:00
Ward Fisher
95719addd2 Added 1.0.1 to test matrix in support of https://github.com/Unidata/netcdf-c/pull/1931#issuecomment-804312933 2021-03-26 14:50:22 -06:00
Ward Fisher
85f3abb515 Updated expected release date. 2021-03-26 14:47:53 -06:00
Ward Fisher
ac4ade4f18 Merge branch '4.8.0-wellspring-prs.wif' into 4.8.0-wellspring.wif 2021-03-22 16:59:15 -06:00
Ward Fisher
4a7f5aeef2 Added check for H5Literate symbol (hdf5 1.8.x, 1.10.x) or macro (1.12.x)) in support of https://github.com/Unidata/netcdf-c/issues/1965 2021-03-22 13:40:11 -06:00
Ward Fisher
094e2a4ea3 Amend check for H5Literate to work with 1.10.x 2021-03-22 13:24:03 -06:00
Ward Fisher
3e0b36a355 Added check for H5Literate in support of https://github.com/Unidata/netcdf-c/issues/1965 2021-03-22 13:05:23 -06:00
Ward Fisher
fc4bfc6196 Merge branch 'dispatchversion.dmh' of https://github.com/DennisHeimbigner/netcdf-c into 4.8.0-wellspring-prs.wif 2021-03-22 12:41:03 -06:00
Ward Fisher
f75c1c4d7b
Merge branch 'master' into dispatchversion.dmh 2021-03-22 12:40:09 -06:00
Ward Fisher
dab186b688 Merge branch '4.8.0-wellspring.wif' of github.com:Unidata/netcdf-c into 4.8.0-wellspring.wif 2021-03-22 12:38:24 -06:00
Ward Fisher
ffa8a7067f Merge branch '951' of https://github.com/brtnfld/netcdf-c into 4.8.0-wellspring-prs.wif 2021-03-22 11:51:54 -06:00
Ward Fisher
379681ff55 Merge branch 'patch-47' of https://github.com/gsjaardema/netcdf-c into 4.8.0-wellspring.wif 2021-03-22 11:48:10 -06:00
Ward Fisher
98abfb7749 Bumped version numbers to next development version. 2021-03-19 11:49:09 -06:00
Ward Fisher
7535a9c98f Updated SO version in cmakelists.txt in preparation for the 4.8.0 release. 2021-03-19 11:30:38 -06:00
Ward Fisher
c12d80a59b Updated SO version in preparation for public release. 2021-03-19 10:36:13 -06:00
Ward Fisher
2499a540a5 Merge branch 'patch-47' of https://github.com/gsjaardema/netcdf-c into 4.8.0-wellspring.wif 2021-03-18 14:51:18 -06:00
Greg Sjaardema
7732ef1c88
Fix if statement to apply to fflush
Even though the `fflush()` is on the same line as the `fprintf(stderr, ...` statement, it is not part of the `if` and is therefore, executed even if the `wdebug` is not active.  This results in `fflush()` being called more than it should.  

Added parenthesis to property protect the fflush call.
2021-03-18 13:49:07 -06:00
Ward Fisher
a9ba3c53b1
Merge pull request #1960 from ibaned/cmake-have-mpi-info
HAVE_MPI_INFO_F2C was missing from CMake config.h
2021-03-17 16:14:26 -06:00
Ward Fisher
7de6da8fee Address a C99 forward-declaration issue. 2021-03-17 11:21:23 -06:00
Ward Fisher
34e63705a6 Restored cleanup stanza in tst_filter.sh 2021-03-17 10:34:37 -06:00
Ward Fisher
3b4c04d87f Merge branch 'master' into 3.8.0-wellspring.wif 2021-03-16 10:42:11 -06:00
Dan Ibanez
455fa214d2 HAVE_MPI_INFO_F2C was missing from CMake config.h 2021-03-12 12:33:05 -07:00
Ward Fisher
ca4d0fa087
Merge pull request #1957 from bartoldeman/master
Add HAVE_MPI_INFO_F2C to cmake config.h input file
2021-03-11 16:38:41 -07:00
Ward Fisher
ec069646b8 Merge branch '4.8.0-wellspring.wif' of github.com:Unidata/netcdf-c into 4.8.0-wellspring.wif 2021-03-09 13:40:23 -07:00
Ward Fisher
6b2f25818f Fix tst_filter.sh such that it returns an error immediately on failure. 2021-03-09 13:40:12 -07:00
Ward Fisher
2a02e5a32b More modification in support of #1940 2021-03-09 10:49:30 -07:00
Ward Fisher
c5d2937889 Correct bash test failure on Windows in MSYS2 bash shell with Visual Studio-based build, in support of https://github.com/Unidata/netcdf-c/issues/1940 2021-03-08 15:10:50 -07:00
Ward Fisher
c31d5ac655
Merge pull request #1958 from DennisHeimbigner/pathmgmt.dmh
Codify cross-platform file paths
2021-03-08 11:23:14 -07:00
Dennis Heimbigner
471268f632 Update RELEASE_NOTES 2021-03-04 13:45:44 -07:00
Dennis Heimbigner
0b7a5382e7 Codify cross-platform file paths
The netcdf-c code has to deal with a variety of platforms:
Windows, OSX, Linux, Cygwin, MSYS, etc.  These platforms differ
significantly in the kind of file paths that they accept.  So in
order to handle this, I have created a set of replacements for
the most common file system operations such as _open_ or _fopen_
or _access_ to manage the file path differences correctly.

A more limited version of this idea was already implemented via
the ncwinpath.h and dwinpath.c code. So this can be viewed as a
replacement for that code. And in path in many cases, the only
change that was required was to replace '#include <ncwinpath.h>'
with '#include <ncpathmgt.h>' and then replace file operation
calls with the NCxxx equivalent from ncpathmgr.h Note that
recently, the ncwinpath.h was renamed ncpathmgmt.h, so this pull
request should not require dealing with winpath.

The heart of the change is include/ncpathmgmt.h, which provides
alternate operations such as NCfopen or NCaccess and which properly
parse and rebuild path arguments to work for the platform on which
the code is executing. This mostly matters for Windows because of the
way that it uses backslash and drive letters, as compared to *nix*.
One important feature is that the user can do string manipulations
on a file path without having to worry too much about the platform
because the path management code will properly handle most mixed cases.
So one can for example concatenate a path suffix that uses forward
slashes to a Windows path and have it work correctly.

The conversion code is in libdispatch/dpathmgr.c, and the
important function there is NCpathcvt which does the proper
conversions to the local path format.

As a rule, most code should just replace their file operations with
the corresponding NCxxx ones defined in include/ncpathmgmt.h. These
NCxxx functions all call NCpathcvt on their path arguments before
executing the actual file operation.

In some rare cases, the client may need to directly use NCpathcvt,
but this should be avoided as much as possible. If there is a need
for supporting a new file operation not already in ncpathmgmt.h, then
use the code in dpathmgr.c as a template. Also please notify Unidata
so we can include it as a formal part or our supported operations.
Also, if you see an operation in the library that is not using the
NCxxx form, then please submit an issue so we can fix it.

Misc. Changes:
* Clean up the utf8 testing code; it is impossible to get some
  tests to work under windows using shell scripts; the args do
  not pass as utf8 but as some other encoding.
* Added an extra utf8 test case: test_unicode_path.sh
* Add a true test for HDF5 1.10.6 or later because as noted in
  PR https://github.com/Unidata/netcdf-c/pull/1794,
  HDF5 changed its Windows file path handling.
2021-03-04 13:41:31 -07:00
Bart Oldeman
0eb1f83fd1 Add HAVE_MPI_INFO_F2C to cmake config.h input file
Without this define parallel netCDF-Fortran did not work
correctly with Open MPI, for example
examples/F90/simple_xy_par_wr.f90
reported
*** An error occurred in MPI_Info_dup
*** reported by process [2543714305,2]
*** on communicator MPI_COMM_WORLD
*** MPI_ERR_INFO: invalid info object
*** MPI_ERRORS_ARE_FATAL (processes in this communicator will now abort,
***    and potentially your MPI job)

Fixes Unidata/netcdf-fortran#109
2021-03-04 00:33:20 +00:00
Dennis Heimbigner
15c713c1b3 Merge branch 'master' into nczarr_xarray.dmh 2021-03-02 13:38:42 -07:00