Commit Graph

2933 Commits

Author SHA1 Message Date
dmh
47e10591b4 ckp 2015-11-19 13:44:55 -07:00
Ward Fisher
c053de5d0c Corrected a static-analysis detected error state where a null pointer could be passed to strcmp 2015-11-17 11:26:38 -07:00
Ward Fisher
d8733e501b Updated Release notes. 2015-11-16 14:39:02 -07:00
Ward Fisher
2683652d4c Added a reference to netcdf4-js interface. 2015-11-16 14:37:44 -07:00
Ward Fisher
135519424f Merge branch 'gdsjaar-cmake' 2015-11-16 12:25:05 -07:00
Greg Sjaardema
26779a9e49 Add local include paths first
If a netcdf.h include file exists in any of the include paths
specified for HDF5 or other libraries, it was being included
instead of the local netcdf.h file in the source directory
since the local include paths were added at the end of the
compile line instead of at the beginning.

This commit puts the local include paths at the beginning
of the compile line
2015-11-16 07:51:17 -05:00
Greg Sjaardema
e1dc89c8f0 Revert "Add local include paths first"
This reverts commit 3fa48a8f9d.
2015-11-16 07:48:05 -05:00
Greg Sjaardema
b2eb493da3 Merge branch 'master' of https://github.com/gdsjaar/netcdf-c 2015-11-16 07:45:25 -05:00
Greg Sjaardema
c62f2703a1 Revert "Fix compliance with classic model"
This reverts commit 513e10d057.
2015-11-16 07:38:30 -05:00
Greg Sjaardema
0b44ab9d38 Merge branch 'master' into master 2015-11-16 07:23:13 -05:00
Ward Fisher
df8a05143f Merge branch 'dynamic-patch' 2015-11-12 15:18:07 -07:00
Ward Fisher
8d76d05464 Updated release notes describing https://github.com/Unidata/netcdf-c/pull/150 2015-11-12 15:17:52 -07:00
Ward Fisher
8d997f1369 Merge branch 'dynamic-patch' 2015-11-12 15:00:56 -07:00
Ward Fisher
e1807c800e Merge branch 'gdsjaar-patch-1' into dynamic-patch 2015-11-12 14:15:32 -07:00
Ward Fisher
0762d47b7f Merge branch 'patch-1' of https://github.com/gdsjaar/netcdf-c into gdsjaar-patch-1 2015-11-12 14:15:10 -07:00
Ward Fisher
51e2180095 Merge branch 'cygwin-fix' 2015-11-11 16:15:20 -07:00
Ward Fisher
21601f669b Applied a patch to fix a bug on cygwin64. The patch was contributed by Marco Atzeri. 2015-11-11 15:36:02 -07:00
Greg Sjaardema
5181f24edb Merge branch 'master' into master 2015-11-11 17:02:15 -05:00
Ward Fisher
ccd824a77f Added new test to distribution file list. 2015-11-11 14:27:25 -07:00
Greg Sjaardema
513e10d057 Fix compliance with classic model
h5->nvars is unused; the variable count is maintainted in grp->nvars

  An alternate fix may be to maintain a global var count (sum of all groups)
  in h5->nvars.

  Since h5->nvars does not seem to be used, possibly remove from the struct.
2015-11-11 15:58:20 -05:00
Greg Sjaardema
eb9e76ae69 Merge branch 'master' into master 2015-11-11 15:10:41 -05:00
Greg Sjaardema
3fa48a8f9d Add local include paths first
If a netcdf.h include file exists in any of the include paths
specified for HDF5 or other libraries, it was being included
instead of the local netcdf.h file in the source directory
since the local include paths were added at the end of the
compile line instead of at the beginning.

This commit puts the local include paths at the beginning
of the compile line
2015-11-11 15:07:01 -05:00
Ward Fisher
b206fb57d5 Updated Release notes. 2015-11-11 12:33:29 -07:00
Ward Fisher
9feedb8570 Merge branch 'gh149' 2015-11-11 12:14:17 -07:00
Ward Fisher
c4d9367c60 Removed stray markdown file. 2015-11-11 12:13:04 -07:00
Ward Fisher
17e9f808d3 Removed branch-specific markdown file. 2015-11-11 12:11:11 -07:00
Ward Fisher
c4f8e73945 Merge branch 'gh149' 2015-11-11 12:10:46 -07:00
Greg Sjaardema
2ae0e45cd3 Remove hard-wired use of NC_MAX_DIMS
Replace static array dimensioned to NC_MAX_DIMS with dynamic memory allocation of correctly sized array.
2015-11-11 14:01:18 -05:00
Ward Fisher
473259b772 Corrected issue where overwriting an attribute of type NC_CHAR with NC_STRING would result in dangling data. 2015-11-11 11:32:12 -07:00
Ward Fisher
5065b01d37 Wired in a new test based on one provided by Jeff Whitaker in support of issue 149 on github. See https://github.com/Unidata/netcdf-c/issues/149. 2015-11-11 10:42:49 -07:00
Ward Fisher
c514695ec7 Merge branch 'working' 2015-11-10 14:50:24 -07:00
Ward Fisher
0f1e262090 Moved developer doxyfile into docs directory, made windows-binaries document more generalized. 2015-11-10 14:44:43 -07:00
Ward Fisher
fe04b2891e Merge branch '440-doc-update' 2015-11-10 14:28:59 -07:00
Ward Fisher
2d94d89d48 Updated release notes for 4.4.0 RC4. 2015-11-10 14:28:36 -07:00
Ward Fisher
af467c58f0 Removing old unnecessary files that migrated into the main branch. 2015-11-10 14:16:39 -07:00
Ward Fisher
5e24340c72 Merge branch '440-doc-update' 2015-11-10 12:29:56 -07:00
Ward Fisher
5d93b9da9f Tweaked cmake faq. 2015-11-10 11:19:05 -07:00
Ward Fisher
3e60daa49d Corrected a typo reported in https://github.com/Unidata/netcdf-c/issues/146 2015-11-10 10:58:31 -07:00
Ward Fisher
34f617d7b7 Merge branch 'sebastic-inconsistent-return-type' 2015-11-09 21:02:05 -07:00
Bas Couwenberg
b8e4161baf Fix inconsistent return type. 2015-11-10 00:19:33 +01:00
Ward Fisher
bd84e9a8eb Merge branch 'cdf-5' 2015-11-09 14:28:00 -07:00
Ward Fisher
1082bd6bca Merge branch 'cdf5-sync-master' into cdf-5 2015-11-09 13:52:23 -07:00
Ward Fisher
c1210f4020 Merge branch 'master' into cdf5-sync-master 2015-11-09 13:45:11 -07:00
Ward Fisher
6eec834120 Merge branch 'cdf-5' of https://github.com/Unidata/netcdf-c into cdf-5 2015-11-09 13:40:05 -07:00
Ward Fisher
9561cf2bdd Wired in a test that was previously not running. 2015-11-09 19:30:27 +00: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
1043461623 Merge branch 'i142' into cdf-5 2015-11-09 18:03:06 +00:00
Ward Fisher
d5b6da4340 Merge branch 'i142' into cdf-5 2015-11-09 10:53:25 -07:00
Ward Fisher
25992d2d71 Merge branch 'issue_140' 2015-11-09 10:26:29 -07:00
dmh
5ad26bb68f Fix github issues #140
1. Added check to libsrc4/nc4var.nc_def_var_extra to
   check that the no specified chunks size is greater than
   the dimension size.

2. Added test to nc_test4/tst_chunks.c
2015-11-07 20:29:16 -07:00