Ward Fisher
5a7d5c6eca
Merge branch 'substrate'
2016-04-08 11:16:37 -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
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
33e43e15f1
Merge branch 'master' into gh240 in preparation for final merge.
2016-04-05 20:28:03 +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
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
Greg Sjaardema
27b1a87d72
Merge branch 'master' into nc3-var-dim-hash
2016-03-24 08:39:26 -06:00
Greg Sjaardema
d5cb4b9e3e
Add hashmap for quick retrieval of dim and var
2016-03-24 06:38:45 -06:00
Greg Sjaardema
362e28948d
Add hashmap for quick retrieval of dim and var
2016-03-22 07:29:00 -06:00
Greg Sjaardema
1dda09655a
Add missing function prototype for hash_fast
2016-03-08 09:41:24 -07:00
Greg Sjaardema
1a84a6a99e
Add hash field to dim and var to facilitate fast name compare
...
In non-classic netcdf-4 models, it is allowable to have
large numbers of dims and vars. In many operations, the
entire list of dims or vars is searched for a dim/var matching
a specific name which results in *lots* of strncmp or strcmp
calls.
If we add a hash field to the var and dim structs similar to what
has already been done for the netcdf-3 formats, then we can hash the
name being searched for and numerically compare that value with
the var/dim hash value. If they match, then do a more expensive
strncmp call to ensure that the names truly match.
2016-03-03 13:18:31 -07:00
Ward Fisher
1c1141d43e
Added missing install for cmake-based builds, netcdf_mem.h. Also, moved install directives for header files into include/CMakeLists.txt. This is in support of https://github.com/Unidata/netcdf-c/issues/227
2016-02-23 18:12:16 +00:00
Ward Fisher
d8b65ccea1
Fix for https://github.com/Unidata/netcdf-c/issues/223
2016-02-19 15:05:39 -07:00
Greg Sjaardema
2d3278c58b
Update comment
...
If pnetcdf support is enabled, then NC_HAS_PARALLEL is defined to 1 even if HDF5 is not enabled. Fix comment to make this clearer.
2016-02-10 15:07:19 -07:00
Dennis Heimbigner
b5ba424793
Clean up the handling of hdf5 initialization by
...
creating an nc4_hdf5_initialize(void) function
plus nc4_hdf5_initialized flag.
Also fix potential null exception in nc4internal.c
2016-01-28 16:19:38 -07:00
Ward Fisher
fbc210f511
Alternative solution to https://github.com/Unidata/netcdf-c/pull/199 and https://github.com/Unidata/netcdf-c/pull/200 .
2016-01-25 14:09:03 -07:00
Ward Fisher
374a8f4193
More cleaning up of documentation (there will probably be a lot of this) and tweaking files so that documentation renders as expected.
2016-01-14 16:02:00 -07:00
Ward Fisher
75b0bcf07e
Trying to sort out why netcdf parallel documentation isn't being generated.
2016-01-14 11:02:23 -07:00
Ward Fisher
0ffbdee1eb
Walking back API changes.
2016-01-04 21:59:51 +00:00
Ward Fisher
c616b53358
Walking back some of the changes to see if they were necessary (hard to tell), which should hopefully fix netcdf-cxx4 compatibility.
2016-01-04 14:49:47 -07:00
Ward Fisher
bd92caa176
More changes towards fixing the issue where the file is read incorrectly.
2015-12-28 17:36:05 +00:00
Ward Fisher
925da14d2a
Some additional errors reared up after fixing the main frustrating one. Working towards fixing them.
2015-12-24 01:37:42 +00:00
Robert T. McGibbon
3303ccd519
Fix preprocessor for mingw
2015-12-07 18:08:13 -08:00
Greg Sjaardema
ccb9682288
Merge branch 'master' into max_vars_dims_cleanup
2015-11-30 10:37:07 -05:00
Greg Sjaardema
724453b113
Update comments related to NC_MAX_VARS and NC_MAX_DIMS
2015-11-30 10:28:06 -05:00
dmh
47e10591b4
ckp
2015-11-19 13:44:55 -07:00
Ward Fisher
f2b8e69ea8
Corrected logic use of USE_PARALLEL for no-hdf5 but still using pnetcdf.
...
Added fix for github issue http://github.com/Unidata/netcdf-c/issues/143 as suggested by Wei-keng Liao.
2015-11-09 18:21:11 +00:00
Ward Fisher
612b35a84c
Merge branch 'master' into cdf-5, in preparation for merging the CDF-5 functionality into the master branch. This will be the key new feature for netcdf 4.4.0.
2015-11-05 13:40:35 -07:00
Ward Fisher
a81773e5bf
Corrected an issue Visual Studio has with how externals are managed.
2015-11-05 12:57:49 -07:00
Ward Fisher
519a56019f
Merge branch 'fix-typos' of https://github.com/tbeu/netcdf-c into tbeu-fix-typos
2015-10-16 14:16:09 -06:00
Ward Fisher
3c8a61f5aa
Corrected a typo in a define that had broken the netcdf4-python interface.
2015-10-15 22:26:13 +00:00
Ward Fisher
fd4c0f74d8
More doxygen-style formatting.
2015-10-15 12:22:24 -06:00
Ward Fisher
febc9040a5
Updated in-code documentation.
2015-10-15 11:29:51 -06:00
Ward Fisher
bf40c80526
More cleaning up of netcdf.h.
2015-10-14 14:19:50 -06:00
Ward Fisher
771830f2d2
Cleaning up netcdf.h to restore a few API-breaking changes.
2015-10-14 14:10:30 -06:00
Dennis Heimbigner
cd7a06b193
pull request
2015-10-12 17:09:37 -06:00
Ward Fisher
bab2f42ab2
Added an alias back to NC_FORMAT_64BIT to avoid breaking compatibility.
2015-10-09 13:53:16 -06:00
Ward Fisher
aa2af5cd5a
Corrected an issue with a dangling endif.
2015-10-09 11:15:15 -06:00
dmh
9f65c3b808
cleanup and squash changes vav master
2015-10-09 10:26:49 -06:00
dmh
8fc86035b2
merge-squash
2015-10-09 10:22:00 -06:00
dmh
087ae58ffd
cleanup and squash changes vav master
2015-10-09 10:12:11 -06:00
dmh
49597a64af
merge-squash
2015-10-09 10:12:11 -06:00
Ward Fisher
dffaff8406
Further progress on [NCF-340], capturing previously-lost error code NC_EGLOBAL
2015-09-10 15:55:06 -06:00
tbeu
e2820e4d8a
Fix common typos
...
Detected by https://github.com/vlajos/misspell_fixer
2015-08-20 11:42:05 +02:00
Russ Rew
ced515b895
Fix a few typos in comments
2015-08-18 10:20:28 -06:00
dmh
2bfe9bba32
cleanup and squash changes vav master
2015-08-16 21:44:18 -06:00
dmh
859f105005
merge-squash
2015-08-15 16:26:35 -06:00
dmh
fab66699d1
Moved libsrc5 to libsrcp
...
because pnetcdf is used for
more than CDF-5 files.
2015-08-14 20:39:56 -06:00
Ward Fisher
f539c0f32e
Added reference docs for netcdf_mem work performed by Dennis. Updated Windows pre-built binary documentation to reflect the move to Visual Studio 2012, from Visual Studio 2010.
2015-06-04 15:37:52 -06:00
