Commit Graph

70 Commits

Author SHA1 Message Date
Greg Sjaardema
ccb9682288 Merge branch 'master' into max_vars_dims_cleanup 2015-11-30 10:37:07 -05:00
Greg Sjaardema
724453b113 Update comments related to NC_MAX_VARS and NC_MAX_DIMS 2015-11-30 10:28:06 -05:00
dmh
47e10591b4 ckp 2015-11-19 13:44:55 -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
3c8a61f5aa Corrected a typo in a define that had broken the netcdf4-python interface. 2015-10-15 22:26:13 +00:00
Ward Fisher
fd4c0f74d8 More doxygen-style formatting. 2015-10-15 12:22:24 -06:00
Ward Fisher
febc9040a5 Updated in-code documentation. 2015-10-15 11:29:51 -06:00
Ward Fisher
bf40c80526 More cleaning up of netcdf.h. 2015-10-14 14:19:50 -06:00
Ward Fisher
771830f2d2 Cleaning up netcdf.h to restore a few API-breaking changes. 2015-10-14 14:10:30 -06:00
Dennis Heimbigner
cd7a06b193 pull request 2015-10-12 17:09:37 -06:00
Ward Fisher
bab2f42ab2 Added an alias back to NC_FORMAT_64BIT to avoid breaking compatibility. 2015-10-09 13:53:16 -06:00
dmh
49597a64af merge-squash 2015-10-09 10:12:11 -06:00
Russ Rew
ced515b895 Fix a few typos in comments 2015-08-18 10:20:28 -06:00
dmh
859f105005 merge-squash 2015-08-15 16:26:35 -06:00
dmh
3dd807a155 The original mem branch somehow got
hosed, so I rebuilt it as a new mem2 branch.
2015-05-28 15:10:10 -06:00
Russ Rew
eaf8ef61e0 resolved conflict 2014-12-09 13:31:20 -07:00
Russ Rew
5ac930dc2d Minor fix to comments on macro defines 2014-12-05 12:44:09 -07:00
Ward Fisher
36ca7ca972 Moved previously defined macros out of meta.h and back into netcdf.h, so that we don't break the just-released netcdf-fortran release. 2014-09-24 10:22:40 -06:00
Ward Fisher
6f4a92f1b6 Updated copyright information for netcdf.h, netcdf_meta.h template. 2014-09-11 15:30:22 -06:00
Ward Fisher
302b8003b7 Added definition of NC_HAVE_META_H to netcdf.h.
Moved NC_HAVE_INQ_FORMAT_EXTENDED, NC_HAVE_RENAME_GRP
to netcdf_meta.h.
2014-09-11 15:19:02 -06:00
Ward Fisher
60d46e40e0 Flagged NC_MPIPOSIX deprecated, as of hdf5 1.8.13. 2014-06-09 14:18:30 -06:00
dmh
83ec39f5db [NCF-272]
re: e support ZCL-340681 and CPW-270700

HDF4 supports compression (and chunking)
but the chunking was not being recorded
for HDF4 files. So, I modified the necessary
files to support HDF4 chunking.
2014-06-02 13:04:28 -06:00
Russ Rew
a4192a5839 Added cast on NC_FILL_STRING to eliminate compiler warnings. 2014-05-27 11:01:34 -06:00
dmh
c7086dd04b Add support to detect authorization errors to DAP 2014-03-11 11:58:22 -06:00
Russ Rew
b70968ed03 Delete inadvertant UTF-8 character in netcdf.h comment line. 2014-03-07 13:25:32 -07:00
Quincey Koziol
d033f9f6ff Clean up Coverity warnings from last checkin. 2014-02-20 08:24:55 -06:00
Ward Fisher
0032af978b Added INQ_FORMAT_EXTENDED-related tests to the cmake build system (based on inclusion in autotools-based builds). 2014-01-16 13:14:49 -07:00
dmh
582410a407 [NCF-273]/HZY-708311
Add a new function called nc_inq_format_extended that
returns more detailed format information (vis-a-vis
nc_inq_format) about an open dataset.

Note that the netcdf API will present the file as if it had
the format specified by nc_inq_format.  The true file
format, however, may not even be a netcdf file; it might be
DAP, HDF4, or PNETCDF, for example. This function returns
that true file type.  It also returns the effective mode for
the file.

signature: nc_inq_format_extended(int ncid, int* formatp, int* modep)
where
* ncid is the NetCDF ID from a previous call to nc_open() or
  nc_create().
* formatp is a pointer to a location for returned true format.
* modep is a pointer to a location for returned mode flags.

Refer to the actual list in the file netcdf.h to see the
currently defined set.

Also added test cases (tst_formatx*).
2013-12-22 12:53:20 -07:00
dmh
6e954fa2ce Quincey noted the following declarations
are duplicated in netcdf.h and netcdf_par.h
This commit removed the duplicates from netcdf.h
since they are only used when parallism is
enabled.

    /* Use these with nc_var_par_access(). */
    #define NC_INDEPENDENT 0
    #define NC_COLLECTIVE 1

    /* Set parallel access for a variable to independent (the default) or
     * collective. */
    EXTERNL int
    nc_var_par_access(int ncid, int varid, int par_access);
2013-09-04 11:28:40 -06:00
Ward Fisher
c25b5b2ba2 Corrected error preventing LFS on 32-bit Windows. 2013-08-28 16:04:04 -06:00
Quincey Koziol
3cdce9e3af Correct error when a parallel application writes different amounts of data to
an unlimited-dimension variable, and different processes don't agree on the
whether to extend the underlying HDF5 dataset, or don't agree on the amount
to extend the dataset.
2013-08-18 20:45:17 -05:00
Ward Fisher
b6d855c0b9 Added NC_HAVE_RENAME_GRP as per Charlie Zender's request:
https://www.unidata.ucar.edu/esupport/staff/index.php?_m=tickets&_a=viewticket&ticketid=22442

Updated configure.ac, CMakeLists.txt to reflect the upcoming 4.3.1-rc1
release.

Added notes to RELEASE_NOTES and RELEASE_NOTES.md
2013-08-01 21:55:32 +00:00
Dennis Heimbigner
67c486bfa0 fix include/netcdf.h:nc_rename_grp signature 2013-07-22 17:18:20 +00:00
Dennis Heimbigner
ee4cf07637 change nc_rename_group -> nc_rename_grp for consistency 2013-07-22 16:49:25 +00:00
Dennis Heimbigner
b85d3568ec Added the necessary code to support
group renaming. The primary API
is 'nc_rename_grp(int grpid, const char* name)'.
No test cases provided yet.
This also required adding a rename_grp entry
to the dispatch tables.
2013-07-19 21:48:37 +00:00
Russ Rew
6cd8fca60d Quincey's fixes for NCF-250, netCDF-4 parallel independent access with
unlimited dimension hanging.  Extending the size of an unlimited
dimension in HDF5 must be a collective operation, so now an error is
returned if trying to extend in independent access mode.

Quincey's bug fixes for parallel build portability, particularly
OpenMPI on MacOS-X.
2013-07-08 21:31:13 +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
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
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
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
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
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
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
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
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
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