Commit Graph

6752 Commits

Author SHA1 Message Date
Ward Fisher
a142849f1f Bringing szip detection in line with what libhdf5 uses, to hopefully fix an issue being observed when using the libsz provided by the libaec package, instead of one built manually. 2019-05-22 13:19:26 -06:00
Ward Fisher
a517efca96
Merge pull request #1404 from NetCDF-World-Domination-Council/ejh_perf
fix compile warnings in tst_large2, tst_rename2, and tst_rename3, and some build issues, including partial fix for building with HDF4 but without HDF5
2019-05-22 13:00:18 -06:00
Greg Sjaardema
7df5569d95
Eliminate compiler warning
`option_min_chunk_bytes` is `size_t` which is unsigned so value can never be less than zero.
2019-05-22 08:19:22 -06:00
Ed Hartnett
150662dd0b changes to support build of libsrc4 without libhdf5 2019-05-22 07:50:12 -06:00
Ed Hartnett
1d9f28fb70 changing USE_NETCDF4 to USE_HDF5 in dfilter.c 2019-05-22 07:36:22 -06:00
Dennis Heimbigner
6ebc108f00 Nccopy was overriding default chunking when it should not.
re: issue https://github.com/Unidata/netcdf-c/issues/1398
re: esupport NDY-294972

The new chunking code added to nccopy missed one case.
In the event that there are no chunking specifications
of any kind, and the input is not netcdf-4, and the output
is netcdf-4 and must be chunked, then use the default chunking
that the library computes as part of the nc_def_var() function.

Misc. changes:
1. add some chunking debug code to hdf5var.c
2019-05-21 15:59:27 -06:00
Ed Hartnett
73a433240c fixed warnings in tst_large2.c 2019-05-21 15:24:56 -06:00
Ed Hartnett
d858313d2e fixed warnings in tst_udf.c 2019-05-21 15:23:23 -06:00
Ed Hartnett
9fd7c06f16 fixed warnings in tst_rename2 2019-05-21 15:16:35 -06:00
Ed Hartnett
f35eea13d7 fixed warnings in tst_rename3 2019-05-21 15:15:25 -06:00
Ed Hartnett
b1b76a8a9c fixed parallel build problem with mmap 2019-05-21 14:50:43 -06:00
Ed Hartnett
7a5040bea7 deleting tmp1.cdl in nc_test 2019-05-21 14:38:38 -06:00
Ed Hartnett
e044b141cd no longer delete *.txt 2019-05-21 13:40:53 -06:00
Ward Fisher
71614acd42 Merge branch 'master' into ncvalidator.dmh 2019-05-16 11:55:16 -06:00
Ward Fisher
95f6314743 Merge branch 'master' into ncvalidator.dmh 2019-05-15 15:55:08 -06:00
Ward Fisher
06ac972bc0
Merge pull request #1394 from NetCDF-World-Domination-Council/ejh_test
uncommented test
2019-05-13 09:57:47 -06:00
Ed Hartnett
26f97cff85 turing on programs in examples/C 2019-05-12 09:12:42 -06:00
Ed Hartnett
fd29e2e608 uncommented test 2019-05-12 08:51:02 -06:00
Ward Fisher
30c44d8982
Merge pull request #1392 from Unidata/nocurl.dmh
Option --disable-byterange fails if libcurl is not found
2019-05-06 12:35:51 -06:00
Dennis Heimbigner
10fa0da210 Fix typo in mmapio.c 2019-05-04 21:09:59 -06:00
Dennis Heimbigner
e5315da1e7 Option --disable-byterange fails if libcurl is not found
re: https://github.com/Unidata/netcdf-c/issues/1390

Change configure.ac to properly test for
combination of no-curl and disable-byterange.
2019-05-04 12:29:42 -06:00
Ward Fisher
3e67d4b8a4
Merge pull request #1389 from Unidata/curlcleanup.dmh
Centralize calls to curl_global_init and curl_global_cleanup
2019-05-03 15:28:57 -06:00
Dennis Heimbigner
331a1f1c63 Centralize calls to curl_global_init and curl_global_cleanup
re: https://github.com/Unidata/netcdf-c/issues/1388

1. Centralize calls to curl_global_init and curl_global_cleanup
   to libdispatch/ddispatch.c
2. Make the above calls if options require curl: currently
   any of DAP2, DAP4, or byterange.
3. Side issue: Fix obscure bug in mmapio.c involving non-persistent mmap.
2019-05-03 13:22:54 -06:00
Ward Fisher
103e5a3ff5
Merge pull request #1385 from Unidata/mmapfix.dmh
Fix cmake wrt mmap
2019-05-02 11:09:12 -06:00
Ward Fisher
ae1b30990d
Merge pull request #1379 from Unidata/threads_part1.dmh
Thread safety: step 1: cleanup
2019-05-02 10:47:46 -06:00
Ward Fisher
44fce0904e
Merge pull request #1387 from Unidata/fixffilter.dmh
Minor config.h changes to support filters in Fortran
2019-05-01 14:44:53 -06:00
Ward Fisher
3b34a82e19 Merge branch 'master' into threads_part1.dmh 2019-05-01 14:41:13 -06:00
Ward Fisher
403301f1e8 Merge branch 'master' of github.com:Unidata/netcdf-c 2019-05-01 14:15:58 -06:00
Ward Fisher
31d9826ea8 Added the missing USE_CC invocation for travis. 2019-05-01 10:56:46 -06:00
Ward Fisher
b5e0a9ee76
Merge pull request #1375 from Unidata/addfilter.dmh
Allow programmatic definition of filters
2019-04-30 16:41:47 -06:00
Ward Fisher
5410967b00 Merge branch 'master' into addfilter.dmh 2019-04-30 14:51:25 -06:00
Dennis Heimbigner
62feacee00 missing cmake file 2019-04-29 20:55:28 -06:00
Ward Fisher
da56955dfe
Merge pull request #1386 from Unidata/v4.7.0-working.wif
Backport relevant changes from 4.7.0 release into master
2019-04-29 16:56:51 -06:00
Dennis Heimbigner
62e2b472b4 Minor config.h changes to support filters in Fortran 2019-04-29 16:36:08 -06:00
Ward Fisher
891e548114 Updated release notes. 2019-04-29 10:54:12 -06:00
Ward Fisher
c86593aca3 Corrected cmake syntax, working with a list not a string. 2019-04-26 16:28:53 -06:00
Ward Fisher
dda48ced44 Corrected a case in CMake Syntax where an empty string would cause a failure. 2019-04-26 16:00:28 -06:00
Ward Fisher
a1fb171a62 Bumped version in Doxyfile.developer. 2019-04-25 15:41:09 -06:00
Ward Fisher
88de6f0e1c Updated versions, Release Notes. 2019-04-25 15:40:04 -06:00
Dennis Heimbigner
c9d16d82d6 Fix cmake X mmap
supercede PR: https://github.com/Unidata/netcdf-c/pull/1384

Since we have an mmap user, undeprecate it and make sure
it works. Other changes:

* fix test cases to work with make -j
* fix exposed ncgen error.
2019-04-19 20:32:26 -06:00
Ward Fisher
48cc56ea38
Merge pull request #1383 from Unidata/gh1360.wif
Bring behavior of nc-config in line with pkgconfig --libs --static netcdf
2019-04-19 16:43:11 -06:00
Ward Fisher
038bebfead
Merge pull request #1361 from Unidata/simpleprov.dmh
Simplify libhdf5/nc5info.c to move to avoid parsing
2019-04-19 15:35:01 -06:00
Dennis Heimbigner
2eb1a8d8cf For some reason, the code for this was incorrect.
Anyway, I repaired it as follows:
1. Created NC4_write_provenance as parallel to NC4_read_provenance
2. Modified hdf5file.c to use NC4_write_provenance
3. Modified hdf5open.c to use NC4_read_provenance (was NC4_read_ncproperties).
4. The creation of the _NCProperties string was seriously hosed:
   was using all the wrong fields.
2019-04-18 14:23:20 -06:00
Ward Fisher
c776039eba Updated call to NC4_read_provenance. 2019-04-18 10:53:16 -06:00
Ward Fisher
8421dccbf0 Fixed line return issue. 2019-04-08 15:05:26 -06:00
Ward Fisher
3ec310829a Updating template files for nc-config in support of https://github.com/Unidata/netcdf-c/issues/1360. Still have a linebreak to deal with to bring this into line with the behavior of pkgconfig, currently nc-config --libs --static will print two separate lines. 2019-04-08 14:46:08 -06:00
Ward Fisher
6446ff37c5
Merge pull request #1368 from jschueller/mingw
Fix MinGW build
2019-04-03 17:32:22 -06:00
Ward Fisher
0fd5a9f0a4
Merge pull request #1378 from Unidata/cleanup.wif
Minor Maintenance PR
2019-04-02 13:45:06 -06:00
Ward Fisher
832c90bb56 Merge branch 'master' into cleanup.wif 2019-04-02 10:44:51 -06:00
Ward Fisher
d0a46d0eed
Merge pull request #1371 from NetCDF-World-Domination-Council/ejh_move_perf
Move performance testing from nc_test4 to new directory nc_perf
2019-04-01 11:08:13 -06:00