Commit Graph

908 Commits

Author SHA1 Message Date
Dennis Heimbigner
c659633d2e merge from trunk 2013-03-26 16:45:02 +00:00
Russ Rew
b36dc5b5fb Fix NCF-244 bug for case where using different order for defining
coordinate variables and their associated dimensions occurs in any
subgroup, rather than just the root group.  If this occurs, the
variable attribute "_Netcdf4Dimid" is created for every dimension
scale.

Also add a test for this bug fix in tst_dims3.nc, based on Pedro
Vicente's demo.
2013-03-26 15:14:19 +00:00
Russ Rew
2071ca9bf3 Fixed NCF-244, a netCDF-4 bug resulting in two dimensions with the same dimension ID 2013-03-25 18:06:19 +00:00
Ward Fisher
f26a4a559a Merged latest from netcdf-cmake branch.
Addressed several cmake-related issues, in terms of
building on Windows.  Also added XGetopt.c to 
EXTRA_dist in Makefile.am files.
2013-03-19 22:40:15 +00:00
Dennis Heimbigner
dea3c726c8 merge trunk into this branch 2013-03-15 20:31:07 +00:00
Dennis Heimbigner
80cf3a2c75 fix typo in previous checkin 2013-03-08 18:27:45 +00:00
Dennis Heimbigner
841f7c7148 Move onstack.h from libsrc
to include because it is used
both in libsrc and libdispatch
2013-03-08 18:08:11 +00:00
Koziol
0f29dd60c0 Description:
Fix Jira issue NCF-29 (https://bugtracking.unidata.ucar.edu/browse/NCF-29):
making the netCDF-4 library ignore HDF5 datasets and attributes which have
datatypes (such as references) that it doesn't understand.

Tested on:
    Mac OSX/64 10.8.2 (amazon) w/--enable-netcdf-4 --enable-extra-tests --enable-extra-example-tests
        --disable-shared --enable-logging
2013-03-01 08:10:28 +00:00
Ward Fisher
57084316de Merging changes from netCDF branch. 2013-02-28 21:50:55 +00:00
Ward Fisher
0140ae8e71 Merge with latest cmake branch.
Added check for HAVE_STDINT_H in utf8proc.h,
to accomodate older visual studio versions
that require pnetcdf.h.
2013-02-26 17:54:41 +00:00
Ward Fisher
ddf3c31bb0 Corrected a handful of syntax issues in CMake config files,
probably introduced more.  

Added CMake-related files to Makefile.am files for inclusion
when creating a distribution package.
2013-02-20 23:28:28 +00:00
Ward Fisher
91188cea7a Merging CMake branch into trunk. Changes include:
CMake related changes in CMakeLists.txt files,
cmake_config.h.in. Other changes relate to 
Windows-specific issues, and changes made
when regenerating generated source files.
2013-01-15 22:43:09 +00:00
Ward Fisher
7b91248723 Merged changes from netcdf-branch.
o Changed variable names 'typeid' to 'typeid1' to avoid a namespace conflict
in visual studio.
o Cleaned up a handful of warnings in Visual Studio.
o Addressed a few Coverity-discovered issuesl
o Made changes to CMake-based builds.
2012-12-13 22:09:41 +00:00
Dennis Heimbigner
5f2eb8afbf Fix a number of potential problems by changing calls to nc_XXX to NC3/4_XXX 2012-12-12 20:05:06 +00:00
Ward Fisher
81280c7878 Merge from latest netcdf-cmake branch.
- Fixes for Windows.
- CMake-based changes (functionality, tests).
- Smattering of coverity-informed bug-fixes.
2012-12-05 18:35:42 +00:00
Ward Fisher
7a226dd3f1 Merging the win_netcdf branch into the trunk. 2012-09-27 22:50:41 +00:00
Ward Fisher
53843f134e 2012-09-10 22:37:38 +00:00
Ward Fisher
e55d002dbc Merged Dennis' changes from trunk. 2012-09-06 21:15:37 +00:00
Dennis Heimbigner
5ca78309cc The effect of this change is to make the struct NC structure
contain as little file-type specific info as possible.  It
modifies especially libsrc so that all of the netcdf-3 data
that used to be in struct NC is now kept in a separate chunk
of data pointed to by the struct NC. This makes all of
current protocols consistent: netcdf-3, netcdf-4, and dap.
2012-09-06 19:44:03 +00:00
Ward Fisher
9e8cfcf808 Additional CMake support, CPack support. 2012-08-29 18:58:08 +00:00
Ward Fisher
04e61d5894 Added MSVC-compatibility items. 2012-08-27 21:19:25 +00:00
Ward Fisher
7ef113df5f 2012-08-24 18:24:58 +00:00
Russ Rew
eda91aa9cf Enhanced netcdf-4 to be able to deal with optional user area data
block at the front of some HDF5 files (NCF-28).  Also fixed some minor
typos in doxygen blocks in netcdf.h.
2012-08-22 21:53:06 +00:00
Ward Fisher
e8453be1e5 Merged from trunk into branch 2012-08-20 18:30:04 +00:00
Dennis Heimbigner
2a0d68c530 update nchashmap; move some old stuff in libdap2; fix new debug code 2012-08-19 21:12:35 +00:00
Russ Rew
4d6f11288b Fix Coverity complaint about passing big parameter by value 2012-08-17 22:00:36 +00:00
Russ Rew
8d53da4826 Fixed bug "adding a bad _FillValue" bug (NCF-190). Fixed minor bugs
reported by static analysis, including memory leak in ncdump, missing
size_t cast for chunk cache.  Fixed various doc problems, including
byte vs. char issues, missing NC_UBYTE in type list, needed link to
"Building with Windows" page.
2012-08-16 18:31:48 +00:00
Ward Fisher
ffb7dc6f0d Merged latest trunk into branch 2012-08-13 19:57:51 +00:00
Dennis Heimbigner
23e66f5adb update list utilities 2012-08-09 19:42:02 +00:00
Dennis Heimbigner
499f8d3a1c complete update of utilities: ncbyte, nclist, ncuri, nclog 2012-08-08 23:15:18 +00:00
Ward Fisher
0d90326575 Integrated latest changes to trunk, added preliminary CPack support. 2012-08-02 22:56:57 +00:00
Dennis Heimbigner
bc3a732e25 fix e-support YOP-841363 plus a number of coverity found bugs 2012-08-02 18:43:21 +00:00
Dennis Heimbigner
f1713dcfe9 fix missing #endif 2012-08-01 17:26:06 +00:00
Dennis Heimbigner
faa1c81671 fix a cosmetic issue with config.h 2012-08-01 17:18:58 +00:00
Ward Fisher
92db1577a4 Corrected an issue when running 'make check' on windows related to declaration of an external function. 2012-07-31 23:02:51 +00:00
Ward Fisher
5746b1e103 Corrected an error found in 'make check' 2012-07-31 22:56:59 +00:00
Dennis Heimbigner
42999f4c7c move from oc1.0 to oc2.0; create new dir oc2 2012-07-31 20:34:13 +00:00
Dennis Heimbigner
a6b932826b add NC_MMAP flag and tests 2012-06-23 19:25:49 +00:00
Dennis Heimbigner
1041a4c25b add procedure and program to locate a working dts test server 2012-06-22 21:54:52 +00:00
Ward Fisher
2e96987a41 Merged latest changes from trunk, including deletion of win32 directory. 2012-06-13 19:29:01 +00:00
Russ Rew
79cde861ac Delete obsolete libdiskless directory, replaced by new diskless
implementation.  Deleted obsolete win32, soon to be replaced by Ward's
Windows 32- and 64-bit fixes for building with MSYS/MinGW.  Made
cosmetic cleanup to output of "make check" to make it easier for users
to interpret.  Fixed bug NCF-175: ncdump -t incorrectly interpreting
units attribute (such as "days") without a base time (such as "since
2007-01-01") as a time unit.

Changed name to 4.2.1-beta.
2012-06-12 21:50:02 +00:00
Ward Fisher
6b8107b25a Merged trunk changes 2160-2239 into my branch 2012-06-05 17:09:51 +00:00
Russ Rew
dbaf62f5e6 Updated some links in Doxygen version of user guide. Fixed some
range_error checks in netCDF-4 type conversion code.  Made netCDF
attribute tests with type conversion more comprehensive and stringent,
fixing bugs identified with better tests.  Changed a test in
nc_test/tst_atts.c to use netCDF-3 file instead of netCDF-4 file,
because that directory is supposed to be for tests that work with
--disable-netcdf-4.  Added test demonstrating NCF-171 bug on 32-bit
platforms, only run when configured with --enable-extra-tests.
2012-05-24 16:29:22 +00:00
Ward Fisher
ff81029eeb o Modified configure/utility scripts.
o include/nctime.h:
  o Modified how the following functions are specified 
    external when building a DLL:
    * cdRel2Iso
    * cdChar2Comp
    * Cdh2e
    * Cde2h
    * cdParseRelunits
2012-05-23 16:28:25 +00:00
Russ Rew
4f6b3a04c4 Fix ncdump bug (NCF-169), not escaping characters special to CDL in enumeration labels. 2012-05-07 12:58:22 +00:00
Dennis Heimbigner
28bd09236b move single use macro to using program 2012-03-28 16:19:16 +00:00
Dennis Heimbigner
dc016d27ae fixed missing macro 2012-03-28 16:06:28 +00:00
Dennis Heimbigner
93f722f594 accidental variable declaration in netcdf.h 2012-03-26 17:03:09 +00:00
Dennis Heimbigner
7e27052f87 - Implemented diskless files for both netcdf classic and extended.
The in-memory files can be made persistent if nc_create is called with
  NC_DISKLESS|NC_WRITE flags set. Initial test case also included.
- Modified ncio mechanism to support
  multiple ncio packages; this is so we
  can have posixio and memio operating
  at the same time.
- cleanup up a bunch of lint issues (unused variables, etc).
2012-03-26 01:34:32 +00:00
Dennis Heimbigner
8a40919a61 fix define in netcdf.h 2012-03-15 20:14:19 +00:00
Dennis Heimbigner
99eef24bc2 - Fix NCF-158 to modify ncgen flag defaults.
- Fix NCF-157 to modify DAP code to support
  partial variable retrieval.
- Fix of NCF-154 to solve problem of ncgen
  improperly processing data lists for variables
  of size greater than 2**18 bytes.
- Fix ncgen processing of char variables that have
  multiple unlimited dimensions.
- Partly fix Jira issue: NCF-145 (vlen issues).
- Benchmark program nc_test4/tst_ar4_*) requires arguments
  and should only be invoked inside a shell
  script; fixed so that they terminate cleanly
  if invoked with no arguments.
- Fix the Doxygen processing so it will work
  with make distcheck.
- Begin switchover to using an alternative to ncio.
- Begin support for in-memory (diskless) files.
2012-03-14 23:26:48 +00:00
Dennis Heimbigner
787d32fffd changed form of some static data to work with cxx4 2012-03-08 22:21:12 +00:00
Dennis Heimbigner
aebd11348a 1)Integrate the oc with improved performance 2012-01-29 18:56:29 +00:00
Russ Rew
572c7d3bf0 Add missing extern "C" {...} boilerplate to netcdf_par.h 2012-01-18 04:46:09 +00:00
Dennis Heimbigner
3ec597a75c simplify 2012-01-16 02:41:07 +00:00
Russ Rew
e39dc1ed39 Revert libtool version to 7.1.1. Disable libdiskless. 2012-01-12 23:27:30 +00:00
Dennis Heimbigner
efd9808b0a completely rewritten constraint system 2011-11-14 04:20:19 +00:00
Dennis Heimbigner
d10a2605ce moved librpc/ from major branch to trunk 2011-10-23 20:17:56 +00:00
Ed Hartnett
7b47adf3a1 removed executable permissions from all code files 2011-10-04 16:05:11 +00:00
Ed Hartnett
fe653a4333 fixed nulldap problem in include file 2011-09-30 15:56:02 +00:00
Dennis Heimbigner
1578ddac0c 2011-09-20 20:39:04 +00:00
Dennis Heimbigner
732fbff7ce 2011-09-20 17:30:02 +00:00
Dennis Heimbigner
12d4f46668 2011-09-18 20:57:51 +00:00
Dennis Heimbigner
d7790e7e7e 2011-09-16 18:36:08 +00:00
Dennis Heimbigner
616aadc321 fix ncaux when --disable-netcdf4 2011-09-04 23:27:34 +00:00
Dennis Heimbigner
62bcf791b2 added include/ncaux.h 2011-09-02 18:41:55 +00:00
Dennis Heimbigner
7eccec950f Merge librpc 2011-09-01 22:32:28 +00:00
Ed Hartnett
d58c18c623 added diskless files API, subsetting not working, classic model only 2011-08-16 21:04:33 +00:00
Ed Hartnett
b6aaedaea1 more doxygen changes 2011-07-20 21:39:14 +00:00
Ed Hartnett
728177f25d added beginning of test contributed by KNMI 2011-07-20 19:44:27 +00:00
Dennis Heimbigner
a7fdbb176d Fixed nulldup issues: Jira # NCF-94 2011-07-14 22:43:43 +00:00
Dennis Heimbigner
4f30d3694c cleanup misc. issues 2011-07-14 22:24:02 +00:00
Ed Hartnett
07ec18ee81 doxygen work on netcdf4 functions 2011-07-14 12:21:03 +00:00
Ed Hartnett
296ca23237 minor changes to improve visual studio and vxworks builds 2011-07-13 12:36:22 +00:00
Ed Hartnett
17d09ddac5 moved string.c to libdispatch 2011-07-12 17:58:42 +00:00
Ed Hartnett
ed204b1cc9 more doxygen variable stuff 2011-07-12 15:37:24 +00:00
Ed Hartnett
cb72a227b4 doxygen changes in variable documentation 2011-07-12 12:30:16 +00:00
Ed Hartnett
b377906536 beginning of conversion to doxygen 2011-07-11 16:04:49 +00:00
Ed Hartnett
6232bbdfe6 beginning of Doxygen conversion for documentation 2011-07-01 16:14:25 +00:00
Dennis Heimbigner
475e868003 1st working version of libcdmr 2011-06-10 18:47:26 +00:00
Dennis Heimbigner
fec4cdb230 Fixed the following Jira minor bugs:
NCF-42: _Format attribute sometimes being ignored
NCF-43: Fixed unsigned long long parsing.
NCF-47: Make opendap code properly handle illegal names like "x.y" by
        supressing them
NCF-49: check for uint type
NCF-50: properly handle username:pwd embedded in urls.
2011-05-12 17:51:32 +00:00
Ed Hartnett
4de8b33251 rolled everything back to 1119 2011-04-28 17:11:21 +00:00
Dennis Heimbigner
80d8926bad fix user+password;also the bad-name problem;also merged libncdap3+ncdap4->libdap2 2011-04-27 20:50:27 +00:00
Dennis Heimbigner
c04d65e1d3 2011-04-17 18:50:10 +00:00
Dennis Heimbigner
0b477e29cc rebuilt dap constraints 2011-04-16 20:56:36 +00:00
Ed Hartnett
8eb9a74016 many changes to get clean DLL builds in mingw for fortran, cxx, cxx4, and v2 2011-03-21 18:38:10 +00:00
Ed Hartnett
0259975e26 changes in response to user feedback to rc1, plus cleaned up H5 test dependancy 2011-03-21 15:45:17 +00:00
Ed Hartnett
965a3aac70 minor refactor of the build system to work better for cross-compiling 2011-03-15 10:19:08 +00:00
Ed Hartnett
1a3ba4a6d8 cywin-mingw32 dlls now building 2011-01-06 20:12:06 +00:00
Ed Hartnett
590fd8e08d change ERR macro back to return instead of abort 2010-12-21 17:26:06 +00:00
Ed Hartnett
7abc6347bf must use abort() not return in ERR macro, or solaris compiler craps out 2010-12-20 13:49:23 +00:00
Ed Hartnett
8058055536 all failed tests now cause return 2010-12-16 19:24:52 +00:00
Dennis Heimbigner
cba787cfff Fixed bug in libcndap about handling nested sequences 2010-12-03 22:01:21 +00:00
Ed Hartnett
8cc0fd982f fixed valgrind problems 2010-11-29 21:07:09 +00:00
Dennis Heimbigner
7a37820c55 Fix #1 for constraints 2010-11-29 17:58:09 +00:00
Ed Hartnett
c9033810e1 added many valgrind tests in libsrc4, fixed some memory problems 2010-10-12 09:12:08 +00:00
Ed Hartnett
64d614fd87 added missing file, fixed includes, removed unneeded header file 2010-10-08 20:08:24 +00:00
Ed Hartnett
65c54d88f5 fixed some AIX portability issues, added tests, especially valgrind tests 2010-10-08 18:54:53 +00:00
Ed Hartnett
e18410535c more work on inq_path, fixed include problem in parallel builds 2010-08-20 12:17:57 +00:00
Ed Hartnett
a0e1b037e5 added nc_inq_path in dispatch tables 2010-08-18 15:11:17 +00:00
Dennis Heimbigner
c5cb1104b7 removed USE_DISPATCH and most uses of nc3 from libsrc4 2010-07-30 19:20:22 +00:00
Dennis Heimbigner
32b819ada8 add nc_default_format support 2010-07-22 21:50:51 +00:00
Ed Hartnett
0e855e0dc5 more changes to make netcdf-4 use less memory per variable 2010-07-01 11:39:34 +00:00
Ed Hartnett
6db57b7f09 made var->chunksizes array allocated intead of fixed size, to improve memory performance of netCDF-4 2010-06-30 21:05:11 +00:00
Ed Hartnett
f0a72cbefb fixed broken classic-only build 2010-06-28 17:17:43 +00:00
Ed Hartnett
819ed83aa8 added missing makefile 2010-06-23 21:20:03 +00:00
Ed Hartnett
9da0b67627 fixed some automake issues to get distcheck working 2010-06-23 17:48:10 +00:00
Ed Hartnett
220c34702c added missing include directory 2010-06-07 11:25:58 +00:00