Commit Graph

5631 Commits

Author SHA1 Message Date
Ward Fisher
ede7c5da60
Merge branch 'master' into provenance.dmh 2018-09-04 11:22:36 -06:00
Ward Fisher
01b211dd64
Merge pull request #1090 from wkliao/default_format
fix problem of setting the default file format
2018-08-28 16:57:43 -06:00
Ward Fisher
5e33522f52
Merge branch 'master' into default_format 2018-08-28 15:02:17 -06:00
Ward Fisher
416413bc8d
Merge pull request #1112 from NetCDF-World-Domination-Council/ejh_vars_null_count_issue_2
Fix handling of NULL start/count/stride, remove unneeded file lookups, moved get/put code from nc4hdf5.c to hdf5var.c
2018-08-28 09:35:11 -06:00
Wei-keng Liao
ca0d2bef72 resolve a merge conflict 2018-08-27 17:57:07 -05:00
Wei-keng Liao
f88a34600e
Merge branch 'master' into default_format 2018-08-27 17:43:12 -05:00
Wei-keng Liao
0ebf73e26f Merge branch 'default_format' of github.com:wkliao/netcdf-c into default_format 2018-08-27 17:01:41 -05:00
Wei-keng Liao
a9b8d58cf4 CDF-5 format is not supported on 32-bit platforms 2018-08-27 17:00:26 -05:00
Ward Fisher
ec5e460986
Merge branch 'master' into ejh_vars_null_count_issue_2 2018-08-27 14:12:55 -06:00
Ward Fisher
8d2429ef49
Merge pull request #1127 from Unidata/combined-pr.wif
Combined PR
2018-08-27 14:12:26 -06:00
Ward Fisher
5f29fe5eba Merge branch 'configure_error_out' of https://github.com/wkliao/netcdf-c into combined-pr.wif 2018-08-27 13:21:23 -06:00
Ward Fisher
f30a46fbd8 Merge branch 'check_pnetcdf_version' of https://github.com/wkliao/netcdf-c into combined-pr.wif 2018-08-27 13:18:45 -06:00
Dennis Heimbigner
2ea1cf5f1b There was a request to extend the provenance information
stored in the _NCProperties attribute to allow two things:
1. capture of additional library dependencies (over and above
   hdf5)
2. Recognition of non-netcdf libraries that create netcdf-4 format
   files.

To this end, the _NCProperties format has been extended to be
and arbitrary set of key=value pairs separated by commas.
This new format has version = 2, and uses commas as the pair separator.
Thus the general form is:
    _NCProperties = "version=2,key1=value,key2=value2..." ;

This new version is accompanied by a new ./configure option of the form
    --with-ncproperties="key1=value1,key2=value2..."
that specifies pairs to add to the _NCProperties attribute for all
files created with that netcdf library.

At this point, what is missing is some programmatic way to
specify either all the pairs or additional pairs
to the _NCProperties attribute. Not sure of the best way
to do this.

Builders using non-netcdf libraries can specify
whatever they want in the key value pairs (as long
as the version=2 is specified first).

By convention, the primary library is expected to be the
the first pair after the leading version=2 pair, but this
is convention only and is neither required nor enforced.

Related changes:
1. Fixed the tests that check _NCProperties to properly operate with version=2.
2. When reading a version 1 _NCProperties attribute, convert it to look
   like a version 2 attribute.
2. Added some version 2 tests to ncdump/tst_fileinfo.c and
   ncdump/tst_fileinfo.sh

Misc Changes:
1. Fix minor problem in ncdap_test/testurl.sh where a parameter to
   buildurl needed to be quoted.
2. Minor fix to ncgen to swap switches -H and -h to be consistent
   with other utilities.
3. Document the -M flag in nccopy usage() and the nccopy man page.
4. Modify a test case to use the nccopy -M flag.
2018-08-25 21:44:41 -06:00
Ward Fisher
17b7177868
Merge branch 'master' into patch-25 2018-08-24 11:27:10 -06:00
Ward Fisher
373d0365a1
Merge branch 'master' into default_format 2018-08-24 11:27:07 -06:00
Ward Fisher
b5db03595e
Merge branch 'master' into check_pnetcdf_version 2018-08-24 11:26:30 -06:00
Ed Hartnett
3bbc590045 merged master 2018-08-20 17:08:20 -06:00
Ward Fisher
ab138d1f11
Merge branch 'master' into configure_error_out 2018-08-20 16:31:48 -06:00
Ward Fisher
c59f43d604
Merge pull request #1103 from NetCDF-World-Domination-Council/ejh_func_cleanup3
Warning, coverity warning, error handling, documentation, and hdf5_set_log_level fixes, all on the path to the lazy var feature
2018-08-20 16:31:31 -06:00
Greg Sjaardema
8743de7f34
Eliminate double printing of nccopy program name in usage output
The `error` macro used to output the usage information already outputs `progname`, so the `progname` argument is not needed and results in double printing of the `progname` as shown below:

```
ceerws2703a:build(master)> ../bin/nccopy
../bin/nccopy: ../bin/nccopy [-k kind] [-[3|4|6|7]] [-d n] [-s] [-c chunkspec] [-u] [-w] [-[v|V] varlist] [-[g|G] grplist] [-m n] [-h n] [-e n] [-r] infile outfile
  [-k kind] specify kind of netCDF format for output file, default same as input
            kind strings: 'classic', '64-bit offset', 'cdf5',
                          'netCDF-4', 'netCDF-4 classic model'
```
2018-08-20 11:28:55 -06:00
Ed Hartnett
b3842197e0 merged master 2018-08-16 05:49:41 -06:00
Ed Hartnett
97a442cdb7 minor cleanup 2018-08-16 05:42:51 -06:00
Ed Hartnett
d59446ccd5
Merge branch 'master' into ejh_func_cleanup3 2018-08-15 18:08:34 -06:00
Ward Fisher
5539b50ce0
Merge pull request #1092 from NetCDF-World-Domination-Council/ejh_func_cleanup2
Cleanup up some functions in preparation for lazy var reads (take 2)
2018-08-15 16:20:49 -06:00
Ed Hartnett
ab1216da10 fix memory issue 2018-08-14 10:38:28 -06:00
Ed Hartnett
9953e53573 converting NULL checking of put functions 2018-08-14 09:21:45 -06:00
Ed Hartnett
829d9d28ae converting NULL checking of put functions 2018-08-14 09:09:08 -06:00
Ed Hartnett
5f9b7af467 converting NULL checking of put functions 2018-08-14 09:04:16 -06:00
Ed Hartnett
d6c0cbe234 removing unneeded file lookups 2018-08-14 08:56:58 -06:00
Ed Hartnett
5800fdd617 removing unneeded file lookups 2018-08-14 08:49:23 -06:00
Ed Hartnett
24f0c9d74c removing unneeded file lookups 2018-08-14 08:39:17 -06:00
Ed Hartnett
bc3c63bf03 removing unneeded file lookups 2018-08-14 08:32:45 -06:00
Ed Hartnett
1e3fe2b8cc removing unneeded file lookups 2018-08-14 08:29:02 -06:00
Ed Hartnett
d1ed803b31 removing unneeded file lookups 2018-08-14 08:18:05 -06:00
Ed Hartnett
3046dabda0 more NULL parameter changes 2018-08-14 08:06:01 -06:00
Ed Hartnett
baa76219d3 more NULL parameter changes 2018-08-14 08:01:54 -06:00
Ed Hartnett
69b37d994e fixed HDF4 test 2018-08-14 06:44:11 -06:00
Ed Hartnett
acc22e0c54 checking NULLs in function 2018-08-14 06:28:28 -06:00
Ed Hartnett
a0bea92919 fixed problem of not calling NC_ versions of vars and varm functions for extra error checking 2018-08-14 05:04:09 -06:00
Ed Hartnett
0b13f52766 documentation 2018-08-14 04:44:26 -06:00
Ed Hartnett
5c39fa115a return error for NULL start for varm functions 2018-08-14 04:35:38 -06:00
Ed Hartnett
a271ebb5f2 testing NULL starts 2018-08-14 04:17:34 -06:00
Ward Fisher
e710027861
Merge branch 'master' into ejh_func_cleanup2 2018-08-13 13:49:55 -06:00
Ward Fisher
75060b7f69
Merge pull request #1109 from Unidata/osx_sh_test.wif
Migrate script-based tests from bash to sh
2018-08-13 13:44:38 -06:00
Ed Hartnett
97c2541a37 put_vars checking for NULL start for non-scalar vars and test 2018-08-13 13:05:32 -06:00
Ed Hartnett
8b26c83379 undid unneeded nc_test changes 2018-08-13 09:15:50 -06:00
Ed Hartnett
b29cc1b94f removed unneeded netcdf-4 checks in dvarget.c 2018-08-13 09:06:51 -06:00
Ed Hartnett
ec3d3a3d06 return error for put_vara calls with NULL start 2018-08-13 09:03:49 -06:00
Ed Hartnett
a63f3449c3 return error for put_vara calls with NULL start 2018-08-13 08:54:38 -06:00
Ed Hartnett
19222632b4 return error for put_vars calls with NULL start 2018-08-13 08:48:20 -06:00