Commit Graph

4707 Commits

Author SHA1 Message Date
Ward Fisher
a640c034f2 Merge branch 'ejh_atts_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:47:48 -07:00
Ward Fisher
e0577cb251 Merge branch 'ejh_fill_value_string_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:47:34 -07:00
Ward Fisher
9276fdaf9a Merge branch 'ejh_var_docs_only_unidata_2' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:43:52 -07:00
Ward Fisher
b268f268bd Merge branch 'ejh_dims_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:43:41 -07:00
Ed Hartnett
0d96ead703
Merge branch 'master' into ejh_dims_unidata 2018-02-05 06:34:04 -07:00
Ward Fisher
b4a29470c0
Merge pull request #478 from wkliao/cdf5_var_len
CDF-5 fix: let NC_var.len be the true size of variable
2018-02-04 13:25:41 -07:00
Wei-keng Liao
be871248b9 disable CDF-5 feature when size_t is of size 4 bytes 2018-02-03 00:05:14 -06:00
Ward Fisher
f428660b69 Corrected typo in libnetcdf.settings.in when using autoconf. 2018-02-02 20:31:45 -07:00
Ward Fisher
d02a905aa9 Updated typo. 2018-02-02 20:27:06 -07:00
Ward Fisher
0fee3b9404 Added a missing line in config.h.cmake.in 2018-02-02 20:22:49 -07:00
Ward Fisher
c1d54b0213 Added check for genlib.h 2018-02-02 20:57:55 -06:00
Ward Fisher
c12fca453e Merge branch 'ejh_rename2_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-02 17:57:32 -07:00
Ward Fisher
7d59cf7165 Merge branch 'ejh_makefile_cleanup_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-02 17:57:21 -07:00
Ward Fisher
9b4b2308c6 Merge branch 'ejh_warnings' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-02 17:56:04 -07:00
Ward Fisher
0d420fcfbb
Merge branch 'master' into cdf5_var_len 2018-02-02 10:31:46 -07:00
Ward Fisher
8c6defe568
Merge pull request #731 from wkliao/nc3-per-var-fill-v2
a clean commit for #383
2018-02-02 10:12:36 -07:00
Ed Hartnett
3ba04ac337 updated year 2018-02-02 08:45:03 -07:00
Ed Hartnett
23af1a98e8 Makefile.am cleanup 2018-02-02 08:42:49 -07:00
Ward Fisher
27693ba4a3
Merge branch 'master' into nc3-per-var-fill-v2 2018-02-01 11:45:40 -07:00
Ward Fisher
aea36f6eb7
Merge pull request #833 from Unidata/gsjaardema-batch
Gsjaardema batch merge
2018-02-01 11:30:40 -07:00
Ed Hartnett
383a19161a fixed warnings 2018-02-01 07:36:34 -07:00
Ed Hartnett
fc6a8caa78
Merge pull request #2 from Unidata/master
sync
2018-02-01 07:27:28 -07:00
Ed Hartnett
69c899a529 removed results of other merges from nc4var.c 2018-02-01 05:28:24 -07:00
Ed Hartnett
2afe401f17 another rename fix 2018-02-01 05:10:57 -07:00
Ward Fisher
03446423f7 Merge branch 'patch-12' of https://github.com/gsjaardema/netcdf-c into gsjaardema-batch 2018-01-31 16:24:38 -07:00
Ward Fisher
1c1c06ff8d Merge branch 'patch-13' of https://github.com/gsjaardema/netcdf-c into gsjaardema-batch 2018-01-31 16:24:05 -07:00
Ward Fisher
9a0d1d6501 Merge branch 'patch-14' of https://github.com/gsjaardema/netcdf-c into gsjaardema-batch 2018-01-31 16:21:41 -07:00
Ward Fisher
8c33de7a9a Merge branch 'patch-15' of https://github.com/gsjaardema/netcdf-c into gsjaardema-batch 2018-01-31 16:17:59 -07:00
Ward Fisher
000096aadb Merge branch 'patch-16' of https://github.com/gsjaardema/netcdf-c into gsjaardema-batch 2018-01-31 16:16:37 -07:00
Ward Fisher
095d025b5b Merge branch 'patch-18' of https://github.com/gsjaardema/netcdf-c into gsjaardema-batch 2018-01-31 16:16:16 -07:00
Greg Sjaardema
30ec6821c3
Missing ERR after api test call
Missed this one on previous PR.  Another missing ERR after API test if.
2018-01-31 10:08:48 -07:00
Greg Sjaardema
4cbfc0f66e
Fix compression level settings
* level is unsigned, so can never be < 0
* If level is 0, then don't enable deflate filter.
2018-01-31 10:02:09 -07:00
Greg Sjaardema
60a6f34102
Fix missing ERR after if test
A couple API invocations were missing the ERR macro following the if test.
2018-01-31 09:17:28 -07:00
Greg Sjaardema
2f44fa49c6
Eliminate unused variables
Remove variables no longer used after recent refactorings.
2018-01-31 09:05:35 -07:00
Greg Sjaardema
e887772e8f
Eliminate unused variables
Eliminate variables no longer used after recent refactorings.
2018-01-31 09:03:19 -07:00
Greg Sjaardema
63b700c40c
Remove V2 code if V2 API not being built
Remove test code that uses the version 2 API if the version 2 API code is not being activated in the build.

This was originally proposed in #656 with a better fix in #755 which was removed.
2018-01-31 09:00:17 -07:00
Ed Hartnett
7c936a7bb6 brought in changes from ejh_att 2018-01-31 08:44:33 -07:00
Ed Hartnett
dff3472a2e comment change to trigger travis testing 2018-01-31 07:22:08 -07:00
Ward Fisher
b7de06a982 Removed some confounding code in CmakeLists.txt, added a .gitignore for files that are copied dynamically. 2018-01-30 16:27:06 -06:00
Ward Fisher
fcd99a9cdf
Merge branch 'master' into cdf5_var_len 2018-01-30 15:16:13 -07:00
Ed Hartnett
94c23712b7 extra tests, plus fill value fixes for string type 2018-01-30 14:39:47 -07:00
Ward Fisher
88a35bb662
Merge branch 'master' into ejh_var_docs_only_unidata_2 2018-01-30 14:17:42 -07:00
Ward Fisher
070df7c583
Merge pull request #813 from Unidata/filtername.dmh
Avoid cmake CMP0002 by using different logical name for plugin libs
2018-01-30 14:17:27 -07:00
Ward Fisher
d6cab0de5e
Merge branch 'master' into filtername.dmh 2018-01-30 11:06:04 -07:00
Ed Hartnett
06c1a027b5 doc changes only 2018-01-30 11:01:50 -07:00
Ed Hartnett
333b802861 fix dim bad paramter issues 2018-01-30 09:35:56 -07:00
Ward Fisher
ee4a3b6b3d
Merge pull request #812 from Unidata/gh809.wif
Gh809.wif
2018-01-29 12:56:22 -07:00
Ward Fisher
973aa0a34b Corrected second instance of macro. 2018-01-29 11:27:15 -07:00
Ward Fisher
3c2f6ba9e9
Merge branch 'master' into cdf5_var_len 2018-01-29 11:20:21 -07:00
Dennis Heimbigner
49e86f5778 Merge branch 'master' into filtername.dmh 2018-01-27 11:33:59 -07:00