Commit Graph

3078 Commits

Author SHA1 Message Date
Ward Fisher
60644f3c4c Bumped next development version. 2016-01-13 10:01:34 -07:00
Ward Fisher
120f1fc3fe Bumped revision in release notes. 2016-01-13 09:56:46 -07:00
Ward Fisher
d938fc6991 Updated release notes re: bump in SO version. 2016-01-11 15:29:24 -07:00
Ward Fisher
d11ed3c478 Bumped SO version in CMakeLists.txt 2016-01-11 15:27:57 -07:00
Ward Fisher
eada3d5a55 Incrementing so version. 2016-01-11 15:20:55 -07:00
Ward Fisher
a6efcb2486 Merge branch 'example-update' 2016-01-08 15:36:27 -07:00
Ward Fisher
a4d826e4fe Merge pull request #187 from Unidata/issue185
The max dimension sizes do not take CDF-5 format into account.
2016-01-08 15:35:38 -07:00
Ward Fisher
5ef5ffc2bc Corrected an inconsistency between the documentation and the example. 2016-01-08 15:29:32 -07:00
Ward Fisher
29f1885488 Merge branch 'master' into issue185 2016-01-08 14:58:49 -07:00
Ward Fisher
592860ff93 Updated release notes. 2016-01-08 13:09:00 -07:00
Ward Fisher
6867960a0c Removed debugging information. 2016-01-08 12:59:56 -07:00
Ward Fisher
65aaac62d8 Tweaked CMakeLists a bit more. 2016-01-08 12:59:37 -07:00
Dennis Heimbigner
39e9cd0ffe Fix issues with Github pull request 187
(https://github.com/Unidata/netcdf-c/pull/187)
Primary problem was cmake build errors.
2016-01-08 12:55:11 -07:00
Ward Fisher
60ef454a7f Refactoring CMakeLists.txt to make the HDF5-related logic a little more clear. Or at least, better documented. 2016-01-08 10:56:25 -07:00
Ward Fisher
d75a3ad38f Typo correction. 2016-01-07 15:50:04 -07:00
Ward Fisher
6d400c8e43 Making an allowance for Linux. 2016-01-07 15:48:31 -07:00
Ward Fisher
c822d4c6df Work progresses on a CMake system that will work with hdf5 1.8.15 and 1.8.16, as well as that will work with Windows and Linux. 2016-01-07 15:43:17 -07:00
Ward Fisher
0b373d8cf1 Work progresses, we need to handle shared and static hdf5 separately it turns out. See examples provided by hdf5 group. 2016-01-07 15:22:11 -07:00
Ward Fisher
2aa17ffb2e Additional tweaks. 2016-01-07 14:53:39 -07:00
Ward Fisher
b2aaaad1ce Restricted prior fix to visual studio only as it doesn't appear necessary for OSX/Linux. 2016-01-07 14:17:58 -07:00
Ward Fisher
e0a0ea7610 Removed debugging information in CMakeLists.txt. 2016-01-07 14:15:05 -07:00
Ward Fisher
2d25f9b915 Updated CMakeLists to explicitely look for static or shared hdf5 libraries. Required as part of hdf5 1.8.16, and is documented in https://github.com/Unidata/netcdf-c/issues/186 2016-01-07 14:11:44 -07:00
Ward Fisher
3bb57f0a8e Extending debug information for cmake and hdf5 1.8.16 on Windows. 2016-01-06 14:18:26 -07:00
Ward Fisher
34125fdecd Trying to nail down name of hdf5 library variable for hdf5 1.8.16. 2016-01-06 13:05:52 -07:00
Dennis Heimbigner
5e4cbd2fec Forgot to check cmake build 2016-01-05 22:26:20 -07:00
Dennis Heimbigner
d15f277252 The max dimension sizes do not take CDF-5 format into account.
NetCDF-c Github issue #185

The code in libsrc/dim.c has not been upgraded to support
CDF-5 format.

Rule we are implementing sets the max dimension sizes as follows:

Classic:	CDF-1	NC_MAX_INT - 3    = 2147483647 - 3
64 bit Offset:	CDF-2	NC_MAX_UINT - 3	  =  4294967295 - 3
64 bit Data:	CDF-5	NC_MAX_UINT64 - 3 = 18446744073709551615 - 3

The -3 is to handle rounding.
2016-01-05 21:26:25 -07:00
Ward Fisher
2c00e715e1 Addressing changes inherent in Visual Studio 2015 and the fact that it now supports snprintf. See http://stackoverflow.com/questions/27754492/vs-2015-compiling-cocos2d-x-3-3-error-fatal-error-c1189-error-macro-definiti for more background. 2016-01-05 15:49:18 -07:00
Ward Fisher
91d025d3ac Merge branch 'gh159-walkback' of https://github.com/Unidata/netcdf-c into gh159-walkback 2016-01-05 10:47:26 -07:00
Ward Fisher
926426abeb Cleaning up a couple stale files. 2016-01-05 10:46:20 -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
e17dfb4581 Provided clarification re: netcdf parallel io, see issue https://github.com/Unidata/netcdf-c/issues/157 on GitHub for more information. 2016-01-04 14:29:40 -07:00
Ward Fisher
21be11b031 Resolve merge conflict. 2016-01-04 14:22:26 -07:00
Ward Fisher
6c415b4ac9 Turned off CDash dashboard submission in travis-ci, as it's currently timing out causing a false-negative for travis-ci. 2015-12-31 15:01:17 -07:00
Ward Fisher
b78051168e Merge branch 'master' into gh181 2015-12-31 14:49:58 -07:00
Ward Fisher
0a0edca515 Cleanup prior to merge, added a reference to github issue http://github.com/Unidata/netcdf-c/issues/181 to the release notes. 2015-12-31 14:28:59 -07:00
Ward Fisher
ac9f02d01a Modified index passed for last row when printing with annotations, in support of fixing https://github.com/Unidata/netcdf-c/issues/181 2015-12-31 21:20:36 +00:00
Ward Fisher
6e8176f1ab Added a gdb command file. 2015-12-31 13:31:15 -07:00
Ward Fisher
b179512aec Added a gdb command file. 2015-12-31 13:31:07 -07:00
Ward Fisher
92fe7792ad Added an lldb command file. 2015-12-31 13:02:23 -07:00
Ward Fisher
1627a778fb Setting up to address GitHub issue https://github.com/Unidata/netcdf-c/issues/181 2015-12-31 12:07:54 -07:00
Ward Fisher
bb00562779 Addressed a static-analysis issue. 2015-12-31 11:47:39 -07:00
Ward Fisher
09ab3fc554 Merging from master in preparation for merging branch back into main development branch. 2015-12-30 13:00:12 -07:00
Ward Fisher
86ecb2c5a1 Trying to add signed/unsigned char tests. 2015-12-29 15:29:29 -07:00
Ward Fisher
023356ba9b Fixed typos. 2015-12-29 12:39:35 -07:00
Ward Fisher
19cfaa9308 A bit of cleaning up for the merge into master. 2015-12-29 11:12:50 -07:00
Ward Fisher
d8a62e14d6 Added reference to https://github.com/Unidata/netcdf-c/issues/178 in Release Notes. 2015-12-28 16:20:54 -07:00
Ward Fisher
a5bf72aa78 Merge branch 'gh178' 2015-12-28 16:19:19 -07:00
Ward Fisher
07621f6b04 Updated release notes with information regarding https://github.com/Unidata/netcdf-c/issues/159. 2015-12-28 16:10:31 -07:00
Ward Fisher
fc33c419e1 Cleaning up a few odds and ends. 2015-12-28 16:07:05 -07:00