Commit Graph

5497 Commits

Author SHA1 Message Date
Wei-keng Liao
6ec2c544b6
Merge branch 'master' into configure_error_out 2018-08-02 23:54:16 -05: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
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
9d4fa6f542
Merge branch 'master' into configure_error_out 2018-07-26 01:40:53 -05: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
25021aa847
Merge branch 'master' into ejh_hdf5_sep 2018-07-23 18:52:07 -06:00
Ed Hartnett
a1437c5ca0
Merge branch 'master' into ejh_split_hdf5file 2018-07-23 18:51:29 -06:00
Ward Fisher
000e7a054d
Merge pull request #1045 from gsjaardema/patch-23
Eliminate NC_Dispatch redefinition compiler warning
2018-07-23 17:19:59 -06:00
Ed Hartnett
7ca24266e5 merged master 2018-07-23 16:40:32 -06:00
Ed Hartnett
0d43a4185d
Merge branch 'master' into ejh_split_hdf5file 2018-07-23 16:32:18 -06:00
Ward Fisher
1783e81bfc
Merge branch 'master' into patch-23 2018-07-23 15:34:27 -06:00
Ward Fisher
ea81baeec9
Merge pull request #1069 from NetCDF-World-Domination-Council/ejh_cmake_fix
cmake warning fix for nc_set_log_level warning from netcdf.h
2018-07-23 15:33:37 -06:00
Ed Hartnett
12b76d2dc5 merged master 2018-07-23 13:18:21 -06:00
Ed Hartnett
d77d12cc58 fixed cmake issue 2018-07-23 11:16:12 -06:00
Ed Hartnett
ee944c3fbb merged master 2018-07-23 10:58:14 -06:00
Ed Hartnett
ef7b525ce4 merged master 2018-07-23 09:45:39 -06:00
Ed Hartnett
1424391a4c merged upstream/master 2018-07-23 09:42:48 -06:00
Ward Fisher
d0ab40a5fb
Merge pull request #1073 from Unidata/pr-aggregation.wif
Merging multiple pull requests
2018-07-23 09:37:32 -06:00
Ed Hartnett
0deb4635d5 fixed master 2018-07-20 10:24:58 -06:00
Ed Hartnett
d1198a3667 whitespace cleanup 2018-07-19 07:33:48 -06:00
Ed Hartnett
9b0192fe94 moved memfile code to libhdf5 2018-07-19 07:26:27 -06:00
Ed Hartnett
3c0abc3d28 moved hdf5 var code to hdf5var.c 2018-07-19 07:23:03 -06:00
Ed Hartnett
bdca4313c4 split nc4var.c 2018-07-19 07:05:55 -06:00
Ward Fisher
b1078c13f0 Merge branch 'ejh_hdf5internal' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2018-07-18 14:12:26 -06:00
Ward Fisher
91fd1de453 Merge remote-tracking branch 'origin/interndocs.dmh' into pr-aggregation.wif 2018-07-18 14:09:47 -06:00
Ward Fisher
a741bec8d9 Merge branch 'doc-cdf5' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif 2018-07-18 14:08:20 -06:00
Ward Fisher
0904a8d37d
Merge branch 'master' into patch-23 2018-07-17 15:54:19 -06:00
Ward Fisher
d6ed28291a
Merge branch 'master' into doc-cdf5 2018-07-17 15:53:56 -06:00
Ward Fisher
2f791cc749 Merge branch 'enable-cdf5' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif 2018-07-17 11:26:21 -06:00
Ward Fisher
b570d10e01
Merge branch 'master' into enable-cdf5 2018-07-17 11:26:02 -06:00
Ward Fisher
03a473f608 Merge branch '32bit_LFS' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif 2018-07-17 11:02:27 -06:00
Ward Fisher
090523e2c5
Merge branch 'master' into 32bit_LFS 2018-07-17 11:01:52 -06:00