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
dmh
413e49d758
1. There were several bugs in ncdump/dumplib.c
...
that were not taking the CDF-5 format into account.
2. Had to update ncgen.1 man page to define the new
k-flag rules to deal with cdf-5.
3. Had to fix some tests that use 'cmp' for comparison;
this really should be deprecated.
3. There was a bug in configure.ac with respect
to using the enable-netcdf-4 flag vs
using disable-netcdf-4.
2015-11-06 17:03:28 -07:00
Ward Fisher
996ef87cd1
More refactoring to fix an issue where an nc4 test was being run when nc4 was disabled.
2015-11-06 13:20:10 -07:00
Ward Fisher
f551581ceb
Modified 'in-memory' test to only run enhanced tests if netcdf-4 is enabled.
2015-11-06 13:12:09 -07:00
Ward Fisher
7bd0dc0445
Added a min/max test configuration to travis-ci.
2015-11-06 12:57:55 -07:00
Ward Fisher
959251d4e0
Corrected an error that had crept into the cdf-5- branch.
2015-11-05 14:20:55 -07: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
da44a0bf25
Fixed a typo.
2015-11-03 10:37:42 -07:00
Ward Fisher
3c0a487674
Applying a patch for cygwin submitted by Marco Atzeri.
2015-11-02 16:26:50 -07:00
Ward Fisher
36a4c6c738
Tweaked .gitignore file.
2015-11-02 16:15:02 -07:00
Ward Fisher
3bb62c3314
Corrected a logic error preventing ncgen from creating cdf-5 files.
2015-11-02 16:11:29 -07:00
Ward Fisher
991d127158
Tweaked ncgen test script to actually *check* to see if the file it says it's creating was created.
2015-11-02 13:58:55 -07:00
Ward Fisher
288dc65c32
Added doxygen to travis configuration.
2015-11-02 13:02:03 -07:00
Ward Fisher
1f52d14392
Reintroduced ENABLE_DOXYGEN_SERVER_BASED_SEARCH option for local webserver use.
2015-11-02 12:58:29 -07:00
