Commit Graph

4915 Commits

Author SHA1 Message Date
Ward Fisher
0f36b279be Merge remote-tracking branch 'origin/cleanncgen.dmh' into pr-aggregate.wif 2018-04-20 13:06:26 -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
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
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
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
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
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
Dennis Heimbigner
dab4a21656 Merge branch 'gethdf4.dmh' of https://github.com/Unidata/netcdf-c into gethdf4.dmh 2018-03-29 18:58:34 -06:00
Ward Fisher
e7a16a19a6 Modified tst_remote3.sh to work on OSX. 2018-03-29 18:30:16 -06:00
Dennis Heimbigner
cdd6e00434 Try to fix file copy from nc_test4/hdf5plugins 2018-03-29 18:29:31 -06:00
Dennis Heimbigner
20200eef7f
Update run_get_hdf4_files.sh
Up number of retries to 4
2018-03-29 16:37:18 -06:00
Dennis Heimbigner
a747cc32ce Attempt to fix the problem of ftp failing
when getting the hdf4 from our ftp site.
Solution used here is to repeat the request
and to use the wget -c flag so we do not
start over on every retry.
2018-03-29 16:30:58 -06:00
Dennis Heimbigner
42e8028726 Re: github issues
https://github.com/Unidata/netcdf-c/issues/917
https://github.com/Unidata/netcdf-c/issues/915

Fix following memory errors:
1. global_buffer_overflow
2. nc4_att_list_add
2018-03-29 14:57:40 -06:00
Dennis Heimbigner
8cf597c8fb Merge branch 'master' into index.dmh 2018-03-29 14:47:58 -06:00
Ward Fisher
595b1abb2e
Merge pull request #912 from NetCDF-World-Domination-Council/ejh_valgrind_0328
fixed spaces
2018-03-29 00:24:19 -06:00
Ed Hartnett
4652d9c3df fixed spaces 2018-03-28 18:04:24 -06:00
Ed Hartnett
055edb73d9
Merge branch 'master' into ejh_valgrind_3 2018-03-28 14:37:48 -06:00
Ed Hartnett
d5bbf89942 new method of using valgrind 2018-03-28 14:00:26 -06:00
Ed Hartnett
af79dfa14d new method of using valgrind 2018-03-28 13:54:05 -06:00
Dennis Heimbigner
eace0e922e Fixed case when --enable-parallel is true 2018-03-28 13:41:26 -06:00
Ward Fisher
28082c283b
Merge branch 'master' into index.dmh 2018-03-26 23:47:43 -06:00
Ward Fisher
859da9b09f
Merge pull request #904 from Unidata/issue899.dmh
Fix bug: Index exceeds dimension bound
2018-03-26 23:21:06 -06:00
Ward Fisher
7b86b4d3d3
Merge branch 'master' into issue899.dmh 2018-03-26 22:31:29 -06:00
Ward Fisher
308a840358
Merge branch 'master' into index.dmh 2018-03-26 17:06:19 -06:00
Ward Fisher
0a9997d872 Merge remote-tracking branch 'origin/minor-update' into vsfix-ssize_t 2018-03-26 15:58:50 -06:00
Ward Fisher
ed6de1be89 Fixed an issue where ssize_t was being either incorrectly type-def'd, or double type-def'd 2018-03-26 15:35:48 -06:00
Ward Fisher
913b4a3961
Merge branch 'master' into index.dmh 2018-03-26 14:22:46 -06:00
Ward Fisher
7109a01ac7 Merge branch 'master' into minor-update 2018-03-26 14:08:17 -06:00