Commit Graph

4927 Commits

Author SHA1 Message Date
Dennis Heimbigner
346f1dcac3 ckp 2018-04-23 15:53:20 -06:00
Ward Fisher
d1807582c2
Merge pull request #945 from Unidata/pr-aggregate.wif
Combine several pull requests
2018-04-23 13:25:37 -06:00
Ward Fisher
63535acfbc Merge remote-tracking branch 'origin/plugdir.dmh' into pr-aggregate.wif 2018-04-23 11:24:20 -06:00
Ward Fisher
e3a60459eb Merge remote-tracking branch 'origin/issue942.dmh' into pr-aggregate.wif 2018-04-23 11:19:58 -06:00
Ward Fisher
8156bdc204 Merge remote-tracking branch 'origin/crcnames.dmh' into pr-aggregate.wif 2018-04-23 11:19:18 -06:00
Dennis Heimbigner
6f69e5a10d Fix github issue https://github.com/Unidata/netcdf-c/issues/942 2018-04-23 11:14:03 -06:00
Dennis Heimbigner
3b0fb561d6 Make change work with cmake 2018-04-22 13:19:12 -06:00
Dennis Heimbigner
d438391f33 ckp 2018-04-22 13:17:57 -06:00
Dennis Heimbigner
d3b309722e re: gh issue https://github.com/Unidata/netcdf-c/issues/911
I took Ed's advice and moved the plugin stuff to its own
top-level directory. This is an attempt to solve the problem of
copying files that we have experienced. In any case, it will
serve as a place to stick additional plugins.
2018-04-21 20:10:47 -06:00
Ward Fisher
e60d87814b
Merge branch 'master' into crcnames.dmh 2018-04-20 15:06:44 -06:00
Ward Fisher
51de06630c
Merge pull request #919 from NetCDF-World-Domination-Council/ejh_fill_test
added fill mode and var rename tests
2018-04-20 15:06:33 -06:00
Ed Hartnett
41639d325f
Merge branch 'master' into ejh_fill_test 2018-04-20 03:35:25 -06:00
Ward Fisher
764fa48c77
Merge branch 'master' into crcnames.dmh 2018-04-19 16:06:39 -06:00
Ward Fisher
405290697a
Merge pull request #935 from Unidata/gh931.wif
Enabled CDF5 support by default
2018-04-19 15:57:12 -06:00
Ed Hartnett
f36ae96ee4
Merge branch 'master' into ejh_fill_test 2018-04-19 15:41:38 -06:00
Ward Fisher
bb9bb66073
Merge branch 'master' into gh931.wif 2018-04-19 14:41:26 -06:00
Ward Fisher
6beb3de8b6
Merge pull request #934 from gsjaardema/patch-19
Use hdf5-1.8 compatible output format if possible
2018-04-19 14:41:05 -06:00
Ward Fisher
1ff184d988 Enabled CDF5 support by default, in support of https://github.com/Unidata/netcdf-c/issues/931 2018-04-19 13:26:58 -06:00
Greg Sjaardema
e9088e5dfa
Use hdf5-1.8 compatible output format if possible
In hdf5-1.10.2, THG added a new enumeration for use in the `H5Pset_libver_bounds` function which makes it easier to maintain compatibility with hdf5-1.8.X clients.   

An explanation is provided at https://www.hdfgroup.org/2018/04/why-should-i-care-about-the-hdf5-1-10-2-release/ 

In particular, the section "What does this change mean to an HDF5 application?" discusses its use with NetCDF
2018-04-19 13:26:56 -06:00
Ward Fisher
d7ead42c3e Merge branch 'master' into gh479-conflict-resolution 2018-04-18 13:48:58 -06:00
Ward Fisher
ee9537b6ab Adjusted enddef test to work on 32 bit platforms as well. 2018-04-18 13:20:50 -06:00
Ward Fisher
9a9326cd6a
Merge pull request #929 from Unidata/gh928.wif
Replace quotes when including system includes
2018-04-18 12:33:33 -06:00
Ward Fisher
9a1172fbb0 Replace quotes when including system includes, in support of https://github.com/Unidata/netcdf-c/issues/928 2018-04-18 10:51:03 -06:00
Ward Fisher
46e39c3647 Merge branch 'err_endef_close' of https://github.com/wkliao/netcdf-c into gh479-conflict-resolution 2018-04-18 10:22:53 -06:00
Ward Fisher
76af2109e3 Corrected an issue in fileinfo script. 2018-04-17 14:23:52 -06:00
Ward Fisher
c2ff9f01a6 Revert a stale change included in the merge. 2018-04-17 14:10:37 -06:00
Ward Fisher
99be33303a Resolving conflicts in support of https://github.com/Unidata/netcdf-c/pull/424 2018-04-17 14:03:52 -06:00
Ed Hartnett
5239c43adb
Merge branch 'master' into ejh_fill_test 2018-04-17 13:47:13 -06:00
Ward Fisher
4e27a01f30
Merge pull request #898 from NetCDF-World-Domination-Council/ejh_cleanup
Removed some unused files and unused m4 macros from acinclude.m4
2018-04-17 11:10:42 -06:00
Ed Hartnett
48c92cbdc3
Merge branch 'master' into ejh_fill_test 2018-04-16 16:35:09 -06:00
Ward Fisher
af36e53d21
Merge branch 'master' into ejh_cleanup 2018-04-16 16:05:49 -06:00
Ward Fisher
9ad46d7692
Merge pull request #922 from NetCDF-World-Domination-Council/ejh_hdf4_again
added merged HDF4 changes
2018-04-16 16:05:34 -06:00
Ed Hartnett
efe2bd116f
Merge branch 'master' into ejh_cleanup 2018-04-05 05:45:54 -06:00
Ed Hartnett
96154d9303 added merged HDF4 changes 2018-04-04 14:11:44 -06:00
Ward Fisher
9ba39124bd
Merge pull request #903 from Unidata/index.dmh
Final refactoring of libsrc4.
2018-04-04 10:29:19 -06:00
Ward Fisher
e2e2c2117f
Merge branch 'master' into index.dmh 2018-04-02 18:13:34 -06:00
Ward Fisher
3447004c84
Merge branch 'master' into ejh_cleanup 2018-04-02 18:11:58 -06:00
Ward Fisher
bdffa3cc17
Merge pull request #910 from NetCDF-World-Domination-Council/ejh_valgrind_3
new method of using valgrind
2018-04-02 17:27:58 -06:00
Ward Fisher
dad2101a04
Merge branch 'master' into index.dmh 2018-04-02 13:56:00 -06:00
Dennis Heimbigner
a4d865b004 The file libdispatch/crc32.c was apparently causing
name symbol conflicts with some versions of libz.
So, make all the functions in crc32.c be static
except for the single externally accessible NC_crc32
function.
2018-04-02 13:19:58 -06:00
Dennis Heimbigner
fd089ab3d2 Oops, forgot to remove nc4xinternal from Makefile.am 2018-03-31 11:56:12 -06:00
Dennis Heimbigner
ce1485d5f8 remove unneeded file 2018-03-31 11:37:21 -06:00
Ed Hartnett
d62d0464b6
Merge branch 'master' into ejh_cleanup 2018-03-30 18:51:44 -06:00
Ed Hartnett
bf3757c2d6
Merge branch 'master' into ejh_valgrind_3 2018-03-30 18:48:37 -06:00
Ed Hartnett
caea514ec7
Merge branch 'master' into ejh_fill_test 2018-03-30 18:48:20 -06:00
Ed Hartnett
9b16ec96c1 removed duplicate docs 2018-03-30 14:13:42 -06:00
Ward Fisher
8b97f22eef
Merge pull request #918 from Unidata/gethdf4.dmh
Attempt to fix the problem of ftp failing when getting the hdf4 from our ftp site.
2018-03-30 12:28:53 -06:00
Ed Hartnett
1546b4a91f added documentation of attribute reserved names to user guide 2018-03-30 11:57:26 -06:00
Ed Hartnett
168340a8b6 added test for utf8 normalization for variable rename 2018-03-30 11:26:47 -06:00
Ed Hartnett
0e454a75c2 added fill mode test 2018-03-30 10:20:33 -06:00