Commit Graph

6154 Commits

Author SHA1 Message Date
Ed Hartnett
5e66c086a2 took config include out of h5testszip 2019-01-02 06:46:56 -07:00
Ed Hartnett
35017d9549 fixed mistake in Makefile.am 2019-01-02 06:21:11 -07:00
Ed Hartnett
6416abe887 fixed HDF4 abort warning 2019-01-02 05:58:54 -07:00
Ed Hartnett
00a43c5374 added curl to try and get hdf4 test files 2019-01-02 05:47:53 -07:00
Ed Hartnett
140967e174 more config.h includes for tests 2019-01-02 05:37:54 -07:00
Ed Hartnett
c15c3fa8d5 cleaned up makefile.am, added config.h to some tests 2019-01-02 05:31:15 -07:00
Ed Hartnett
35495eb734
Merge branch 'master' into ejh_test_null_vars_stride 2019-01-02 03:49:22 -07:00
Ward Fisher
a26d188917
Merge pull request #1264 from Unidata/pr-aggregation.wif
YAA (Yet Another Aggregation)
2019-01-02 00:13:37 -07:00
Ed Hartnett
46e50bc196 more tests for NULL strides 2018-12-31 09:44:29 -07:00
Ed Hartnett
091880fd4d fixed null stride problem for vars calls 2018-12-31 07:36:39 -07:00
Ward Fisher
9e94e3298d Merge branch 'ejh_fast_var_prep_2' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2018-12-31 00:02:04 -08:00
Ward Fisher
e6f768b983 Merge branch 'ejh_fast_var_prep' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2018-12-30 23:56:12 -08:00
Ward Fisher
c62d7eb541 Merge remote-tracking branch 'origin/gh1233.dmh' into pr-aggregation.wif 2018-12-30 23:55:30 -08:00
Ward Fisher
718537af7e A bit of cleanup. 2018-12-30 23:49:22 -08:00
Ward Fisher
6b2156bbcc
Merge branch 'master' into patch-30 2018-12-31 00:38:09 -07:00
Ed Hartnett
b2fbc71bd4 added test, uncommented some test code 2018-12-17 09:24:47 -07:00
Ed Hartnett
dc982efb3d moved tst_attsperf to be with rest of benchmarks 2018-12-17 08:44:36 -07:00
Ed Hartnett
aa16d29e98 fixed comment 2018-12-17 08:43:19 -07:00
Ed Hartnett
e9bd94821d split out some var meta reading, fixed setting of var->container 2018-12-17 08:41:43 -07:00
Ed Hartnett
77b3a81d86 starting to deal with var metadata separately 2018-12-17 08:25:19 -07:00
Ed Hartnett
3697f43b1d whitespace fixes in header file, fixed enable-benchmarks doc string in configure.ac 2018-12-17 07:59:33 -07:00
Ed Hartnett
8ca5a1ac17
Merge branch 'master' into ejh_fast_var_prep 2018-12-12 07:05:45 -07:00
Ward Fisher
b16eceabe2
Merge pull request #1250 from Unidata/pr-aggregation.wif
Combined Pull Requests, second take
2018-12-12 00:18:26 -05:00
Ward Fisher
30ea33435c Merge remote-tracking branch 'origin/license_update.wif' into pr-aggregation.wif 2018-12-11 17:08:21 -05:00
Ward Fisher
d6b480cec1 Merge branch 'ejh_next_23' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2018-12-11 17:06:56 -05:00
Ward Fisher
50fa6b4f32 Merge branch 'ejh_next_22' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2018-12-11 17:06:43 -05:00
Ward Fisher
dedc8e7dde Merge branch 'ejh_next_20' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2018-12-11 17:06:32 -05:00
Ward Fisher
dd8ae88add Merge remote-tracking branch 'origin/fixcomments.dmh' into pr-aggregation.wif 2018-12-11 17:06:24 -05:00
Ward Fisher
ca0e23fca7 Merge remote-tracking branch 'origin/gh1207.dmh' into pr-aggregation.wif 2018-12-11 17:06:06 -05:00
Ward Fisher
6deb77bade Merge branch 'master' into gh1207.dmh 2018-12-11 16:44:04 -05:00
Ed Hartnett
aaa5a50ca9 cleanup of hdf5open.c, now check for COORDINATES hidden att and use it to find dimids if available 2018-12-11 09:57:08 -07:00
Ed Hartnett
dc1115ae76 moved rec_match_dimscales() to hdf5open.c, made it faster by skipping already-identified dims 2018-12-11 09:40:59 -07:00
Ed Hartnett
28aa22f8cf cleanup and some comments for rec_write_metadata() 2018-12-11 09:33:46 -07:00
Ed Hartnett
8e1d781ea3 fixed error handling in write_dim(), also converted dimscale creation to H5Dcreate2() 2018-12-11 09:28:23 -07:00
Ed Hartnett
1a0cfb729e fixed error handling in write_var() 2018-12-11 08:10:08 -07:00
Ed Hartnett
26239a0897 cleaned up loop reattaching dimscales 2018-12-11 07:21:09 -07:00
Ed Hartnett
7b72d0b832 fixed error handling in attach_dimscales() 2018-12-11 07:15:46 -07:00
Ed Hartnett
39a0f822fa changed loop to use ncindexlookup() instead of looping through the names 2018-12-11 07:07:00 -07:00
Ed Hartnett
d7b657af4e cleaned up comments, changed loop to use ncindexlookup() instead of looping through the names 2018-12-11 06:43:27 -07:00
Ed Hartnett
53bdb74869 fixed error handling of write_netcdf4_dimid() 2018-12-11 06:38:23 -07:00
Ed Hartnett
f724fe6385 uncommented test in tst_interops.c 2018-12-11 06:34:44 -07:00
Ed Hartnett
89b2c48d4c added benchmark program tst_wrf_reads.c 2018-12-11 06:32:25 -07:00
Ed Hartnett
7d168f712f cleaned up nc4internal.c 2018-12-11 06:25:33 -07:00
Ed Hartnett
ef5a39e19a cleaned up hdf5internal.c 2018-12-11 06:22:48 -07:00
Ed Hartnett
3c9a141ee3 moved function detect_preserve_dimids and made it static 2018-12-11 06:15:47 -07:00
Ed Hartnett
da58a31c8a merged ejh_next_23 2018-12-11 06:01:11 -07:00
Ward Fisher
221ac43eb6 Turned off filter testing for the moment, in appveyor. 2018-12-10 14:25:34 -05:00
Ward Fisher
7af0e32d82 Fixed issue with make distclean 2018-12-07 15:27:40 -07:00
Ward Fisher
d135fb4200 Removed confounding text from a reference file, turned on filter testing by default in Cmake-based builds. 2018-12-07 14:44:47 -07:00
Greg Sjaardema
30540026db
Eliminate nested comments
Looks like extra comment begin and a missing comment end resulted in nested comments.  Results in warning on at least the ibm compiler:
```
In file included from /g/g16/TPL/netcdf/netcdf-c/include/nc4internal.h:24:0,
                 from /g/g16/TPL/netcdf/netcdf-c/ncgen/includes.h:50,
                 from /g/g16/TPL/netcdf/netcdf-c/ncgen/genc.c:7:
/g/g16/TPL/netcdf/netcdf-c/include/nc_provenance.h:4:1: warning: "/*" within comment [-Wcomment]
 /**
 ^
```
2018-12-07 08:44:46 -07:00