mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-12-27 08:49:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,818 Commits 90 Branches 75 Tags 88 MiB
8d5e66ec5f
Commit Graph

5818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei-keng Liao
0853b3c9ee Merge branch 'pnetcdf_driver' of github.com:wkliao/netcdf-c into pnetcdf_driver 2018-09-20 11:50:27 -05:00
Wei-keng Liao
5ed6c239e1 More replacement of "parallel-netcdf" with "PnetCDF". 2018-09-20 11:45:25 -05:00
Ed Hartnett
cc62140f1d
Merge branch 'master' into ejh_cache_sep 2018-09-18 16:59:49 -06:00
Ward Fisher
5b5311ef80
Merge branch 'master' into pnetcdf_driver 2018-09-18 12:21:11 -06:00
Ward Fisher
18a05d0ed6
Merge pull request #1129 from NetCDF-World-Domination-Council/ejh_hdf5_sep_next_2 
Fix benchmark programs
 2018-09-18 12:20:59 -06:00
Wei-keng Liao
28512f77f0 remove unused variables 2018-09-18 01:27:57 -05:00
Wei-keng Liao
83608143ee more checks of NC_ENOTBUILT 2018-09-17 17:18:48 -05:00
Wei-keng Liao
5d297238d5 fix nc_test/tst_addvar.c. This program reads output file 
tst_pnetcdf.nc generated from tst_pnetcdf.c.
 2018-09-17 17:18:48 -05:00
Wei-keng Liao
48da78e133 Use PnetCDF instead of parallel-netcdf to avoid confusion with 
parallel netcdf4. Also, update PnetCDF web page.
 2018-09-17 17:18:48 -05:00
Wei-keng Liao
64e2982d0f adjust test logics for NC_ENOTBUILT 2018-09-17 17:18:48 -05:00
Wei-keng Liao
d24f292077 return NC_ENOTBUILT when CDF5 is not enabled but NC_64BIT_DATA is used 2018-09-17 17:18:48 -05:00
Wei-keng Liao
ec2b3250a3 Use cmode for nc_create() and omode for nc_open() 2018-09-17 17:18:48 -05:00
Wei-keng Liao
668e3021a8 Check if NC_ENOTBUILT is returend when PnetCDF feature is not 
enabled but NC_PNETCDF is used in cmode or omode.
 2018-09-17 17:18:48 -05:00
Wei-keng Liao
2e85316dbb Improve parallel create/open mode logic. 
1. When model is detected as NC_FORMATX_NC3 and is called from
   nc_create_par, change the model to NC_FORMATX_PNETCDF.
2. When called from nc_create() or nc_open(), using NC_MPIIO or
   NC_MPIPOSIX is considered invalid.
3. Handle the case when NETCDF4 is not enabled but cmode/omode
   contains NC_NETCDF4.
4. Handle the case when PNETCDF is not enabled but cmode/omode
   contains NC_PNETCDF.
5. Correct comments about PnetCDF only handles CDF-5 files.
6. Add a check for MPI_ERR_NO_SUCH_FILE error class.

Make NC_check_file_type() static, as it is used in dfile.c only.
 2018-09-17 17:18:48 -05:00
Wei-keng Liao
a537312895 nc_create_par() and nc_open_par() implies parallel I/O, so 
using NC_MPIIO or NC_MPIPOSIX explicitly is not necessary.
These 2 subroutines call NC_create() and NC_open() with argument
useparallel set to 1, which should be used to tell which I/O
driver to use underneath.
 2018-09-17 17:18:48 -05:00
Wei-keng Liao
329a44f911 fix varm API when stride == NULL and imap != NULL 
fix bug when NC_check_id() failed, nc should not be used.
 2018-09-17 17:18:48 -05:00
Ward Fisher
5259b4b1e8
Merge branch 'master' into ejh_hdf5_sep_next_2 2018-09-17 14:53:55 -06:00
Ward Fisher
58d382ce45
Merge pull request #1142 from Unidata/issue972.dmh 
Fix szip filter handling code and corresponding tests
 2018-09-17 14:53:37 -06:00
Dennis Heimbigner
108dc0f01d Fix szip filter handling code and correspondingtests 
re: https://github.com/Unidata/netcdf-c/issues/972

The current szip plugin code in the HDF5 library has some
unexpected behaviors that require some changes to how
nc_inq_var_szip is implemented and to the corresponding tests:
nc_test4/{test_szip,tst_vars3}.

Specifically, the following can happen:

1. The number of parameters provided by the user will be two,
   but the number of parameters returned by nc_inq_var_filter
   will be four because the HDF5 code (H5Zszip) will add two
   extra parameters for internal use. It turns out that the two
   parameters provided when calling nc_def_var_filter correspond
   to the first two parameters of the four parameters returned
   by nc_inq_var_filter.

2. The nc_inq_var_szip values corresponding to the ones provided
   by the caller may be different than those provided by
   nc_def_var_filter.  The value of the options_mask argument is
   known to add additional flag bits, and the pixels_per_block
   parameter may be modified.
 2018-09-15 15:21:51 -06:00
Ward Fisher
26b02ae362 Corrected a few things for old experimental bootstrap fortran option. Still not working tho. 2018-09-14 16:08:11 -06:00
Ward Fisher
a1dd3d2a2a Bumped experimental fortran autoinstall script to 4.4.4 2018-09-14 15:56:28 -06:00
Ward Fisher
e3cc0185cc Merge branch 'master' into housekeeping 2018-09-14 15:55:29 -06:00
Ed Hartnett
d9ef143d1e separated cache code from hdf5file.c 2018-09-14 13:33:22 -06:00
Ed Hartnett
b501748f58 fixed merge error 2018-09-14 11:56:10 -06:00
Ed Hartnett
a009dab557 fixed inadvertant move of function 2018-09-14 11:39:57 -06:00
Ed Hartnett
8367992725 undid changes to dap4_test/findtestserver4.c 2018-09-14 11:36:44 -06:00
Ed Hartnett
e2839c120f
Merge branch 'master' into ejh_hdf5_sep_next_2 2018-09-14 11:33:59 -06:00
Ward Fisher
cf1f737116
Merge pull request #1128 from NetCDF-World-Domination-Council/ejh_hdf5_sep_next 
Clean up unneeded object lookups...
 2018-09-14 11:12:34 -06:00
Ed Hartnett
eabb690949 fixing merge issue 2018-09-12 09:36:36 -06:00
Ed Hartnett
abf247de92 made dumpopenobjects static in attempt to get appvayor build working 2018-09-12 07:53:31 -06:00
Ed Hartnett
90d5783eea removed commented-out code 2018-09-12 06:08:02 -06:00
Ed Hartnett
9de849d492 restored dap4_test/findtestserver4.c to what it is on master 2018-09-12 06:05:09 -06:00
Ed Hartnett
bb53ad80a0 merged master 2018-09-12 06:01:37 -06:00
Ed Hartnett
72a2214bef
Merge branch 'master' into ejh_hdf5_sep_next 2018-09-11 15:42:47 -06:00
Ward Fisher
756030d79f
Merge pull request #1139 from Unidata/issue1138.dmh 
Remove the set_fmode
 2018-09-11 14:44:41 -06:00
Dennis Heimbigner
57e2e9cbf3
Remove the set_fmode 
resolve issue: https://github.com/Unidata/netcdf-c/issues/1138
 2018-09-10 12:38:18 -06:00
Ward Fisher
2e6889c1f1 modified version for upcoming maintenance release. 2018-09-10 09:16:23 -06:00
Ed Hartnett
12b74a2622
Merge branch 'master' into ejh_hdf5_sep_next 2018-09-07 18:03:34 -06:00
Ward Fisher
7514d7feaa
Merge pull request #1126 from Unidata/dapcurlopt.dmh 
Add the ability to set some additional curlopt values
 2018-09-07 16:56:49 -06:00
Ward Fisher
b884e17596 Merge branch 'master' into dapcurlopt.dmh 2018-09-07 15:37:46 -06:00
Ed Hartnett
08a2dce904 merged master 2018-09-07 12:40:44 -06:00
Ed Hartnett
8390d572ad
Merge branch 'master' into ejh_hdf5_sep_next 2018-09-06 17:30:37 -06:00
Ward Fisher
3f2557e868
Merge pull request #1124 from Unidata/provenance.dmh 
Improve provenance information
 2018-09-06 17:19:39 -06:00
Ward Fisher
6efa25e7e4 Updated and removed a check for _NCProperties during file comparison, as this test fails if the environment is different from the environment the reference file was built on. 2018-09-06 15:53:25 -06:00
Ward Fisher
784d777bff Merge branch 'master' into provenance.dmh 2018-09-06 15:13:09 -06:00
Ed Hartnett
86e002d794 merged master 2018-09-06 14:01:59 -06:00
Ed Hartnett
4213f10ed6 moved function 2018-09-06 13:57:39 -06:00
Ed Hartnett
e4b7c97b75 removed commented out code 2018-09-06 12:34:16 -06:00
Ed Hartnett
20cdb78590 restored findtestserver4.c 2018-09-06 12:26:01 -06:00
Ed Hartnett
80dc5bc0f7 merged master 2018-09-06 12:24:29 -06:00