mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-04-12 18:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into issue314.dmh

Browse Source
This commit is contained in:
DennisHeimbigner 2016-09-02 14:18:41 -06:00 committed by GitHub
commit 4984536a60
12 changed files with 56 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -572,6 +572,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
##
# Include the HDF5 include directory.
##
IF(HDF5_INCLUDE_DIRS AND NOT HDF5_INCLUDE_DIR)
SET(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
ENDIF()
MESSAGE(STATUS "Using HDF5 include dir: ${HDF5_INCLUDE_DIR}")
INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
###

1
RELEASE_NOTES.md
View File

@ -9,6 +9,7 @@ This file contains a high-level description of this package's evolution. Release
## 4.4.2 - TBD
* [Bug] Corrected an issue related to test failures when `--disable-utilities` or `-DENABLE_UTILITIES=OFF` are specified when building with autotools or cmake, respectively. See [GitHub #313](https://github.com/Unidata/netcdf-c/issues/313) for more information.
* [Bug][Enhancement] Corrected a behavioral issue with the `_NCProperties` attribute taking up too much space. See [GitHub #300](https://github.com/Unidata/netcdf-c/issues/300) and [GitHub #301](https://github.com/Unidata/netcdf-c/pull/301) for more information.
* [Bug] Corrected behavior for `nc-config` so that, if `nf-config` is found in system, the proper fortran-related information will be conveyed. See [GitHub #296](https://github.com/Unidata/netcdf-c/issues/296] for more information.

2
configure.ac
View File

@ -1,4 +1,4 @@
M# -*- Autoconf -*-
# -*- Autoconf -*-
## Process this file with autoconf to produce a configure script.
# This is part of Unidata's netCDF package. Copyright 2005-2012, see

6
docs/netcdf.m4
View File

@ -774,15 +774,15 @@ Learn about a compound type.
.HP
FDECL(def_vlen, (INCID(), INAME(), INCTYPE(base_typeid), ONCTYPE(xtypep)))
.sp
Create a varaible length array type.
Create a variable length array type.
.HP
FDECL(inq_vlen, (INCID(), INCTYPE(), ONAME(), OSIZET(datum_sizep), ONCTYPE(base_nc_typep)))
.sp
Learn about a varaible length array type.
Learn about a variable length array type.
.HP
FDECL(free_vlen, (nc_vlen_t *vl))
.sp
Free memory comsumed by reading data of a varaible length array type.
Free memory comsumed by reading data of a variable length array type.
.HP
FDECL(put_vlen_element, (INCID(), INCTYPE(), IVOIDP(vlen_element), ISIZET(len), IVOIDP(data)))
.sp

2
docs/old/netcdf-f90.texi
View File

@ -5180,7 +5180,7 @@ rh in an existing netCDF dataset named foo.nc:
@findex NF90_INQ_VARID
@cindex NF90_INQ_VARID, example
Given the name of a varaible, nf90_inq_varid finds the variable ID.
Given the name of a variable, nf90_inq_varid finds the variable ID.
@heading Usage
@example

21
nc_test/CMakeLists.txt
View File

@ -68,16 +68,19 @@ ENDFOREACH()
ADD_TEST(nc_test ${EXECUTABLE_OUTPUT_PATH}/nc_test)
IF(BUILD_DISKLESS)
add_sh_test(nc_test run_diskless)
IF(BUILD_MMAP)
add_sh_test(nc_test run_mmap)
ENDIF()
IF(LARGE_FILE_TESTS)
add_sh_test(nc_test run_diskless2)
ENDIF()
IF(BUILD_UTILITIES)
ENDIF()
IF(BUILD_DISKLESS)
add_sh_test(nc_test run_diskless)
IF(BUILD_MMAP)
add_sh_test(nc_test run_mmap)
ENDIF(BUILD_MMAP)
IF(LARGE_FILE_TESTS)
add_sh_test(nc_test run_diskless2)
ENDIF(LARGE_FILE_TESTS)
ENDIF(BUILD_DISKLESS)
ENDIF(BUILD_UTILITIES)
# Copy some test files from current source dir to out-of-tree build dir.
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)

18
nc_test/Makefile.am
View File

@ -62,14 +62,16 @@ endif
TESTS = $(TESTPROGRAMS)
if BUILD_DISKLESS
TESTS += run_diskless.sh
if BUILD_MMAP
TESTS += run_mmap.sh
endif
if LARGE_FILE_TESTS
TESTS += run_diskless2.sh
endif
if BUILD_UTILITIES
if BUILD_DISKLESS
TESTS += run_diskless.sh
if BUILD_MMAP
TESTS += run_mmap.sh
endif
if LARGE_FILE_TESTS
TESTS += run_diskless2.sh
endif
endif
endif
if USE_PNETCDF

13
nc_test4/CMakeLists.txt
View File

@ -5,7 +5,7 @@ SET(NC4_TESTS tst_dims tst_dims2 tst_dims3 tst_files tst_files4 tst_vars
tst_strings2 tst_interops tst_interops4 tst_interops6
tst_enums tst_coords tst_coords2 tst_coords3 tst_vars3 tst_vars4
tst_chunks tst_chunks2 tst_utf8 tst_fills tst_fills2 tst_fillbug
tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill tst_atts
tst_xplatform2 tst_h_atts2 tst_endian_fill tst_atts
t_type cdm_sea_soundings tst_vl tst_atts1 tst_atts2
tst_vars2 tst_files5 tst_files6 tst_sync tst_h_strbug tst_h_refs
tst_h_scalar tst_rename tst_h5_endians tst_atts_string_rewrite
@ -13,8 +13,13 @@ SET(NC4_TESTS tst_dims tst_dims2 tst_dims3 tst_files tst_files4 tst_vars
tst_rehash)
# Note, renamegroup needs to be compiled before run_grp_rename
build_bin_test(renamegroup)
add_sh_test(nc_test4 run_grp_rename)
IF(BUILD_UTILITIES)
SET(NC4_TESTS ${NC4_TESTS} tst_xplatform)
build_bin_test(renamegroup)
add_sh_test(nc_test4 run_grp_rename)
ADD_SH_TEST(nc_test4 tst_misc)
ENDIF(BUILD_UTILITIES)
##
# The shell script, run_empty_vlen_test.sh,
@ -23,7 +28,7 @@ add_sh_test(nc_test4 run_grp_rename)
BUILD_BIN_TEST(tst_empty_vlen_unlim)
ADD_SH_TEST(nc_test4 run_empty_vlen_test)
ADD_SH_TEST(nc_test4 tst_misc)
IF(NOT MSVC)
SET(NC4_TESTS ${NC4_TESTS} tst_interops5 tst_camrun)

6
nc_test4/Makefile.am
View File

@ -33,7 +33,11 @@ endif
TESTS = $(NC4_TESTS)
TESTS += run_grp_rename.sh run_empty_vlen_test.sh tst_misc.sh
if BUILD_UTILITIES
TESTS += run_grp_rename.sh tst_misc.sh
endif
TESTS += run_empty_vlen_test.sh
# If the v2 API was built, add its test program.
if BUILD_V2

6
ncdap_test/CMakeLists.txt
View File

@ -43,8 +43,10 @@ IF(ENABLE_TESTS)
ENDIF()
IF(ENABLE_DAP_REMOTE_TESTS)
add_sh_test(ncdap tst_remote3)
add_sh_test(ncdap tst_formatx)
IF(BUILD_UTILITIES)
add_sh_test(ncdap tst_remote3)
add_sh_test(ncdap tst_formatx)
ENDIF(BUILD_UTILTIES)
add_bin_test(ncdap test_partvar)
IF(ENABLE_DAP_LONG_TESTS)
add_sh_test(ncdap tst_longremote3)

6
ncdap_test/Makefile.am
View File

@ -33,7 +33,11 @@ if ENABLE_DAP_REMOTE_TESTS
check_PROGRAMS += nctestserver
nctestserver_SOURCES = nctestserver.c
TESTS += tst_remote3.sh tst_formatx.sh test_partvar testurl.sh
if BUILD_UTILITIES
TESTS += tst_remote3.sh tst_formatx.sh
endif
TESTS += test_partvar testurl.sh
if ENABLE_DAP_LONG_TESTS
TESTS += tst_longremote3.sh

2
ncgen/ncgen.1
View File

@ -864,7 +864,7 @@ There are three other cases of note.
.IP 1. 3
If there is only a single, unlimited dimension,
then all of the constants are concatenated
and fill characers are added to the
and fill characters are added to the
end of the resulting string to make its
length be that of the unlimited dimension.
If the length is larger than