Commit Graph

5769 Commits

Author SHA1 Message Date
Ward Fisher
6b0217f38c
Merge pull request #1149 from Unidata/netcdf_mem_fix.dmh
Remove unneeded include of netcdf.h from netcdf_mem.h
2018-10-09 13:50:57 -06:00
Dennis Heimbigner
534364b069 This Pre removed #include <netcdf.h> from netcdf_mem.h.
In turn that caused some problems elsewhere because some files
did not include netcdf.h preceding netcdf_mem.h. Specifically,
building under visual studio fails.
So fix those cases that I can find. May need to
add more later.
2018-10-07 12:05:26 -06:00
Dennis Heimbigner
77886deff2
Merge branch 'master' into netcdf_mem_fix.dmh 2018-10-06 13:32:57 -06:00
Ward Fisher
266d3c5997
Merge pull request #1157 from Unidata/filtermem.dmh
Fix memory problems when using HDF5 version 1.10.x and later.
2018-10-04 16:26:29 -06:00
Ward Fisher
cbcd6c616d Added new generated files to .gitignore file. 2018-10-04 15:02:02 -06:00
Ward Fisher
35ea9da7f6
Merge branch 'master' into filtermem.dmh 2018-10-04 15:01:29 -06:00
Ward Fisher
debb149a4f
Merge pull request #1141 from NetCDF-World-Domination-Council/ejh_cache_sep
Separate the HDF5 cache code
2018-10-04 12:05:39 -06:00
Dennis Heimbigner
d07c05b58f Fix memory problems when using HDF5 version 1.10.x and later.
re: issue https://github.com/Unidata/netcdf-c/issues/1156

Starting with HDF5 version 1.10.x, the plugin code MUST be
careful when using the standard *malloc()*, *realloc()*, and
*free()* function.

In the event that the code is allocating, reallocating, or
free'ing memory that either came from -- or will be exported to --
the calling HDF5 library, then one MUST use the corresponding
HDF5 functions *H5allocate_memory()*, *H5resize_memory()*,
*H5free_memory()* [5] to avoid memory failures.

Additionally, if your filter code leaks memory, then the HDF5 library
generates a failure something like this.
````
H5MM.c:232: H5MM_final_sanity_check: Assertion `0 == H5MM_curr_alloc_bytes_s' failed.
````

This PR modifies the code in the plugins directory to
conform to these new requirements.

This raises a question about the libhdf5 code where this
same problem may occur. We need to scan especially nc4hdf.c
to look for this problem.
2018-10-04 11:37:21 -06:00
Ward Fisher
de3b0902fc
Merge branch 'master' into ejh_cache_sep 2018-10-03 14:14:06 -06:00
Ward Fisher
0381e1a4e6
Merge pull request #1155 from Unidata/fillmismatch.dmh
Modify DAP2 and DAP4 to optionally allow Fillvalue/Variable mismatch
2018-10-03 14:08:52 -06:00
Ward Fisher
9b02df9472 Updated travis.yml to enable filter testing as part of the travis CI tests. 2018-10-02 17:41:52 -06:00
Dennis Heimbigner
26da2fae01 Remove debug output 2018-10-02 11:43:11 -06:00
Dennis Heimbigner
dd654a272e Remove debug from tst_filter.sh 2018-10-01 15:54:25 -06:00
Dennis Heimbigner
8072d1f6bb Modify DAP2 and DAP4 to optionally allow Fillvalue/Variable mismatch
re: issue https://github.com/Unidata/netcdf-c/issues/1151

Modify DAP2 and DAP4 code to handle case when _FillValue type is not
same as the parent variable type.

Specifically:
1. Define a parameter [fillmismatch] to allow this mismatch;
   default is to disallow.
2. If allowed, forcibly change the type of the _FillValue to match
   the parent variable.
3. If allowed Convert the values to match new type
4. Generate a log message
5. if not allowed, then fail

Implementing this required some changes to ncdap_test/dapcvt.c
Also added test cases.

Minor Unrelated Changes:
1. There were a number of warnings about e.g.
   assigning a const char* to a char*. Fix these
2. In nccopy.1, replace .NP with .IP "n"
   (re PR https://github.com/Unidata/netcdf-c/pull/1144)
3. fix minor error in ncdump/ocprint
2018-10-01 15:51:43 -06:00
Dennis Heimbigner
bba2a676a7
Remove unneeded include of netcdf.h from netcdf_mem.h 2018-09-23 14:16:45 -06:00
Ed Hartnett
cc62140f1d
Merge branch 'master' into ejh_cache_sep 2018-09-18 16:59:49 -06:00
Ward Fisher
18a05d0ed6
Merge pull request #1129 from NetCDF-World-Domination-Council/ejh_hdf5_sep_next_2
Fix benchmark programs
2018-09-18 12:20:59 -06:00
Ward Fisher
5259b4b1e8
Merge branch 'master' into ejh_hdf5_sep_next_2 2018-09-17 14:53:55 -06:00
Ward Fisher
58d382ce45
Merge pull request #1142 from Unidata/issue972.dmh
Fix szip filter handling code and corresponding tests
2018-09-17 14:53:37 -06:00
Dennis Heimbigner
108dc0f01d Fix szip filter handling code and correspondingtests
re: https://github.com/Unidata/netcdf-c/issues/972

The current szip plugin code in the HDF5 library has some
unexpected behaviors that require some changes to how
nc_inq_var_szip is implemented and to the corresponding tests:
nc_test4/{test_szip,tst_vars3}.

Specifically, the following can happen:

1. The number of parameters provided by the user will be two,
   but the number of parameters returned by nc_inq_var_filter
   will be four because the HDF5 code (H5Zszip) will add two
   extra parameters for internal use. It turns out that the two
   parameters provided when calling nc_def_var_filter correspond
   to the first two parameters of the four parameters returned
   by nc_inq_var_filter.

2. The nc_inq_var_szip values corresponding to the ones provided
   by the caller may be different than those provided by
   nc_def_var_filter.  The value of the options_mask argument is
   known to add additional flag bits, and the pixels_per_block
   parameter may be modified.
2018-09-15 15:21:51 -06:00
Ward Fisher
26b02ae362 Corrected a few things for old experimental bootstrap fortran option. Still not working tho. 2018-09-14 16:08:11 -06:00
Ward Fisher
a1dd3d2a2a Bumped experimental fortran autoinstall script to 4.4.4 2018-09-14 15:56:28 -06:00
Ward Fisher
e3cc0185cc Merge branch 'master' into housekeeping 2018-09-14 15:55:29 -06:00
Ed Hartnett
d9ef143d1e separated cache code from hdf5file.c 2018-09-14 13:33:22 -06:00
Ed Hartnett
b501748f58 fixed merge error 2018-09-14 11:56:10 -06:00
Ed Hartnett
a009dab557 fixed inadvertant move of function 2018-09-14 11:39:57 -06:00
Ed Hartnett
8367992725 undid changes to dap4_test/findtestserver4.c 2018-09-14 11:36:44 -06:00
Ed Hartnett
e2839c120f
Merge branch 'master' into ejh_hdf5_sep_next_2 2018-09-14 11:33:59 -06:00
Ward Fisher
cf1f737116
Merge pull request #1128 from NetCDF-World-Domination-Council/ejh_hdf5_sep_next
Clean up unneeded object lookups...
2018-09-14 11:12:34 -06:00
Ed Hartnett
eabb690949 fixing merge issue 2018-09-12 09:36:36 -06:00
Ed Hartnett
abf247de92 made dumpopenobjects static in attempt to get appvayor build working 2018-09-12 07:53:31 -06:00
Ed Hartnett
90d5783eea removed commented-out code 2018-09-12 06:08:02 -06:00
Ed Hartnett
9de849d492 restored dap4_test/findtestserver4.c to what it is on master 2018-09-12 06:05:09 -06:00
Ed Hartnett
bb53ad80a0 merged master 2018-09-12 06:01:37 -06:00
Ed Hartnett
72a2214bef
Merge branch 'master' into ejh_hdf5_sep_next 2018-09-11 15:42:47 -06:00
Ward Fisher
756030d79f
Merge pull request #1139 from Unidata/issue1138.dmh
Remove the set_fmode
2018-09-11 14:44:41 -06:00
Dennis Heimbigner
57e2e9cbf3
Remove the set_fmode
resolve issue: https://github.com/Unidata/netcdf-c/issues/1138
2018-09-10 12:38:18 -06:00
Ward Fisher
2e6889c1f1 modified version for upcoming maintenance release. 2018-09-10 09:16:23 -06:00
Ed Hartnett
12b74a2622
Merge branch 'master' into ejh_hdf5_sep_next 2018-09-07 18:03:34 -06:00
Ward Fisher
7514d7feaa
Merge pull request #1126 from Unidata/dapcurlopt.dmh
Add the ability to set some additional curlopt values
2018-09-07 16:56:49 -06:00
Ward Fisher
b884e17596 Merge branch 'master' into dapcurlopt.dmh 2018-09-07 15:37:46 -06:00
Ed Hartnett
08a2dce904 merged master 2018-09-07 12:40:44 -06:00
Ed Hartnett
8390d572ad
Merge branch 'master' into ejh_hdf5_sep_next 2018-09-06 17:30:37 -06:00
Ward Fisher
3f2557e868
Merge pull request #1124 from Unidata/provenance.dmh
Improve provenance information
2018-09-06 17:19:39 -06:00
Ward Fisher
6efa25e7e4 Updated and removed a check for _NCProperties during file comparison, as this test fails if the environment is different from the environment the reference file was built on. 2018-09-06 15:53:25 -06:00
Ward Fisher
784d777bff Merge branch 'master' into provenance.dmh 2018-09-06 15:13:09 -06:00
Ed Hartnett
86e002d794 merged master 2018-09-06 14:01:59 -06:00
Ed Hartnett
4213f10ed6 moved function 2018-09-06 13:57:39 -06:00
Ed Hartnett
e4b7c97b75 removed commented out code 2018-09-06 12:34:16 -06:00
Ed Hartnett
20cdb78590 restored findtestserver4.c 2018-09-06 12:26:01 -06:00