Commit Graph

4958 Commits

Author SHA1 Message Date
Dennis Heimbigner
5bc174920f re: esupport MQO-415619
There is an error in handling the nc_create_memio function
as noted in the above esupport thread.
This attempts to fix it.

Also do a master merge
2018-05-03 21:02:32 -06:00
Dennis Heimbigner
9aa1e9a14e master merge 2018-05-03 21:02:12 -06:00
Ward Fisher
a98df356d9
Merge pull request #940 from NetCDF-World-Domination-Council/ejh_hdf4_cleanup
removed unused HDF4 code, fixed warnings in HDF4 test tst_h4_lendian.c
2018-05-02 16:27:21 -06:00
Ed Hartnett
b2e85ce8a1
Merge branch 'master' into ejh_hdf4_cleanup 2018-04-30 17:53:19 -06:00
Ward Fisher
e040083045
Merge pull request #902 from luzpaz/misc-typos
Misc. source comment typos
2018-04-30 16:45:21 -06:00
Dennis Heimbigner
b9cb89a959 Merge branch 'master' into inmemory.dmh 2018-04-27 11:25:46 -06:00
luz.paz
b4d0fe651a Follow-up trivial typos 2018-04-26 23:04:01 -04:00
luz.paz
74fbacdb82 Misc. source comment typos
Some are user-facing. Found via `codespell` and through the downstream FreeCAD.
2018-04-26 23:04:01 -04:00
Ed Hartnett
fab1e397cd
Merge branch 'master' into ejh_hdf4_cleanup 2018-04-26 18:47:33 -06:00
Ward Fisher
8ef28327fb
Merge pull request #950 from t-b/pass-cmake-on-windows-cmd-prompt
nctest: Make cmake pass under a windows cmd prompt
2018-04-26 16:48:38 -06:00
Dennis Heimbigner
ff212442f1 merge master and conflict resolve 2018-04-26 14:22:01 -06:00
Thomas Braun
3af477a926 netcdf-c: Make cmake pass a windows cmd prompt
add_sh_test only creates the test if HAVE_BASH is TRUE.
Therefore we can only call SET_TESTS_PROPERTIES on the created test if
HAVE_BASH is equally true.
2018-04-26 14:43:27 +02:00
Ward Fisher
f06e98ba6d
Merge pull request #949 from gsjaardema/patch-20
Add missing ERR Macro
2018-04-25 13:12:50 -06:00
Greg Sjaardema
09b0a76a01
Add missing ERR Macro
The ERR macro was  missing from a couple tests.
2018-04-25 09:54:31 -06:00
Ed Hartnett
cffddcd4ee
Merge branch 'master' into ejh_hdf4_cleanup 2018-04-23 13:27:56 -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
Dennis Heimbigner
b9c9a0c9eb Merge branch 'inmemory.dmh' of https://github.com/Unidata/netcdf-c into inmemory.dmh 2018-04-23 11:30:22 -06:00
Dennis Heimbigner
0a44d9ae3a Merge branch 'master' into inmemory.dmh 2018-04-23 11:30:14 -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
Ed Hartnett
d5326551dd removed unused file 2018-04-23 05:05:40 -06:00
Ed Hartnett
912e7764a8 fixed HDF4 test 2018-04-23 04:25:40 -06:00
Ed Hartnett
7d2f5a87d0 fixed warnings in test 2018-04-23 04:19:12 -06:00
Ed Hartnett
a49bc92e36 removed unused HDF4 code 2018-04-23 04:09:54 -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
e257649535
Merge branch 'master' into inmemory.dmh 2018-04-17 11:11:14 -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