Commit Graph

534 Commits

Author SHA1 Message Date
Ward Fisher
76af2109e3 Corrected an issue in fileinfo script. 2018-04-17 14:23:52 -06:00
Ward Fisher
913b4a3961
Merge branch 'master' into index.dmh 2018-03-26 14:22:46 -06:00
Dennis Heimbigner
1246dd189b merge master 2018-03-20 21:50:58 -06:00
Dennis Heimbigner
e6e3583e30 Merge branch 'master' into ncdaptestsclean.dmh 2018-03-20 21:37:35 -06:00
Dennis Heimbigner
05d078a8b0 The ncdap_tests were a mess, so I decided to clean them up
to remove cruft and to remove unused site tests
and make the tests somewhat more understandable.

Also did a fix to libdispatch/dwinpath to convert
relative paths to absolute paths. This will, I hope,
take care of some windows path problems when using
$srcdir in shell scripts.
2018-03-20 21:31:31 -06:00
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
25f062528b This completes (for now) the refactoring of libsrc4.
The file docs/indexing.dox tries to provide design
information for the refactoring.

The primary change is to replace all walking of linked
lists with the use of the NCindex data structure.
Ncindex is a combination of a hash table (for name-based
lookup) and a vector (for walking the elements in the index).
Additionally, global vectors are added to NC_HDF5_FILE_INFO_T
to support direct mapping of an e.g. dimid to the NC_DIM_INFO_T
object. These global vectors exist for dimensions, types, and groups
because they have globally unique id numbers.

WARNING:
1. since libsrc4 and libsrchdf4 share code, there are also
   changes in libsrchdf4.
2. Any outstanding pull requests that change libsrc4 or libhdf4
   are likely to cause conflicts with this code.
3. The original reason for doing this was for performance improvements,
   but as noted elsewhere, this may not be significant because
   the meta-data read performance apparently is being dominated
   by the hdf5 library because we do bulk meta-data reading rather
   than lazy reading.
2018-03-16 11:46:18 -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
0f5fc7222b
Merge branch 'master' into plugins.dmh 2018-01-18 15:46:50 -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
cf92670687 added guards for header files that needed them 2018-01-17 09:20:20 -07:00
Dennis Heimbigner
99fccab359 1. Keep up to date by merging master
2. Fixed plugin building (nc_test4/hdf5plugins)
   to be done properly by cmake and automake.
4. Duplicated part of the nc_test4 filter test code
   in examples/C

An incomplete and untested set of hooks exist
for OS-X in nc_test4/findplugins.in. They need testing.
2018-01-16 11:00:09 -07:00
Ward Fisher
69a418c27d Merge branch 'cmake-fix' of https://github.com/nehaljwani/netcdf-c into gh692 2018-01-02 13:24:13 -07:00
Ward Fisher
98dd736a40 Oops. Corrected error properly, should check before I commit. 2017-12-18 14:57:25 -07:00
Ward Fisher
1703e33c61 Removed 'function' keyword, non-portable on ARM. 2017-12-18 14:56:32 -07:00
Ward Fisher
84a77be0c4 Added explicit error checking to tst_netcdf4.sh 2017-12-18 15:26:33 -06:00
Ward Fisher
58972c8cc0 Working out issues on Windows. 2017-12-12 10:44:22 -06:00
Ward Fisher
77cca75977
Merge branch 'master' into ejh_more_tests 2017-12-07 20:24:43 -07:00
Ward Fisher
24c6b27dfe Configuring a test so that it won't fail during parallel testing. 2017-12-06 15:00:21 -07:00
Ward Fisher
e8471c9eeb
Merge branch 'master' into ejh_more_tests 2017-12-06 13:21:32 -07:00
Ed Hartnett
4de61e21f2 more docs, more cleaning 2017-12-04 12:21:14 -07:00
Ward Fisher
6166f86bfc Flagged tst_nccopy4 to not run parallel when using cmake. 2017-12-01 15:19:42 -07:00
Ward Fisher
72052689c6 More reshuffling. 2017-12-01 15:04:13 -07:00
Ward Fisher
d095101a95 Corrected a typo. 2017-12-01 14:39:48 -07:00
Ward Fisher
b029b36aa3 Rearranging deck chairs. 2017-12-01 14:36:57 -07:00
Ward Fisher
07228d0010 Addressing more test dependencies. 2017-12-01 14:27:26 -07:00
Nehal J Wani
b487c30382
Merge branch 'master' into cmake-fix 2017-12-01 06:20:20 +00:00
Nehal J Wani
11b19988a3
Merge branch 'master' into cmake-fix 2017-11-28 05:02:52 +00:00
Ed Hartnett
3c5404ccf7
Merge branch 'master' into ejh_ncfunc_testing 2017-11-28 00:04:38 +00:00
Ward Fisher
2bdc8a7855 Temporarily removed a test for Windows. 2017-11-27 11:58:27 -06:00
Ward Fisher
47f6a5589d
Merge branch 'master' into strlcat1.dmh 2017-11-27 10:32:24 -07:00
Ed Hartnett
f33897e248 fixed some warnings, added some files to makefile.am to be cleaned 2017-11-26 08:50:16 -07:00
Ed Hartnett
0157c5660c readded some cleanfiles to ncdump makefile 2017-11-26 07:15:17 -07:00
Ed Hartnett
6ebe58998f clean up 2017-11-26 07:13:10 -07:00
Ed Hartnett
bebe7e1e9d merged master 2017-11-26 07:06:02 -07:00
Ed Hartnett
f779345b23 eliminating test dependencies in ncdap_test 2017-11-26 07:00:17 -07:00
Nehal J Wani
03dd4e260f
Make certain tests conditional on dependencies
tst_h_rdc0 depends on ncdump_tst_netcdf4, which isn't build if HAVE_BASH
isn't true. But CMake errors out with:

-- Bash shell not found; disabling shell script tests.
CMake Error at CMakeLists.txt:1521 (SET_PROPERTY):
  SET_PROPERTY given TEST names that do not exist:

    tst_h_rdc0

There are also some tests which cdl_do_maps depends on, but it is
also not defined if HAVE_BASH isn't true. CMake errors out with:

CMake Error at examples/CDL/CMakeLists.txt:10 (SET_TESTS_PROPERTIES):
  SET_TESTS_PROPERTIES Can not find test to add properties to:
cdl_do_comps

This patch makes these tests conditional, making CMake happy.
2017-11-26 10:17:58 +05:30
Ward Fisher
5163189f0c Merge branch 'cmake-parallel-testing' 2017-11-25 11:57:01 -07:00
Ed Hartnett
579bfcb766 removed tst_ctest.sh from cmake build 2017-11-25 07:42:11 -07:00
Ed Hartnett
38b53c08ff cleaned up comments 2017-11-25 07:30:17 -07:00
Ed Hartnett
8d9e7b366d removed many dependencies in ncdump testing 2017-11-25 07:28:07 -07:00
Ed Hartnett
6fdbbf480d removed redundant check 2017-11-25 05:23:45 -07:00