Commit Graph

5550 Commits

Author SHA1 Message Date
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
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
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
f473c53c06
Merge pull request #1100 from Unidata/coverity0803.dmh
Clear up coverity complaints
2018-08-06 11:30:45 -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
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
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
Ward Fisher
90d664b9ec Merge branch 'has_parallel4' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif 2018-07-31 11:32:54 -06:00
Ward Fisher
3b10efa26f
Merge branch 'master' into var_par_access 2018-07-31 11:30:43 -06:00
Ward Fisher
334a936732
Merge branch 'master' into relax_coord_bound 2018-07-31 11:26:51 -06:00
Ward Fisher
70e454227e Corrected an issue on Windows. 2018-07-30 15:25:45 -06:00
Ward Fisher
00f66133af
Merge branch 'master' into has_parallel4 2018-07-30 14:17:41 -06:00
Ed Hartnett
fce57d4498
Merge branch 'master' into ejh_hdf5_sep 2018-07-30 12:13:45 -06:00
Ward Fisher
d41c080b0f
Merge branch 'master' into ncchunking.dmh 2018-07-30 11:03:14 -06:00
Ward Fisher
bc2eebd399
Merge pull request #1093 from wkliao/NC_EPNETCDF
introduce error code NC_EPNETCDF for errors at PnetCDF level
2018-07-30 11:02:54 -06:00
Wei-keng Liao
025c7d1bb2 introduce error code NC_EPNETCDF for errors at PnetCDF level 2018-07-29 15:33:08 -05:00
Ed Hartnett
36d5a18660 merged master 2018-07-29 03:18:26 -06:00
Ed Hartnett
66b1884f41 fixed merge problem 2018-07-29 02:35:53 -06:00
Ed Hartnett
df15707488
Merge branch 'master' into ejh_hdf5_sep_file_info 2018-07-28 08:16:26 -06:00
Ed Hartnett
37d2fa902e
Merge branch 'master' into ejh_hdf5_sep 2018-07-27 17:37:55 -06:00
Ward Fisher
ac805e3ebd
Merge pull request #1071 from NetCDF-World-Domination-Council/ejh_split_hdf5file
Split hdf5file.c into hdf5file.c, hdf5create.c, and hdf5open.c
2018-07-27 15:59:46 -06:00
Dennis Heimbigner
b02703aa24 This PR primarily addresses Issue https://github.com/Unidata/netcdf-c/issues/725.
After a long discussion, I implemented the rules at the end of that issue.
They are documented in nccopy.1.

Additionally, I added a new, per-variable, -c flag that allows
for the direct setting of the chunking parameters for a variable.
The form is
    -c var:c1,c2,...ck
where var is the name of the variable (possibly a fully qualified name)
and the ci are the chunksizes for that variable. It must be the case
that the rank of the variable is k. If the new form is used as well
as the old form, then the new form overrides the old form for the
specified variable. Note that multiple occurrences of the new form
-c flag may be specified.

Misc. Other fixes
1. Added -M <size> option to nccopy to specify the minimum
   allowable chunksize.
2. Removed the unused variables from bigmeta.c
   (Issue https://github.com/Unidata/netcdf-c/issues/1079)
3. Fixed failure of nc_test4/tst_filter.sh by using the new -M
   flag (#1) to allow filter test on a small chunk size.
2018-07-26 20:16:02 -06:00
Wei-keng Liao
e154ad609f
Merge branch 'master' into has_parallel4 2018-07-26 01:40:15 -05:00
Wei-keng Liao
5a06155f88
Merge branch 'master' into relax_coord_bound 2018-07-26 01:39:59 -05:00
Wei-keng Liao
ab7ce457c0
Merge branch 'master' into var_par_access 2018-07-26 01:35:39 -05:00
Ed Hartnett
5631fa512a merged master 2018-07-24 01:51:51 -06:00
Ed Hartnett
56e4bbd996 merged warning fix 2018-07-24 01:45:33 -06:00
Ed Hartnett
b94da38f7c fixed warnings 2018-07-24 01:38:39 -06:00
Ed Hartnett
25021aa847
Merge branch 'master' into ejh_hdf5_sep 2018-07-23 18:52:07 -06:00