Commit Graph

5735 Commits

Author SHA1 Message Date
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
c1acba1f07 redid branch for PR 2018-07-29 04:57:25 -06: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
Wei-keng Liao
4341e4f6c9 spell check 2018-07-28 16:10:07 -05:00
Wei-keng Liao
0ee68a3263 This commit fixes the logical problem of using the default file formats.
The fix includes the following changes.
1. Checking and using the default file format at file create time is now
   done only when the create mode (argument cmode) does not include any
   format related flags, i.e. NC_64BIT_OFFSET, NC_64BIT_DATA,
   NC_CLASSIC_MODEL, and NC_NETCDF4.
2. Adjustment of cmode based on the default format is now done in
   NC_create() only. The idea is to adjust cmode before entering the
   dispatcher's file create subroutine.
3. Any adjustment of cmode is removed from all I/O dispatchers, i.e.
   NC4_create(), NC3_create(), and NCP_create().
4. Checking for illegal cmode has been done in check_create_mode() called
   in NC_create(). This commit removes the redundant checking from
   NCP_create().
5. Remove PnetCDF tests in nc_test/tst_names.c, so it can focus on testing
   all classic formats and netCDF4 formats.

Two new test programs are added. They can be used to test netCDF with and
without this commit.
1. nc_test/tst_default_format.c
2. nc_test/tst_default_format_pnetcdf.c (use when PnetCDF is enabled).
2018-07-28 11:18:28 -05: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
Wei-keng Liao
0a5d93bdaa check PnetCDF version at compile time 2018-07-27 12:18:37 -05: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
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
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
c094baea42 merged master 2018-07-23 13:53:07 -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
da7af8f1e7 comment cleanup 2018-07-21 15:36:58 -06:00
Ed Hartnett
2cc3d10f4b comment cleanup 2018-07-21 10:47:01 -06:00
Ed Hartnett
5a52f28bb7 further condensing code 2018-07-21 10:43:36 -06:00
Ed Hartnett
48d6473844 further condensing code 2018-07-21 09:31:51 -06:00
Ed Hartnett
afa7c0a87d further condensing code 2018-07-21 09:26:16 -06:00
Ed Hartnett
21dade79a9 use same callback function for global and var atts 2018-07-21 09:20:22 -06:00
Ed Hartnett
b56a8edcc9 code cleanup 2018-07-21 09:09:12 -06:00
Ed Hartnett
a17d66f66b clean up 2018-07-21 07:35:27 -06:00
Ed Hartnett
7aed50a902 performance test for fast global att reads 2018-07-21 07:29:12 -06:00
Ed Hartnett
43f094ca50 changing the way global atts are read 2018-07-21 06:46:29 -06:00
Ed Hartnett
fcbd5226a7 clean up 2018-07-20 12:39:02 -06:00
Ed Hartnett
8fdea13227 merged ejh_change_attsperf 2018-07-20 12:27:19 -06:00
Ed Hartnett
9908e538bb merged ejh_global_att_read 2018-07-20 12:26:36 -06:00
Ed Hartnett
cafd2eaaf9 more changes to hande different scales 2018-07-20 12:19:20 -06:00