mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-05 16:20:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1075 from NetCDF-World-Domination-Council/ejh_hdf5_sep

Browse Source 
Moving rest of HDF5 code from libsrc4 to libhdf5
This commit is contained in:
Ward Fisher 2018-07-31 16:07:52 -06:00 committed by GitHub
commit 6535c78a65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1277 additions and 1266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nc4internal.h
View File

@ -322,6 +322,7 @@ int nc4_convert_type(const void *src, void *dest, const nc_type src_type,
const void *fill_value, int strict_nc3);
/* These functions do HDF5 things. */
int rec_detach_scales(NC_GRP_INFO_T *grp, int dimid, hid_t dimscaleid);
int delete_existing_dimscale_dataset(NC_GRP_INFO_T *grp, int dimid, NC_DIM_INFO_T *dim);
int nc4_open_var_grp2(NC_GRP_INFO_T *grp, int varid, hid_t *dataset);
int nc4_put_vars(NC *nc, int ncid, int varid, const size_t *startp,
@ -406,6 +407,9 @@ int nc4_check_name(const char *name, char *norm_name);
int nc4_normalize_name(const char *name, char *norm_name);
int nc4_check_dup_name(NC_GRP_INFO_T *grp, char *norm_name);
/* Find default fill value. */
int nc4_get_default_fill_value(const NC_TYPE_INFO_T *type_info, void *fill_value);
/* Close the file. */
int nc4_close_netcdf4_file(NC_FILE_INFO_T *h5, int abort, int extractmem);

3
libhdf5/CMakeLists.txt
View File

@ -7,7 +7,8 @@
# The source files for the HDF5 dispatch layer.
SET(libnchdf5_SOURCES nc4hdf.c nc4info.c hdf5file.c hdf5attr.c
hdf5dim.c hdf5grp.c hdf5type.c hdf5internal.c hdf5create.c hdf5open.c)
hdf5dim.c hdf5grp.c hdf5type.c hdf5internal.c hdf5create.c hdf5open.c
hdf5var.c nc4mem.c nc4memcb.c)
# Build the HDF4 dispatch layer as a library that will be included in
# the netCDF library.

4
libhdf5/Makefile.am
View File

@ -14,7 +14,9 @@ noinst_LTLIBRARIES = libnchdf5.la
# The source files.
libnchdf5_la_SOURCES = nc4hdf.c nc4info.c hdf5file.c hdf5attr.c \
hdf5dim.c hdf5grp.c hdf5type.c hdf5internal.c hdf5create.c hdf5open.c
hdf5dim.c hdf5grp.c hdf5type.c hdf5internal.c hdf5create.c hdf5open.c \
hdf5var.c nc4mem.c nc4memcb.c
# Package this for cmake build.
EXTRA_DIST = CMakeLists.txt

1250
libhdf5/hdf5var.c Normal file
View File

File diff suppressed because it is too large Load Diff

0
libsrc4/nc4mem.c → libhdf5/nc4mem.c
View File

0
libsrc4/nc4memcb.c → libhdf5/nc4memcb.c
View File

2
libsrc4/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Process these files with m4.
SET(libsrc4_SOURCES nc4dispatch.c nc4attr.c nc4dim.c nc4grp.c nc4type.c nc4var.c ncfunc.c nc4internal.c ncindex.c nc4mem.c nc4memcb.c )
SET(libsrc4_SOURCES nc4dispatch.c nc4attr.c nc4dim.c nc4grp.c nc4type.c nc4var.c ncfunc.c nc4internal.c ncindex.c )
IF(LOGGING)
SET(libsrc4_SOURCES ${libsrc4_SOURCES} error4.c)

2
libsrc4/Makefile.am
View File

@ -12,7 +12,7 @@ libnetcdf4_la_CPPFLAGS = ${AM_CPPFLAGS}
noinst_LTLIBRARIES = libnetcdf4.la
libnetcdf4_la_SOURCES = nc4dispatch.c nc4attr.c nc4dim.c nc4grp.c \
nc4internal.c nc4type.c nc4var.c ncfunc.c error4.c nc4printer.c \
ncindex.c nc4mem.c nc4memcb.c
ncindex.c
EXTRA_DIST = CMakeLists.txt

1278
libsrc4/nc4var.c
View File

File diff suppressed because it is too large Load Diff