mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,203 Commits 91 Branches 74 Tags 85 MiB
1d789d9d39
Commit Graph

5203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ward Fisher
1d789d9d39 Additional reconciliation 2018-06-08 15:50:39 -06:00
Ward Fisher
df4942d280 Merge branch 'master' into vars.dmh 2018-06-08 15:50:28 -06:00
Ward Fisher
601c65e7ae
Merge pull request #1015 from Unidata/misc-changes.wif 
Misc changes
 2018-06-08 14:31:33 -06:00
Ward Fisher
4fba5dfb45 Squaed a potential memory leak. 2018-06-08 12:08:33 -06:00
Ward Fisher
335f25e947 Corrected a couple of potential memory related issues and an uninitialized variable issue. 2018-06-08 11:38:11 -06:00
Ward Fisher
595f39ce42 Corrected an unlikely but possible passage of a null pointer to memcpy. 2018-06-08 11:18:08 -06:00
Ward Fisher
32b8ffbee9 Merge branch 'master' into misc-changes.wif 2018-06-07 16:17:54 -06:00
Ward Fisher
1af8b8f8fc Corrected a stored value that's never read issue detected by static analysis. 2018-06-07 16:17:32 -06:00
Ward Fisher
bb65fe5ea5 More potential memory leaks squashed. 2018-06-07 15:58:47 -06:00
Ward Fisher
3cce9e99e2 Corrected several potential null dereference or memory leak issues detected by static analysis. 2018-06-07 15:21:42 -06:00
Ward Fisher
eca9cdb7ee
Merge pull request #1013 from NetCDF-World-Domination-Council/ejh_long_2 
removed dead code associated with old handling of NC_LONG, fixed test checking NC_ELATEFILL
 2018-06-07 13:13:45 -06:00
Ward Fisher
e1ed2531d7 Merge branch 'master' into misc-changes.wif 2018-06-07 11:23:32 -06:00
Ed Hartnett
9a2782b56c got long working with master 2018-06-05 14:40:49 -06:00
Ward Fisher
e289404896
Merge pull request #1007 from NetCDF-World-Domination-Council/ejh_all_tests 
Test code for parallel I/O issue, enum issue, and some other issues
 2018-06-05 13:54:04 -06:00
Ward Fisher
3a0d55f137 Removed a null assignment. 2018-05-31 16:40:11 -06:00
Ward Fisher
acc0b29140 Potential dereference of a null pointer fixed. 2018-05-31 15:28:13 -06:00
Ward Fisher
165d59e6af Fixed a potential memory leak identified by static analysis. 2018-05-31 15:25:40 -06:00
Ward Fisher
db8d23b986 Removed a potential double-free identified by static analysis. 2018-05-31 15:09:11 -06:00
Ward Fisher
3e1bd3ce5f Removed some potential issues identified by static analysis. 2018-05-31 14:27:26 -06:00
Ward Fisher
6488768a7a Updated documentation for nc_inq_varid(). 2018-05-31 12:55:52 -06:00
Ed Hartnett
112a200cc9
Merge branch 'master' into ejh_all_tests 2018-05-30 17:39:19 -06:00
Ward Fisher
2eb02ad89e
Merge pull request #1008 from Unidata/f03fix.dmh 
Fix use of 'int' to represent 'hid_t' that caused HDF5 1.10 to fail.
 2018-05-30 17:31:32 -06:00
Dennis Heimbigner
4b936ee26a Fix use of 'int' to represent 'hid_t' that caused HDF5 1.10 to fail. 
re: github issue https://github.com/Unidata/netcdf-fortran/issues/82

This was originally discovered in the Fortran tests, but is
a problem in the C library.

The problem only occurred when using HDF5-1.10.x.  The reason it
failed is that starting with 1.10, the hid_t type was changed
from 32 bits to 64 bits.
The function libsrc4/nc4memcb.c#NC4_image_init was using type int (doh!)
to return the hdf fileid instead of hid_t type.  This, of course,
caused the id to be truncated and in turn later use of the id
caused hdf5 to fail.

Fix is trivial: replace int with hid_t. This also requires a related
change in nc4mem.c.

Also added the test case derived from the original Fortran code.

You would think I would learn...
 2018-05-30 14:47:37 -06:00
Dennis Heimbigner
2f1daaa61e Merge branch 'master' into vars.dmh 2018-05-30 10:45:00 -06:00
Ed Hartnett
011e85cea4 merge ejh_par_tests 2018-05-30 05:06:25 -06:00
Ed Hartnett
3949bd61bc merge ejh_par_leak 2018-05-30 05:03:42 -06:00
Ed Hartnett
5ac7df7ae1 merge ejh_more_tests 2018-05-30 05:01:19 -06:00
Ed Hartnett
fcc6091600 merged ejh_test_def_var_extra 2018-05-30 04:59:10 -06:00
Ward Fisher
d4332040c4
Merge pull request #1005 from Unidata/misc-changes.wif 
Misc changes.wif
 2018-05-29 21:37:20 -06:00
Ward Fisher
84fd054a29 Merge branch 'ejh_hdf5_3' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into misc-changes.wif 2018-05-29 15:39:09 -06:00
Ward Fisher
a5ea8411d6 Merge branch 'ejh_comm_info' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into misc-changes.wif 2018-05-29 15:18:27 -06:00
Ed Hartnett
5b56e66096 removed changes to nc4hdf5.c 2018-05-24 15:26:17 -06:00
Ed Hartnett
e0f92efaa2 fixed logging 2018-05-24 14:55:34 -06:00
Ed Hartnett
d26df3fb27 comment cleanup 2018-05-24 14:43:00 -06:00
Ed Hartnett
f2cb4678ee moving HDF5 functions to libhdf5 2018-05-24 14:27:16 -06:00
Ed Hartnett
0c0da02b49
Merge branch 'master' into ejh_comm_info 2018-05-24 13:39:42 -06:00
Ward Fisher
4283b791b5 Misc changes to appveyor testing. 2018-05-24 13:16:56 -06:00
Ward Fisher
491b96066c
Merge pull request #980 from NetCDF-World-Domination-Council/ejh_hdf5_2 
more progress towards separating HDF5 code from libsrc4 code
 2018-05-24 13:13:27 -06:00
Dennis Heimbigner
ee509ff4f3 Re-Implement the nc_get/put_vars operations for netcdf-4 using the 
corresponding HDF5 operations.

re: github issue https://github.com/Unidata/netcdf-c/issues/908
also in reference to https://github.com/pydata/xarray/issues/2004

The netcdf-c library has implemented the nc_get_vars and nc_put_vars
operations as element at a time. This has resulted in very slow
operation.

This pr attempts to improve the situation for netcdf-4/hdf5 files
by using the slab operations provided by the hdf5 library. The new
implementation passes the get/put vars stride information down to
the hdf5 slab operations.

The result appears to improve performance significantly. Some simple
tests on large 2-D arrays shows speedups in excess of 150.

Misc. other changes:
1. fix bug in ncgen/semantics.c; using a list's allocated length
   instead of actual length.
2. Added a temporary hook in the netcdf library plus a performance
   test case (tst_varsperf.c) to estimate the speedup. After users
   have had some experience with this, I will remove it, probably
   after the 4.7 release.
 2018-05-22 16:50:52 -06:00
Ed Hartnett
59f9a0c4f0
Merge branch 'master' into ejh_hdf5_2 2018-05-22 07:19:23 -06:00
Ward Fisher
2a9eaffd67
Merge pull request #619 from Unidata/dapparams.dmh 
Alias stringlength url parameter and maxstrlen
 2018-05-21 13:36:29 -06:00
Dennis Heimbigner
02bd33f250 Merge branch 'dapparams.dmh' of https://github.com/Unidata/netcdf-c into dapparams.dmh 2018-05-19 16:11:24 -06:00
Dennis Heimbigner
5fc6be9472 Code duplicated; merge failure? 2018-05-18 20:28:51 -06:00
Ed Hartnett
e4bed351c3
Merge branch 'master' into ejh_hdf5_2 2018-05-18 17:15:25 -06:00
Ed Hartnett
4a443d1d76
Merge branch 'master' into ejh_comm_info 2018-05-18 17:15:06 -06:00
Ward Fisher
30d41fa44a
Merge branch 'master' into dapparams.dmh 2018-05-18 14:27:55 -06:00
Ed Hartnett
29427ef3ec
Merge branch 'master' into ejh_comm_info 2018-05-18 05:32:53 -06:00
Ed Hartnett
fb6d19c3bb
Merge branch 'master' into ejh_hdf5_2 2018-05-18 05:32:09 -06:00
Ward Fisher
61a6c0c183
Merge branch 'master' into cleanncgen.dmh 2018-05-17 12:41:03 -06:00
Ward Fisher
5bd8992ff6
Merge pull request #988 from NetCDF-World-Domination-Council/ejh_clean 
removed unused function
 2018-05-17 12:40:41 -06:00