mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,349 Commits 91 Branches 74 Tags 86 MiB
b2b8499f53
Commit Graph

3349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dmh
39fa6a071c ckp 2016-04-06 20:20:57 -06:00
dmh
764a1c40a3 ckp 2016-04-06 19:51:40 -06:00
Dennis Heimbigner
a8ff523677 ckp 2016-04-06 14:05:58 -06:00
Ward Fisher
e9fba1da79 Artificial bump to ping travis-ci. 2016-04-05 15:55:53 -06:00
Ward Fisher
cc803f5c00 Merge branch 'nc3-hashmap-fix' of https://github.com/gsjaardema/netcdf-c into merge-gh246 2016-04-05 15:31:06 -06:00
Ward Fisher
0e6de1999c Updated release notes in support of https://github.com/Unidata/netcdf-c/issues/gh240 2016-04-05 20:32:39 +00:00
Ward Fisher
33e43e15f1 Merge branch 'master' into gh240 in preparation for final merge. 2016-04-05 20:28:03 +00:00
Ward Fisher
d8592ef380 Updated tests now that things are passing. Added some true failures to test for as well. 2016-04-05 20:25:49 +00:00
Ward Fisher
6409b11640 Modified nc_inq_type so that it will return valid information for valid data types even if the associated ncid doesn't have access to those data types. See https://github.com/Unidata/netcdf-c/issues/240 for more information. 2016-04-05 20:13:42 +00:00
Greg Sjaardema
09454cba09 Fix accessing deleted memory 2016-04-05 09:47:12 -06:00
Greg Sjaardema
41431acd70 Merge branch 'master' into nc3-hashmap-fix 2016-04-05 09:09:35 -06:00
Greg Sjaardema
1f9eb8093c Fix duplicate key issues in nc_hashmap 
The addition of the nc_hashmap to facilitate quick
retrieval of var and dim by name did not take into
account key collisions -- two or more names hashed
to the same value.  If the keys matched, it assumed
that the names matched also.

This change fixes this incorrect assumption and
checks both the key (which is the hash of the name)
and if the keys match, it also checks that the names
match.

While there have been no instances of duplicate keys,
they are certain to occur and cause difficult to
debug issues. This fix eliminates that defect.
 2016-04-05 09:07:40 -06:00
Ward Fisher
817c83855a Updated release notes in support of https://github.com/Unidata/netcdf-c/issues/242 2016-04-04 15:29:44 -06:00
Ward Fisher
829036ab7f Corrected an issue with out-of-source-tree builds, in support of https://github.com/Unidata/netcdf-c/issues/242 2016-04-04 15:27:22 -06:00
Ward Fisher
928c94367b Updated release notes to reference https://github.com/Unidata/netcdf-c/pull/238 2016-04-04 12:30:00 -06:00
Ward Fisher
aa6a3969b7 Included expected failures for netcdf-3 files and nc_inq_type. 2016-03-30 15:03:20 -06:00
Ward Fisher
7f997ffb0b Updated types.dox to reflect that some types are supported in CDF5 files. 2016-03-28 19:22:35 +00:00
Ward Fisher
7adad14ec7 Further fleshing out the test. 2016-03-28 19:19:21 +00:00
Ward Fisher
5a5295406d Updated test. 2016-03-28 19:12:11 +00:00
Ward Fisher
a369ddb0bb Fleshed out test for nc_inq_type 2016-03-28 18:49:56 +00:00
Ward Fisher
93641eb2d6 Refactored types test. 2016-03-28 18:29:47 +00:00
Greg Sjaardema
27b1a87d72 Merge branch 'master' into nc3-var-dim-hash 2016-03-24 08:39:26 -06:00
Greg Sjaardema
43ef27a407 Revert array geometric growth option 2016-03-24 06:44:41 -06:00
Greg Sjaardema
a248e0dfbe Free hashmap to eliminate memory leaks 2016-03-24 06:38:45 -06:00
Greg Sjaardema
d5cb4b9e3e Add hashmap for quick retrieval of dim and var 2016-03-24 06:38:45 -06:00
Ward Fisher
2f9c4f85b7 Merge branch 'working' 2016-03-23 17:06:28 -06:00
Ward Fisher
69911758a9 Made a small change to ifFail to accomodate PGI compilers. 2016-03-23 16:48:15 -06:00
Ward Fisher
eeea5969bd Merge branch 'patch-12' of https://github.com/gsjaardema/netcdf-c into gh232 2016-03-22 15:34:03 -06:00
Ward Fisher
f5414bfee2 Merge pull request #237 from Unidata/issue236 
ncdump can generate nul characters &#0 ; when dumping ncml using -x.
 2016-03-22 09:47:56 -07:00
Greg Sjaardema
3bb86e417d Update var.c 2016-03-22 07:52:41 -06:00
Greg Sjaardema
362e28948d Add hashmap for quick retrieval of dim and var 2016-03-22 07:29:00 -06:00
Greg Sjaardema
c6e666a864 Merge branch 'master' of https://github.com/Unidata/netcdf-c into upstream 2016-03-21 14:52:24 -06:00
Dennis Heimbigner
2bff7305ba Merge branch 'master' into issue236 2016-03-18 15:36:47 -06:00
Dennis Heimbigner
5a1ca24fd6 Fix github issue: https://github.com/Unidata/netcdf-c/issues/236 
If a char valued attribute contains embedded nul characters,
then illegal xml will be generated when using the -x (ncml) flag.

There is not good solution since we have a char value '\0' that
is legal in a netcdf-c char valued attribute, but is completely
illegal in ncml (i.e. xml).

So, implemented hack is to go ahead and generate '�' entities
and then complain that we are generating illegal ncml.
 2016-03-17 22:05:46 -06:00
Ward Fisher
fc9ad03f67 Merge branch 'coverity', wherein several bugs are fixed which had been 
detected via static analysis.
 2016-03-11 11:22:14 -07:00
Ward Fisher
78b43dbfdb Addressed a memory leak identified by Coverity. See Coverity #1256386 2016-03-11 11:03:01 -07:00
Ward Fisher
41282c42d5 Merge branch 'master' into coverity 2016-03-11 10:32:39 -07:00
Ward Fisher
d32e4355ba Merge branch 'gh235' 2016-03-10 12:21:03 -07:00
Ward Fisher
e1fb460935 Added a reference to https://github.com/Unidata/netcdf-c/pull/235 in release notes. 2016-03-10 11:20:42 -07:00
Peter Hill
3c7109dd59 Use cmake libdir, includedir variables in nc-config 2016-03-10 16:13:29 +00:00
Ward Fisher
f12daedeb3 Corrected a coverity issue with a potential negative argument. Coverity 711780 2016-03-08 13:48:30 -07:00
Greg Sjaardema
1dda09655a Add missing function prototype for hash_fast 2016-03-08 09:41:24 -07:00
Ward Fisher
00d7881b34 Updated release notes. 2016-03-07 15:35:35 -07:00
Ward Fisher
719ddac946 Adding cmake infrastructure in support of https://github.com/Unidata/netcdf-c/issues/228 2016-03-07 14:04:52 -07:00
Ward Fisher
b74b299618 Updated release notes with information related to https://github.com/Unidata/netcdf-c/issues/213 2016-03-07 10:59:24 -07:00
Ward Fisher
fb2ff0c24b Refactored old ENOERR code into NC_NOERR error code in libsrc. This is done in support of https://github.com/Unidata/netcdf-c/issues/213. 2016-03-07 10:58:02 -07:00
Ward Fisher
e10ad6bed8 Removing duplicated errors, in support of https://github.com/Unidata/netcdf-c/issues/213 2016-03-07 10:48:04 -07:00
Greg Sjaardema
cc999713c4 Use dim field of var instead of finding dim from var->dimids. 
The var struct has a 'dim' field which was not being used
Instead, the dimids field would always search for the dim
with the matching dimid.  For db with large numbers of dims,
this could be a significant time sync.

Modified code to always set var-dim[i] when var->dimids[i] was
set (if the dim existed at that point).  Then use the var->dim
field instead of var->dimids and search whenever requested.

All var->dim accesses are protected by asserts that verify
non-null and that the var->dim[]->dimid == var->dimids[].
 2016-03-05 17:24:07 -07:00
Ward Fisher
0bb9856880 Merge branch 'upstream' of https://github.com/gsjaardema/netcdf-c into gs-pulls 2016-03-04 14:58:10 -07:00
Ward Fisher
f84a9d58ea Merge branch 'netcdf4-hash' of https://github.com/gsjaardema/netcdf-c into gs-pulls 2016-03-04 14:55:34 -07:00