Commit Graph

4342 Commits

Author SHA1 Message Date
Ward Fisher
034cf40ab3 Merge branch 'ejh_tst_var_fix' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into merge_small_pulls 2017-10-25 10:55:09 -06:00
Ed Hartnett
ca9a5d4133 fixed warning 2017-10-25 06:30:47 -06:00
Ed Hartnett
50408acec0 fixed more warnings 2017-10-25 06:22:58 -06:00
Ed Hartnett
fb4437e584 fixed warnings 2017-10-25 06:12:59 -06:00
Ed Hartnett
785e0c3a9a fixed warning in nc4var.c 2017-10-25 04:55:56 -06:00
Ed Hartnett
19e248c63e fixed compile warnings in nc4info.c 2017-10-25 04:48:03 -06:00
Ed Hartnett
26f443b7ac fixed warnings in libsrc4/nc4hdf.c 2017-10-25 04:28:24 -06:00
Dennis Heimbigner
ea9d685a7b Modify nc_test/tst_parallel2.c to remove a failure.
The failure comes at the end when each processor tries to
remove() the created file. The second one appears to fail
-- possibly because of a race condition. In any case, if I
move the remove() call past MPI_Finalize(), the error goes away.

It is not clear of the exact circumstances that cause the
failure, but I encountered it with the following env.
- automake on centos7 64-bit.
- compiling with -O1 for gcc.
- The pnetcdf version is 1.8.1
- The command "mpiexec --version" gives:
  Version: 3.0.4
  Release Date: Wed Apr 24 10:08:10CDT2013
2017-10-24 19:12:07 -06:00
Ward Fisher
47a2b4a714 Merge branch 'master' into dap2cvt.dmh 2017-10-24 17:15:48 -06:00
Dennis Heimbigner
9983b9d911 re e-support UBS-599337
re pull request https://github.com/Unidata/netcdf-c/pull/405
re pull request https://github.com/Unidata/netcdf-c/pull/446

Notes:
1. This branch is a cleanup of the magic.dmh branch.
2. magic.dmh was originally merged, but caused problems with parallel IO.
   It was re-issued as pull request https://github.com/Unidata/netcdf-c/pull/446.
3. This branch + pull request replace any previous pull requests and magic.dmh branch.

Given an otherwise valid netCDF file that has a corrupted header,
the netcdf library currently crashes. Instead, it should return
NC_ENOTNC.

Additionally, the NC_check_file_type code does not do the
forward search required by hdf5 files. It currently only looks
at file position 0 instead of 512, 1024, 2048,... Also, it turns
out that the HDF4 magic number is assumed to always be at the
beginning of the file (unlike HDF5).
The change is localized to libdispatch/dfile.c See
https://support.hdfgroup.org/release4/doc/DSpec_html/DS.pdf

Also, it turns out that the code in NC_check_file_type is duplicated
(mostly) in the function libsrc4/nc4file.c#nc_check_for_hdf.

This branch does the following.
1. Make NC_check_file_type return NC_ENOTNC instead of crashing.
2. Remove nc_check_for_hdf and centralize all file format checking
   NC_check_file_type.
3. Add proper forward search for HDF5 files (but not HDF4 files)
   to look for the magic number at offsets of 0, 512, 1024...
4. Add test tst_hdf5_offset.sh. This tests that hdf5 files with
   an offset are properly recognized. It does so by prefixing
   a legal file with some number of zero bytes: 512, 1024, etc.
5. Off-topic: Added -N flag to ncdump to force a specific output dataset name.
2017-10-24 16:25:09 -06:00
Ed Hartnett
dabc84338f Merge branch 'master' into ejh_test_mem_leak 2017-10-24 12:55:53 -06:00
Ed Hartnett
1e3831f98d fixed memory leak and warnings in test 2017-10-24 12:54:29 -06:00
Ed Hartnett
35a1e25928 Merge branch 'master' into ejh_ncdump 2017-10-24 12:20:26 -06:00
Ed Hartnett
6363cae315 fixed warnings 2017-10-24 12:18:20 -06:00
Ed Hartnett
d640b625dc Merge branch 'master' into ejh_fix_warning 2017-10-24 11:40:16 -06:00
Ed Hartnett
1b93bc9427 fixed warning 2017-10-24 11:35:03 -06:00
Ed Hartnett
98f6c32df6 Merge branch 'master' into ejh_open_mem_leak_fix 2017-10-24 09:47:39 -06:00
Ed Hartnett
a7d29db7b5 fixed memory leak in nc_open when cmode includes both NC_MPIIO and NC_MPIPOSIX 2017-10-24 09:46:08 -06:00
Ed Hartnett
1ad3bc8d5b Merge branch 'master' into ejh_tst_var_fix 2017-10-24 09:22:46 -06:00
Ed Hartnett
d6eb9f9f5c fix for tst_vars.c memory overflow 2017-10-24 09:20:41 -06:00
Dennis Heimbigner
338f958e46 Force attribute value to be in-range vs causing error.
re: https://github.com/conda-forge/libnetcdf-feedstock/pull/26
(Note: note conda-forge, not Unidata).
Revert dap2 code to 4.4.1.1. behavior so that attribute values
are forced into a specific range. Current behavior generates
error if an attribute value is out of range.
2017-10-23 18:27:43 -06:00
Ward Fisher
b7517758c5 Updated release notes in support of https://github.com/Unidata/netcdf-c/pulls/511 2017-10-23 15:54:17 -06:00
Ed Hartnett
9f708a052f Merge branch 'master' into master 2017-10-23 09:54:12 -06:00
Ward Fisher
92ba3f033f Merge pull request #503 from Unidata/gh500.dmh
Fix dap4 related warnings in https://github.com/Unidata/netcdf-c/issues/501.
2017-10-23 09:50:14 -06:00
Ed Hartnett
6a71bf81b1 fixed memory problem in tst_h_dimscales 2017-10-23 09:49:38 -06:00
Dennis Heimbigner
440cf724ad Update by merging with master 2017-10-21 13:37:09 -06:00
Dennis Heimbigner
c8b2184409 Fix dap4 related warnings in https://github.com/Unidata/netcdf-c/issues/501.
The nc_test/util.c error is a typo. The libdap4/d4meta.c error only is shown
when using a 64 bit machine because then |size_t| == 64 bits
and |int| = 32bits.
2017-10-20 21:17:12 -06:00
Ward Fisher
a2964f5fb0 Merge branch 'master' into v4.5.0-release-branch 2017-10-20 12:33:03 -06:00
Ward Fisher
c147f8203a Updated release date. 2017-10-20 11:20:38 -06:00
Ward Fisher
60047504ce Updated the dependency versions deployed with netcdf on Windows. 2017-10-17 15:33:49 -06:00
Ward Fisher
1ca5f8c993 Updated SO version, other little issue with ncdump Makefile.am. 2017-10-17 14:56:22 -06:00
Ward Fisher
58874fd452 Updated release date in the release notes. 2017-10-17 13:19:19 -06:00
Ward Fisher
df91249b3f Merge branch 'par-hang-fix' into v4.5.0-release-branch 2017-10-17 10:27:05 -06:00
Ward Fisher
50a003b484 Merge branch 'v4.5.0-release-branch' 2017-10-17 10:25:29 -06:00
Ward Fisher
9e240e6c9a Modified t_nc.c to only test cdf5 if it has been enabled. 2017-10-16 11:19:24 -06:00
Ward Fisher
631741b0e3 Updated the release notes to reflect the fix provided by https://github.com/Unidata/netcdf-c/pull/449 . 2017-10-16 11:03:28 -06:00
Ward Fisher
98c169aa9a Merge branch 'patch-1' of https://github.com/gsjaardema/netcdf-c into par-hang-fix 2017-10-16 11:01:24 -06:00
Ward Fisher
4ac39abaaf Merge branch 'has-parallel' into v4.5.0-release-branch 2017-10-16 10:54:44 -06:00
Ward Fisher
dfe92e6d39 Typo 2017-10-16 10:35:09 -06:00
Ward Fisher
b52f3dd0d5 Corrected issue with nc-config generatred by autotools. 2017-10-16 10:30:47 -06:00
Ward Fisher
d14b7e01c0 Fixed shell script typo. 2017-10-16 10:06:46 -06:00
Ward Fisher
d432dc4083 Correcting typos. 2017-10-16 09:55:47 -06:00
Ward Fisher
d0c21662ec Corrected an incomplete merge. 2017-10-16 09:47:57 -06:00
Ward Fisher
bd510c33a8 Added help messages to nc-config for the new --has-parallel flag. 2017-10-16 09:40:59 -06:00
Ward Fisher
1e0c260234 Merge branch 'patch-3' of https://github.com/gsjaardema/netcdf-c into has-parallel 2017-10-16 09:36:52 -06:00
Ward Fisher
186cb958ba Merge branch 'revert-pull470' into v4.5.0-release-branch 2017-10-12 11:10:50 -06:00
Ward Fisher
f9d0711ab8 Reverted pull 470, added info about the _NoFill attribute (used only by ncgen). 2017-10-11 13:11:06 -06:00
Ward Fisher
41c764fb05 Reverting previous documentation change. 2017-10-11 11:35:17 -06:00
Ward Fisher
e59c0f4753 Updated release notes in support of https://github.com/Unidata/netcdf-c/issues/359. 2017-10-11 10:09:35 -06:00
Dennis Heimbigner
0b87770dab add files to git 2017-10-10 16:38:35 -06:00