Commit Graph

87 Commits

Author SHA1 Message Date
Ward Fisher
1c148a580b Corrected double declaration. 2018-03-20 14:41:21 -06:00
Ward Fisher
36c4b7947d Merge branch 'master' into newhash1.dmh 2018-03-20 11:20:14 -06:00
Dennis Heimbigner
dd4e71c150 1. Solve issue raised on netcdfgroup mailing list:
https://www.unidata.ucar.edu/mailing_lists/archives/netcdfgroup/2018/msg00020.html
See docs/filters.md for a detailed description of the solution.
Basically we add nccopy flags "-F none" and "-F <varname>:none"
to suppress output compression as desired.

2. Add tests to nc_test4/tst_filter.sh to test out the solution.
2018-03-02 16:55:58 -07:00
Dennis Heimbigner
8cb1fc4cfe This is the second step in refactoring the libsrc4 code.
The first was branch newhash0.dmh.

As with newhash0.dmh, these changes should be transparent.
2018-02-24 20:36:24 -07:00
Dennis Heimbigner
3e47f5f300 Rebuilt the filter parameter handling code to use a common
parser everywhere.
2018-01-23 16:00:11 -07:00
Dennis Heimbigner
22ebecab23 Use an explicit can_apply function for filters 2018-01-19 18:45:56 -07:00
Dennis Heimbigner
6420d46491 oops, forgot to condition filter code on netcdf-4 2018-01-19 12:25:03 -07:00
Dennis Heimbigner
991c4c6d16 Add some extra nccopy filter debug output 2018-01-19 12:06:02 -07:00
Dennis Heimbigner
e723d7dfed Merge branch 'plugins.dmh' of https://github.com/Unidata/netcdf-c into plugins.dmh 2018-01-19 10:58:46 -07:00
Ward Fisher
45ad829238 Added a new logging option, -L, to nccopy. 2018-01-18 16:12:29 -06:00
Dennis Heimbigner
8d8dff9a2a Add some temporary debugging output 2018-01-17 19:47:54 -07:00
Ed Hartnett
4de61e21f2 more docs, more cleaning 2017-12-04 12:21:14 -07:00
Ed Hartnett
4a4a4fb7a0 make -j working for classic only in ncdump 2017-11-17 08:22:49 -07:00
Dennis Heimbigner
733da154c5 1. Keep up to date by merging master
2. Factored out the parameter string parsing for ncgen and nccopy
   int libdispatch/dfilter.c + include/ncfilter.h
3. Allow a parameter string to use constant types other than
   unsigned int. See docs/filters.md for details.
4. Moved the old content of  include/netcdf_filter.h into include/netcdf.h
   and removed include/netcdf_filter.h as no longer needed.
5. Force the test filter (bzip2) in nc_test4/filter_test to
   be built using BUILT_SOURCES.
2017-10-08 15:56:45 -06:00
Ward Fisher
3822751043 Corrected a missing break in a switch statement. 2017-09-20 14:18:43 -06:00
Ward Fisher
3c410f5257 Made nccopy aware of USE_CDF5 flag. 2017-09-18 14:11:53 -06:00
Ward Fisher
a95a7c18bb Corrected an issue with netcdf3 files that would prevent the -v and -V flags from working properly when using nccopy. See https://github.com/Unidata/netcdf-c/issues/425 and https://github.com/Unidata/netcdf-c/issues/463 for more information. 2017-08-31 16:16:21 -06:00
Dennis Heimbigner
d37ac215e2 Add new capabilities to filter code:
1. Allow nccopy to apply filters, especially on the output file.
   This provides a third way to do this other than using ncgen or
   programatically
2. Make sure that even if the filter code is not available, it is
   possible to see the filter id and parameters for variables using
   e.g ncdump -hs.
3. Fix bug in nccopy so that the input file does
   not necessarily have to be netcdf-4.
4. At last minute decided to change to using a
   single "_Filter" attribute for ncgen
5. Added a test to tst_filter.sh to generate C code using ncgen.
2017-05-14 18:10:02 -06:00
dmh
859f105005 merge-squash 2015-08-15 16:26:35 -06:00
Russ Rew
2e029a3058 More cleanups from clang warnings. 2015-08-02 17:23:32 -06:00
Russ Rew
e10bce8637 Fix bug ncf-321, requiring chunk size for unlimited dimension instead of providing default 2015-01-02 07:09:16 -07:00
Russ Rew
9347ef020a In nccopy, replace short format names to match new docs, fix comments 2014-12-17 10:27:35 -07:00
Russ Rew
7121a5dd73 Cleaned up deprecated -k n option messages and comments 2014-12-05 15:36:01 -07:00
Russ Rew
2640c0c9e3 Add numeric options (-3, -4, -6, -7) for output format, deprecating
equivalent -k N options.
2014-12-05 12:26:42 -07:00
Russ Rew
c5237736e4 For nccopy, added version info in usage printout. 2014-08-26 14:05:47 -06:00
Ward Fisher
cd30a9e570 Corrected several static analysis errors related to uninitialized variables. 2014-04-22 16:11:37 -06:00
Russ Rew
b22181768d Fix a few coverity warnings. 2014-03-28 22:03:10 -06:00
Russ Rew
9d86610739 Fix Jira ticket NCF-295, nccopy -d0 shuffle and chunking issues 2014-03-23 17:25:45 -06:00
Russ Rew
d774e23bc1 Fix -d0 option to not do unwanted chunking or associated shuffle.
Add -c '/' option to specify changing layout for all variables from chunked to contiguous.
Fix logic for chunking and compression depending on input and output formats.
2014-03-21 12:34:19 -06:00
Russ Rew
cb1e4471b5 Removed doxygen man page, since it now is in the User Guide. 2014-03-06 21:15:00 -07:00
Russ Rew
8e59dc3ce8 Merge branch 'master' of https://github.com/Unidata/netcdf-c
Conflicts:
	ncdump/nccopy.c
2014-03-06 21:12:48 -07:00
Russ Rew
dac98c89b5 Typo fixes in install doc. Document nccopy chunk threshold. 2014-03-04 15:03:49 -07:00
Ward Fisher
805a6f5b58 Removed a stray character that caused the build to fail. 2014-03-03 12:24:36 -07:00
Ward Fisher
700a0bf848 Reorganizing NetCDF User's guide document. 2014-03-03 11:29:46 -07:00
Ward Fisher
f6a969cfd5 Updated and consolidated some redundant documentation. 2014-02-25 17:08:04 -07:00
Quincey Koziol
4bfd9b27a0 Merge remote-tracking branch 'upstream/master'
Conflicts:
	libdap2/common34.c
	oc2/ocutil.c
2014-02-11 17:26:09 -06:00
dmh
0f4b72c53b [NCF-286]/e-support:JVN-123940
using cygwin64 causes a couple of bugs during make check.
Fixes are as follows:
1. in ncdump.c and nccopy.c change all occurrences of
   'return EXIT_FAILURE'
   and
   'return EXIT_SUCCESS'
   with
   exit(EXIT_FAILURE)
   and
   exit(EXIT_SUCCESS)
   respectively.
   I have no idea why this works.
2. in libdap2/ncdap3a.c#freeNCDAPCOMMON,
   remove the call to nc_abort, it is
   causing a loop; not sure why this
   is not caught under other operating systems.
2014-02-04 16:26:52 -07:00
Quincey Koziol
cd71eb525c Corrected "BAIL" macros to avoid infinite loop when logging is disabled and an
error occurs after an "exit:" label.

Corrected a dozen Coverity errors (mainly allocation issues, along with a few
    other things):
        711711, 711802, 711803, 711905, 970825, 996123, 996124, 1025787,
        1047274, 1130013, 1130014, 1139538

Refactored internal fill-value code to correctly handle string types, and
    especially to allow NULL pointers and null strings (ie. "") to be
    distinguished.  The code now avoids partially aliasing the two together
    (which only happened on the 'write' side of things and wasn't reflected on
    the 'read' side, adding to the previous confusion).

    Probably still weak on handling fill-values of variable-length and compound
    datatypes.

Refactored the recursive metadata reads a bit more, to process HDF5 named
    datatypes and datasets immediately, avoiding chewing up memory for those
    types of objects, etc.

Finished uncommenting and updating the nc_test4/tst_fills2.c code (as I'm
    proceeding alphabetically through the nc_test4 code files).
2013-12-29 01:12:43 -06:00
Russ Rew
920393b891 Update nccopy documentation for -v and -g options 2013-04-25 20:50:59 +00:00
Russ Rew
51ac4014da Add missing documentation for nccopy -v and -g options 2013-04-16 22:18:14 +00:00
Ward Fisher
4a274b9870 Merged latest changes from cmake development branch.
Addressed a number of memory-related problems
reported by Coverity.
2013-04-02 22:09:31 +00:00
Russ Rew
3ef3b35a94 Refactor to share functions between ncdump and nccopy. Merge nccopy
enhancements, based on contributed code from Martin van Driel, to
support -v, -g, -V, and -G options for selecting groups and variables
in output.  Fix all clang warnings from nccopy and ncdump sources, as
well as a few other cleanup changes to testing code.
2013-01-23 17:45:29 +00:00
Russ Rew
22b411a17c Merged in pnetcdf fixes from Greg Sjardema, to make set_fill_mode work
with parallel-netcdf, to fully implement parallel-netcdf support for
other functions, and to prevent a hang in hdf5 from an eary return in
an nc4_put_vara() call.  Also fixed an nccopy bug when
nc_inq_var_deflate() returns defalate_level of 0, but says the variable
is deflated.
2013-01-15 03:46:46 +00:00
Russ Rew
d93d40fd5f Fixed bug NCF-211 with nccopy. Minor updates to top-level README. 2012-12-11 17:49:40 +00:00
Russ Rew
0eef2f4c87 Add suffix support for nccopy -e option 2012-11-21 20:46:43 +00:00
Russ Rew
8e98e3727d Fixed bug NCF-144 (ncdump of variables with multiple unlimited
dimensions).  Added comprehensive tests that include variables with
lots of combinations of 0 through 4 fixed and unlimited dimensions.
2012-11-16 21:37:43 +00:00
Ward Fisher
2de3388cf1 Additional CMake usage. 2012-09-13 18:27:23 +00:00
Ward Fisher
d6c7112481 2012-09-11 19:53:47 +00:00
Ward Fisher
04e61d5894 Added MSVC-compatibility items. 2012-08-27 21:19:25 +00:00
Russ Rew
a24c1732b6 Fix unnecessary tests and other minor problems in ncdump identified by Coverity. 2012-07-31 22:17:42 +00:00