Commit Graph

5575 Commits

Author SHA1 Message Date
Ward Fisher
373d0365a1
Merge branch 'master' into default_format 2018-08-24 11:27:07 -06:00
Ward Fisher
c59f43d604
Merge pull request #1103 from NetCDF-World-Domination-Council/ejh_func_cleanup3
Warning, coverity warning, error handling, documentation, and hdf5_set_log_level fixes, all on the path to the lazy var feature
2018-08-20 16:31:31 -06:00
Ed Hartnett
d59446ccd5
Merge branch 'master' into ejh_func_cleanup3 2018-08-15 18:08:34 -06:00
Ward Fisher
5539b50ce0
Merge pull request #1092 from NetCDF-World-Domination-Council/ejh_func_cleanup2
Cleanup up some functions in preparation for lazy var reads (take 2)
2018-08-15 16:20:49 -06:00
Ward Fisher
e710027861
Merge branch 'master' into ejh_func_cleanup2 2018-08-13 13:49:55 -06:00
Ward Fisher
75060b7f69
Merge pull request #1109 from Unidata/osx_sh_test.wif
Migrate script-based tests from bash to sh
2018-08-13 13:44:38 -06:00
Ward Fisher
ffc448deb4 Further sh compatibility. 2018-08-13 00:05:31 -06:00
Ward Fisher
40a929575c sh compatibility. 2018-08-13 00:01:53 -06:00
Ward Fisher
77c3fd023e Removed 'function' keyword for sh compatibility. 2018-08-12 23:23:59 -06:00
Ward Fisher
a996ed554e Swapped /bin/bash for /bin/sh to test on osx. 2018-08-12 23:01:08 -06:00
Ed Hartnett
06ecd2412d merged master 2018-08-08 05:54:03 -06:00
Ed Hartnett
a65078040d whitespace cleanup 2018-08-07 15:17:40 -06:00
Ed Hartnett
a628fd7a2c merged master 2018-08-07 15:15:42 -06:00
Ward Fisher
c844e5bab9
Merge pull request #1081 from NetCDF-World-Domination-Council/ejh_global_att_read
Make global atts read much, much faster
2018-08-07 13:23:10 -06:00
Ed Hartnett
4a16369e0e undid inadvertant change 2018-08-06 16:42:59 -06:00
Ed Hartnett
70eb6fca19 merged master 2018-08-06 16:37:36 -06:00
Ed Hartnett
99f9699e97 merged master 2018-08-06 16:36:46 -06:00
Ed Hartnett
edfa5bc442 finished fixes 2018-08-06 16:34:00 -06:00
Ed Hartnett
bf7ad679f7 finished fixes 2018-08-06 16:33:44 -06:00
Ed Hartnett
ad25807bd1
Merge branch 'master' into ejh_global_att_read 2018-08-06 16:30:26 -06:00
Ward Fisher
1fec7b462b
Merge pull request #1076 from NetCDF-World-Domination-Council/ejh_hdf5_sep_file_info
Move hid_t from NC_FILE_INFO_T to new struct NC_HDF5_FILE_INFO_T
2018-08-06 14:42:13 -06:00
Ward Fisher
19a3472a45
Merge branch 'master' into ejh_hdf5_sep_file_info 2018-08-06 11:33:08 -06:00
Ward Fisher
5f89204bdb
Merge branch 'master' into ejh_func_cleanup3 2018-08-06 11:32:45 -06:00
Ward Fisher
f473c53c06
Merge pull request #1100 from Unidata/coverity0803.dmh
Clear up coverity complaints
2018-08-06 11:30:45 -06:00
Ed Hartnett
56a57a57f0 bring in changes from lazy vars branch 2018-08-06 10:57:19 -06:00
Ed Hartnett
5a452c5815 bring in changes from lazy vars branch 2018-08-06 10:49:31 -06:00
Ed Hartnett
9dc99c8a04 cleaned up some functions in preparation for lazy vars 2018-08-06 10:16:49 -06:00
Ed Hartnett
f443facac5 merged ejh_hdf5_sep_file_info 2018-08-06 09:57:17 -06:00
Ed Hartnett
354b89c363 merged upstream/master 2018-08-06 08:36:44 -06:00
Ed Hartnett
86cb431cfb merged upstream/master 2018-08-06 08:29:49 -06:00
Dennis Heimbigner
4ec592648a Force chunking when testing filter 2018-08-04 18:57:02 -06:00
Dennis Heimbigner
f46b65c602 Clear up coverity complaints
with respect to this coverity report.

https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZApv53Ry-2FReUME-2Fmei1et81WqdBwm5AxSAYBM9iFSmbw-3D-3D_YxTn3nq1kZ9CfXcyYFaB2DtJSVHTn8U-2BK0LV-2FDyLYKcFvnwYJ7pm2zFB5UovsEUh5miIfeCfQzYxpN9HYcdqs9sKVjtklOkfPIjEpg0Tj8G9wiptznJeX-2FO4PrqJA1ViQYtQfpjugq01XGMQ3-2Bll42dUMxrmbdYSqi8T7bCcANC5evyZs4MKvmAWXt1bnPaHcOYJDN-2FUt-2FJTlhwu91HyR7h-2FnkvMY9paYUNB1gxiyUA-3D
2018-08-04 13:22:29 -06:00
Ward Fisher
59e98ef087
Merge branch 'master' into default_format 2018-08-03 10:59:41 -06:00
Ward Fisher
915a55105e
Merge branch 'master' into ejh_hdf5_sep_file_info 2018-08-03 10:59:22 -06:00
Ward Fisher
2a99222e64
Merge pull request #1097 from Unidata/ocprint-dap-fix.wif
Correct ocprint build when DAP is turned off.
2018-08-03 10:58:58 -06:00
Ward Fisher
81c91eb519 Made some changes to export symbols on Windows builds. 2018-08-02 14:58:47 -06:00
Ward Fisher
f1eb7c77a4 Correcting an appveyor failure. 2018-08-02 11:33:21 -06:00
Ward Fisher
504867ab67 Corrected issue with strings.h. 2018-08-02 09:47:36 -06:00
Ward Fisher
16bc7d63f6 Modified ocprint to not install. 2018-08-01 14:27:09 -06:00
Ward Fisher
ed1b7089db Modified ocprint to not be installed 2018-08-01 14:19:50 -06:00
Ward Fisher
6cf9c2e6c5 Fence-posted ocprint behind a DAP conditional, in support of bf6ae6c591 (commitcomment-29912584) 2018-08-01 14:15:01 -06:00
Ed Hartnett
b9afdee6cd merged master 2018-07-31 19:44:28 -06:00
Ed Hartnett
7ab6d7bdda
Merge branch 'master' into ejh_global_att_read 2018-07-31 19:32:36 -06:00
Ed Hartnett
b0be5171e9 merged master 2018-07-31 17:05:58 -06:00
Ward Fisher
6535c78a65
Merge pull request #1075 from NetCDF-World-Domination-Council/ejh_hdf5_sep
Moving rest of HDF5 code from libsrc4 to libhdf5
2018-07-31 16:07:52 -06:00
Ward Fisher
5582466724
Merge branch 'master' into ejh_hdf5_sep 2018-07-31 14:04:55 -06:00
Ward Fisher
6f8cacf9a0
Merge pull request #1096 from Unidata/pr-aggregation.wif
YAA (Yet Another Aggregation)
2018-07-31 13:56:59 -06:00
Ward Fisher
bf6ae6c591 Added ocprint binary to cmakelists. 2018-07-31 12:51:24 -06:00
Ward Fisher
013bb964fa Merge remote-tracking branch 'origin/ncchunking.dmh' into pr-aggregation.wif 2018-07-31 11:44:47 -06:00
Ward Fisher
4c0d32cf47 Merge branch 'var_par_access' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif 2018-07-31 11:33:05 -06:00