Commit Graph

3093 Commits

Author SHA1 Message Date
Ward Fisher
bd84e9a8eb Merge branch 'cdf-5' 2015-11-09 14:28:00 -07:00
Ward Fisher
1082bd6bca Merge branch 'cdf5-sync-master' into cdf-5 2015-11-09 13:52:23 -07:00
Ward Fisher
c1210f4020 Merge branch 'master' into cdf5-sync-master 2015-11-09 13:45:11 -07:00
Ward Fisher
6eec834120 Merge branch 'cdf-5' of https://github.com/Unidata/netcdf-c into cdf-5 2015-11-09 13:40:05 -07:00
Ward Fisher
9561cf2bdd Wired in a test that was previously not running. 2015-11-09 19:30:27 +00:00
Ward Fisher
f2b8e69ea8 Corrected logic use of USE_PARALLEL for no-hdf5 but still using pnetcdf.
Added fix for github issue http://github.com/Unidata/netcdf-c/issues/143 as suggested by Wei-keng Liao.
2015-11-09 18:21:11 +00:00
Ward Fisher
1043461623 Merge branch 'i142' into cdf-5 2015-11-09 18:03:06 +00:00
Ward Fisher
d5b6da4340 Merge branch 'i142' into cdf-5 2015-11-09 10:53:25 -07:00
Ward Fisher
25992d2d71 Merge branch 'issue_140' 2015-11-09 10:26:29 -07:00
dmh
5ad26bb68f Fix github issues #140
1. Added check to libsrc4/nc4var.nc_def_var_extra to
   check that the no specified chunks size is greater than
   the dimension size.

2. Added test to nc_test4/tst_chunks.c
2015-11-07 20:29:16 -07:00
dmh
413e49d758 1. There were several bugs in ncdump/dumplib.c
that were not taking the CDF-5 format into account.

2. Had to update ncgen.1 man page to define the new
   k-flag rules to deal with cdf-5.

3. Had to fix some tests that use 'cmp' for comparison;
   this really should be deprecated.

3. There was a bug in configure.ac with respect
   to using the enable-netcdf-4 flag vs
   using disable-netcdf-4.
2015-11-06 17:03:28 -07:00
Ward Fisher
996ef87cd1 More refactoring to fix an issue where an nc4 test was being run when nc4 was disabled. 2015-11-06 13:20:10 -07:00
Ward Fisher
f551581ceb Modified 'in-memory' test to only run enhanced tests if netcdf-4 is enabled. 2015-11-06 13:12:09 -07:00
Ward Fisher
7bd0dc0445 Added a min/max test configuration to travis-ci. 2015-11-06 12:57:55 -07:00
Ward Fisher
959251d4e0 Corrected an error that had crept into the cdf-5- branch. 2015-11-05 14:20:55 -07:00
Ward Fisher
612b35a84c Merge branch 'master' into cdf-5, in preparation for merging the CDF-5 functionality into the master branch. This will be the key new feature for netcdf 4.4.0. 2015-11-05 13:40:35 -07:00
Ward Fisher
a81773e5bf Corrected an issue Visual Studio has with how externals are managed. 2015-11-05 12:57:49 -07:00
Ward Fisher
da44a0bf25 Fixed a typo. 2015-11-03 10:37:42 -07:00
Ward Fisher
3c0a487674 Applying a patch for cygwin submitted by Marco Atzeri. 2015-11-02 16:26:50 -07:00
Ward Fisher
36a4c6c738 Tweaked .gitignore file. 2015-11-02 16:15:02 -07:00
Ward Fisher
3bb62c3314 Corrected a logic error preventing ncgen from creating cdf-5 files. 2015-11-02 16:11:29 -07:00
Ward Fisher
991d127158 Tweaked ncgen test script to actually *check* to see if the file it says it's creating was created. 2015-11-02 13:58:55 -07:00
Ward Fisher
288dc65c32 Added doxygen to travis configuration. 2015-11-02 13:02:03 -07:00
Ward Fisher
1f52d14392 Reintroduced ENABLE_DOXYGEN_SERVER_BASED_SEARCH option for local webserver use. 2015-11-02 12:58:29 -07:00
Ward Fisher
9018649d9b Re-adding server-side search option. 2015-11-02 12:46:09 -07:00
Ward Fisher
bf02ded6f4 Merge branch 'ncf344' of https://github.com/Unidata/netcdf-c into ncf344 2015-11-02 12:15:19 -07:00
Ward Fisher
acc4993b19 Changes to modified files. 2015-11-02 12:14:19 -07:00
Ward Fisher
f330e6f11a [NCF-344] Modified addvar test to return 0 when called without an argument. Test doesn't run unless passed a file, but it isn't a failure. The test is run properly through a shell script already. 2015-10-30 17:11:27 +00:00
Ward Fisher
32eee4bbdb Removed a stray backslash. 2015-10-30 17:01:33 +00:00
Ward Fisher
c87d792cfc Applied the patch provided by Wei-keng Liao in support of [NCF-344]. 2015-10-30 16:45:32 +00:00
Ward Fisher
4e9dd0c2fc Correctly updating CMakeLists.txt build method. 2015-10-29 19:56:04 +00:00
Ward Fisher
4e60400275 Changing some cmake infrastructure re: how tests are built. 2015-10-29 19:50:48 +00:00
Ward Fisher
b7a4f1c7b5 Updated tests so that tst_addvar.c is run after tst_pnetcdf.c 2015-10-29 10:27:31 -06:00
Ward Fisher
d8835b7f35 Replaced my test program with one provided by Wei-keng. 2015-10-29 10:07:33 -06:00
Ward Fisher
ee9a68e931 Modified behavior when an unknown error is handled by libpnetcdf. 2015-10-28 16:44:54 -06:00
Ward Fisher
4fb7dc9092 Corrected usage of nc_open_par 2015-10-28 11:28:55 -06:00
Ward Fisher
a28a1f865a Corrected usage of nc_open_par 2015-10-28 11:28:30 -06:00
Ward Fisher
07625e39c2 Fixed an MPI error. 2015-10-28 11:27:36 -06:00
Ward Fisher
117708f464 More work on the parallel bug. 2015-10-28 11:26:23 -06:00
Ward Fisher
183d2b3db0 Using a pre-existing file for a new pnetcdf test. 2015-10-28 11:06:49 -06:00
Ward Fisher
f7b7996f7e Added brackets for clarity around some code in question. 2015-10-28 11:04:34 -06:00
Ward Fisher
ccad3765ca Adding a new test for a particular pnetcdf bug. See YRZ-543552. 2015-10-28 10:51:53 -06:00
Ward Fisher
0ef498e6b5 Reworked doxygen so that auth.html is only generated when needed, as I'm sure it was originally intended. Created a specific make target in docs directory, 'oc2-auth', for autotools and cmake. 2015-10-27 18:23:54 -06:00
Ward Fisher
680bbb61ce Tweaked makefile.am to accomodate new auth.html 2015-10-27 18:09:22 -06:00
Ward Fisher
49dfc5beef Updated doxygen to work properly with auth.html. 2015-10-27 17:56:28 -06:00
Ward Fisher
64a42f4f8a Fixing generation of doxygen-based documentation. 2015-10-27 15:32:18 -06:00
Ward Fisher
b7746cf89b Merge branch 'cdf-5-working' into cdf-5 2015-10-27 12:32:01 -06:00
Ward Fisher
1979a1ca5f Corrected an issue on 32-bit Windows. 2015-10-27 12:31:36 -06:00
Ward Fisher
390cd7b892 Updated test files. 2015-10-27 12:25:18 -06:00
Ward Fisher
d5ce804744 The issue (at least this one) in nctest is solved. In dv2i.c, line 896 (or thereabouts), a long variable was being passed to a function expecting a ptrdiff_t. These are not compatible sizes, on Windows. 2015-10-27 12:04:03 -06:00