Commit Graph

6787 Commits

Author SHA1 Message Date
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
Dennis Heimbigner
6934aa2e8b Thread safety: step 1: cleanup
re: https://github.com/Unidata/netcdf-c/issues/1373 (partial)

* Mark some global constants be const to indicate to make them easier to track.
* Hide direct access to the ncrc_globalstate behind a function call.
* Convert dispatch tables to constants (except the user defined ones)
  This has some consequences in terms of function arguments needing to be marked
  as const also.
* Remove some no longer needed global fields
* Aggregate all the globals in nclog.c
* Uniformly replace nc_sizevector{0,1} with NC_coord_{zero,one}
* Uniformly replace nc_ptrdffvector1 with NC_stride_one
* Remove some obsolete code
2019-03-30 14:06:20 -06:00
Ward Fisher
3823307b9e Disable run_par_test2.sh.in template processing code temporarily. 2019-03-26 15:38:22 -06:00
Ward Fisher
752a040bb0 Merge branch 'master' into cleanup.wif 2019-03-26 15:33:40 -06:00
Ward Fisher
7addb30afd
Merge pull request #1367 from jschueller/patch-1
Fix STRNG typo in CMakeList
2019-03-26 15:33:00 -06:00
Ward Fisher
0810d00511
Merge pull request #1377 from Unidata/ansifileno.dmh
Fix minor --ansi warnings in dinfermodel.c and bzlib.c
2019-03-26 15:31:47 -06:00
Ward Fisher
0b292063b3 Merge branch 'master' into cleanup.wif 2019-03-26 14:28:34 -06:00
Ed Hartnett
d4ab03ea23 merged upstream/master 2019-03-26 11:29:01 -06:00
Ward Fisher
85b94a4244
Merge pull request #1364 from NetCDF-World-Domination-Council/ejh_non_contoversial
non controversial parts of last PR
2019-03-26 11:14:33 -06:00
Dennis Heimbigner
403947e7f2 Add Wei-King Liao's ncvalidator program
Add Wei-King Liao's ncvalidator program (with his permission) as
an uninstalled (for now) tool in the ncdump directory. It has in
the past been useful for debugging netcdf-3 files.
2019-03-23 14:02:39 -06:00
Dennis Heimbigner
4026323383 Fix minor --ansi warnings in dinfermodel.c and bzlib.c
re:

Needed to provide centralized definitions of fileno and fdopen;
also need to #include sys/types.h
2019-03-22 15:16:47 -06:00
Ward Fisher
5ee026f843 Cleaned up some errant conflict resolution fenceposting. 2019-03-21 15:56:27 -06:00
Ward Fisher
b20dd7df9d Removed a redundant check 2019-03-21 15:31:01 -06:00
Ward Fisher
f6b1e83fbc Only check for szlib if HDF5 requires it. 2019-03-21 15:25:20 -06:00
Ward Fisher
275516e32f Correct typo in CMakeLists.txt 2019-03-21 14:47:03 -06:00
Ward Fisher
cb7bec8dbc Merge branch 'master' into cleanup.wif 2019-03-21 14:39:57 -06:00