mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-12-21 08:39:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Unidata/main'

Browse Source
This commit is contained in:
Dennis Heimbigner 2022-10-04 11:06:20 -06:00
commit 0f198c6a72
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nc-config.in
View File

@ -10,7 +10,7 @@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
plugindir=@PLUGIN_INSTALL_DIR@ plugindir=@PLUGIN_INSTALL_DIR@
if test "x@PLUGIN_INSTALL_DIR@" == "xno" ; then if test "@PLUGIN_INSTALL_DIR@" = "no" ; then
plugindir="" plugindir=""
fi fi

6
nc_test4/tst_virtual_datasets.c
View File

@ -12,7 +12,8 @@ static void
create_dataset_a() { create_dataset_a() {
hsize_t dims[1] = {VARIABLE_SIZE}; hsize_t dims[1] = {VARIABLE_SIZE};
float data[VARIABLE_SIZE]; float data[VARIABLE_SIZE];
for(size_t i = 0; i < VARIABLE_SIZE; ++i) { size_t i;
for(i = 0; i < VARIABLE_SIZE; ++i) {
data[i] = (float)i; data[i] = (float)i;
} }
@ -51,6 +52,7 @@ create_dataset_b() {
int read_back_contents(const char* filename) { int read_back_contents(const char* filename) {
int ncid, varid, ndims; int ncid, varid, ndims;
size_t i;
float data[VARIABLE_SIZE]; float data[VARIABLE_SIZE];
char var_name[NC_MAX_NAME+1]; char var_name[NC_MAX_NAME+1];
@ -63,7 +65,7 @@ int read_back_contents(const char* filename) {
if (nc_inq_var(ncid, varid, var_name, &var_type, &ndims, dimids_var, &natts)) ERR; if (nc_inq_var(ncid, varid, var_name, &var_type, &ndims, dimids_var, &natts)) ERR;
if (nc_get_var_float(ncid, varid, data)) ERR; if (nc_get_var_float(ncid, varid, data)) ERR;
printf("\t %s: ", var_name); printf("\t %s: ", var_name);
for (size_t i = 0; i < VARIABLE_SIZE; ++i) { for (i = 0; i < VARIABLE_SIZE; ++i) {
printf("%f, ", data[i]); printf("%f, ", data[i]);
} }
printf("\n"); printf("\n");

2
ncdump/CMakeLists.txt
View File

@ -264,7 +264,7 @@ endif()
add_sh_test(ncdump tst_netcdf4_4) add_sh_test(ncdump tst_netcdf4_4)
add_sh_test(ncdump tst_nccopy4) add_sh_test(ncdump tst_nccopy4)
SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2") SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_sh_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2;tst_nans;tst_opaque_data;tst_create_files;tst_special_atts")
SET_TESTS_PROPERTIES(ncdump_tst_nccopy5 PROPERTIES DEPENDS "ncdump_tst_nccopy4") SET_TESTS_PROPERTIES(ncdump_tst_nccopy5 PROPERTIES DEPENDS "ncdump_tst_nccopy4")
ENDIF(USE_HDF5) ENDIF(USE_HDF5)

3
plugins/Makefile.am
View File

@ -74,6 +74,9 @@ if ENABLE_PLUGINS
lib__nczstdfilters_la_SOURCES = NCZstdfilters.c lib__nczstdfilters_la_SOURCES = NCZstdfilters.c
lib__nczhdf5filters_la_SOURCES = NCZhdf5filters.c lib__nczhdf5filters_la_SOURCES = NCZhdf5filters.c
lib__nczstdfilters_la_LDFLAGS = ${plugin_version_info}
lib__nczhdf5filters_la_LDFLAGS= ${plugin_version_info}
plugin_LTLIBRARIES += lib__nczhdf5filters.la plugin_LTLIBRARIES += lib__nczhdf5filters.la
plugin_LTLIBRARIES += lib__nczstdfilters.la plugin_LTLIBRARIES += lib__nczstdfilters.la