diff --git a/.gitignore b/.gitignore
index dceaeaa1c4bd742c9511cf379e5fa73c17f5186d..f7cf6f582fc61e781eafa5efb51f3bebbf6a8859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,16 @@ libtool
*.dSYM
.DS_Store
+# Cmake
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+CMakeUserPresets.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20739bda0487b03968b1c27166b5a89765b5b0cf..6d444fec2cdd41d95728af6e37117ddd9ac16b91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,38 +1,95 @@
-cmake_minimum_required( VERSION 3.30 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.27 FATAL_ERROR )
-project(libcdi VERSION 2.4.0 LANGUAGES C )
+message(VERBOSE "Entering libcdi")
+project(cdilib VERSION 2.5.1 LANGUAGES C )
set(CMAKE_C_STANDARD 11)
+include(CTest)
include(CheckIncludeFile)
-configure_file (
- "${PROJECT_SOURCE_DIR}/cmake/cdi_config.h.in"
- "${PROJECT_SOURCE_DIR}/src/config.h"
- )
-
-find_package(hdf5 REQUIRED)
-if(hdf5_FOUND)
- message(STATUS "HDF5 shaed found")
-else()
- message(FATAL_ERROR "HDF shared not found")
-endif()
-
-#NetCDF
-find_package(netCDF COMPONENTS C REQUIRED)
-set(netcdf_flag HAVE_LIBNETCDF)
-set(netcdf_flag ${HAVE_LIBNETCDF})
-check_include_files("netcdf.h" ${netcdf_flag} C)
-if (${netCDF_FOUND})
- message(STATUS "added compile definition HAVE_LIBNETCDF=${netCDF_FOUND}")
- add_compile_definitions(HAVE_LIBNETCDF=${netCDF_FOUND})
-else()
- message(WARNING "netcdf not found, compiling without netcdf")
-endif ()
+# Finding libraries
+### -------------- Pthread ---------------------------
+
+option(CDI_PTHREAD "Use the pthread library [default=ON]" ON)
+if(${CDI_PTHREAD})
+ include(FindThreads)
+ find_package(Threads REQUIRED)
+ set_target_properties(Threads::Threads PROPERTIES THREADS_PREFER_PTHREAD_FLAG TRUE)
+ list(APPEND cdi_compile_defs HAVE_PTHREAD=1)
+ list(APPEND cdi_linked_libs pthread)
+endif()
+
+# enable default internal libs
+option(CDI_LIBGRIB "GRIB support [default=ON]" ON)
+if(${CDI_LIBGRIB})
+ list(APPEND cdi_compile_defs HAVE_LIBGRIB=1)
+endif()
+
+option(CDI_LIBGRIBEX "Use the CGRIBEX library [default=ON]" ON)
+if(${CDI_LIBGRIBEX})
+ list(APPEND cdi_compile_defs LIBCGRIBEX=1)
+endif()
+
+option(CDI_EXTRA "Use the extra library [default=ON]" ON)
+if(${CDI_EXTRA})
+ list(APPEND cdi_compile_defs HAVE_LIBEXTRA=1)
+endif()
+
+option(CDI_IEG "Use the extra library [default=ON]" ON)
+if(${CDI_IEG})
+ list(APPEND cdi_compile_defs HAVE_LIBIEG=1)
+endif()
+
+option(CDI_SERVICE "Use the extra library [default=ON]" ON)
+if(${CDI_SERVICE})
+ list(APPEND cdi_compile_defs HAVE_LIBSERVICE=1)
+endif()
+
+# ecCodes
+option(CDI_ECCODES "Use the eccodes library [default=ON]" ON)
+if(${CDI_ECCODES} OR eccodes_ROOT)
+ find_package(eccodes)
+ if (${eccodes_FOUND})
+ list(APPEND cdi_compile_defs HAVE_LIBGRIB_API=${eccodes_FOUND})
+ message(VERBOSE "added compile definition HAVE_LIBGRIB_API=${eccodes_FOUND}")
+ list(APPEND cdi_linked_libs eccodes)
+ else()
+ message(WARNING "eccodes not found, compiling without eccodes")
+ endif ()
+endif()
+# NetCDF
+option(CDI_NETCDF "Use the netcdf library [default=ON]" ON)
+if(${CDI_NETCDF} OR netCDF_ROOT )
+ find_package(netCDF COMPONENTS C REQUIRED)
+ if (TARGET netCDF::netcdf)
+ list(APPEND cdi_compile_defs
+ HAVE_LIBNETCDF=${netCDF_FOUND}
+ HAVE_LIBNC_DAP=${netCDF_FOUND}
+ HAVE_NETCDF4=${netCDF_FOUND}
+ HAVE_LIBGRIB_API=${netCDF_FOUND}
+ HAVE_LIBGRIB=${netCDF_FOUND}
+ )
+ list(APPEND cdi_linked_libs netCDF::netcdf)
+ else()
+ message(WARNING "netcdf target not found, compiling without netcdf")
+ endif ()
+endif()
+
+message(VERBOSE "looking for config.h in: ${PROJECT_BINARY_DIR}/src")
#adding subdirectories
## lib and general files
+list(APPEND cdi_compile_defs CDI=1 CDI_SIZE_TYPE=size_t PACKAGE_NAME="${PROJECT_NAME}" VERSION="${CMAKE_PROJECT_VERSION}")
add_subdirectory(src)
-## cdi executable
-add_subdirectory(app)
+#app
+option(CDI_BUILD_APP "Build the app" ON)
+if (CDI_BUILD_APP)
+ add_subdirectory(app)
+endif ()
+
+#tests
+if (BUILD_TESTING)
+ add_subdirectory(tests)
+endif ()
diff --git a/ChangeLog b/ChangeLog
index 60d0a39cd565c2e01a08634b16d6a5fcfd979c00..b1e9272c0692a43be5c759aa014b62854d57147e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2025-03-05 Uwe Schulzweida
+
+ * Version 2.5.1 released
+
+2025-02-28 Uwe Schulzweida
+
+ * taxis: added support for CDI_KEY_DATATYPE
+
+2025-02-12 Uwe Schulzweida
+
+ * GRIB_API: Handle LLAM as LCC
+
+2025-02-06 Uwe Schulzweida
+
+ * Added obsolete functions vlistNgrids() and vlistNzaxis() for ParaView vtkCDIReader
+
+2025-02-01 Uwe Schulzweida
+
+ * Added support for READ_CELL_CENTER=false
+
+2025-01-30 Uwe Schulzweida
+
+ * Added CDI_KEY_CHUNKSIZE_DIMX
+ * Added CDI_KEY_CHUNKSIZE_DIMY
+
+2025-01-29 Uwe Schulzweida
+
+ * Added CDI_KEY_CHUNKSIZE_DIMZ
+ * Added CDI_KEY_CHUNKSIZE_DIMT
+
+2025-01-14 Uwe Schulzweida
+
+ * NetCDF: Fix error in scanning coordinates attribute
+
+2024-12-28 Uwe Schulzweida
+
+ * NetCDF4: improved calculation of output chunk size
+
+2024-12-23 Uwe Schulzweida
+
+ * NetCDF4: improved calculation of input chunk cache size for numStep>1 and zSize>1
+
2024-11-28 Uwe Schulzweida
* using CGRIBEX library version 2.3.1
diff --git a/Makefile.am b/Makefile.am
index e6b9801be55fe18fe099d3ac1734f03f7f994bc1..6498136e51ab75b303d22893639d516302655adb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ doc/cdi_fman.pdf:
EXTRA_DIST = \
LICENSE \
+ CMakeLists.txt \
config/interface.rb \
doc/cdi_cman.pdf \
doc/cdi_fman.pdf \
diff --git a/NEWS b/NEWS
index d21b4942d545009488a8b484d6f3d109096da300..d05d2f19a2af320a4b8a230800d10148067b0809 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
CDI NEWS
--------
+Version 2.5.1 (05 Mar 2025):
+
+ Changes:
+ * NetCDF4: improved calculation of output chunk size
+ * NetCDF4: improved calculation of input chunk cache size for numStep>1 and zSize>1
+
Version 2.5.0 (28 Nov 2024):
Changes:
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index ce87f49683bff30ea6f52c4f06e33dc4d1bf135e..4264972e74952dfc37e3368f88c30b0ced8ecc6e 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -2,11 +2,11 @@ add_executable(cdi
cdi.c printinfo.c
)
-target_include_directories(cdi PUBLIC
+target_include_directories(cdi PRIVATE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:include
)
-target_link_libraries(cdi PUBLIC cdilib netCDF::netcdf ${HDF5_LIBS} pthread)
-
-target_compile_definitions(cdi PUBLIC HAVE_CONFIG_H)
+target_link_libraries(cdi PRIVATE cdilib ${cdi_linked_libs})
+target_include_directories(cdi PRIVATE "${PROJECT_BINARY_DIR}/src/config.h")
+target_compile_definitions(cdi PRIVATE ${cdi_netcdf_definitions})
diff --git a/app/Makefile.am b/app/Makefile.am
index 421e8d9f5c74e39f0394204dbcf0f789c8166422..53f1384b97a89e746ef0e5ce46fcd9a042a623c1 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -2,6 +2,8 @@ bin_PROGRAMS =
noinst_PROGRAMS =
check_PROGRAMS =
+EXTRA_DIST = CMakeLists.txt
+
if ENABLE_CDI_APP
if ENABLE_CDI_LIB
bin_PROGRAMS += cdi
diff --git a/app/printinfo.c b/app/printinfo.c
index ccbeea0049bdb477e3734ebe858d7251880cf61f..8fd902e0b769628db06bbcf9e152f9938f603bf2 100644
--- a/app/printinfo.c
+++ b/app/printinfo.c
@@ -300,8 +300,8 @@ printGridInfoKernel(int gridID, int index, bool lproj)
size_t xsize = (size_t) gridInqXsize(gridID);
size_t ysize = (size_t) gridInqYsize(gridID);
- // int prec = gridInqDatatype(gridID);
- // int dig = (prec == CDI_DATATYPE_FLT64) ? 15 : 7;
+ // int datatype;
+ // cdiInqKeyInt(gridID, CDI_GLOBAL, CDI_KEY_DATATYPE, &datatype);
int dig = 7;
if (!lproj)
@@ -537,8 +537,9 @@ printZaxisInfo(int vlistID)
int ltype = 0;
cdiInqKeyInt(zaxisID, CDI_GLOBAL, CDI_KEY_TYPEOFFIRSTFIXEDSURFACE, <ype);
int levelsize = zaxisInqSize(zaxisID);
- // int prec = zaxisInqDatatype(zaxisID);
- // int dig = (prec == CDI_DATATYPE_FLT64) ? 15 : 7;
+ // int datatype;
+ // cdiInqKeyInt(gridID, CDI_GLOBAL, CDI_KEY_DATATYPE, &datatype);
+ // int dig = (datatype == CDI_DATATYPE_FLT64) ? 15 : 7;
zaxisName(zaxistype, zaxisname);
int length = CDI_MAX_NAME;
diff --git a/cmake/cdi_config.h.in b/cmake/cdi_config.h.in
deleted file mode 100644
index e3bfd3225b75696f7fcb8e82af0f6f5b8acccba8..0000000000000000000000000000000000000000
--- a/cmake/cdi_config.h.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef cdi_config_h
-#define cdi_config_h
-
-#define PACKAGE_NAME "@PROJECT_NAME@"
-
-#define VERSION "@PROJECT_VERSION@"
-
-#define CDI 1
-
-#define HAVE_LIBGRIB 1
-#define HAVE_LIBCGRIBEX 1
-#define HAVE_LIBEXTRA 1
-#define HAVE_LIBSERVICE 1
-#define HAVE_LIBIEG 1
-
-#define HAVE_NETCDF @HAVE_NETCDF@
-#define HAVE_NETCDF_NC4 @netCDF_HAS_NC4@
-#define NETCDF_FOUND @NetCDF_FOUND@
-
-#endif /* cdi_config_h */
diff --git a/configure.ac b/configure.ac
index caa057f45a4237c314588e343f073fcbedc14504..16a3b7051565555d6cf4eab1ca5603e2c4e0ecc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
AC_PREREQ([2.69])
LT_PREREQ([2.4.6])
-AC_INIT([cdi],[2.5.0],[https://mpimet.mpg.de/cdi])
+AC_INIT([cdi],[2.5.1],[https://mpimet.mpg.de/cdi])
AC_DEFINE_UNQUOTED(CDI, ["$PACKAGE_VERSION"], [CDI version])
AC_CONFIG_AUX_DIR([config])
@@ -21,6 +21,9 @@ AM_INIT_AUTOMAKE([1.16.1 foreign])
AM_MAINTAINER_MODE([enable])
AM_EXTRA_RECURSIVE_TARGETS([examples])
+AC_MSG_NOTICE([setting up libtool])
+LT_INIT
+
dnl Tests for the C compiler:
dnl Make sure conftest.dSYM is removed when configured on MacOS with
dnl CFLAGS='-g':
diff --git a/examples/pio/compareResourcesArray.c b/examples/pio/compareResourcesArray.c
index 0082d60caee0271025039752166cee9fd0e94bd0..4eb771089b26c079bb3cbce5fa842bab1cc4cae1 100644
--- a/examples/pio/compareResourcesArray.c
+++ b/examples/pio/compareResourcesArray.c
@@ -60,7 +60,7 @@ defineGrid()
cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_UNITS, "myXunits");
cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_UNITS, "myYunits");
- gridDefDatatype(gridID, DOUBLE_PRECISION);
+ cdiDefKeyInt(gridID, CDI_GLOBAL, CDI_KEY_DATATYPE, DOUBLE_PRECISION);
gridDefTrunc(gridID, 1);
cdiDefKeyInt(gridID, CDI_GLOBAL, CDI_KEY_NUMBEROFGRIDUSED, 6);
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1f88fe09b84956160e7b52fb11ea0605f0b274a3..26ea963f1b0e27f9204c6cf8a2473d665a556bda 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -61,6 +61,7 @@ list( APPEND cdi_src_files
grb_write.c
gribapi.c
gribapi.h
+ gribapi_utilities.c
gribapi_utilities.h
grid.c
grid.h
@@ -103,6 +104,7 @@ list( APPEND cdi_src_files
stream_ext.h
stream_grb.c
stream_grb.h
+ stream_gribapi.c
stream_gribapi.h
stream_ieg.c
stream_ieg.h
@@ -137,12 +139,95 @@ list( APPEND cdi_src_files
zaxis.c
zaxis.h
)
+list( APPEND cdi_pio_files
+ cdipio.h
+ pio.c
+ pio.h
+ pio_cdf_int.c
+ pio_cdf_int.h
+ pio_client.c
+ pio_client.h
+ pio_comm.c
+ pio_comm.h
+ pio_conf.c
+ pio_conf.h
+ pio_dbuffer.c
+ pio_dbuffer.h
+ pio_dist_grid.c
+ pio_dist_grid.h
+ pio_id_set.h
+ pio_idxlist_cache.c
+ pio_idxlist_cache.h
+ pio_impl.h
+ pio_interface.c
+ pio_interface.h
+ pio_mpi_fw_at_all.c
+ pio_mpi_fw_at_reblock.c
+ pio_mpi_fw_ordered.c
+ pio_mpinonb.c
+ pio_posixasynch.c
+ pio_posixfpguardsendrecv.c
+ pio_posixnonb.c
+ pio_record_send.c
+ pio_roles.c
+ pio_rpc.c
+ pio_rpc.h
+ pio_serialize.c
+ pio_serialize.h
+ pio_server.c
+ pio_server.h
+ pio_util.c
+ pio_util.h
+ pio_xmap_cache.c
+ pio_xmap_cache.h
+)
+
+list( APPEND cdi_unknown
+ cfortran.h
+ getline.c
+ make_fint.c
+ resource_unpack.c
+ resource_unpack.h
+)
+
+option(CDI_BUILD_UNKNOWN "Build unknown sources in libcdi" ON)
+mark_as_advanced(CDI_BUILD_UNKNOWN)
+if (CDI_BUILD_UNKNOWN)
+ list(APPEND cdi_src_files ${cdi_unknown})
+endif ()
+
+# Support exporting all symbolds on Windows
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
add_library(cdilib
${cdi_src_files}
# INSTALL_HEADERS_LIST cdi.h
)
-find_package(HDF5 REQUIRED COMPONENTS C REQUIRED)
-target_link_libraries(cdilib PUBLIC netCDF::netcdf ${HDF5_LIBS})
-target_compile_definitions(cdilib PUBLIC HAVE_CONFIG_H)
+target_include_directories(cdilib PRIVATE "${PROJECT_BINARY_DIR}/src/config.h")
+target_link_libraries(cdilib ${cdi_linked_libs})
+target_compile_definitions(cdilib PRIVATE PACKAGE_NAME="${PROJECT_NAME}" VERSION="${CMAKE_PROJECT_VERSION}" ${cdi_compile_defs})
+
+add_library(cdilib::cdilib ALIAS cdilib)
+
+include(GNUInstallDirs)
+install(FILES cdi.h calendar.h cdi_datetime.h julian_date.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+install(TARGETS cdilib
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cdi/cdi-config.cmake.in" "${CMAKE_BINARY_DIR}/cmake/cdi-config.cmake"
+ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cdi")
+write_basic_package_version_file(
+ "${CMAKE_BINARY_DIR}/cmake/cdi-config-version.cmake"
+ VERSION "${PACKAGE_VERSION}"
+ COMPATIBILITY SameMajorVersion)
+install(
+ FILES
+ "${CMAKE_BINARY_DIR}/cmake/cdi-config.cmake"
+ "${CMAKE_BINARY_DIR}/cmake/cdi-config-version.cmake"
+ DESTINATION
+ "${CMAKE_INSTALL_LIBDIR}/cmake/cdi")
diff --git a/src/Makefile.am b/src/Makefile.am
index c38810106b8d353990dd954393643770db46d5e2..1903a6ac7ff5a03aeff61e16a1a5f3be9cba0bd1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ check_LTLIBRARIES =
noinst_LTLIBRARIES =
EXTRA_PROGRAMS = make_fint
EXTRA_DIST = \
+ CMakeLists.txt \
cdilib.c \
make_cdilib
diff --git a/src/cdf.c b/src/cdf.c
index 78e7fff9ff3579a3718212be6e11917fdf186367..43b1df25f837623cd7e59141b7461a30894c7a97 100644
--- a/src/cdf.c
+++ b/src/cdf.c
@@ -200,7 +200,7 @@ static void
cdfCloseFile(int fileID)
{
- if (CDF_Debug) Message( "Closing cdf file: %d", fileID);
+ if (CDF_Debug) Message("Closing cdf file: %d", fileID);
cdf_close(fileID);
}
@@ -209,6 +209,7 @@ cdfClose(int fileID)
{
cdfCloseFile(fileID);
}
+
#endif
/*
* Local Variables:
diff --git a/src/cdf_int.c b/src/cdf_int.c
index c7c03a5ea7b949de077d50ce914ccb8cd2b874e4..1c0eff0b29acbea41368d4b24676db4f5f1c4f6d 100644
--- a/src/cdf_int.c
+++ b/src/cdf_int.c
@@ -32,7 +32,6 @@ cdf__create(const char *path, int cmode, int *ncidp)
{
int status = -1;
size_t chunksizehint = 0;
-
size_t initialsz = 0;
#if defined(__SX__) || defined(ES)
@@ -128,14 +127,14 @@ cdf_enddef(int ncid, int streamID)
}
void
-cdf__enddef(int ncid, int streamID, const size_t hdr_pad)
+cdf__enddef(int ncid, int streamID, size_t hdr_pad)
{
- const size_t v_align = 4UL; // [B] Alignment of beginning of data section for fixed variables
- const size_t v_minfree = 0UL; // [B] Pad at end of data section for fixed size variables
- const size_t r_align = 4UL; // [B] Alignment of beginning of data section for record variables
+ size_t v_align = 4UL; // [B] Alignment of beginning of data section for fixed variables
+ size_t v_minfree = 0UL; // [B] Pad at end of data section for fixed size variables
+ size_t r_align = 4UL; // [B] Alignment of beginning of data section for record variables
// nc_enddef(ncid) is equivalent to nc__enddef(ncid, 0, 4, 0, 4)
- cdi_nc__enddef_funcp my_nc__enddef = (cdi_nc__enddef_funcp) namespaceSwitchGet(NSSWITCH_NC_ENDDEF).func;
+ cdi_nc__enddef_funcp my_nc__enddef = (cdi_nc__enddef_funcp) namespaceSwitchGet(NSSWITCH_NC__ENDDEF).func;
int status = my_nc__enddef(ncid, streamID, hdr_pad, v_align, v_minfree, r_align);
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -151,7 +150,6 @@ void
cdf_inq(int ncid, int *ndimsp, int *nvarsp, int *ngattsp, int *unlimdimidp)
{
int status = nc_inq(ncid, ndimsp, nvarsp, ngattsp, unlimdimidp);
-
if (CDF_Debug || status != NC_NOERR)
Message("ncid=%d ndims=%d nvars=%d ngatts=%d unlimid=%d", ncid, *ndimsp, *nvarsp, *ngattsp, *unlimdimidp);
@@ -162,9 +160,7 @@ void
cdf_def_dim(int ncid, const char *name, size_t len, int *dimidp)
{
int status = nc_def_dim(ncid, name, len, dimidp);
-
- if (CDF_Debug || status != NC_NOERR) Message("ncid=%d name=%s len=%d", ncid, name, len);
-
+ if (CDF_Debug || status != NC_NOERR) Message("ncid=%d name=%s len=%zu", ncid, name, len);
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -172,9 +168,7 @@ void
cdf_inq_dimid(int ncid, const char *name, int *dimidp)
{
int status = nc_inq_dimid(ncid, name, dimidp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d name=%s dimid=%d", ncid, name, *dimidp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -182,9 +176,7 @@ void
cdf_inq_dim(int ncid, int dimid, char *name, size_t *lengthp)
{
int status = nc_inq_dim(ncid, dimid, name, lengthp);
-
- if (CDF_Debug || status != NC_NOERR) Message("ncid=%d dimid=%d length=%d name=%s", ncid, dimid, *lengthp, name);
-
+ if (CDF_Debug || status != NC_NOERR) Message("ncid=%d dimid=%d length=%zu name=%s", ncid, dimid, *lengthp, name);
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -192,9 +184,7 @@ void
cdf_inq_dimname(int ncid, int dimid, char *name)
{
int status = nc_inq_dimname(ncid, dimid, name);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d dimid=%d name=%s", ncid, dimid, name);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -202,9 +192,7 @@ void
cdf_inq_dimlen(int ncid, int dimid, size_t *lengthp)
{
int status = nc_inq_dimlen(ncid, dimid, lengthp);
-
- if (CDF_Debug || status != NC_NOERR) Message("ncid=%d dimid=%d length=%d", ncid, dimid, *lengthp);
-
+ if (CDF_Debug || status != NC_NOERR) Message("ncid=%d dimid=%d length=%zu", ncid, dimid, *lengthp);
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -234,9 +222,7 @@ void
cdf_inq_varid(int ncid, const char *name, int *varidp)
{
int status = nc_inq_varid(ncid, name, varidp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d name=%s varid=%d", ncid, name, *varidp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -244,9 +230,7 @@ void
cdf_inq_nvars(int ncid, int *nvarsp)
{
int status = nc_inq_nvars(ncid, nvarsp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d nvars=%d", ncid, *nvarsp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -254,7 +238,6 @@ void
cdf_inq_var(int ncid, int varid, char *name, nc_type *xtypep, int *ndimsp, int dimids[], int *nattsp)
{
int status = nc_inq_var(ncid, varid, name, xtypep, ndimsp, dimids, nattsp);
-
if (CDF_Debug || status != NC_NOERR)
Message("ncid=%d varid=%d ndims=%d xtype=%d natts=%d name=%s", ncid, varid, *ndimsp, *xtypep, *nattsp, name);
@@ -265,9 +248,7 @@ void
cdf_inq_varname(int ncid, int varid, char *name)
{
int status = nc_inq_varname(ncid, varid, name);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d name=%s", ncid, varid, name);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -275,9 +256,7 @@ void
cdf_inq_vartype(int ncid, int varid, nc_type *xtypep)
{
int status = nc_inq_vartype(ncid, varid, xtypep);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d xtype=%s", ncid, varid, *xtypep);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -285,9 +264,7 @@ void
cdf_inq_varndims(int ncid, int varid, int *ndimsp)
{
int status = nc_inq_varndims(ncid, varid, ndimsp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -295,9 +272,7 @@ void
cdf_inq_vardimid(int ncid, int varid, int dimids[])
{
int status = nc_inq_vardimid(ncid, varid, dimids);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -305,9 +280,7 @@ void
cdf_inq_varnatts(int ncid, int varid, int *nattsp)
{
int status = nc_inq_varnatts(ncid, varid, nattsp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d nattsp=%d", ncid, varid, *nattsp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -315,9 +288,7 @@ void
cdf_put_var_text(int ncid, int varid, const char *tp)
{
int status = nc_put_var_text(ncid, varid, tp);
-
if (CDF_Debug || status != NC_NOERR) Message("%d %d %s", ncid, varid, tp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -325,9 +296,7 @@ void
cdf_put_var_short(int ncid, int varid, const short *sp)
{
int status = nc_put_var_short(ncid, varid, sp);
-
if (CDF_Debug || status != NC_NOERR) Message("%d %d %hd", ncid, varid, *sp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -335,9 +304,7 @@ void
cdf_put_var_int(int ncid, int varid, const int *ip)
{
int status = nc_put_var_int(ncid, varid, ip);
-
if (CDF_Debug || status != NC_NOERR) Message("%d %d %d", ncid, varid, *ip);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -345,9 +312,7 @@ void
cdf_put_var_long(int ncid, int varid, const long *lp)
{
int status = nc_put_var_long(ncid, varid, lp);
-
if (CDF_Debug || status != NC_NOERR) Message("%d %d %ld", ncid, varid, *lp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -355,9 +320,7 @@ void
cdf_put_var_float(int ncid, int varid, const float *fp)
{
int status = nc_put_var_float(ncid, varid, fp);
-
if (CDF_Debug || status != NC_NOERR) Message("%d %d %f", ncid, varid, *fp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -420,7 +383,6 @@ void
cdf_put_vara_double(int ncid, int varid, const size_t start[], const size_t count[], const double *dp)
{
int status = nc_put_vara_double(ncid, varid, start, count, dp);
-
if (CDF_Debug || status != NC_NOERR)
{
char name[256];
@@ -443,7 +405,6 @@ void
cdf_put_vara_float(int ncid, int varid, const size_t start[], const size_t count[], const float *fp)
{
int status = nc_put_vara_float(ncid, varid, start, count, fp);
-
if (CDF_Debug || status != NC_NOERR)
{
char name[256];
@@ -466,9 +427,7 @@ void
cdf_put_vara(int ncid, int varid, const size_t start[], const size_t count[], const void *cp)
{
int status = nc_put_vara(ncid, varid, start, count, cp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -476,9 +435,7 @@ void
cdf_get_vara(int ncid, int varid, const size_t start[], const size_t count[], void *cp)
{
int status = nc_get_vara(ncid, varid, start, count, cp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -486,9 +443,7 @@ void
cdf_get_vara_int(int ncid, int varid, const size_t start[], const size_t count[], int *dp)
{
int status = nc_get_vara_int(ncid, varid, start, count, dp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -496,9 +451,7 @@ void
cdf_get_vara_double(int ncid, int varid, const size_t start[], const size_t count[], double *dp)
{
int status = nc_get_vara_double(ncid, varid, start, count, dp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d start[0]=%zu count[0]=%zu", ncid, varid, start[0], count[0]);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -506,9 +459,7 @@ void
cdf_get_vara_float(int ncid, int varid, const size_t start[], const size_t count[], float *fp)
{
int status = nc_get_vara_float(ncid, varid, start, count, fp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d start[0]=%zu count[0]=%zu", ncid, varid, start[0], count[0]);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -516,9 +467,7 @@ void
cdf_get_vara_text(int ncid, int varid, const size_t start[], const size_t count[], char *tp)
{
int status = nc_get_vara_text(ncid, varid, start, count, tp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -526,9 +475,7 @@ void
cdf_get_vara_uchar(int ncid, int varid, const size_t start[], const size_t count[], unsigned char *tp)
{
int status = nc_get_vara_uchar(ncid, varid, start, count, tp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -536,9 +483,7 @@ void
cdf_put_var_double(int ncid, int varid, const double *dp)
{
int status = nc_put_var_double(ncid, varid, dp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d val0=%f", ncid, varid, *dp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -546,9 +491,7 @@ void
cdf_get_var1_text(int ncid, int varid, const size_t index[], char *tp)
{
int status = nc_get_var1_text(ncid, varid, index, tp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -556,9 +499,7 @@ void
cdf_get_var1_double(int ncid, int varid, const size_t index[], double *dp)
{
int status = nc_get_var1_double(ncid, varid, index, dp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -566,9 +507,7 @@ void
cdf_put_var1_double(int ncid, int varid, const size_t index[], const double *dp)
{
int status = nc_put_var1_double(ncid, varid, index, dp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d val=%f", ncid, varid, *dp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -576,9 +515,7 @@ void
cdf_get_var_text(int ncid, int varid, char *tp)
{
int status = nc_get_var_text(ncid, varid, tp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -586,9 +523,7 @@ void
cdf_get_var_short(int ncid, int varid, short *sp)
{
int status = nc_get_var_short(ncid, varid, sp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -596,9 +531,7 @@ void
cdf_get_var_int(int ncid, int varid, int *ip)
{
int status = nc_get_var_int(ncid, varid, ip);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -606,9 +539,7 @@ void
cdf_get_var_long(int ncid, int varid, long *lp)
{
int status = nc_get_var_long(ncid, varid, lp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -616,9 +547,7 @@ void
cdf_get_var_float(int ncid, int varid, float *fp)
{
int status = nc_get_var_float(ncid, varid, fp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d", ncid, varid);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -626,9 +555,7 @@ void
cdf_get_var_double(int ncid, int varid, double *dp)
{
int status = nc_get_var_double(ncid, varid, dp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d val[0]=%f", ncid, varid, *dp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -636,9 +563,7 @@ void
cdf_copy_att(int ncid_in, int varid_in, const char *name, int ncid_out, int varid_out)
{
int status = nc_copy_att(ncid_in, varid_in, name, ncid_out, varid_out);
-
if (CDF_Debug || status != NC_NOERR) Message("%d %d %s %d %d", ncid_in, varid_out, name, ncid_out, varid_out);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -646,9 +571,7 @@ void
cdf_put_att_text(int ncid, int varid, const char *name, size_t len, const char *tp)
{
int status = nc_put_att_text(ncid, varid, name, len, tp);
-
- if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s text=%.*s", ncid, varid, name, (int) len, tp);
-
+ if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s text='%.*s'", ncid, varid, name, (int) len, tp);
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -656,11 +579,8 @@ void
cdf_put_att_int(int ncid, int varid, const char *name, nc_type xtype, size_t len, const int *ip)
{
int status = nc_put_att_int(ncid, varid, name, xtype, len, ip);
-
if (status == NC_ERANGE) status = NC_NOERR;
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s val=%d", ncid, varid, name, *ip);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -668,9 +588,7 @@ void
cdf_put_att_float(int ncid, int varid, const char *name, nc_type xtype, size_t len, const float *dp)
{
int status = nc_put_att_float(ncid, varid, name, xtype, len, dp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s val=%g", ncid, varid, name, *dp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -678,9 +596,7 @@ void
cdf_put_att_double(int ncid, int varid, const char *name, nc_type xtype, size_t len, const double *dp)
{
int status = nc_put_att_double(ncid, varid, name, xtype, len, dp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s val=%g", ncid, varid, name, *dp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -688,9 +604,7 @@ void
cdf_get_att_text(int ncid, int varid, const char *name, char *tp)
{
int status = nc_get_att_text(ncid, varid, name, tp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d name=%s", ncid, varid, name);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -699,9 +613,7 @@ cdf_get_att_string(int ncid, int varid, const char *name, char **tp)
{
#ifdef HAVE_NETCDF4
int status = nc_get_att_string(ncid, varid, name, tp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d name=%s", ncid, varid, name);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
#endif
}
@@ -710,11 +622,8 @@ void
cdf_get_att_int(int ncid, int varid, const char *name, int *ip)
{
int status = nc_get_att_int(ncid, varid, name, ip);
-
if (status == NC_ERANGE) status = NC_NOERR;
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s val=%d", ncid, varid, name, *ip);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -723,11 +632,8 @@ cdf_get_att_longlong(int ncid, int varid, const char *name, long long *llp)
{
#ifdef HAVE_NETCDF4
int status = nc_get_att_longlong(ncid, varid, name, llp);
-
if (status == NC_ERANGE) status = NC_NOERR;
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s val=%lld", ncid, varid, name, *llp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
#endif
}
@@ -736,9 +642,7 @@ void
cdf_get_att_double(int ncid, int varid, const char *name, double *dp)
{
int status = nc_get_att_double(ncid, varid, name, dp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s val=%.9g", ncid, varid, name, *dp);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -746,9 +650,7 @@ void
cdf_inq_att(int ncid, int varid, const char *name, nc_type *xtypep, size_t *lenp)
{
int status = nc_inq_att(ncid, varid, name, xtypep, lenp);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s", ncid, varid, name);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -756,9 +658,7 @@ void
cdf_inq_atttype(int ncid, int varid, const char *name, nc_type *xtypep)
{
int status = nc_inq_atttype(ncid, varid, name, xtypep);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s", ncid, varid, name);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -766,9 +666,7 @@ void
cdf_inq_attlen(int ncid, int varid, const char *name, size_t *lenp)
{
int status = nc_inq_attlen(ncid, varid, name, lenp);
-
- if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s len=%d", ncid, varid, name, *lenp);
-
+ if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s len=%zu", ncid, varid, name, *lenp);
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -776,9 +674,7 @@ void
cdf_inq_attname(int ncid, int varid, int attnum, char *name)
{
int status = nc_inq_attname(ncid, varid, attnum, name);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d attnum=%d att=%s", ncid, varid, attnum, name);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -786,9 +682,7 @@ void
cdf_inq_attid(int ncid, int varid, const char *name, int *attnump)
{
int status = nc_inq_attid(ncid, varid, name, attnump);
-
if (CDF_Debug || status != NC_NOERR) Message("ncid=%d varid=%d att=%s", ncid, varid, name);
-
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
@@ -797,10 +691,34 @@ void
cdf_def_var_chunking(int ncid, int varid, int storage, const size_t *chunksizesp)
{
int status = nc_def_var_chunking(ncid, varid, storage, chunksizesp);
+ if (CDF_Debug || status != NC_NOERR)
+ Message("chunks=%zu/%zu/%zu/%zu", chunksizesp[0], chunksizesp[1], chunksizesp[2], chunksizesp[3]);
if (status != NC_NOERR) Error("%s", nc_strerror(status));
}
#endif
+size_t
+cdf_xtype_to_numbytes(nc_type xtype)
+{
+ size_t numBytes = 8;
+
+ // clang-format off
+ if (xtype == NC_BYTE ) numBytes = 1;
+ else if (xtype == NC_CHAR ) numBytes = 1;
+ else if (xtype == NC_SHORT ) numBytes = 2;
+ else if (xtype == NC_INT ) numBytes = 4;
+ else if (xtype == NC_FLOAT ) numBytes = 4;
+#ifdef HAVE_NETCDF4
+ else if (xtype == NC_UBYTE ) numBytes = 1;
+ else if (xtype == NC_USHORT) numBytes = 2;
+ else if (xtype == NC_LONG ) numBytes = 4;
+ else if (xtype == NC_UINT ) numBytes = 4;
+#endif
+ // clang-format on
+
+ return numBytes;
+}
+
#endif
/*
* Local Variables:
diff --git a/src/cdf_int.h b/src/cdf_int.h
index 7a4931a49b5342f8dee4b5d41bb84afd32ef1beb..6afae60303733513b5e0f92ba88730428d323a86 100644
--- a/src/cdf_int.h
+++ b/src/cdf_int.h
@@ -13,7 +13,7 @@ void cdf_close(int ncid);
void cdf_redef(int ncid);
void cdf_enddef(int ncid, int streamID);
-void cdf__enddef(int ncid, int streamID, const size_t hdr_pad);
+void cdf__enddef(int ncid, int streamID, size_t hdr_pad);
void cdf_sync(int ncid);
void cdf_inq(int ncid, int *ndimsp, int *nvarsp, int *ngattsp, int *unlimdimidp);
@@ -99,6 +99,9 @@ int cdi_nc_enddef_serial(int ncid, int streamID);
int cdi_nc__enddef_serial(int ncid, int streamID, size_t hdr_pad, size_t v_align, size_t v_minfree, size_t r_align);
typedef int (*cdi_nc_enddef_funcp)(int ncid, int streamID);
typedef int (*cdi_nc__enddef_funcp)(int ncid, int streamID, size_t hdr_pad, size_t v_align, size_t v_minfree, size_t r_align);
+
+size_t cdf_xtype_to_numbytes(nc_type xtype);
+
#endif
#endif /* CDF_INT_H */
diff --git a/src/cdf_lazy_grid.c b/src/cdf_lazy_grid.c
index af1315bddd49e2a1735dc04af15e27df67d50ecc..65339aec2935a81ef74454466783376f90ac989d 100644
--- a/src/cdf_lazy_grid.c
+++ b/src/cdf_lazy_grid.c
@@ -3,7 +3,9 @@
#endif
#ifdef HAVE_LIBNETCDF
+#include "dmemory.h"
#include "stream_cdf.h"
+#include "cdf_int.h"
#include "cdf_lazy_grid.h"
static struct gridVirtTable cdfLazyGridVtable;
@@ -42,7 +44,7 @@ static void
cdfLazyGridDelete(grid_t *grid)
{
struct cdfLazyGrid *cdfGrid = (struct cdfLazyGrid *) grid;
- void (*baseDestroy)(grid_t * grid) = cdfGrid->baseVtable->destroy;
+ void (*baseDestroy)(grid_t *grid) = cdfGrid->baseVtable->destroy;
cdfLazyGridDestroy(cdfGrid);
baseDestroy(grid);
}
@@ -194,7 +196,7 @@ cdfLazyGridInqXVal(grid_t *grid, SizeType index)
{
struct cdfLazyGrid *lazyGrid = (struct cdfLazyGrid *) grid;
lock_lazy_load(lazyGrid);
- const double rv = cdfLazyGridInqXYVal(grid, (size_t) index, &lazyGrid->xValsGet, grid->x.vals, grid->vtable->inqXValsPtr);
+ double rv = cdfLazyGridInqXYVal(grid, (size_t) index, &lazyGrid->xValsGet, grid->x.vals, grid->vtable->inqXValsPtr);
unlock_lazy_load(lazyGrid);
return rv;
}
@@ -204,7 +206,7 @@ cdfLazyGridInqYVal(grid_t *grid, SizeType index)
{
struct cdfLazyGrid *lazyGrid = (struct cdfLazyGrid *) grid;
lock_lazy_load(lazyGrid);
- const double rv = cdfLazyGridInqXYVal(grid, (size_t) index, &lazyGrid->yValsGet, grid->y.vals, grid->vtable->inqYValsPtr);
+ double rv = cdfLazyGridInqXYVal(grid, (size_t) index, &lazyGrid->yValsGet, grid->y.vals, grid->vtable->inqYValsPtr);
unlock_lazy_load(lazyGrid);
return rv;
}
@@ -315,10 +317,10 @@ cdfLazyGridCopyScalarFields(grid_t *gridptrOrig, grid_t *gridptrDup)
static void
cdfLazyGridCopyArrayFields(grid_t *gridptrOrig, grid_t *gridptrDup)
{
- const size_t reducedPointsSize = (size_t) gridptrOrig->reducedPointsSize;
- const size_t gridsize = gridptrOrig->size;
- const int gridtype = gridptrOrig->type;
- const int irregular = (gridtype == GRID_CURVILINEAR || gridtype == GRID_UNSTRUCTURED);
+ size_t reducedPointsSize = (size_t) gridptrOrig->reducedPointsSize;
+ size_t gridsize = gridptrOrig->size;
+ int gridtype = gridptrOrig->type;
+ int irregular = (gridtype == GRID_CURVILINEAR || gridtype == GRID_UNSTRUCTURED);
if (reducedPointsSize)
{
@@ -328,28 +330,28 @@ cdfLazyGridCopyArrayFields(grid_t *gridptrOrig, grid_t *gridptrDup)
if (gridptrOrig->x.vals != NULL && gridptrOrig->x.vals != cdfPendingLoad)
{
- const size_t size = irregular ? gridsize : gridptrOrig->x.size;
+ size_t size = irregular ? gridsize : gridptrOrig->x.size;
gridptrDup->x.vals = (double *) Malloc(size * sizeof(double));
memcpy(gridptrDup->x.vals, gridptrOrig->x.vals, size * sizeof(double));
}
if (gridptrOrig->y.vals != NULL && gridptrOrig->y.vals != cdfPendingLoad)
{
- const size_t size = irregular ? gridsize : gridptrOrig->y.size;
+ size_t size = irregular ? gridsize : gridptrOrig->y.size;
gridptrDup->y.vals = (double *) Malloc(size * sizeof(double));
memcpy(gridptrDup->y.vals, gridptrOrig->y.vals, size * sizeof(double));
}
if (gridptrOrig->x.bounds != NULL && gridptrOrig->x.bounds != cdfPendingLoad)
{
- const size_t size = (irregular ? gridsize : gridptrOrig->x.size) * (size_t) gridptrOrig->nvertex;
+ size_t size = (irregular ? gridsize : gridptrOrig->x.size) * (size_t) gridptrOrig->nvertex;
gridptrDup->x.bounds = (double *) Malloc(size * sizeof(double));
memcpy(gridptrDup->x.bounds, gridptrOrig->x.bounds, size * sizeof(double));
}
if (gridptrOrig->y.bounds != NULL && gridptrOrig->y.bounds != cdfPendingLoad)
{
- const size_t size = (irregular ? gridsize : gridptrOrig->y.size) * (size_t) gridptrOrig->nvertex;
+ size_t size = (irregular ? gridsize : gridptrOrig->y.size) * (size_t) gridptrOrig->nvertex;
gridptrDup->y.bounds = (double *) Malloc(size * sizeof(double));
memcpy(gridptrDup->y.bounds, gridptrOrig->y.bounds, size * sizeof(double));
}
@@ -357,7 +359,7 @@ cdfLazyGridCopyArrayFields(grid_t *gridptrOrig, grid_t *gridptrDup)
{
if (gridptrOrig->area != NULL && gridptrOrig->area != cdfPendingLoad)
{
- const size_t size = gridsize;
+ size_t size = gridsize;
gridptrDup->area = (double *) Malloc(size * sizeof(double));
memcpy(gridptrDup->area, gridptrOrig->area, size * sizeof(double));
}
@@ -365,14 +367,14 @@ cdfLazyGridCopyArrayFields(grid_t *gridptrOrig, grid_t *gridptrDup)
if (gridptrOrig->mask != NULL)
{
- const size_t size = gridsize;
+ size_t size = gridsize;
gridptrDup->mask = (mask_t *) Malloc(size * sizeof(mask_t));
memcpy(gridptrDup->mask, gridptrOrig->mask, size * sizeof(mask_t));
}
if (gridptrOrig->mask_gme != NULL)
{
- const size_t size = gridsize;
+ size_t size = gridsize;
gridptrDup->mask_gme = (mask_t *) Malloc(size * sizeof(mask_t));
memcpy(gridptrDup->mask_gme, gridptrOrig->mask_gme, size * sizeof(mask_t));
}
diff --git a/src/cdf_lazy_grid.h b/src/cdf_lazy_grid.h
index ac0184ffd2854bb33c15571e67b02989ed7d7074..3788e2622c534999a991e8b302c4254b1f7143a6 100644
--- a/src/cdf_lazy_grid.h
+++ b/src/cdf_lazy_grid.h
@@ -19,8 +19,6 @@
#include <string.h>
-#include "dmemory.h"
-#include "cdf_int.h"
#include "grid.h"
struct xyValGet
diff --git a/src/cdf_read.c b/src/cdf_read.c
index 05622e06081bc7bfa5e099e941303d242be8c217..487ec7fad907651fbbac8fb578e3c08e341c641e 100644
--- a/src/cdf_read.c
+++ b/src/cdf_read.c
@@ -15,7 +15,6 @@
#include "stream_cdf.h"
#include "cdf_int.h"
#include "vlist.h"
-#include "vlist_var.h"
static void
cdfReadGridTraj(stream_t *streamptr, int gridID)
@@ -24,8 +23,9 @@ cdfReadGridTraj(stream_t *streamptr, int gridID)
int fileID = streamptr->fileID;
int gridindex = vlistGridIndex(vlistID, gridID);
- int ncLonId = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_X];
- int ncLatId = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_Y];
+ const CdfGrid *cdfGrid = &(streamptr->cdfInfo.cdfGridVec[gridindex]);
+ int ncLonId = cdfGrid->ncIdVec[CDF_VARID_X];
+ int ncLatId = cdfGrid->ncIdVec[CDF_VARID_Y];
int tsID = streamptr->curTsID;
size_t ncStepIndex = (size_t) streamptr->tsteps[tsID].ncStepIndex;
@@ -47,6 +47,7 @@ cdfGetSlapDescription(stream_t *streamptr, int varID, size_t (*start)[MAX_DIMENS
int zaxisID = vlistInqVarZaxis(vlistID, varID);
int timetype = vlistInqVarTimetype(vlistID, varID);
int gridindex = vlistGridIndex(vlistID, gridID);
+ const CdfGrid *cdfGrid = &(streamptr->cdfInfo.cdfGridVec[gridindex]);
size_t ncStepIndex = (size_t) streamptr->tsteps[tsID].ncStepIndex;
int xid = CDI_UNDEFID, yid = CDI_UNDEFID;
@@ -56,11 +57,11 @@ cdfGetSlapDescription(stream_t *streamptr, int varID, size_t (*start)[MAX_DIMENS
}
else
{
- xid = streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_X];
- yid = streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_Y];
+ xid = cdfGrid->ncIdVec[CDF_DIMID_X];
+ yid = cdfGrid->ncIdVec[CDF_DIMID_Y];
}
int zaxisindex = vlistZaxisIndex(vlistID, zaxisID);
- int zid = streamptr->zaxisID[zaxisindex];
+ int zid = streamptr->cdfInfo.zaxisIdVec[zaxisindex];
int ndims = 0;
#define addDimension(startCoord, length) \
@@ -376,7 +377,7 @@ cdf_inq_dimIds(stream_t *streamptr, int varId, int (*outDimIds)[4])
int vlistID = streamptr->vlistID;
int gridId = vlistInqVarGrid(vlistID, varId);
int gridindex = vlistGridIndex(vlistID, gridId);
- const int *ncIDs = streamptr->ncgrid[gridindex].ncIDs;
+ const int *ncIDs = streamptr->cdfInfo.cdfGridVec[gridindex].ncIdVec;
switch (gridInqType(gridId))
{
@@ -395,15 +396,16 @@ cdf_inq_dimIds(stream_t *streamptr, int varId, int (*outDimIds)[4])
int zaxisID = vlistInqVarZaxis(vlistID, varId);
int zaxisindex = vlistZaxisIndex(vlistID, zaxisID);
- (*outDimIds)[2] = streamptr->zaxisID[zaxisindex];
+ (*outDimIds)[2] = streamptr->cdfInfo.zaxisIdVec[zaxisindex];
}
static size_t
stream_inq_dimlen(stream_t *streamptr, int dimid)
{
- int ndims = streamptr->ncNumDims;
- int *ncdimid = streamptr->ncDimID;
- size_t *ncdimlen = streamptr->ncDimLen;
+ const CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ int ndims = cdfInfo->ncNumDims;
+ const int *ncdimid = cdfInfo->ncDimIdVec;
+ const size_t *ncdimlen = cdfInfo->ncDimLenVec;
for (int i = 0; i < ndims; ++i)
{
if (dimid == ncdimid[i]) return ncdimlen[i];
@@ -490,8 +492,8 @@ cdfGetSliceSlapDescription(stream_t *streamptr, long tsID, int varID, int levelI
if (skipdim == 1) addDimension(0, 1);
int gridindex = vlistGridIndex(vlistID, gridId);
- const ncgrid_t *ncGrid = &streamptr->ncgrid[gridindex];
- bool readPart = (ncGrid->gridID == gridId && ncGrid->start != -1 && ncGrid->count != -1);
+ const CdfGrid *cdfGrid = &(streamptr->cdfInfo.cdfGridVec[gridindex]);
+ bool readPart = (cdfGrid->gridID == gridId && cdfGrid->start != -1 && cdfGrid->count != -1);
for (int id = 0; id < 4; ++id)
{
@@ -503,7 +505,7 @@ cdfGetSliceSlapDescription(stream_t *streamptr, long tsID, int varID, int levelI
case 2:
case 4:
if (readPart && curDimId == dimIds[0])
- addDimension((size_t) ncGrid->start, (size_t) ncGrid->count);
+ addDimension((size_t) cdfGrid->start, (size_t) cdfGrid->count);
else
addDimension(0, stream_inq_dimlen(streamptr, curDimId));
break;
@@ -794,14 +796,13 @@ static size_t
cdf_read_data(stream_t *streamptr, int recID, int memtype, void *data)
{
int tsID = streamptr->curTsID;
- int varID = streamptr->tsteps[tsID].records[recID].varID;
- int levelID = streamptr->tsteps[tsID].records[recID].levelID;
+ recinfo_t *recInfo = &(streamptr->tsteps[tsID].recinfo[recID]);
size_t numMissVals = 0;
if (memtype == MEMTYPE_DOUBLE)
- cdf_read_var_slice_DP(streamptr, tsID, varID, levelID, (double *) data, &numMissVals);
+ cdf_read_var_slice_DP(streamptr, tsID, recInfo->varID, recInfo->levelID, (double *) data, &numMissVals);
else
- cdf_read_var_slice_SP(streamptr, tsID, varID, levelID, (float *) data, &numMissVals);
+ cdf_read_var_slice_SP(streamptr, tsID, recInfo->varID, recInfo->levelID, (float *) data, &numMissVals);
return numMissVals;
}
@@ -815,16 +816,15 @@ typedef struct JobDescriptorCDF
static JobArgsCDF
job_args_init(stream_t *streamptr, long tsID, long recID, int memtype, void *data)
{
- int varID = streamptr->tsteps[tsID].records[recID].varID;
- int levelID = streamptr->tsteps[tsID].records[recID].levelID;
- size_t gridsize = (size_t) gridInqSize(vlistInqVarGrid(streamptr->vlistID, varID));
+ recinfo_t *recInfo = &(streamptr->tsteps[tsID].recinfo[recID]);
+ size_t gridsize = (size_t) gridInqSize(vlistInqVarGrid(streamptr->vlistID, recInfo->varID));
if (!data) data = Malloc(gridsize * ((memtype == MEMTYPE_FLOAT) ? sizeof(float) : sizeof(double)));
- return (JobArgsCDF){
+ return (JobArgsCDF) {
.streamptr = streamptr,
- .varID = varID,
- .levelID = levelID,
+ .varID = recInfo->varID,
+ .levelID = recInfo->levelID,
.memtype = memtype,
.recID = recID,
.tsID = tsID,
@@ -887,7 +887,7 @@ cdf_get_local_step_and_recId(stream_t *streamptr, long globalRecId)
globalRecId -= tsteps[1].nrecs;
}
- return (struct recTsId){ .recID = globalRecId, .tsID = localTsId };
+ return (struct recTsId) { .recID = globalRecId, .tsID = localTsId };
}
static void
diff --git a/src/cdf_records.c b/src/cdf_records.c
index 1ad97c2a7d8aa5f25b0fcf4306e68117ffabaa81..445c438c9a7d58979b4258507104e97e01f3cf83 100644
--- a/src/cdf_records.c
+++ b/src/cdf_records.c
@@ -16,7 +16,7 @@
static void
cdf_init_timestep(tsteps_t *timeStep, int numRecs, int numRecsAvail)
{
- timeStep->records = (record_t *) Malloc((size_t) numRecs * sizeof(record_t));
+ timeStep->recinfo = (recinfo_t *) Malloc((size_t) numRecs * sizeof(recinfo_t));
timeStep->nrecs = numRecsAvail;
timeStep->nallrecs = numRecs;
timeStep->recordSize = numRecs;
@@ -39,7 +39,7 @@ cdf_get_numRecsAvail(int vlistID)
}
static void
-cdf_init_records_step0(int numRecs, int *recIDs, record_t *records, int vlistID)
+cdf_init_records_step0(int numRecs, int *recIDs, recinfo_t *recinfo, int vlistID)
{
for (int recID = 0; recID < numRecs; recID++) recIDs[recID] = recID;
@@ -50,20 +50,20 @@ cdf_init_records_step0(int numRecs, int *recIDs, record_t *records, int vlistID)
int nlevels = zaxisInqSize(zaxisID);
for (int levelID = 0; levelID < nlevels; levelID++)
{
- recordInitEntry(&records[recID]);
- records[recID].varID = (short) varID;
- records[recID].levelID = levelID;
+ recinfoInitEntry(&recinfo[recID]);
+ recinfo[recID].varID = (short) varID;
+ recinfo[recID].levelID = levelID;
recID++;
}
}
}
static void
-cdf_init_records_step1(int numRecs, int *recIDs, record_t *records, int vlistID)
+cdf_init_records_step1(int numRecs, int *recIDs, recinfo_t *recinfo, int vlistID)
{
for (int recID = 0, vrecID = 0; recID < numRecs; recID++)
{
- if (vlistInqVarTimetype(vlistID, records[recID].varID) != TIME_CONSTANT)
+ if (vlistInqVarTimetype(vlistID, recinfo[recID].varID) != TIME_CONSTANT)
{
recIDs[vrecID++] = recID;
}
@@ -94,7 +94,7 @@ cdf_create_records(stream_t *streamptr, size_t tsID)
cdf_init_timestep(destTstep, numFields, numRecsAvail);
destTstep->recIDs = (int *) Malloc((size_t) numRecsAvail * sizeof(int));
- cdf_init_records_step0(numFields, destTstep->recIDs, destTstep->records, vlistID);
+ cdf_init_records_step0(numFields, destTstep->recIDs, destTstep->recinfo, vlistID);
}
else if (tsID == 1)
{
@@ -104,17 +104,17 @@ cdf_create_records(stream_t *streamptr, size_t tsID)
cdf_init_timestep(destTstep, numFields, numRecsAvail);
- memcpy(destTstep->records, sourceTstep->records, (size_t) numFields * sizeof(record_t));
+ memcpy(destTstep->recinfo, sourceTstep->recinfo, (size_t) numFields * sizeof(recinfo_t));
if (numRecsAvail)
{
destTstep->recIDs = (int *) Malloc((size_t) numRecsAvail * sizeof(int));
- cdf_init_records_step1(numFields, destTstep->recIDs, destTstep->records, vlistID);
+ cdf_init_records_step1(numFields, destTstep->recIDs, destTstep->recinfo, vlistID);
}
}
else
{
- if (streamptr->tsteps[1].records == 0) cdf_create_records(streamptr, 1);
+ if (streamptr->tsteps[1].recinfo == 0) cdf_create_records(streamptr, 1);
int numRecsAvail = streamptr->tsteps[1].nrecs;
@@ -122,7 +122,7 @@ cdf_create_records(stream_t *streamptr, size_t tsID)
cdf_init_timestep(destTstep, numFields, numRecsAvail);
- memcpy(destTstep->records, sourceTstep->records, (size_t) numFields * sizeof(record_t));
+ memcpy(destTstep->recinfo, sourceTstep->recinfo, (size_t) numFields * sizeof(recinfo_t));
if (numRecsAvail)
{
diff --git a/src/cdf_util.c b/src/cdf_util.c
index 3f529d185cbfc8ddf7052a00993c8107885ad0f9..f4779e3f4d51e8a10f43af53571d7dfc54a90932 100644
--- a/src/cdf_util.c
+++ b/src/cdf_util.c
@@ -13,7 +13,6 @@
#include <string.h>
#include <ctype.h>
-#include "dmemory.h"
#include "cdi.h"
#include "cdi_int.h"
#include "cdf_util.h"
diff --git a/src/cdf_util.h b/src/cdf_util.h
index 021f0467a32740a3c326272291a62dd21b9c24c6..8ac9d7158926d2150cdcc58b9fbba22c95366f72 100644
--- a/src/cdf_util.h
+++ b/src/cdf_util.h
@@ -1,6 +1,7 @@
#ifndef CDF_UTIL_H_
#define CDF_UTIL_H_
+#include <stdlib.h>
#include <stdbool.h>
bool xtypeIsText(int xtype);
diff --git a/src/cdf_write.c b/src/cdf_write.c
index eb556afcac38904a2ddbc11224283458fb6d6c16..4e5ece4fbaca9d08a7ee32710e8535ba80d2a990 100644
--- a/src/cdf_write.c
+++ b/src/cdf_write.c
@@ -13,7 +13,6 @@
#include "cdf.h"
#include "cdf_int.h"
#include "vlist.h"
-#include "vlist_var.h"
void
cdfDefVarDeflate(int ncid, int ncvarID, int shuffle, int compLevel)
@@ -73,9 +72,10 @@ cdfDefVarSzip(int ncid, int ncvarID, int pixels_per_block)
static nc_type
cdfTypeComplexFloat(stream_t *streamptr)
{
- if (streamptr->nc_complex_float_id == CDI_UNDEFID)
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ if (cdfInfo->complexFloatId == CDI_UNDEFID)
{
- typedef struct complex_float
+ typedef struct
{
float r, i;
} complex_float;
@@ -88,18 +88,19 @@ cdfTypeComplexFloat(stream_t *streamptr)
if (status != NC_NOERR) Error("%s", nc_strerror(status));
status = nc_insert_compound(fileID, nc_complex_id, "i", NC_COMPOUND_OFFSET(complex_float, i), NC_FLOAT);
if (status != NC_NOERR) Error("%s", nc_strerror(status));
- streamptr->nc_complex_float_id = nc_complex_id;
+ cdfInfo->complexFloatId = nc_complex_id;
}
- return (nc_type) streamptr->nc_complex_float_id;
+ return (nc_type) cdfInfo->complexFloatId;
}
static nc_type
cdfTypeComplexDouble(stream_t *streamptr)
{
- if (streamptr->nc_complex_double_id == CDI_UNDEFID)
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ if (cdfInfo->complexDoubleId == CDI_UNDEFID)
{
- typedef struct complex_double
+ typedef struct
{
double r, i;
} complex_double;
@@ -112,10 +113,10 @@ cdfTypeComplexDouble(stream_t *streamptr)
if (status != NC_NOERR) Error("%s", nc_strerror(status));
status = nc_insert_compound(fileID, nc_complex_id, "i", NC_COMPOUND_OFFSET(complex_double, i), NC_DOUBLE);
if (status != NC_NOERR) Error("%s", nc_strerror(status));
- streamptr->nc_complex_double_id = nc_complex_id;
+ cdfInfo->complexDoubleId = nc_complex_id;
}
- return (nc_type) streamptr->nc_complex_double_id;
+ return (nc_type) cdfInfo->complexDoubleId;
}
#endif
@@ -414,7 +415,7 @@ nc_grid_index(stream_t *streamptr, int gridID)
int vlistID = streamptr->vlistID;
int ngrids = vlistNumGrids(vlistID);
for (index = 0; index < ngrids; ++index)
- if (streamptr->ncgrid[index].gridID == gridID) break;
+ if (streamptr->cdfInfo.cdfGridVec[index].gridID == gridID) break;
assert(index < ngrids);
@@ -577,9 +578,10 @@ cdfDefineCoordinates(const stream_t *streamptr, int ncvarID, int nczvarID, int g
if (numLPE > 0) cdf_put_att_int(fileID, ncvarID, "CDI_grid_num_LPE", NC_INT, 1, &numLPE);
}
+ const CdfGrid *cdfGrid = &(streamptr->cdfInfo.cdfGridVec[gridindex]);
if (gridtype == GRID_GAUSSIAN_REDUCED)
{
- int ncyvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_Y];
+ int ncyvarID = cdfGrid->ncIdVec[CDF_VARID_Y];
if (ncyvarID != CDI_UNDEFID)
{
char name[CDI_MAX_NAME];
@@ -589,7 +591,7 @@ cdfDefineCoordinates(const stream_t *streamptr, int ncvarID, int nczvarID, int g
cdf_put_att_text(fileID, ncvarID, "CDI_grid_latitudes", len, name);
}
- int ncrpvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_RP];
+ int ncrpvarID = cdfGrid->ncIdVec[CDF_VARID_RP];
if (ncrpvarID != CDI_UNDEFID)
{
char name[CDI_MAX_NAME];
@@ -613,25 +615,25 @@ cdfDefineCoordinates(const stream_t *streamptr, int ncvarID, int nczvarID, int g
}
else if (gridtype == GRID_LONLAT && xid == CDI_UNDEFID && yid == CDI_UNDEFID && gridsize == 1)
{
- int ncxvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_X];
- int ncyvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_Y];
+ int ncxvarID = cdfGrid->ncIdVec[CDF_VARID_X];
+ int ncyvarID = cdfGrid->ncIdVec[CDF_VARID_Y];
cdfAppendCoordinates(fileID, ncyvarID, coordinates);
cdfAppendCoordinates(fileID, ncxvarID, coordinates);
}
else if (gridtype == GRID_GAUSSIAN_REDUCED)
{
/*
- int ncxvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_X];
- int ncyvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_Y];
+ int ncxvarID = ncgrid->ncIDs[CDF_VARID_X];
+ int ncyvarID = ncgrid->ncIDs[CDF_VARID_Y];
cdfAppendCoordinates(fileID, ncyvarID, coordinates);
cdfAppendCoordinates(fileID, ncxvarID, coordinates);
*/
}
else if (gridtype == GRID_UNSTRUCTURED || gridtype == GRID_CURVILINEAR)
{
- int ncxvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_X];
- int ncyvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_Y];
- int ncavarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_A];
+ int ncxvarID = cdfGrid->ncIdVec[CDF_VARID_X];
+ int ncyvarID = cdfGrid->ncIdVec[CDF_VARID_Y];
+ int ncavarID = cdfGrid->ncIdVec[CDF_VARID_A];
// CMOR order: coordinates = "lat lon"
if (CDI_Coordinates_Lon_Lat)
{
@@ -671,12 +673,12 @@ cdfDefineCoordinates(const stream_t *streamptr, int ncvarID, int nczvarID, int g
{
if (gridInqXIsc(gridID))
{
- int ncxvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_X];
+ int ncxvarID = cdfGrid->ncIdVec[CDF_VARID_X];
cdfAppendCoordinates(fileID, ncxvarID, coordinates);
}
else if (gridInqYIsc(gridID))
{
- int ncyvarID = streamptr->ncgrid[gridindex].ncIDs[CDF_VARID_Y];
+ int ncyvarID = cdfGrid->ncIdVec[CDF_VARID_Y];
cdfAppendCoordinates(fileID, ncyvarID, coordinates);
}
}
@@ -702,19 +704,41 @@ calc_chunksize(size_t chunkSizeLim, size_t size)
static const size_t chunkSizeMin = 262144; // 256k
static const size_t chunkSizeLim = 16777216; // 16m
+size_t
+auto_chunksize_y(size_t gridsize, size_t xsize, size_t ysize)
+{
+ size_t gridChunkSize = calc_chunksize(chunkSizeLim, gridsize);
+ size_t yChunkSize = gridChunkSize / xsize;
+ size_t numChunks = (ysize % yChunkSize == 0) ? (ysize / yChunkSize) : (ysize / yChunkSize) + 1;
+ size_t modChunk = ysize % numChunks;
+ size_t maxChunks = numChunks * 2;
+ for (size_t i = numChunks; i < maxChunks; ++i)
+ {
+ size_t imod = ysize % i;
+ if (imod == 0 || imod > modChunk)
+ {
+ numChunks = i;
+ modChunk = imod;
+ if (modChunk == 0) break;
+ }
+ }
+ yChunkSize = ysize / numChunks;
+ return yChunkSize;
+}
+
size_t
calc_chunksize_y(int chunkType, size_t gridsize, size_t xsize, size_t ysize)
{
if (chunkType == CDI_CHUNK_AUTO)
- return (gridsize <= chunkSizeMin) ? ysize : chunkSizeMin / xsize;
+ return auto_chunksize_y(gridsize, xsize, ysize);
else
return (chunkType == CDI_CHUNK_LINES) ? 1 : ysize;
}
size_t
-calc_chunksize_x(int chunkType, long chunkSize, size_t xsize, bool yIsUndefined)
+calc_chunksize_x(int chunkType, long chunkSize, size_t xsize, bool isReg2dGrid)
{
- if (chunkType == CDI_CHUNK_AUTO && yIsUndefined)
+ if (chunkType == CDI_CHUNK_AUTO && !isReg2dGrid)
return (chunkSize > 0 && (size_t) chunkSize < xsize) ? (size_t) chunkSize : ((xsize <= chunkSizeMin) ? xsize : chunkSizeMin);
else
return calc_chunksize(chunkSizeLim, xsize);
@@ -722,8 +746,9 @@ calc_chunksize_x(int chunkType, long chunkSize, size_t xsize, bool yIsUndefined)
static int
cdfDefineDimsAndChunks(const stream_t *streamptr, int varID, int xid, int yid, int zid, size_t gridsize, const int dimorder[3],
- int dims[4], bool useChunks, size_t chunks[4], char axis[5], size_t *piax)
+ int dims[4], bool useChunks, size_t chunks[4], char axis[5], size_t *piax, size_t *pchunkCacheSize)
{
+ size_t chunkCacheSize = 1;
int fileID = streamptr->fileID;
int vlistID = streamptr->vlistID;
@@ -732,18 +757,22 @@ cdfDefineDimsAndChunks(const stream_t *streamptr, int varID, int xid, int yid, i
for (int i = 0; i < 4; ++i) chunks[i] = 0;
- size_t xsize = 0, ysize = 0;
+ size_t xsize = 0, ysize = 0, zsize = 0;
if (xid != CDI_UNDEFID) cdf_inq_dimlen(fileID, xid, &xsize);
if (yid != CDI_UNDEFID) cdf_inq_dimlen(fileID, yid, &ysize);
+ if (zid != CDI_UNDEFID) cdf_inq_dimlen(fileID, zid, &zsize);
int timetype = vlistInqVarTimetype(vlistID, varID);
if (vlistHasTime(vlistID) && timetype != TIME_CONSTANT)
{
+ int chunkSizeDimT = 0;
+ cdiInqKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE_DIMT, &chunkSizeDimT);
int tid = streamptr->basetime.ncdimid;
if (tid == CDI_UNDEFID) Error("Internal problem, time undefined!");
axis[iax++] = 'T';
- chunks[ndims] = 1;
+ chunks[ndims] = (chunkSizeDimT > 0) ? chunkSizeDimT : 1;
dims[ndims] = tid;
+ chunkCacheSize *= chunks[ndims];
ndims++;
}
@@ -753,9 +782,10 @@ cdfDefineDimsAndChunks(const stream_t *streamptr, int varID, int xid, int yid, i
cdiInqKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE, &chunkSize);
if (chunkSize > 0 && yid == CDI_UNDEFID) chunkType = CDI_CHUNK_AUTO;
- if (chunkType == CDI_CHUNK_GRID && gridsize > ChunkSizeLim)
+ bool isReg2dGrid = (yid != CDI_UNDEFID && xid != CDI_UNDEFID);
+ if (chunkType == CDI_CHUNK_GRID && gridsize > ChunkSizeLim && isReg2dGrid)
{
- if (CDI_Debug) fprintf(stderr, "gridsize > %u, changed chunkType to CDI_CHUNK_LINES!\n", ChunkSizeLim);
+ if (CDI_Debug) fprintf(stderr, "gridsize > %u, changed chunkType to CDI_CHUNK_AUTO!\n", ChunkSizeLim);
chunkType = CDI_CHUNK_AUTO;
}
@@ -763,21 +793,35 @@ cdfDefineDimsAndChunks(const stream_t *streamptr, int varID, int xid, int yid, i
{
if (dimorder[id] == 3 && zid != CDI_UNDEFID)
{
+ int chunkSizeDimZ = 0;
+ cdiInqKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE_DIMZ, &chunkSizeDimZ);
+ if (chunkSizeDimZ == -1) chunkSizeDimZ = zsize;
axis[iax++] = 'Z';
- chunks[ndims] = 1;
+ chunks[ndims] = (chunkSizeDimZ > 0) ? chunkSizeDimZ : 1;
dims[ndims] = zid;
+ chunkCacheSize *= (chunkCacheSize > 1) ? zsize : chunks[ndims];
ndims++;
}
else if (dimorder[id] == 2 && yid != CDI_UNDEFID)
{
- chunks[ndims] = calc_chunksize_y(chunkType, gridsize, xsize, ysize);
+ int chunkSizeDimY = 0;
+ cdiInqKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE_DIMY, &chunkSizeDimY);
+ if (chunkSizeDimY == -1) chunkSizeDimY = ysize;
+ if (chunkSizeDimY == 0) chunkSizeDimY = calc_chunksize_y(chunkType, gridsize, xsize, ysize);
+ chunks[ndims] = chunkSizeDimY;
dims[ndims] = yid;
+ chunkCacheSize *= ysize;
ndims++;
}
else if (dimorder[id] == 1 && xid != CDI_UNDEFID)
{
- chunks[ndims] = calc_chunksize_x(chunkType, chunkSize, xsize, (yid == CDI_UNDEFID));
+ int chunkSizeDimX = 0;
+ cdiInqKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE_DIMX, &chunkSizeDimX);
+ if (chunkSizeDimX == -1) chunkSizeDimX = xsize;
+ if (chunkSizeDimX == 0) chunkSizeDimX = calc_chunksize_x(chunkType, chunkSize, xsize, isReg2dGrid);
+ chunks[ndims] = chunkSizeDimX;
dims[ndims] = xid;
+ chunkCacheSize *= xsize;
ndims++;
}
}
@@ -786,6 +830,7 @@ cdfDefineDimsAndChunks(const stream_t *streamptr, int varID, int xid, int yid, i
fprintf(stderr, "useChunks %d chunkType %d chunkSize %d chunks %zu %zu %zu %zu\n", useChunks, chunkType, chunkSize, chunks[0],
chunks[1], chunks[2], chunks[3]);
+ *pchunkCacheSize = chunkCacheSize;
*piax = iax;
return ndims;
}
@@ -895,14 +940,15 @@ cdfGenVarname(int fileID, char name[CDI_MAX_NAME], int pnum, int pcat, int *pdis
}
static void
-cdfDefVarChunkCache(int fileID, int ncvarID)
+cdfDefVarChunkCache(int fileID, int ncvarID, size_t chunkCacheSize)
{
size_t size = 0;
size_t nelems = 0;
float preemption = 0;
- if (CDI_Chunk_Cache > 0 && nc_get_var_chunk_cache(fileID, ncvarID, &size, &nelems, &preemption) == NC_NOERR)
+ if (nc_get_var_chunk_cache(fileID, ncvarID, &size, &nelems, &preemption) == NC_NOERR)
{
- size = (size_t) CDI_Chunk_Cache;
+ if (chunkCacheSize > size) size = chunkCacheSize;
+ if (CDI_Chunk_Cache > 0) size = (size_t) CDI_Chunk_Cache;
}
nc_set_var_chunk_cache(fileID, ncvarID, size, nelems, preemption);
@@ -927,14 +973,15 @@ cdfDefVar(stream_t *streamptr, int varID)
SizeType gridsize = gridInqSize(gridID);
int gridtype = gridInqType(gridID);
int gridindex = nc_grid_index(streamptr, gridID);
- int xid = (gridtype != GRID_TRAJECTORY) ? streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_X] : CDI_UNDEFID;
- int yid = (gridtype != GRID_TRAJECTORY && gridtype != GRID_GAUSSIAN_REDUCED) ? streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_Y]
- : CDI_UNDEFID;
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ const CdfGrid *cdfGrid = &(streamptr->cdfInfo.cdfGridVec[gridindex]);
+ int xid = (gridtype != GRID_TRAJECTORY) ? cdfGrid->ncIdVec[CDF_DIMID_X] : CDI_UNDEFID;
+ int yid = (gridtype != GRID_TRAJECTORY && gridtype != GRID_GAUSSIAN_REDUCED) ? cdfGrid->ncIdVec[CDF_DIMID_Y] : CDI_UNDEFID;
int zaxisID = vlistInqVarZaxis(vlistID, varID);
int zaxistype = zaxisInqType(zaxisID);
int zaxisindex = vlistZaxisIndex(vlistID, zaxisID);
- int zid = streamptr->zaxisID[zaxisindex];
+ int zid = cdfInfo->zaxisIdVec[zaxisindex];
int dimorder[3]; // ZYX/321 and ZXY/312
vlistInqVarDimorder(vlistID, varID, dimorder);
@@ -952,8 +999,9 @@ cdfDefVar(stream_t *streamptr, int varID)
char axis[5];
int dims[4];
size_t chunks[4];
- int ndims
- = cdfDefineDimsAndChunks(streamptr, varID, xid, yid, zid, (size_t) gridsize, dimorder, dims, useChunks, chunks, axis, &iax);
+ size_t chunkCacheSize = 1;
+ int ndims = cdfDefineDimsAndChunks(streamptr, varID, xid, yid, zid, (size_t) gridsize, dimorder, dims, useChunks, chunks, axis,
+ &iax, &chunkCacheSize);
char name[CDI_MAX_NAME];
int length = CDI_MAX_NAME;
@@ -976,19 +1024,20 @@ cdfDefVar(stream_t *streamptr, int varID)
else
cdfGenVarname(fileID, name, pnum, pcat, &pdis, &code);
- int dtype = vlistInqVarDatatype(vlistID, varID);
- nc_type xtype = cdfDefDatatype(dtype, streamptr);
-
if (streamptr->ncmode == 2)
{
cdf_redef(fileID);
streamptr->ncmode = 1;
}
+ int dtype = vlistInqVarDatatype(vlistID, varID);
+ nc_type xtype = cdfDefDatatype(dtype, streamptr);
+
int ncvarID = -1;
cdf_def_var(fileID, name, xtype, ndims, dims, &ncvarID);
- cdfDefVarChunkCache(fileID, ncvarID);
+ chunkCacheSize *= cdf_xtype_to_numbytes(xtype);
+ cdfDefVarChunkCache(fileID, ncvarID, chunkCacheSize);
#ifdef HAVE_NETCDF4
#ifdef NC_QUANTIZE_BITROUND
@@ -1039,7 +1088,7 @@ cdfDefVar(stream_t *streamptr, int varID)
}
bool zaxisIsScalar = (zid == CDI_UNDEFID) ? (zaxisInqScalar(zaxisID) > 0) : false;
- int nczvarID = (zaxisIsScalar || zaxistype == ZAXIS_CHAR) ? streamptr->nczvarID[zaxisindex] : CDI_UNDEFID;
+ int nczvarID = (zaxisIsScalar || zaxistype == ZAXIS_CHAR) ? streamptr->cdfInfo.ncZvarIdVec[zaxisindex] : CDI_UNDEFID;
cdfDefineCoordinates(streamptr, ncvarID, nczvarID, gridtype, gridID, gridindex, xid, yid, (size_t) gridsize, axis, iax);
@@ -1106,8 +1155,9 @@ static void
cdfWriteGridTraj(stream_t *streamptr, int gridID)
{
int gridindex = nc_grid_index(streamptr, gridID);
- int lonID = streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_X];
- int latID = streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_Y];
+ const CdfGrid *cdfGrid = &(streamptr->cdfInfo.cdfGridVec[gridindex]);
+ int lonID = cdfGrid->ncIdVec[CDF_DIMID_X];
+ int latID = cdfGrid->ncIdVec[CDF_DIMID_Y];
size_t index = (size_t) streamptr->curTsID;
double xlon = gridInqXval(gridID, 0);
@@ -1352,13 +1402,14 @@ cdfGetXYZid(stream_t *streamptr, int gridID, int zaxisID, int *xid, int *yid, in
else
{
int gridindex = nc_grid_index(streamptr, gridID);
- *xid = streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_X];
- if (gridtype != GRID_GAUSSIAN_REDUCED) *yid = streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_Y];
+ const CdfGrid *cdfGrid = &(streamptr->cdfInfo.cdfGridVec[gridindex]);
+ *xid = cdfGrid->ncIdVec[CDF_DIMID_X];
+ if (gridtype != GRID_GAUSSIAN_REDUCED) *yid = cdfGrid->ncIdVec[CDF_DIMID_Y];
}
int vlistID = streamptr->vlistID;
int zaxisindex = vlistZaxisIndex(vlistID, zaxisID);
- *zid = streamptr->zaxisID[zaxisindex];
+ *zid = streamptr->cdfInfo.zaxisIdVec[zaxisindex];
}
static void
diff --git a/src/cdi.h b/src/cdi.h
index 624905c5dda1551c5803546224f815d35db79c47..d6e73b918c02aa5f7773a3d53ca10c19a0a23f8b 100644
--- a/src/cdi.h
+++ b/src/cdi.h
@@ -457,6 +457,10 @@ void streamReadField(int streamID, double data[], SizeType *numMissVals);
void streamReadFieldF(int streamID, float data[], SizeType *numMissVals);
void streamCopyField(int streamIDdest, int streamIDsrc);
+void * stream_get_pointer(int streamID);
+void * stream_get_vlist_pointer(int streamID);
+void pstreamInqField(void *streamPtr, int *varID, int *levelID);
+
void streamInqGRIBinfo(int streamID, int *intnum, float *fltnum, off_t *bignum);
@@ -695,6 +699,8 @@ int vlistFindLevel(int vlistID, int fvarID, int flevelID);
int vlistMergedVar(int vlistID, int varID);
int vlistMergedLevel(int vlistID, int varID, int levelID);
+int pvlistInqFlag(void *vlistPtr, int varID, int levelID);
+
// cdiClearAdditionalKeys: Clear the list of additional GRIB keys
void cdiClearAdditionalKeys(void);
// cdiDefAdditionalKey: Register an additional GRIB key which is read when file is opened
@@ -831,7 +837,6 @@ SizeType gridInqYCvals(int gridID, char *ycvals[]);
#define CDI_KEY_UNITS 945 // Units of the variable
#define CDI_KEY_DATATYPE 946 // Data type
#define CDI_KEY_REFERENCEURI 947 // Reference URI to grid file
-#define CDI_KEY_CHUNKS 948 // Chunks
// Integer keys
#define CDI_KEY_NUMBEROFGRIDUSED 961 // GRIB2 numberOfGridUsed
@@ -840,6 +845,10 @@ SizeType gridInqYCvals(int gridID, char *ycvals[]);
#define CDI_KEY_NLEV 964 // GRIB2 nlev
#define CDI_KEY_CHUNKTYPE 965 // ChunkType: CDI_CHUNK_AUTO/CDI_CHUNK_GRID/CDI_CHUNK_LINES
#define CDI_KEY_CHUNKSIZE 966 // ChunkSize
+#define CDI_KEY_CHUNKSIZE_DIMT 967 // ChunkSize time dimension
+#define CDI_KEY_CHUNKSIZE_DIMZ 968 // ChunkSize zaxis dimension
+#define CDI_KEY_CHUNKSIZE_DIMY 969 // ChunkSize yaxis dimension
+#define CDI_KEY_CHUNKSIZE_DIMX 970 // ChunkSize xaxis dimension
// Floating point keys
#define CDI_KEY_MISSVAL 701 // Missing value
@@ -1306,6 +1315,10 @@ int vlistInqVarTypeOfGeneratingProcess(int vlistID, int varID);
void vlistDefVarTypeOfGeneratingProcess(int vlistID, int varID, int typeOfGeneratingProcess);
void vlistDefVarProductDefinitionTemplate(int vlistID, int varID, int productDefinitionTemplate);
+// Compatibility functions for ParaView vtkCDIReader (obsolete functions)
+int vlistNgrids(int vlistID); // calls vlistNumGrids()
+int vlistNzaxis(int vlistID); // calls vlistNumZaxis()
+
#ifdef __cplusplus
}
#endif
@@ -1437,6 +1450,9 @@ extern int (*proj_stere_to_lonlat_func)(struct CDI_GridProjParams gpp, double, d
// Used on CDO remap_scrip_io.cc
void cdf_def_var_filter(int ncid, int ncvarID, const char *filterSpec);
+int cdi_has_dap(void);
+int cdi_has_cgribex(void);
+
#ifdef __cplusplus
}
#endif
diff --git a/src/cdi_fdb.h b/src/cdi_fdb.h
index 9baf530494deeef70c26ad2f78643cc96922f856..1d3549c761a33c7e74019b5e896a7639ae605cb6 100644
--- a/src/cdi_fdb.h
+++ b/src/cdi_fdb.h
@@ -5,8 +5,6 @@
#include "config.h"
#endif
-extern int cdi_fdb_dummy;
-
#ifdef HAVE_LIBFDB5
#include <fdb5/api/fdb_c.h>
diff --git a/src/cdi_int.c b/src/cdi_int.c
index 347090c20199a71e38299791856b2121a6b835c1..04ed90af6d313018a152d40efb0c18c4570c52fa 100644
--- a/src/cdi_int.c
+++ b/src/cdi_int.c
@@ -41,12 +41,15 @@ int CDI_Inventory_Mode = 1;
int CDI_Version_Info = 1;
int CDI_Query_Abort = 1;
int CDI_Convert_Cubesphere = 1;
+int CDI_Read_Cell_Center = 1;
int CDI_Read_Cell_Corners = 1;
int CDI_CMOR_Mode = 0;
int CDI_Reduce_Dim = 0;
int CDI_Shuffle = 0;
int CDI_Test = 0;
size_t CDI_Netcdf_Hdr_Pad = 0UL;
+bool CDI_CopyChunkSpec = false;
+bool CDI_RemoveChunkSpec = false;
bool CDI_Chunk_Cache_Info = false;
long CDI_Chunk_Cache = -1L;
size_t CDI_Chunk_Cache_Max = 0UL;
@@ -347,6 +350,9 @@ cdiInitialize(void)
value = cdi_getenv_int("CDI_LOCK_IO");
if (value >= 0) CDI_Lock_IO = (bool) value;
+ value = cdi_getenv_int("CDI_READ_CELL_CENTER");
+ if (value >= 0) CDI_Read_Cell_Center = (int) value;
+
value = cdi_getenv_int("CDI_READ_CELL_CORNERS");
if (value >= 0) CDI_Read_Cell_Corners = (int) value;
@@ -368,6 +374,12 @@ cdiInitialize(void)
value = cdi_getenv_int("CDI_NETCDF_HDR_PAD");
if (value >= 0) CDI_Netcdf_Hdr_Pad = (size_t) value;
+ value = cdi_getenv_int("CDI_COPY_CHUNKSPEC");
+ if (value >= 0) CDI_CopyChunkSpec = (value > 0);
+
+ value = cdi_getenv_int("CDI_REMOVE_CHUNKSPEC");
+ if (value >= 0) CDI_RemoveChunkSpec = (value > 0);
+
value = cdi_getenv_int("CDI_CHUNK_CACHE_INFO");
if (value > 0) CDI_Chunk_Cache_Info = true;
@@ -515,11 +527,14 @@ cdiDefGlobal(const char *string, int value)
else if (str_is_equal(string, "SORTNAME")) cdiSortName = value;
else if (str_is_equal(string, "HAVE_MISSVAL")) cdiHaveMissval = value;
else if (str_is_equal(string, "NC_CHUNKSIZEHINT")) CDI_Netcdf_Chunksizehint = value;
+ else if (str_is_equal(string, "READ_CELL_CENTER")) CDI_Read_Cell_Center = value;
else if (str_is_equal(string, "READ_CELL_CORNERS")) CDI_Read_Cell_Corners = value;
else if (str_is_equal(string, "CMOR_MODE")) CDI_CMOR_Mode = value;
else if (str_is_equal(string, "REDUCE_DIM")) CDI_Reduce_Dim = value;
else if (str_is_equal(string, "NETCDF_HDR_PAD")) CDI_Netcdf_Hdr_Pad = (size_t) value;
else if (str_is_equal(string, "NETCDF_LAZY_GRID_LOAD")) CDI_Netcdf_Lazy_Grid_Load = (bool) value;
+ else if (str_is_equal(string, "COPY_CHUNKSPEC")) CDI_CopyChunkSpec = (bool) value;
+ else if (str_is_equal(string, "REMOVE_CHUNKSPEC")) CDI_RemoveChunkSpec = (bool) value;
else Warning("Unsupported global key: %s", string);
// clang-format on
}
@@ -564,6 +579,35 @@ cdiBaseFiletype(int filetype)
return filetype;
}
+void
+stream_def_accesstype(stream_t *s, int type)
+{
+ if (s->accesstype == CDI_UNDEFID)
+ {
+ s->accesstype = type;
+ }
+ else if (s->accesstype != type)
+ Error("Changing access type from %s not allowed!", s->accesstype == TYPE_REC ? "REC to VAR" : "VAR to REC");
+}
+
+int
+cdi_has_dap(void)
+{
+#ifdef HAVE_LIBNC_DAP
+ return 1;
+#endif
+ return 0;
+}
+
+int
+cdi_has_cgribex(void)
+{
+#ifdef HAVE_LIBCGRIBEX
+ return 1;
+#endif
+ return 0;
+}
+
/*
* Local Variables:
* c-file-style: "Java"
diff --git a/src/cdi_int.h b/src/cdi_int.h
index 847b95d36ee2e02b362cba2e4253ae8c82086fc3..f85c782869ee942298ee41afa3da642ad4d16018 100644
--- a/src/cdi_int.h
+++ b/src/cdi_int.h
@@ -171,23 +171,31 @@ varScanKeysIsEqual(const VarScanKeys *s1, const VarScanKeys *s2)
return memcmp(s1, s2, sizeof(VarScanKeys)) == 0;
}
+typedef struct
+{
+ int levelID;
+ short varID;
+ short used;
+} recinfo_t;
+
typedef struct
{
off_t position;
size_t size;
size_t gridsize;
- int zip;
int param;
int ilevel;
int ilevel2;
- int ltype;
+ short ltype;
short tsteptype;
- short varID;
- int levelID;
- short used;
- char varname[32]; // needed for grib decoding with GRIB_API
+#ifdef HAVE_LIBGRIB
+ int zip;
VarScanKeys scanKeys;
var_tile_t tiles; // tile-related meta-data, currently for GRIB-API only.
+#ifdef HAVE_LIBGRIB_API
+ char varname[32];
+#endif
+#endif
#ifdef HAVE_LIBFDB5
int fdbItemIndex;
#endif
@@ -196,6 +204,7 @@ typedef struct
typedef struct
{
int *recIDs; // IDs of non constant records
+ recinfo_t *recinfo;
record_t *records;
int recordSize; // number of allocated records
int nrecs; // number of used records
@@ -250,16 +259,31 @@ enum cdfIDIdx
CDF_VARID_Y,
CDF_VARID_RP, // reducedPoints
CDF_VARID_A,
- CDF_SIZE_ncIDs,
+ CDF_SIZE_NCID,
};
typedef struct
{
- int ncIDs[CDF_SIZE_ncIDs];
+ int ncIdVec[CDF_SIZE_NCID];
int gridID;
long start;
long count;
-} ncgrid_t;
+} CdfGrid;
+
+typedef struct
+{
+ int complexFloatId;
+ int complexDoubleId;
+ CdfGrid cdfGridVec[MAX_GRIDS_PS];
+ int zaxisIdVec[MAX_ZAXES_PS]; // Warning: synchronous array to vlist_to_pointer(vlistID)->zaxisIDs
+ int ncZvarIdVec[MAX_ZAXES_PS];
+ int ncDimIdVec[MAX_DIMS_PS];
+ size_t ncDimLenVec[MAX_DIMS_PS];
+ int ncNumDims;
+ size_t chunkSizeDimT;
+ size_t chunkSizeDimZ;
+ VCT vct;
+} CdfInfo;
#endif
typedef struct
@@ -290,17 +314,7 @@ typedef struct
int ncmode;
int vlistID;
#ifdef HAVE_LIBNETCDF
- int nc_complex_float_id;
- int nc_complex_double_id;
- ncgrid_t ncgrid[MAX_GRIDS_PS];
- int zaxisID[MAX_ZAXES_PS]; // Warning: synchronous array to vlist_to_pointer(vlistID)->zaxisIDs
- int nczvarID[MAX_ZAXES_PS];
- int ncNumDims;
- int ncDimID[MAX_DIMS_PS];
- size_t ncDimLen[MAX_DIMS_PS];
- VCT vct;
- size_t chunkSizeTdim;
- size_t chunkSizeZdim;
+ CdfInfo cdfInfo;
#endif
long maxGlobalRecs;
int globalatts;
@@ -403,11 +417,14 @@ extern int CDI_Inventory_Mode;
extern int CDI_Query_Abort;
extern int CDI_Version_Info;
extern int CDI_Convert_Cubesphere;
+extern int CDI_Read_Cell_Center;
extern int CDI_Read_Cell_Corners;
extern int CDI_CMOR_Mode;
extern int CDI_Reduce_Dim;
extern int CDI_Shuffle;
extern size_t CDI_Netcdf_Hdr_Pad;
+extern bool CDI_CopyChunkSpec;
+extern bool CDI_RemoveChunkSpec;
extern bool CDI_Chunk_Cache_Info;
extern long CDI_Chunk_Cache;
extern size_t CDI_Chunk_Cache_Max;
@@ -455,7 +472,7 @@ void cdi_generate_vars(stream_t *streamptr);
void vlist_check_contents(int vlistID);
-void cdi_create_records(stream_t *streamptr, int tsID);
+void cdi_create_records(stream_t *streamptr, int tsID, bool allocRecords);
void streamFCopyRecord(stream_t *streamptr2, stream_t *streamptr1, const char *container_name);
@@ -463,12 +480,11 @@ int recordNewEntry(stream_t *streamptr, int tsID);
void cdi_create_timesteps(size_t numTimesteps, stream_t *streamptr);
-void recordInitEntry(record_t *record);
+void recinfoInitEntry(recinfo_t *recinfo);
void cdiCheckZaxis(int zaxisID);
-void cdiDefAccesstype(int streamID, int type);
-int cdiInqAccesstype(int streamID);
+void stream_def_accesstype(stream_t *s, int type);
int getByteswap(int byteorder);
diff --git a/src/cdi_key.c b/src/cdi_key.c
index e5c00dc940f93e8d4787300d09139a28c98f4648..3f0351a1e366d8eac9054cf0e10e30d82c3c6abe 100644
--- a/src/cdi_key.c
+++ b/src/cdi_key.c
@@ -12,6 +12,7 @@
#include "cdi.h"
#include "cdi_int.h"
+#include "taxis.h"
#include "zaxis.h"
#include "grid.h"
#include "vlist.h"
@@ -43,6 +44,12 @@ zaxis_get_keysp(zaxis_t *zaxisptr, int varID)
return (varID == CDI_GLOBAL) ? &zaxisptr->keys : NULL;
}
+static cdi_keys_t *
+taxis_get_keysp(taxis_t *taxisptr, int varID)
+{
+ return (varID == CDI_GLOBAL) ? &taxisptr->keys : NULL;
+}
+
static cdi_key_t *
new_key(cdi_keys_t *keysp, int key)
{
@@ -68,7 +75,7 @@ find_key(cdi_keys_t *keysp, int key)
if (keysp->nelems == 0) return NULL;
- for (size_t keyid = 0; keyid < keysp->nelems; keyid++)
+ for (uint16_t keyid = 0; keyid < keysp->nelems; keyid++)
{
cdi_key_t *keyp = &(keysp->value[keyid]);
if (keyp->key == key) return keyp; // Normal return
@@ -84,7 +91,7 @@ find_key_const(const cdi_keys_t *keysp, int key)
if (keysp->nelems == 0) return NULL;
- for (size_t keyid = 0; keyid < keysp->nelems; keyid++)
+ for (uint16_t keyid = 0; keyid < keysp->nelems; keyid++)
{
const cdi_key_t *keyp = &(keysp->value[keyid]);
if (keyp->key == key) return keyp; // Normal return
@@ -96,10 +103,12 @@ find_key_const(const cdi_keys_t *keysp, int key)
static cdi_keys_t *
cdi_get_keysp(int objID, int varID)
{
- if (reshGetTxCode(objID) == GRID) return grid_get_keysp(grid_to_pointer(objID), varID);
- if (reshGetTxCode(objID) == DIST_GRID) return grid_get_keysp(grid_to_pointer(objID), varID);
- if (reshGetTxCode(objID) == ZAXIS) return zaxis_get_keysp(zaxis_to_pointer(objID), varID);
- if (reshGetTxCode(objID) == VLIST) return vlist_get_keysp(vlist_to_pointer(objID), varID);
+ int reshID = reshGetTxCode(objID);
+ if (reshID == GRID) return grid_get_keysp(grid_to_pointer(objID), varID);
+ if (reshID == DIST_GRID) return grid_get_keysp(grid_to_pointer(objID), varID);
+ if (reshID == ZAXIS) return zaxis_get_keysp(zaxis_to_pointer(objID), varID);
+ if (reshID == TAXIS) return taxis_get_keysp(taxis_to_pointer(objID), varID);
+ if (reshID == VLIST) return vlist_get_keysp(vlist_to_pointer(objID), varID);
return NULL;
}
@@ -114,9 +123,9 @@ cdi_key_compare(cdi_keys_t *keyspa, cdi_keys_t *keyspb, int keynum)
if (keypa->type != keypb->type) return 1;
if (keypa->length != keypb->length) return 1;
- if (keypa->type == KEY_BYTES) return (memcmp(keypa->v.s, keypb->v.s, (size_t) keypa->length) != 0);
- if (keypa->type == KEY_FLOAT) return (IS_NOT_EQUAL(keypa->v.d, keypb->v.d));
- if (keypa->type == KEY_INT) return (keypa->v.i != keypb->v.i);
+ if (keypa->type == KeyBytes) return (memcmp(keypa->v.s, keypb->v.s, (size_t) keypa->length) != 0);
+ if (keypa->type == KeyFloat) return (IS_NOT_EQUAL(keypa->v.d, keypb->v.d));
+ if (keypa->type == KeyInt) return (keypa->v.i != keypb->v.i);
return 0;
}
@@ -127,16 +136,16 @@ cdi_delete_key(cdi_key_t *keyp)
if (keyp != NULL && keyp->length) // key in use
{
keyp->length = 0;
- if (keyp->type == KEY_BYTES)
+ if (keyp->type == KeyBytes)
{
if (keyp->v.s) Free(keyp->v.s);
keyp->v.s = NULL;
}
- else if (keyp->type == KEY_FLOAT)
+ else if (keyp->type == KeyFloat)
{
keyp->v.d = 0.0;
}
- else if (keyp->type == KEY_INT)
+ else if (keyp->type == KeyInt)
{
keyp->v.i = 0;
}
@@ -146,8 +155,8 @@ cdi_delete_key(cdi_key_t *keyp)
void
cdiDeleteVarKeys(cdi_keys_t *keysp)
{
- int nelems = keysp ? (int) keysp->nelems : 0;
- for (int keyid = 0; keyid < nelems; keyid++)
+ uint16_t nelems = keysp ? keysp->nelems : 0;
+ for (uint16_t keyid = 0; keyid < nelems; keyid++)
{
cdi_delete_key(&(keysp->value[keyid]));
}
@@ -167,20 +176,20 @@ cdiDeleteKeys(int cdiID, int varID)
void
cdiPrintVarKeys(cdi_keys_t *keysp)
{
- int nelems = keysp ? (int) keysp->nelems : 0;
- for (int keyid = 0; keyid < nelems; keyid++)
+ uint16_t nelems = keysp ? (int) keysp->nelems : 0;
+ for (uint16_t keyid = 0; keyid < nelems; keyid++)
{
cdi_key_t *keyp = &(keysp->value[keyid]);
if (keyp->length == 0) continue;
- if (keyp->type == KEY_BYTES)
+ if (keyp->type == KeyBytes)
{
fprintf(stdout, "%d key %d length %d value %s\n", keyid + 1, keyp->key, keyp->length, keyp->v.s);
}
- else if (keyp->type == KEY_FLOAT)
+ else if (keyp->type == KeyFloat)
{
fprintf(stdout, "%d key %d value %g\n", keyid + 1, keyp->key, keyp->v.d);
}
- else if (keyp->type == KEY_INT)
+ else if (keyp->type == KeyInt)
{
fprintf(stdout, "%d key %d value %d\n", keyid + 1, keyp->key, keyp->v.i);
}
@@ -219,9 +228,9 @@ static void
cdi_define_key(const cdi_key_t *keyp, cdi_keys_t *keysp)
{
// clang-format off
- if (keyp->type == KEY_INT) cdiDefVarKeyInt(keysp, keyp->key, keyp->v.i);
- else if (keyp->type == KEY_FLOAT) cdiDefVarKeyFloat(keysp, keyp->key, keyp->v.d);
- else if (keyp->type == KEY_BYTES) cdiDefVarKeyBytes(keysp, keyp->key, keyp->v.s, keyp->length);
+ if (keyp->type == KeyInt) cdiDefVarKeyInt(keysp, keyp->key, keyp->v.i);
+ else if (keyp->type == KeyFloat) cdiDefVarKeyFloat(keysp, keyp->key, keyp->v.d);
+ else if (keyp->type == KeyBytes) cdiDefVarKeyBytes(keysp, keyp->key, keyp->v.s, keyp->length);
// clang-format on
}
@@ -241,7 +250,7 @@ cdiDeleteKey(int cdiID, int varID, int key)
void
cdiCopyVarKeys(const cdi_keys_t *keysp1, cdi_keys_t *keysp2)
{
- for (size_t keyid = 0; keyid < keysp1->nelems; keyid++)
+ for (uint16_t keyid = 0; keyid < keysp1->nelems; keyid++)
{
const cdi_key_t *keyp = &(keysp1->value[keyid]);
if (keyp->length > 0) cdi_define_key(keyp, keysp2);
@@ -299,7 +308,7 @@ cdiDefVarKeyInt(cdi_keys_t *keysp, int key, int value)
{
// if ( keyp->v.i != value )
{
- keyp->type = KEY_INT;
+ keyp->type = KeyInt;
keyp->v.i = value;
keyp->length = 1;
}
@@ -370,7 +379,7 @@ cdiInqKeyInt(int cdiID, int varID, int key, int *value)
const cdi_key_t *keyp = find_key_const(keysp, key);
if (keyp != NULL && keyp->length == 1) // key in use
{
- if (keyp->type == KEY_INT)
+ if (keyp->type == KeyInt)
{
*value = keyp->v.i;
status = CDI_NOERR;
@@ -386,7 +395,7 @@ cdiInqVarKeyInt(const cdi_keys_t *keysp, int key)
int value = 0;
const cdi_key_t *keyp = find_key_const(keysp, key);
- if (keyp && keyp->type == KEY_INT) value = keyp->v.i;
+ if (keyp && keyp->type == KeyInt) value = keyp->v.i;
return value;
}
@@ -399,7 +408,7 @@ cdiDefVarKeyFloat(cdi_keys_t *keysp, int key, double value)
if (keyp != NULL)
{
- keyp->type = KEY_FLOAT;
+ keyp->type = KeyFloat;
keyp->v.d = value;
keyp->length = 1;
}
@@ -469,7 +478,7 @@ cdiInqKeyFloat(int cdiID, int varID, int key, double *value)
const cdi_key_t *keyp = find_key_const(keysp, key);
if (keyp != NULL && keyp->length == 1) // key in use
{
- if (keyp->type == KEY_FLOAT)
+ if (keyp->type == KeyFloat)
{
*value = keyp->v.d;
status = CDI_NOERR;
@@ -500,7 +509,7 @@ cdiDefVarKeyBytes(cdi_keys_t *keysp, int key, const unsigned char *bytes, int le
}
memcpy(keyp->v.s, bytes, length_);
- keyp->type = KEY_BYTES;
+ keyp->type = KeyBytes;
}
}
@@ -546,7 +555,7 @@ cdiInqVarKeyBytes(const cdi_keys_t *keysp, int key, unsigned char *bytes, int *l
int val_len;
if (keyp != NULL && (val_len = keyp->length) > 0) // key in use
{
- if (keyp->type == KEY_BYTES)
+ if (keyp->type == KeyBytes)
{
if (val_len < *length)
*length = val_len;
@@ -702,7 +711,7 @@ cdiInqVarKeyStringPtr(const cdi_keys_t *keysp, int key)
const cdi_key_t *keyp = find_key_const(keysp, key);
if (keyp != NULL) // key in use
{
- if (keyp->type == KEY_BYTES) return (const char *) keyp->v.s;
+ if (keyp->type == KeyBytes) return (const char *) keyp->v.s;
}
return NULL;
@@ -713,7 +722,7 @@ cdiInitKeys(cdi_keys_t *keysp)
{
keysp->nalloc = MAX_KEYS;
keysp->nelems = 0;
- for (int i = 0; i < MAX_KEYS; ++i) keysp->value[i].length = 0;
+ for (uint16_t i = 0; i < MAX_KEYS; ++i) keysp->value[i].length = 0;
}
/*
diff --git a/src/cdi_key.h b/src/cdi_key.h
index 71755838c36dd14983b189ceeada51516a09a59c..8fa4f03637dff751c1ab7aba7bb29543eff38bb8 100644
--- a/src/cdi_key.h
+++ b/src/cdi_key.h
@@ -2,14 +2,15 @@
#define CDI_KEY_H
#include <stdio.h>
+#include <stdint.h>
#include "cdi_limits.h"
// CDI key
typedef struct
{
- int key; // CDI key
- int type; // KEY_INT, KEY_FLOAT, KEY_BYTES
- int length; // number of bytes in v.s
+ uint16_t key; // CDI key
+ uint16_t type; // KEY_INT, KEY_FLOAT, KEY_BYTES
+ int length; // number of bytes in v.s
union
{
int i;
@@ -20,16 +21,16 @@ typedef struct
typedef struct
{
- size_t nalloc; // number allocated >= nelems
- size_t nelems; // length of the array
+ uint16_t nalloc; // number allocated >= nelems
+ uint16_t nelems; // length of the array
cdi_key_t value[MAX_KEYS];
} cdi_keys_t;
enum
{
- KEY_INT = 1,
- KEY_FLOAT,
- KEY_BYTES
+ KeyInt = 1,
+ KeyFloat,
+ KeyBytes
};
void cdiDefVarKeyInt(cdi_keys_t *keysp, int key, int value);
diff --git a/src/cdi_util.c b/src/cdi_util.c
index 187cf2c530db3c7c1d9229384cfcf5c050d74ca1..1609557054206213c43706fa1877e3af3bcef7f8 100644
--- a/src/cdi_util.c
+++ b/src/cdi_util.c
@@ -2,8 +2,9 @@
#include "config.h"
#endif
+#ifndef _WIN32
#include <unistd.h>
-
+#endif
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/cdi_uuid.h b/src/cdi_uuid.h
index e55d3a8959c4abd9c4393d1367ee78eddd3b4dc3..cbb3071899d9434c23eb65d195c90400b4863811 100644
--- a/src/cdi_uuid.h
+++ b/src/cdi_uuid.h
@@ -24,7 +24,9 @@ int cdiUUIDIsNull(const unsigned char uuid[])
return isNull;
}
+#ifndef _WIN32
void cdiCreateUUID(unsigned char uuid[CDI_UUID_SIZE]);
+#endif
int cdiUUID2Str(const unsigned char uuid[], char uuidstr[]);
int cdiStr2UUID(const char *uuidstr, unsigned char uuid[]);
diff --git a/src/cmake/cdi/cdi-config.cmake.in b/src/cmake/cdi/cdi-config.cmake.in
index e34cb86e5e2ca978fc9b156b5277ba1b2eaa8502..f2f972547906a2212567d9e37c5b8461363df4b6 100644
--- a/src/cmake/cdi/cdi-config.cmake.in
+++ b/src/cmake/cdi/cdi-config.cmake.in
@@ -1,9 +1,9 @@
# Config file for lib CDI project
# run cmake with CDI_DIR pointing to the directory containing this file.
-# set(CDI_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../../..")
+set(CDI_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../../..")
# use following line instead of previous if this file can be configured
-set(CDI_ROOT_DIR "@prefix@")
+# set(CDI_ROOT_DIR "@prefix@")
find_path(CDI_INCLUDE_DIRECTORY
cdi.h
@@ -15,7 +15,7 @@ find_path(CDI_INCLUDE_DIRECTORY
mark_as_advanced(CDI_INCLUDE_DIRECTORY)
find_library(CDI_LIBRARY
- NAMES cdi
+ NAMES cdilib
PATHS "${CDI_ROOT_DIR}/lib"
# use following line instead of previous if this file can be configured
# PATHS "@libdir@"
diff --git a/src/extra.h b/src/extra.h
index 1c586432db021af78776419ad4debe01e81ffbef..0c046b399015b44b8c738da5272e2d283d5ff81b 100644
--- a/src/extra.h
+++ b/src/extra.h
@@ -5,6 +5,8 @@
#include "config.h"
#endif
+#include <stdlib.h>
+
enum
{
EXT_REAL = 1,
diff --git a/src/extralib.c b/src/extralib.c
index cf3b0a72645b35cc23648603df86b7e9fd25230a..0bcc85454fd26586f1f8393b87ff439a4e08700a 100644
--- a/src/extralib.c
+++ b/src/extralib.c
@@ -11,7 +11,6 @@
* next to find out what happened */
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/src/file.c b/src/file.c
index 2086da8a5643a461bf96f56909a7f5dba5fc8578..d38c5a2516b3955fbb13bad9f8553f82e8553b2b 100644
--- a/src/file.c
+++ b/src/file.c
@@ -10,19 +10,25 @@
#include "config.h"
#endif
-#include <unistd.h>
-
#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
-#include <stdbool.h>
#include <string.h>
-#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/types.h>
+
+// On Windows, define ssize_t manually
+#ifdef _WIN32
+#define ssize_t __int64
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h> // gettimeofday()
@@ -392,7 +398,7 @@ fileFlush(int fileID)
{
FILE *fp = fileptr->fp;
retval = fflush(fp);
- if (retval == 0) retval = fsync(fileno(fp));
+ if (retval == 0) retval = fflush(fp);
if (retval != 0) retval = errno;
}
diff --git a/src/gaussian_latitudes.c b/src/gaussian_latitudes.c
index 7196999fc060af391969c8193574959dbaa89ed1..f62954c319556df722c1c02897dca50f86cf7d39 100644
--- a/src/gaussian_latitudes.c
+++ b/src/gaussian_latitudes.c
@@ -14,6 +14,9 @@
#include <stdlib.h>
#include <stdbool.h>
#include <float.h>
+
+// Required on windows to be able to use M_PI
+#define _USE_MATH_DEFINES
#include <math.h>
#ifndef M_SQRT2
diff --git a/src/grb_read.c b/src/grb_read.c
index 9c82461945d496e7b14a77979cd8bda2addf1717..5868c1618e73bc7a0a74a27333f6ac270a8bdf0d 100644
--- a/src/grb_read.c
+++ b/src/grb_read.c
@@ -111,7 +111,8 @@ grib1_unzip_record(void *gribbuffer, size_t *gribsize)
typedef struct JobArgsGRB
{
- int recID, tsID, *outZip, filetype, memType, datatype, unreduced;
+ int *outZip;
+ int recID, tsID, filetype, memType, datatype, unreduced;
void *cgribexp, *gribbuffer, *data;
size_t recsize, gridsize, numMissVals;
double missval;
@@ -131,7 +132,7 @@ static JobArgsGRB
grb_read_raw_data(stream_t *streamptr, int tsID, int recID, int memType, void *gribbuffer, void *data, bool resetFilePos)
{
int vlistID = streamptr->vlistID;
- int varID = streamptr->tsteps[tsID].records[recID].varID;
+ int varID = streamptr->tsteps[tsID].recinfo[recID].varID;
size_t recsize = streamptr->tsteps[tsID].records[recID].size;
int gridID = vlistInqVarGrid(vlistID, varID);
@@ -167,7 +168,7 @@ grb_read_raw_data(stream_t *streamptr, int tsID, int recID, int memType, void *g
if (!resetFilePos) streamptr->numvals += (SizeType) gridsize;
}
- return (JobArgsGRB){
+ return (JobArgsGRB) {
.recID = recID,
.tsID = tsID,
.outZip = &streamptr->tsteps[tsID].records[recID].zip,
diff --git a/src/grb_write.c b/src/grb_write.c
index 9ece9e4c10669e5875cc02efa512ac4047b1c8d8..217904313fda17b3dfc7d6f1a7d3caf7ed14f976 100644
--- a/src/grb_write.c
+++ b/src/grb_write.c
@@ -224,7 +224,8 @@ grbCopyField(stream_t *streamptr2, stream_t *streamptr1)
int tsID = streamptr1->curTsID;
int vrecID = streamptr1->tsteps[tsID].curRecID;
int recID = streamptr1->tsteps[tsID].recIDs[vrecID];
- const record_t *record = &streamptr1->tsteps[tsID].records[recID];
+ const recinfo_t *recinfo = &(streamptr1->tsteps[tsID].recinfo[recID]);
+ const record_t *record = &(streamptr1->tsteps[tsID].records[recID]);
off_t recpos = record->position;
size_t recsize = record->size;
@@ -347,8 +348,7 @@ grbCopyField(stream_t *streamptr2, stream_t *streamptr1)
if (streamptr2->protocol == CDI_PROTOCOL_FDB)
{
int vlistID = streamptr1->vlistID;
- int varID = record->varID;
- int zaxisID = vlistInqVarZaxis(vlistID, varID);
+ int zaxisID = vlistInqVarZaxis(vlistID, recinfo->varID);
int zaxisType = zaxisInqType(zaxisID);
CdiDateTime vDateTime = streamptr1->tsteps[tsID].taxis.vDateTime;
@@ -443,7 +443,7 @@ grb_write_var_slice(stream_t *streamptr, int varID, int levelID, int memtype, co
case CDI_PROTOCOL_FILE:
{
size_t (*myFileWrite)(int fileID, const void *restrict buffer, size_t len)
- = (size_t(*)(int, const void *restrict, size_t)) namespaceSwitchGet(NSSWITCH_FILE_WRITE).func;
+ = (size_t (*)(int, const void *restrict, size_t)) namespaceSwitchGet(NSSWITCH_FILE_WRITE).func;
size_t nwrite = myFileWrite(fileID, gribbuffer, nbytes);
if (nwrite != nbytes) SysError("Failed to write GRIB slice!");
diff --git a/src/gribapi.h b/src/gribapi.h
index 87e9a23e30fa062572fc3314a9e18d5a71d8fdf7..784eb940a8e64e75d1f69e54d2b8fa50645ed675 100644
--- a/src/gribapi.h
+++ b/src/gribapi.h
@@ -49,6 +49,7 @@
#define GRIB2_GTYPE_LATLON_ROTSTR 3 // Stretched and Rotated Latitude/longitude
#define GRIB2_GTYPE_STERE 20 // Polar stereographic projection
#define GRIB2_GTYPE_LCC 30 // Lambert conformal
+#define GRIB2_GTYPE_LLAM 33 // Lambert LAM
#define GRIB2_GTYPE_GAUSSIAN 40 // Gaussian latitude/longitude
#define GRIB2_GTYPE_GAUSSIAN_ROT 41 // Rotated Gaussian latitude/longitude
#define GRIB2_GTYPE_GAUSSIAN_STR 42 // Stretched Gaussian latitude/longitude
diff --git a/src/gribapi_utilities.c b/src/gribapi_utilities.c
index 7d45150803ce435a1b184442906c4a5011589fcc..ee5b158633b7760dac7ff66825c1b92c778cda80 100644
--- a/src/gribapi_utilities.c
+++ b/src/gribapi_utilities.c
@@ -591,6 +591,7 @@ gribapiGetGridType(grib_handle *gh)
case GRIB2_GTYPE_GAUSSIAN: return has_ni(gh) ? GRID_GAUSSIAN : GRID_GAUSSIAN_REDUCED;
case GRIB2_GTYPE_LATLON_ROT: return GRID_PROJECTION;
case GRIB2_GTYPE_LCC: return CDI_PROJ_LCC;
+ case GRIB2_GTYPE_LLAM: return CDI_PROJ_LCC; // Handle LLAM as LCC
case GRIB2_GTYPE_STERE: return CDI_PROJ_STERE;
case GRIB2_GTYPE_SPECTRAL: return GRID_SPECTRAL;
case GRIB2_GTYPE_GME: return GRID_GME;
@@ -966,7 +967,7 @@ gribapiGetGrid(grib_handle *gh, grid_t *grid)
Default / implicit scanning mode is 64:
i and j scan positively, i points are consecutive (row-major) */
#ifdef HIRLAM_EXTENSIONS
- if (cdiDebugExt >= 30 && edititionnumber <= 1)
+ if (cdiDebugExt >= 30 && editionNumber <= 1)
{
// indicatorOfParameter=33,indicatorOfTypeOfLevel=105,level
long paramId, levelTypeId, levelId;
diff --git a/src/grid.c b/src/grid.c
index 9e2897e9209f7d10922920ebd88fa2ae56c1ed0b..f29d333f0c7b76978ecb6972a1527d3c3db72380 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -989,9 +989,7 @@ gridInqSize(int gridID)
{
size_t xsize = gridptr->x.size;
size_t ysize = gridptr->y.size;
-
size = ysize ? xsize * ysize : xsize;
-
gridptr->size = size;
}
@@ -2194,7 +2192,7 @@ compareXYvals2(grid_t *gridRef, grid_t *gridTest)
|| ((gridTest->x.bounds == NULL) ^ (gridRef->x.bounds == NULL))
|| ((gridTest->y.bounds == NULL) ^ (gridRef->y.bounds == NULL));
- typedef double (*inqVal)(grid_t * grid, SizeType index);
+ typedef double (*inqVal)(grid_t *grid, SizeType index);
inqVal inqXValRef = gridRef->vtable->inqXVal, inqYValRef = gridRef->vtable->inqYVal, inqXValTest = gridTest->vtable->inqXVal,
inqYValTest = gridTest->vtable->inqYVal;
@@ -4871,7 +4869,7 @@ cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode)
}
}
- return (struct addIfNewRes){ .Id = gridID, .isNew = (!gridIsDefined && !gridIsDefinedGlobal) };
+ return (struct addIfNewRes) { .Id = gridID, .isNew = (!gridIsDefined && !gridIsDefinedGlobal) };
}
const struct gridVirtTable cdiGridVtable = {
diff --git a/src/ieg.h b/src/ieg.h
index df110c2d5edc2c34853efe6591cfe66a12aa38ca..cb07281d67a51e8841c0403cfb28bacb8cf57569 100644
--- a/src/ieg.h
+++ b/src/ieg.h
@@ -1,6 +1,8 @@
#ifndef _IEG_H
#define _IEG_H
+#include <stdlib.h>
+
// clang-format off
/* Level Types */
diff --git a/src/ieglib.c b/src/ieglib.c
index 067ce68abc22b6c4b118febf91cde188a44d27dd..b5e08e2cf245c7638efa8cb48f0cc6267a91214e 100644
--- a/src/ieglib.c
+++ b/src/ieglib.c
@@ -11,7 +11,6 @@
* next to find out what happened */
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/src/input_file.c b/src/input_file.c
index 40dd475037c44dc306844bb311a8c05327823216..11df000c99bb693605e2d3694b529d8b99287d14 100644
--- a/src/input_file.c
+++ b/src/input_file.c
@@ -18,9 +18,20 @@
#include <errno.h>
#include <fcntl.h>
-#include <pthread.h>
#include <string.h>
+
+// On Windows, define ssize_t and pread manually
+#ifdef _WIN32
+#define ssize_t __int64
+#define pread read
+#include <io.h>
+#else
#include <unistd.h>
+#endif
+
+#if HAVE_PTHREAD
+#include <pthread.h>
+#endif
static void cdiInputFile_destruct(CdiInputFile *me);
@@ -64,7 +75,9 @@ success:
static CdiInputFile **openFileList = NULL;
static size_t openFileCount = 0, openFileListSize = 0;
+#if HAVE_PTHREAD
static pthread_mutex_t openFileListLock = PTHREAD_MUTEX_INITIALIZER;
+#endif
// This either returns a new object, or retains and returns a preexisting open file.
CdiInputFile *
@@ -72,8 +85,10 @@ cdiInputFile_make(const char *path)
{
CdiInputFile *result = NULL;
xassert(path);
+#if HAVE_PTHREAD
int error = pthread_mutex_lock(&openFileListLock);
xassert(!error);
+#endif
{
// Check the list of open files for the given path.
for (size_t i = openFileCount; i-- && !result;)
@@ -108,8 +123,10 @@ cdiInputFile_make(const char *path)
}
}
}
+#if HAVE_PTHREAD
error = pthread_mutex_unlock(&openFileListLock);
xassert(!error);
+#endif
return result;
}
@@ -142,8 +159,10 @@ cdiInputFile_getPath(const CdiInputFile *me)
void
cdiInputFile_destruct(CdiInputFile *me)
{
+#if HAVE_PTHREAD
int error = pthread_mutex_lock(&openFileListLock);
xassert(!error);
+#endif
{
// Find the position of me in the list of open files.
ssize_t position = (ssize_t) openFileCount;
@@ -152,8 +171,10 @@ cdiInputFile_destruct(CdiInputFile *me)
// Remove me from the list
openFileList[position] = openFileList[--openFileCount];
}
+#if HAVE_PTHREAD
error = pthread_mutex_unlock(&openFileListLock);
xassert(!error);
+#endif
cdiInputFile_condestruct(me, NULL);
}
diff --git a/src/institution.c b/src/institution.c
index 0250a7dc7045fbe51bbec18d9d3a7eba1a428bfa..6484ddb0601aad0ad1065975ef8bcb2139e8c973 100644
--- a/src/institution.c
+++ b/src/institution.c
@@ -15,7 +15,6 @@
#include <limits.h>
#include "cdi.h"
-#include "cdi_int.h"
#include "resource_handle.h"
#include "resource_unpack.h"
#include "namespace.h"
diff --git a/src/iterator_fallback.c b/src/iterator_fallback.c
index eb561f4d11716a67f6e37fa39993e2f2a4962361..fd7bc6db7bc393b64ff4c1be216159d30d0abed8 100644
--- a/src/iterator_fallback.c
+++ b/src/iterator_fallback.c
@@ -20,6 +20,13 @@
#include <limits.h>
#include <stdlib.h>
+// On Windows, define ssize_t manually
+#ifdef _WIN32
+#define ssize_t __int64
+#else
+#include <unistd.h>
+#endif
+
struct CdiFallbackIterator
{
CdiIterator super;
diff --git a/src/make_fint.c b/src/make_fint.c
index 6d76942d3d6c3671334c5aeb5ca4fc36f37717f9..efc2165972f376d5d1f35bc8200c3db9ac70fbf4 100644
--- a/src/make_fint.c
+++ b/src/make_fint.c
@@ -1367,8 +1367,8 @@ static int detectComment(char **line_, ssize_t *lineLen, size_t *lineBufSize,
cline += strspn(cline, " \t*");
char *eol = strchr(cline, '\n');
if (!eol) eol = comment + commentLen;
- size_t lineLen = (size_t)(eol - cline);
- fprintf(fpinc, "! %.*s\n", (int)lineLen, cline);
+ size_t lineLen2 = (size_t)(eol - cline);
+ fprintf(fpinc, "! %.*s\n", (int)lineLen2, cline);
cline = (eol != comment + commentLen) ? eol + 1: NULL;
} while (cline);
fputs("!\n", fpinc);
diff --git a/src/pio_server.c b/src/pio_server.c
index bdda03d49c0726350b4daae0ffbfecbd6ceb01b5..a9f4c7c3dd66ef03bcd985ccaae950e450448bbc 100644
--- a/src/pio_server.c
+++ b/src/pio_server.c
@@ -246,8 +246,8 @@ readFuncCall(struct winHeaderEntry *header, size_t streamIdx)
int position = header->offset;
int changedTaxisID = taxisUnpack((char *) rxWin[streamIdx].clientBuf[0].mem, (int) rxWin[streamIdx].clientBuf[0].size,
&position, originNamespace, &pioInterComm, 0);
- taxis_t *oldTaxisPtr = taxisPtr(oldTaxisID);
- taxis_t *changedTaxisPtr = taxisPtr(changedTaxisID);
+ taxis_t *oldTaxisPtr = taxis_to_pointer(oldTaxisID);
+ taxis_t *changedTaxisPtr = taxis_to_pointer(changedTaxisID);
ptaxisCopy(oldTaxisPtr, changedTaxisPtr);
taxisDestroy(changedTaxisID);
streamDefTimestep(streamID, funcArgs->streamNewTimestep.tsID);
diff --git a/src/serialize.h b/src/serialize.h
index d771d704fcddae3935dae49c9361a7250b4a3761..c77c56707ac251c7867a1991f9a618f27a47ab38 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -42,16 +42,16 @@ serializeKeysGetPackSize(const cdi_keys_t *keysp, void *context)
int type = keyp->type;
packBuffSize += serializeGetSize(1, CDI_DATATYPE_INT, context); // key
packBuffSize += serializeGetSize(1, CDI_DATATYPE_INT, context); // type
- if (type == KEY_BYTES)
+ if (type == KeyBytes)
{
int length = keyp->length;
packBuffSize += serializeGetSize(1, CDI_DATATYPE_INT, context) + serializeGetSize(length, CDI_DATATYPE_TXT, context);
}
- else if (type == KEY_INT)
+ else if (type == KeyInt)
{
packBuffSize += serializeGetSize(1, CDI_DATATYPE_INT, context);
}
- else if (type == KEY_FLOAT)
+ else if (type == KeyFloat)
{
packBuffSize += serializeGetSize(1, CDI_DATATYPE_FLT64, context);
}
@@ -74,18 +74,18 @@ serializeKeysPack(const cdi_keys_t *keysp, void *buf, int buf_size, int *positio
int type = keyp->type;
serializePack(&key, 1, CDI_DATATYPE_INT, buf, buf_size, position, context);
serializePack(&type, 1, CDI_DATATYPE_INT, buf, buf_size, position, context);
- if (type == KEY_BYTES)
+ if (type == KeyBytes)
{
int length = keyp->length;
serializePack(&length, 1, CDI_DATATYPE_INT, buf, buf_size, position, context);
serializePack(keyp->v.s, length, CDI_DATATYPE_TXT, buf, buf_size, position, context);
d ^= cdiCheckSum(CDI_DATATYPE_TXT, length, keyp->v.s);
}
- else if (type == KEY_INT)
+ else if (type == KeyInt)
{
serializePack(&keyp->v.i, 1, CDI_DATATYPE_INT, buf, buf_size, position, context);
}
- else if (type == KEY_FLOAT)
+ else if (type == KeyFloat)
{
serializePack(&keyp->v.d, 1, CDI_DATATYPE_FLT64, buf, buf_size, position, context);
}
@@ -108,7 +108,7 @@ serializeKeysUnpack(const void *buf, int buf_size, int *position, cdi_keys_t *ke
int key, type;
serializeUnpack(buf, buf_size, position, &key, 1, CDI_DATATYPE_INT, context);
serializeUnpack(buf, buf_size, position, &type, 1, CDI_DATATYPE_INT, context);
- if (type == KEY_BYTES)
+ if (type == KeyBytes)
{
int length;
serializeUnpack(buf, buf_size, position, &length, 1, CDI_DATATYPE_INT, context);
@@ -121,13 +121,13 @@ serializeKeysUnpack(const void *buf, int buf_size, int *position, cdi_keys_t *ke
cdiDefVarKeyBytes(keysp, key, (unsigned char *) buffer, length);
d2 ^= cdiCheckSum(CDI_DATATYPE_TXT, length, buffer);
}
- else if (type == KEY_INT)
+ else if (type == KeyInt)
{
int ival;
serializeUnpack(buf, buf_size, position, &ival, 1, CDI_DATATYPE_INT, context);
cdiDefVarKeyInt(keysp, key, ival);
}
- else if (type == KEY_FLOAT)
+ else if (type == KeyFloat)
{
double dval;
serializeUnpack(buf, buf_size, position, &dval, 1, CDI_DATATYPE_FLT64, context);
diff --git a/src/service.h b/src/service.h
index 9c9a5d14b39cd85e57340cd2d8f94170258d253f..edc06842ea2e1fd3de959f67cb4fb73aa5fa6499 100644
--- a/src/service.h
+++ b/src/service.h
@@ -1,6 +1,8 @@
#ifndef _SERVICE_H
#define _SERVICE_H
+#include <stdlib.h>
+
typedef struct
{
int checked;
diff --git a/src/servicelib.c b/src/servicelib.c
index 70a649f968393f12fdf25cd8c0fd206e4fdee784..5c0bd113caf78434894f0b6e75d14610236cc32c 100644
--- a/src/servicelib.c
+++ b/src/servicelib.c
@@ -11,7 +11,6 @@
* next to find out what happened */
#include <stdio.h>
-#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <ctype.h>
diff --git a/src/stream.c b/src/stream.c
index 81fee3cae624cb8f00ecfc238bb57ca3c65d0dcb..f3a11f7c81df0494610670f4a9aa27cea5621718 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -251,9 +251,10 @@ streamDefNumWorker(int streamID, int numWorker)
if (streamptr->maxGlobalRecs == -1) xabort("Internal error: number of timesteps missing!");
if (streamptr->maxGlobalRecs == 1) numWorker = 0;
if (numWorker > streamptr->maxGlobalRecs) numWorker = (int) streamptr->maxGlobalRecs;
- if (streamptr->chunkSizeTdim > 1 && numWorker > streamptr->nvars) numWorker = streamptr->nvars;
- if (streamptr->chunkSizeZdim > 1) numWorker = 0;
- if (CDI_Test) Message("chunkSizeTdim=%d chunkSizeZdim=%d", streamptr->chunkSizeTdim, streamptr->chunkSizeZdim);
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ if (cdfInfo->chunkSizeDimT > 1 && numWorker > streamptr->nvars) numWorker = streamptr->nvars;
+ if (cdfInfo->chunkSizeDimZ > 1) numWorker = 0;
+ if (CDI_Test) Message("chunkSizeTdim=%d chunkSizeZdim=%d", cdfInfo->chunkSizeDimT, cdfInfo->chunkSizeDimZ);
}
#endif
else
@@ -429,7 +430,7 @@ cdiInqContents(stream_t *streamptr)
if (taxisID != CDI_UNDEFID)
{
taxis_t *taxisptr1 = &streamptr->tsteps[0].taxis;
- taxis_t *taxisptr2 = taxisPtr(taxisID);
+ taxis_t *taxisptr2 = taxis_to_pointer(taxisID);
ptaxisCopy(taxisptr2, taxisptr1);
}
}
@@ -1076,31 +1077,32 @@ streamDefaultValue(stream_t *streamptr)
basetimeInit(&streamptr->basetime);
#ifdef HAVE_LIBNETCDF
- streamptr->nc_complex_float_id = CDI_UNDEFID;
- streamptr->nc_complex_double_id = CDI_UNDEFID;
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ cdfInfo->complexFloatId = CDI_UNDEFID;
+ cdfInfo->complexDoubleId = CDI_UNDEFID;
- for (int i = 0; i < MAX_ZAXES_PS; i++) streamptr->zaxisID[i] = CDI_UNDEFID;
- for (int i = 0; i < MAX_ZAXES_PS; i++) streamptr->nczvarID[i] = CDI_UNDEFID;
+ for (int i = 0; i < MAX_ZAXES_PS; i++) cdfInfo->zaxisIdVec[i] = CDI_UNDEFID;
+ for (int i = 0; i < MAX_ZAXES_PS; i++) cdfInfo->ncZvarIdVec[i] = CDI_UNDEFID;
for (int i = 0; i < MAX_GRIDS_PS; i++)
{
- streamptr->ncgrid[i].start = CDI_UNDEFID;
- streamptr->ncgrid[i].count = CDI_UNDEFID;
- streamptr->ncgrid[i].gridID = CDI_UNDEFID;
- for (size_t j = 0; j < CDF_SIZE_ncIDs; ++j) streamptr->ncgrid[i].ncIDs[j] = CDI_UNDEFID;
+ cdfInfo->cdfGridVec[i].start = CDI_UNDEFID;
+ cdfInfo->cdfGridVec[i].count = CDI_UNDEFID;
+ cdfInfo->cdfGridVec[i].gridID = CDI_UNDEFID;
+ for (size_t j = 0; j < CDF_SIZE_NCID; ++j) cdfInfo->cdfGridVec[i].ncIdVec[j] = CDI_UNDEFID;
}
- streamptr->ncNumDims = 0;
- for (int i = 0; i < MAX_DIMS_PS; i++) streamptr->ncDimID[i] = CDI_UNDEFID;
- for (int i = 0; i < MAX_DIMS_PS; i++) streamptr->ncDimLen[i] = 0;
+ cdfInfo->ncNumDims = 0;
+ for (int i = 0; i < MAX_DIMS_PS; i++) cdfInfo->ncDimIdVec[i] = CDI_UNDEFID;
+ for (int i = 0; i < MAX_DIMS_PS; i++) cdfInfo->ncDimLenVec[i] = 0;
- streamptr->vct.ilev = 0;
- streamptr->vct.mlev = 0;
- streamptr->vct.ilevID = CDI_UNDEFID;
- streamptr->vct.mlevID = CDI_UNDEFID;
+ cdfInfo->chunkSizeDimT = 0;
+ cdfInfo->chunkSizeDimZ = 0;
- streamptr->chunkSizeTdim = 0;
- streamptr->chunkSizeZdim = 0;
+ cdfInfo->vct.ilev = 0;
+ cdfInfo->vct.mlev = 0;
+ cdfInfo->vct.ilevID = CDI_UNDEFID;
+ cdfInfo->vct.mlevID = CDI_UNDEFID;
#endif
streamptr->maxGlobalRecs = CDI_UNDEFID;
@@ -1233,16 +1235,12 @@ cdiStreamCloseDefaultDelegate(stream_t *streamptr, int recordBufIsToBeDeleted)
cdfClose(fileID);
if (streamptr->ntsteps == 0 && streamptr->tsteps != NULL)
{
- if (streamptr->tsteps[0].records)
- {
- Free(streamptr->tsteps[0].records);
- streamptr->tsteps[0].records = NULL;
- }
- if (streamptr->tsteps[0].recIDs)
- {
- Free(streamptr->tsteps[0].recIDs);
- streamptr->tsteps[0].recIDs = NULL;
- }
+ tsteps_t *tstep = &(streamptr->tsteps[0]);
+ // clang-format off
+ if (tstep->recinfo) { Free(tstep->recinfo); tstep->recinfo = NULL; }
+ if (tstep->records) { Free(tstep->records); tstep->records = NULL; }
+ if (tstep->recIDs) { Free(tstep->recIDs); tstep->recIDs = NULL; }
+ // clang-format on
}
break;
}
@@ -1306,8 +1304,11 @@ streamDestroyViaDelegate(stream_t *streamptr, void (*streamCloseDelegate)(stream
for (int index = 0; index < maxSteps; ++index)
{
tsteps_t *tstep = &(streamptr->tsteps[index]);
- if (tstep->records) Free(tstep->records);
- if (tstep->recIDs) Free(tstep->recIDs);
+ // clang-format off
+ if (tstep->recinfo) { Free(tstep->recinfo); tstep->recinfo = NULL; }
+ if (tstep->records) { Free(tstep->records); tstep->records = NULL; }
+ if (tstep->recIDs) { Free(tstep->recIDs); tstep->recIDs = NULL; }
+ // clang-format on
taxisDestroyKernel(&(tstep->taxis));
}
@@ -1339,7 +1340,6 @@ streamDestroyViaDelegate(stream_t *streamptr, void (*streamCloseDelegate)(stream
Free(streamptr);
}
-
static void
streamDestroy(stream_t *streamptr)
{
@@ -1462,14 +1462,15 @@ cdiStreamDefTimestep_(stream_t *streamptr, int tsID)
}
int taxisID = vlistInqTaxis(vlistID);
- if (taxisID != CDI_UNDEFID) ptaxisCopy(&streamptr->tsteps[tsID].taxis, taxisPtr(taxisID));
+ if (taxisID != CDI_UNDEFID) ptaxisCopy(&streamptr->tsteps[tsID].taxis, taxis_to_pointer(taxisID));
streamptr->curTsID = tsID;
streamptr->ntsteps = tsID + 1;
+ bool baseFiletypeIsNetCDF = (cdiBaseFiletype(streamptr->filetype) == CDI_FILETYPE_NETCDF);
#ifdef HAVE_LIBNETCDF
int timeIsVarying = vlistHasTime(vlistID);
- if (cdiBaseFiletype(streamptr->filetype) == CDI_FILETYPE_NETCDF && timeIsVarying)
+ if (baseFiletypeIsNetCDF && timeIsVarying)
{
/* usually points to cdfDefTimestep in serial mode but
* to cdiPioCdfDefTimestep on servers and to a null-op on
@@ -1480,7 +1481,7 @@ cdiStreamDefTimestep_(stream_t *streamptr, int tsID)
}
#endif
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, !baseFiletypeIsNetCDF);
return (int) streamptr->ntsteps;
}
@@ -1563,7 +1564,7 @@ streamInqTimestep(int streamID, int tsID)
streamptr->tsteps[tsID].curRecID = CDI_UNDEFID;
int taxisID = vlistInqTaxis(vlistID);
if (taxisID == -1) Error("Timestep undefined for fileID = %d", streamID);
- ptaxisCopy(taxisPtr(taxisID), &streamptr->tsteps[tsID].taxis);
+ ptaxisCopy(taxis_to_pointer(taxisID), &streamptr->tsteps[tsID].taxis);
return nrecs;
}
@@ -1632,7 +1633,7 @@ streamInqTimestep(int streamID, int tsID)
int taxisID = vlistInqTaxis(vlistID);
if (taxisID == -1) Error("Timestep undefined for fileID = %d", streamID);
- ptaxisCopy(taxisPtr(taxisID), &streamptr->tsteps[tsID].taxis);
+ ptaxisCopy(taxis_to_pointer(taxisID), &streamptr->tsteps[tsID].taxis);
return nrecs;
}
@@ -1783,26 +1784,6 @@ streamInqFileID(int streamID)
return s->fileID;
}
-void
-cdiDefAccesstype(int streamID, int type)
-{
- stream_t *s = (stream_t *) reshGetVal(streamID, &streamOps);
-
- if (s->accesstype == CDI_UNDEFID)
- {
- s->accesstype = type;
- }
- else if (s->accesstype != type)
- Error("Changing access type from %s not allowed!", s->accesstype == TYPE_REC ? "REC to VAR" : "VAR to REC");
-}
-
-int
-cdiInqAccesstype(int streamID)
-{
- stream_t *s = (stream_t *) reshGetVal(streamID, &streamOps);
- return s->accesstype;
-}
-
static int
streamTxCode(void *s)
{
@@ -1851,7 +1832,7 @@ cdiStreamSetupVlist_(stream_t *streamptr, int vlistID)
if (taxisInqType(taxisID) == TAXIS_RELATIVE)
if (cdiBaseFiletype(streamptr->filetype) == CDI_FILETYPE_NETCDF)
{
- const taxis_t *taxisptr = taxisPtr(taxisID);
+ const taxis_t *taxisptr = taxis_to_pointer(taxisID);
if (cdiDateTime_isNull(taxisptr->rDateTime))
{
int vdate = taxisInqVdate(taxisID);
@@ -1860,7 +1841,7 @@ cdiStreamSetupVlist_(stream_t *streamptr, int vlistID)
}
}
#endif
- ptaxisCopy(&streamptr->tsteps[0].taxis, taxisPtr(taxisID));
+ ptaxisCopy(&streamptr->tsteps[0].taxis, taxis_to_pointer(taxisID));
}
switch (cdiBaseFiletype(streamptr->filetype))
@@ -2039,13 +2020,13 @@ streamUnpack(char *unpackBuffer, int unpackBufferSize, int *unpackBufferPos, int
return retval;
}
-
/* *
* This function does not really close the memio,
* this has to be done outside cdi to access the memory buffer*/
void
freePtrAfterNCMem(stream_t *streamptr, int recordBufIsToBeDeleted)
{
+ (void) recordBufIsToBeDeleted;
int fileID = streamptr->fileID;
if (fileID == CDI_UNDEFID)
@@ -2056,20 +2037,15 @@ freePtrAfterNCMem(stream_t *streamptr, int recordBufIsToBeDeleted)
if (streamptr->ntsteps == 0 && streamptr->tsteps != NULL)
{
- if (streamptr->tsteps[0].records)
- {
- Free(streamptr->tsteps[0].records);
- streamptr->tsteps[0].records = NULL;
- }
- if (streamptr->tsteps[0].recIDs)
- {
- Free(streamptr->tsteps[0].recIDs);
- streamptr->tsteps[0].recIDs = NULL;
- }
+ tsteps_t *tstep = &(streamptr->tsteps[0]);
+ // clang-format off
+ if (tstep->recinfo) { Free(tstep->recinfo); tstep->recinfo = NULL; }
+ if (tstep->records) { Free(tstep->records); tstep->records = NULL; }
+ if (tstep->recIDs) { Free(tstep->recIDs); tstep->recIDs = NULL; }
+ // clang-format on
}
}
-
void
streamCloseNCMem(int streamID)
{
@@ -2079,7 +2055,7 @@ streamCloseNCMem(int streamID)
if (lockIO) CDI_IO_LOCK();
if (CDI_Debug) Message("streamID = %d filename = %s", streamID, streamptr->filename);
- streamDestroyViaDelegate(streamptr,freePtrAfterNCMem);
+ streamDestroyViaDelegate(streamptr, freePtrAfterNCMem);
reshRemove(streamID, &streamOps);
if (CDI_Debug) Message("Removed stream %d from stream list", streamID);
diff --git a/src/stream_cdf.h b/src/stream_cdf.h
index d4b379742b09f9983910c0310f8c0220e3eac2e8..8d61ec280aed2c29eb03cb1f523adb3301d0adbf 100644
--- a/src/stream_cdf.h
+++ b/src/stream_cdf.h
@@ -32,7 +32,7 @@ int cdfInqContents(stream_t *streamptr);
void cdfEndDef(stream_t *streamptr);
void cdfDefField(stream_t *streamptr);
-void cdfCopyRecord(stream_t *streamptr2, stream_t *streamptr1);
+void cdfCopyField(stream_t *streamptr2, stream_t *streamptr1);
void cdfDefineAttributes(int filetype, int vlistID, int varID, int fileID, int ncvarID);
diff --git a/src/stream_cdf_i.c b/src/stream_cdf_i.c
index 9b7565a012bdd95b2b93a32f63d07e6db6648768..3096c518c8518a88ae9114558489334cfc903126 100644
--- a/src/stream_cdf_i.c
+++ b/src/stream_cdf_i.c
@@ -6,7 +6,6 @@
#include <ctype.h>
#include <limits.h>
-#include <strings.h>
#include "dmemory.h"
#include "cdi_int.h"
@@ -19,6 +18,13 @@
#include "cdf_lazy_grid.h"
#include "cdf_filter.h"
+// On Windows, define strcasecmp manually
+#ifdef _WIN32
+#define strcasecmp _stricmp
+#else
+#include <unistd.h>
+#endif
+
enum VarStatus
{
UndefVar = -1,
@@ -52,6 +58,7 @@ typedef struct
typedef struct
{
+ int cdiVarID;
int ncid;
int varStatus;
bool ignoreVar;
@@ -115,6 +122,7 @@ typedef struct
size_t gridSize;
size_t xSize;
size_t ySize;
+ size_t zSize;
int nattsNC;
int natts;
int *atts;
@@ -138,7 +146,6 @@ typedef struct
char longname[CDI_MAX_NAME];
char stdname[CDI_MAX_NAME];
char units[CDI_MAX_NAME];
- char extra[CDI_MAX_NAME];
char filterSpec[CDI_MAX_NAME];
} ncvar_t;
@@ -343,7 +350,8 @@ cdfInqDatatype(stream_t *streamptr, int xtype, bool isUnsigned)
else if (xtype == NC_UINT64) datatype = CDI_DATATYPE_FLT64;
else
{
- if (xtype != streamptr->nc_complex_float_id && xtype != streamptr->nc_complex_double_id)
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ if (xtype != cdfInfo->complexFloatId && xtype != cdfInfo->complexDoubleId)
{
bool isUserDefinedType = false;
#ifdef NC_FIRSTUSERTYPEID
@@ -362,14 +370,14 @@ cdfInqDatatype(stream_t *streamptr, int xtype, bool isUnsigned)
nc_inq_compound_field(fileID, xtype, 1, NULL, NULL, &field_type2, &field_dims2, NULL);
if (field_type1 == field_type2 && field_dims1 == 0 && field_dims2 == 0)
{
- if (field_type1 == NC_FLOAT) streamptr->nc_complex_float_id = xtype;
- else if (field_type1 == NC_DOUBLE) streamptr->nc_complex_double_id = xtype;
+ if (field_type1 == NC_FLOAT) cdfInfo->complexFloatId = xtype;
+ else if (field_type1 == NC_DOUBLE) cdfInfo->complexDoubleId = xtype;
}
}
}
}
- if (xtype == streamptr->nc_complex_float_id ) datatype = CDI_DATATYPE_CPX32;
- else if (xtype == streamptr->nc_complex_double_id) datatype = CDI_DATATYPE_CPX64;
+ if (xtype == cdfInfo->complexFloatId ) datatype = CDI_DATATYPE_CPX32;
+ else if (xtype == cdfInfo->complexDoubleId) datatype = CDI_DATATYPE_CPX64;
}
#endif
// clang-format on
@@ -549,7 +557,7 @@ cdf_time_dimid(int fileID, int ndims, ncdim_t *ncdims, int nvars, ncvar_t *ncvar
check_dimids[dimid0] = true;
char sbuf[CDI_MAX_NAME];
- for (int iatt = 0; iatt < ncvar->nattsNC; ++iatt)
+ for (int iatt = 0, n = ncvar->nattsNC; iatt < n; ++iatt)
{
sbuf[0] = 0;
cdf_inq_attname(fileID, varid, iatt, sbuf);
@@ -586,6 +594,7 @@ init_ncvars(int nvars, ncvar_t *ncvars, int ncid)
for (int varid = 0; varid < nvars; varid++)
{
ncvar_t *ncvar = &ncvars[varid];
+ ncvar->cdiVarID = CDI_UNDEFID;
ncvar->ncid = ncid;
ncvar->varStatus = UndefVar;
ncvar->ignoreVar = false;
@@ -649,6 +658,7 @@ init_ncvars(int nvars, ncvar_t *ncvars, int ncid)
ncvar->gridSize = 0;
ncvar->xSize = 0;
ncvar->ySize = 0;
+ ncvar->zSize = 0;
ncvar->nattsNC = 0;
ncvar->natts = 0;
ncvar->atts = NULL;
@@ -673,7 +683,6 @@ init_ncvars(int nvars, ncvar_t *ncvars, int ncid)
memset(ncvar->longname, 0, CDI_MAX_NAME);
memset(ncvar->stdname, 0, CDI_MAX_NAME);
memset(ncvar->units, 0, CDI_MAX_NAME);
- memset(ncvar->extra, 0, CDI_MAX_NAME);
memset(ncvar->filterSpec, 0, CDI_MAX_NAME);
}
}
@@ -724,14 +733,14 @@ scan_hybrid_formulaterms(int ncid, int ncfvarid, int *avarid, int *bvarid, int *
char *tagname = pstring;
while (!isspace((int) *pstring) && *pstring != 0) pstring++;
if (*pstring == 0) lstop = true;
- *pstring++ = 0;
+ *(pstring++) = 0;
while (isspace((int) *pstring)) pstring++;
if (*pstring == 0) break;
char *varname = pstring;
while (!isspace((int) *pstring) && *pstring != 0) pstring++;
if (*pstring == 0) lstop = true;
- *pstring++ = 0;
+ *(pstring++) = 0;
int dimvarid;
int status_nc = nc_inq_varid(ncid, varname, &dimvarid);
@@ -1031,11 +1040,11 @@ cdf_get_cell_varid(char *attstring, int ncid)
while (isspace((int) *pstring)) pstring++;
char *cell_measures = pstring;
while (isalnum((int) *pstring)) pstring++;
- *pstring++ = 0;
+ *(pstring++) = 0;
while (isspace((int) *pstring)) pstring++;
char *cell_var = pstring;
while (!isspace((int) *pstring) && *pstring != 0) pstring++;
- *pstring++ = 0;
+ *(pstring++) = 0;
/*
printf("cell_measures >%s<\n", cell_measures);
printf("cell_var >%s<\n", cell_var);
@@ -1054,21 +1063,6 @@ cdf_get_cell_varid(char *attstring, int ncid)
return nc_cell_id;
}
-static void
-set_extra_attr(char *buf, int nvdims, const size_t *chunks)
-{
- size_t pos = strlen(buf);
- static const char prefix[] = "chunks=";
- memcpy(buf + pos, prefix, sizeof(prefix));
- pos += sizeof(prefix) - 1;
- for (int i = nvdims - 1; i >= 0; --i)
- {
- pos += (size_t) (snprintf(buf + pos, CDI_MAX_NAME - pos, "%zu%s", chunks[i], i > 0 ? "x" : ""));
- }
- buf[pos] = ' ';
- buf[pos + 1] = 0;
-}
-
static bool
is_valid_coordinate(ncvar_t *ncvar)
{
@@ -1090,7 +1084,7 @@ read_coordinates_vars(int ncid, char *attstring, ncvar_t *ncvar, ncvar_t *ncvars
while (!isspace((int) *attstring) && *attstring != 0) attstring++;
if (*attstring == 0) lstop = true;
if (*(attstring - 1) == ',') *(attstring - 1) = 0;
- *attstring++ = 0;
+ *(attstring++) = 0;
int dimvarid;
int status = nc_inq_varid(ncid, varname, &dimvarid);
@@ -1116,7 +1110,7 @@ read_coordinates_vars(int ncid, char *attstring, ncvar_t *ncvar, ncvar_t *ncvars
if (k == *nchecked_vars)
{
- if (*nchecked_vars < max_check_vars) checked_vars[*nchecked_vars++] = strdup(varname);
+ if (*nchecked_vars < max_check_vars) checked_vars[(*nchecked_vars)++] = strdup(varname);
Warning("%s - >%s<", nc_strerror(status), varname);
}
}
@@ -1134,7 +1128,7 @@ read_auxiliary_vars(int ncid, char *attstring, ncvar_t *ncvar, ncvar_t *ncvars)
char *varname = attstring;
while (!isspace((int) *attstring) && *attstring != 0) attstring++;
if (*attstring == 0) lstop = true;
- *attstring++ = 0;
+ *(attstring++) = 0;
int dimvarid;
int status = nc_inq_varid(ncid, varname, &dimvarid);
@@ -1167,7 +1161,7 @@ set_vars_chunks(int ncid, int ncvarid, int nvdims, ncvar_t *ncvar)
ncvar->hasFilter = cdf_get_var_filter(ncid, ncvarid, ncvar->filterSpec, CDI_MAX_NAME);
// if (ncvar->hasFilter) printf("filterSpec: %s=%s\n", ncvar->name, ncvar->filterSpec);
- size_t chunks[nvdims];
+ size_t chunks[MAX_DIMS_CDF];
int storageIn;
if (nc_inq_var_chunking(ncid, ncvarid, &storageIn, chunks) == NC_NOERR)
{
@@ -1181,8 +1175,6 @@ set_vars_chunks(int ncid, int ncvarid, int nvdims, ncvar_t *ncvar)
for (int i = 0; i < nvdims; ++i) fprintf(stderr, "%zu ", chunks[i]);
fprintf(stderr, "\n");
}
-
- set_extra_attr(ncvar->extra, nvdims, chunks);
}
}
@@ -1245,10 +1237,9 @@ set_vars_timetype(int nvars, ncvar_t *ncvars, int timedimid)
}
else
{
- int nvdims = ncvar->ndims;
- for (int vdimid = 1; vdimid < nvdims; vdimid++)
+ for (int i = 1, n = ncvar->ndims; i < n; i++)
{
- if (timedimid == ncvar->dimids[vdimid])
+ if (timedimid == ncvar->dimids[i])
{
Warning("Time must be the first dimension! Unsupported array structure, skipped variable %s!", ncvar->name);
ncvar->varStatus = CoordVar;
@@ -1641,25 +1632,42 @@ scan_vars_attr(int nvars, ncvar_t *ncvars, int ndims, ncdim_t *ncdims, int model
static void
cdf_set_chunk_info(stream_t *streamptr, int nvars, ncvar_t *ncvars)
{
+ int vlistID = streamptr->vlistID;
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
for (int ncvarid = 0; ncvarid < nvars; ncvarid++)
{
+ int chunkSizeDimT = 0;
+ int chunkSizeDimZ = 0;
+ int chunkSizeDimY = 0;
+ int chunkSizeDimX = 0;
ncvar_t *ncvar = &ncvars[ncvarid];
- if (ncvar->varStatus == DataVar)
+ int varID = ncvar->cdiVarID;
+ if (ncvar->varStatus == DataVar && ncvar->isChunked && varID != CDI_UNDEFID)
{
- int ndims = ncvar->ndims;
- ncvar->isChunked = true;
- for (int i = 0; i < ndims; ++i)
+ for (int i = 0, n = ncvar->ndims; i < n; ++i)
{
size_t chunkSize = ncvar->chunks[i];
if (chunkSize > 1)
{
int dimType = ncvar->dimtypes[i];
// clang-format off
- if (dimType == T_AXIS && chunkSize > streamptr->chunkSizeTdim) streamptr->chunkSizeTdim = chunkSize;
- else if (dimType == Z_AXIS && chunkSize > streamptr->chunkSizeZdim) streamptr->chunkSizeZdim = chunkSize;
- // clang-format on
+ if (dimType == T_AXIS && chunkSize > cdfInfo->chunkSizeDimT) cdfInfo->chunkSizeDimT = chunkSize;
+ else if (dimType == Z_AXIS && chunkSize > cdfInfo->chunkSizeDimZ) cdfInfo->chunkSizeDimZ = chunkSize;
+
+ if (dimType == T_AXIS) chunkSizeDimT = chunkSize;
+ else if (dimType == Z_AXIS) chunkSizeDimZ = chunkSize;
+ else if (dimType == Y_AXIS) chunkSizeDimY = chunkSize;
+ else if (dimType == X_AXIS) chunkSizeDimX = chunkSize;
+ // clang-format onw
}
}
+ if ((CDI_CopyChunkSpec || chunkSizeDimT == 0) && CDI_RemoveChunkSpec == false)
+ {
+ if (chunkSizeDimT > 0) cdiDefKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE_DIMT, chunkSizeDimT);
+ if (chunkSizeDimZ > 0) cdiDefKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE_DIMZ, chunkSizeDimZ);
+ if (chunkSizeDimY > 0) cdiDefKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE_DIMY, chunkSizeDimY);
+ if (chunkSizeDimX > 0) cdiDefKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE_DIMX, chunkSizeDimX);
+ }
}
}
}
@@ -1688,9 +1696,9 @@ verify_vars_attr(int nvars, ncvar_t *ncvars, ncdim_t *ncdims)
cdf_inq_atttype(ncid, ncvarid, attname, &atttype);
size_t attstringsize = sizeof(attstring);
- bool isText = xtypeIsText(atttype);
// bool isNumber = (xtypeIsFloat(atttype) || xtypeIsInt(atttype));
+ bool isText = xtypeIsText(atttype);
if (isText)
{
cdfGetAttText(ncid, ncvarid, attname, sizeof(attstring), attstring);
@@ -1717,8 +1725,7 @@ find_dimtypes(ncvar_t *ncvars, ncvar_t *ncvar, bool *plxdim, bool *plydim, bool
{
bool lxdim = false, lydim = false, lzdim = false /*, ltdim = false */;
int lcdim = 0;
- int ndims = ncvar->ndims;
- for (int i = 0; i < ndims; i++)
+ for (int i = 0, n = ncvar->ndims; i < n; i++)
{
int dimtype = ncvar->dimtypes[i];
lxdim |= (dimtype == X_AXIS);
@@ -1745,8 +1752,7 @@ cdf_set_dimtype(int nvars, ncvar_t *ncvars, ncdim_t *ncdims)
ncvar_t *ncvar = &ncvars[varid];
if (ncvar->varStatus == DataVar)
{
- int ndims = ncvar->ndims;
- for (int i = 0; i < ndims; i++)
+ for (int i = 0, n = ncvar->ndims; i < n; i++)
{
int ncdimid = ncvar->dimids[i];
int dimtype = ncdims[ncdimid].dimtype;
@@ -1756,7 +1762,7 @@ cdf_set_dimtype(int nvars, ncvar_t *ncvars, ncdim_t *ncdims)
if (CDI_Debug)
{
Message("var %d %s", varid, ncvar->name);
- for (int i = 0; i < ndims; i++) printf(" dim%d type=%d ", i, ncvar->dimtypes[i]);
+ for (int i = 0, n = ncvar->ndims; i < n; i++) printf(" dim%d type=%d ", i, ncvar->dimtypes[i]);
printf("\n");
}
}
@@ -1797,8 +1803,7 @@ cdf_set_dimtype(int nvars, ncvar_t *ncvars, ncdim_t *ncdims)
for (int varid = 0; varid < nvars; varid++)
{
ncvar_t *ncvar = &ncvars[varid];
- int ndims = ncvar->ndims;
- for (int i = 0; i < ndims; i++)
+ for (int i = 0, n = ncvar->ndims; i < n; i++)
{
if (ncvar->dimtypes[i] == CDI_UNDEFID)
{
@@ -2115,7 +2120,7 @@ cdf_load_vals(size_t size, int ndims, int varid, ncvar_t *ncvar, double **gridva
{
if (CDI_Netcdf_Lazy_Grid_Load)
{
- *valsGet = (struct xyValGet){
+ *valsGet = (struct xyValGet) {
.scalefactor = ncvar->scalefactor,
.addoffset = ncvar->addoffset,
.start = { start[0], start[1], start[2] },
@@ -2283,6 +2288,12 @@ cdf_get_xydimid(int ndims, int *dimids, int *dimtypes, int *xdimid, int *ydimid)
static void
cdf_check_gridtype(int *gridtype, bool isLon, bool isLat, size_t xsize, size_t ysize, grid_t *grid)
{
+ if (grid->y.vals == NULL)
+ {
+ *gridtype = GRID_GENERIC;
+ return;
+ }
+
if (isLat && (isLon || xsize == 0))
{
double yinc = 0.0;
@@ -2387,8 +2398,10 @@ cdf_read_xcoord(stream_t *streamptr, struct cdfLazyGrid *lazyGrid, ncdim_t *ncdi
grid->x.clength = size / (*xsize);
#endif
}
- else
- cdf_load_vals(size, ndims, xvarid, axisvar, &grid->x.vals, &lazyGrid->xValsGet, hasTimeDim, readPart, start, count);
+ else if (CDI_Read_Cell_Center)
+ {
+ cdf_load_vals(size, ndims, xvarid, axisvar, &grid->x.vals, &lazyGrid->xValsGet, hasTimeDim, readPart, start, count);
+ }
cdf_copy_grid_axis_attr(axisvar, &grid->x);
@@ -2469,8 +2482,10 @@ cdf_read_ycoord(stream_t *streamptr, struct cdfLazyGrid *lazyGrid, ncdim_t *ncdi
grid->y.clength = size / (*ysize);
#endif
}
- else
- cdf_load_vals(size, ndims, yvarid, axisvar, &grid->y.vals, &lazyGrid->yValsGet, hasTimeDim, readPart, start, count);
+ else if (CDI_Read_Cell_Center)
+ {
+ cdf_load_vals(size, ndims, yvarid, axisvar, &grid->y.vals, &lazyGrid->yValsGet, hasTimeDim, readPart, start, count);
+ }
cdf_copy_grid_axis_attr(axisvar, &grid->y);
@@ -2981,7 +2996,7 @@ destroy_grid(struct cdfLazyGrid *lazyGrid, grid_t *grid)
}
static int
-cdf_define_all_grids(stream_t *streamptr, ncgrid_t *ncgrid, int vlistID, ncdim_t *ncdims, int nvars, ncvar_t *ncvars,
+cdf_define_all_grids(stream_t *streamptr, CdfGrid *ncgrid, int vlistID, ncdim_t *ncdims, int nvars, ncvar_t *ncvars,
GridInfo *gridInfo)
{
for (int ncvarid = 0; ncvarid < nvars; ++ncvarid)
@@ -3155,14 +3170,14 @@ cdf_define_all_grids(stream_t *streamptr, ncgrid_t *ncgrid, int vlistID, ncdim_t
ncgrid[gridindex].gridID = gridID;
if (grid->type == GRID_TRAJECTORY)
{
- ncgrid[gridindex].ncIDs[CDF_VARID_X] = xvarid;
- ncgrid[gridindex].ncIDs[CDF_VARID_Y] = yvarid;
+ ncgrid[gridindex].ncIdVec[CDF_VARID_X] = xvarid;
+ ncgrid[gridindex].ncIdVec[CDF_VARID_Y] = yvarid;
}
else
{
- if (xdimid != CDI_UNDEFID) ncgrid[gridindex].ncIDs[CDF_DIMID_X] = ncdims[xdimid].dimid;
- if (ydimid != CDI_UNDEFID) ncgrid[gridindex].ncIDs[CDF_DIMID_Y] = ncdims[ydimid].dimid;
- if (ncvar->isCubeSphere) ncgrid[gridindex].ncIDs[CDF_DIMID_E] = ncdims[ncvar->dimids[ndims - 3]].dimid;
+ if (xdimid != CDI_UNDEFID) ncgrid[gridindex].ncIdVec[CDF_DIMID_X] = ncdims[xdimid].dimid;
+ if (ydimid != CDI_UNDEFID) ncgrid[gridindex].ncIdVec[CDF_DIMID_Y] = ncdims[ydimid].dimid;
+ if (ncvar->isCubeSphere) ncgrid[gridindex].ncIdVec[CDF_DIMID_E] = ncdims[ncvar->dimids[ndims - 3]].dimid;
}
if (xdimid == CDI_UNDEFID && ydimid == CDI_UNDEFID && grid->size == 1) gridDefHasDims(gridID, CoordVar);
@@ -3261,12 +3276,12 @@ cdf_define_all_zaxes(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nvar
if (ncvars[zvarid].xtype == NC_FLOAT) zdatatype = CDI_DATATYPE_FLT32;
else if (ncvars[zvarid].xtype == NC_INT) zdatatype = CDI_DATATYPE_INT32;
else if (ncvars[zvarid].xtype == NC_SHORT) zdatatype = CDI_DATATYPE_INT16;
- // clang-format on
- // don't change the name !!!
- /*
- if ((len = strlen(pname)) > 2)
- if (pname[len-2] == '_' && isdigit((int) pname[len-1])) pname[len-2] = 0;
- */
+ // clang-format on
+ // don't change the name !!!
+ /*
+ if ((len = strlen(pname)) > 2)
+ if (pname[len-2] == '_' && isdigit((int) pname[len-1])) pname[len-2] = 0;
+ */
#ifndef USE_MPI
if (zaxisType == ZAXIS_CHAR && ncvars[zvarid].ndims == 2)
{
@@ -3339,6 +3354,7 @@ cdf_define_all_zaxes(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nvar
ncvar->zaxisID = varDefZaxis(vlistID, zaxisType, (int) zsize, zvar, (const char **) zcvals, zclength, lbounds, ubounds,
(int) vctsize, vct, pname, plongname, punits, zdatatype, 1, 0, -1);
+ ncvar->zSize = zsize;
int zaxisID = ncvar->zaxisID;
@@ -3386,7 +3402,7 @@ cdf_define_all_zaxes(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nvar
}
int zaxisindex = vlistZaxisIndex(vlistID, zaxisID);
- streamptr->zaxisID[zaxisindex] = zdimid >= 0 ? ncdims[zdimid].dimid : zdimid;
+ streamptr->cdfInfo.zaxisIdVec[zaxisindex] = zdimid >= 0 ? ncdims[zdimid].dimid : zdimid;
if (CDI_Debug) Message("zaxisID %d %d %s", zaxisID, ncvarid, ncvar->name);
@@ -3528,28 +3544,6 @@ cdf_define_institut_and_model_id(int vlistID, int varID)
if (varTableID != CDI_UNDEFID) vlistDefVarTable(vlistID, varID, varTableID);
}
-static size_t
-cdf_xtype_to_numbytes(int xtype)
-{
- size_t numBytes = 8;
-
- // clang-format off
- if (xtype == NC_BYTE ) numBytes = 1;
- else if (xtype == NC_CHAR ) numBytes = 1;
- else if (xtype == NC_SHORT ) numBytes = 2;
- else if (xtype == NC_INT ) numBytes = 4;
- else if (xtype == NC_FLOAT ) numBytes = 4;
-#ifdef HAVE_NETCDF4
- else if (xtype == NC_UBYTE ) numBytes = 1;
- else if (xtype == NC_USHORT) numBytes = 2;
- else if (xtype == NC_LONG ) numBytes = 4;
- else if (xtype == NC_UINT ) numBytes = 4;
-#endif
- // clang-format on
-
- return numBytes;
-}
-
static inline size_t
size_of_dim_chunks(size_t n, size_t c)
{
@@ -3559,20 +3553,21 @@ size_of_dim_chunks(size_t n, size_t c)
static size_t
calc_chunk_cache_size(int timedimid, ncvar_t *ncvar)
{
- size_t nx = 0, ny = 0;
+ size_t nx = 0, ny = 0, nz = 0;
size_t cx = 0, cy = 0, cz = 0;
for (int i = 0; i < ncvar->ndims; i++)
{
int dimtype = ncvar->dimtypes[i];
// clang-format off
- if (dimtype == Z_AXIS) { cz = ncvar->chunks[i]; }
+ if (dimtype == Z_AXIS) { cz = ncvar->chunks[i]; nz = ncvar->zSize; }
else if (dimtype == Y_AXIS) { cy = ncvar->chunks[i]; ny = ncvar->ySize; }
else if (dimtype == X_AXIS) { cx = ncvar->chunks[i]; nx = ncvar->xSize; }
// clang-format on
}
- size_t chunkCacheSize = (ncvar->dimids[0] == timedimid) ? ncvar->chunks[0] : 1;
- if (cz > 0) chunkCacheSize *= cz;
+ size_t numSteps = (ncvar->dimids[0] == timedimid) ? ncvar->chunks[0] : 1;
+ size_t chunkCacheSize = numSteps;
+ if (nz > 0 && cz > 0) chunkCacheSize *= (numSteps == 1) ? cz : size_of_dim_chunks(nz, cz);
if (chunkCacheSize == 1) return 0; // no chunk cache needed because the full field is read
@@ -3617,6 +3612,7 @@ cdf_define_all_vars(stream_t *streamptr, int vlistID, int instID, int modelID, i
stream_new_var(streamptr, gridID, zaxisID, CDI_UNDEFID);
int varID = vlistDefVar(vlistID, gridID, zaxisID, ncvar->timetype);
+ ncvar->cdiVarID = varID;
#ifdef HAVE_NETCDF4
if (ncvar->hasFilter) cdiDefKeyString(vlistID, varID, CDI_KEY_FILTERSPEC_IN, ncvar->filterSpec);
@@ -3667,11 +3663,12 @@ cdf_define_all_vars(stream_t *streamptr, int vlistID, int instID, int modelID, i
Message("varID = %d gridID = %d zaxisID = %d", varID, vlistInqVarGrid(vlistID, varID), vlistInqVarZaxis(vlistID, varID));
int gridindex = vlistGridIndex(vlistID, gridID);
- int xdimid = streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_X];
- int ydimid = streamptr->ncgrid[gridindex].ncIDs[CDF_DIMID_Y];
+ const CdfGrid *ncGrid = &(streamptr->cdfInfo.cdfGridVec[gridindex]);
+ int xdimid = ncGrid->ncIdVec[CDF_DIMID_X];
+ int ydimid = ncGrid->ncIdVec[CDF_DIMID_Y];
int zaxisindex = vlistZaxisIndex(vlistID, zaxisID);
- int zdimid = streamptr->zaxisID[zaxisindex];
+ int zdimid = streamptr->cdfInfo.zaxisIdVec[zaxisindex];
int ndims = ncvar->ndims;
static const int ipow10[4] = { 1, 10, 100, 1000 };
@@ -3714,8 +3711,6 @@ cdf_define_all_vars(stream_t *streamptr, int vlistID, int instID, int modelID, i
if (ncvar->numberOfForecastsInEnsemble != -1)
cdiDefKeyInt(vlistID, varID, CDI_KEY_TYPEOFENSEMBLEFORECAST, ncvar->typeOfEnsembleForecast);
}
-
- if (ncvar->extra[0] != 0) cdiDefKeyString(vlistID, varID, CDI_KEY_CHUNKS, ncvar->extra);
}
for (int varID = 0; varID < nvars; varID++)
@@ -4445,9 +4440,10 @@ static void
stream_set_ncdims(stream_t *streamptr, int ndims, ncdim_t *ncdims)
{
int n = (ndims > MAX_DIMS_PS) ? MAX_DIMS_PS : ndims;
- streamptr->ncNumDims = n;
- for (int i = 0; i < n; i++) streamptr->ncDimID[i] = ncdims[i].dimid;
- for (int i = 0; i < n; i++) streamptr->ncDimLen[i] = ncdims[i].len;
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ cdfInfo->ncNumDims = n;
+ for (int i = 0; i < n; i++) cdfInfo->ncDimIdVec[i] = ncdims[i].dimid;
+ for (int i = 0; i < n; i++) cdfInfo->ncDimLenVec[i] = ncdims[i].len;
}
static void
@@ -4722,7 +4718,7 @@ cdfInqContents(stream_t *streamptr)
// define all grids
gridInfo.timedimid = timedimid;
- int status = cdf_define_all_grids(streamptr, streamptr->ncgrid, vlistID, ncdims, nvars, ncvars, &gridInfo);
+ int status = cdf_define_all_grids(streamptr, streamptr->cdfInfo.cdfGridVec, vlistID, ncdims, nvars, ncvars, &gridInfo);
if (status < 0) return status;
// define all zaxes
@@ -4731,8 +4727,7 @@ cdfInqContents(stream_t *streamptr)
if (status < 0) return status;
// verify vars
- cdfVerifyVars(nvars, ncvars //, ncdims
- );
+ cdfVerifyVars(nvars, ncvars);
// select vars
int nvarsData = 0;
diff --git a/src/stream_cdf_o.c b/src/stream_cdf_o.c
index 987fb0514748e8247f2af414fa2003f1264e9217..22b50d769565f4d2ea0835c8de64e5b12c7400df 100644
--- a/src/stream_cdf_o.c
+++ b/src/stream_cdf_o.c
@@ -18,13 +18,13 @@
static const char bndsName[] = "bnds";
void
-cdfCopyRecord(stream_t *streamptr2, stream_t *streamptr1)
+cdfCopyField(stream_t *streamptr2, stream_t *streamptr1)
{
int vlistID1 = streamptr1->vlistID;
int tsID = streamptr1->curTsID;
int vrecID = streamptr1->tsteps[tsID].curRecID;
int recID = streamptr1->tsteps[tsID].recIDs[vrecID];
- int ivarID = streamptr1->tsteps[tsID].records[recID].varID;
+ int ivarID = streamptr1->tsteps[tsID].recinfo[recID].varID;
int gridID = vlistInqVarGrid(vlistID1, ivarID);
size_t datasize = (size_t) gridInqSize(gridID);
int datatype = vlistInqVarDatatype(vlistID1, ivarID);
@@ -49,17 +49,17 @@ static void
cdfDefComplex(stream_t *streamptr, int gridID, int gridIndex)
{
int dimID;
- ncgrid_t *ncgrid = streamptr->ncgrid;
+ CdfGrid *cdfGridVec = streamptr->cdfInfo.cdfGridVec;
for (int index = 0; index < gridIndex; ++index)
{
- if (ncgrid[index].ncIDs[CDF_DIMID_X] != CDI_UNDEFID)
+ if (cdfGridVec[index].ncIdVec[CDF_DIMID_X] != CDI_UNDEFID)
{
- int gridID0 = ncgrid[index].gridID;
+ int gridID0 = cdfGridVec[index].gridID;
int gridtype0 = gridInqType(gridID0);
if (gridtype0 == GRID_SPECTRAL || gridtype0 == GRID_FOURIER)
{
- dimID = ncgrid[index].ncIDs[CDF_DIMID_X];
+ dimID = cdfGridVec[index].ncIdVec[CDF_DIMID_X];
goto dimIDEstablished;
}
}
@@ -87,8 +87,8 @@ cdfDefComplex(stream_t *streamptr, int gridID, int gridIndex)
}
dimIDEstablished:
- ncgrid[gridIndex].gridID = gridID;
- ncgrid[gridIndex].ncIDs[CDF_DIMID_X] = dimID;
+ cdfGridVec[gridIndex].gridID = gridID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_DIMID_X] = dimID;
}
struct idSearch
@@ -98,22 +98,22 @@ struct idSearch
};
static inline struct idSearch
-cdfSearchIDBySize(size_t startIdx, size_t numIDs, const ncgrid_t ncgrid[/*numIDs*/], int ncIDType, int searchType,
+cdfSearchIDBySize(size_t startIdx, size_t numIDs, const CdfGrid cdfGridVec[/*numIDs*/], int ncIDType, int searchType,
SizeType searchSize, int (*typeInq)(int id), SizeType (*sizeInq)(int id))
{
int numNonMatching = 0, foundID = CDI_UNDEFID;
size_t foundIdx = SIZE_MAX;
for (size_t index = startIdx; index < numIDs; index++)
{
- if (ncgrid[index].ncIDs[ncIDType] != CDI_UNDEFID)
+ if (cdfGridVec[index].ncIdVec[ncIDType] != CDI_UNDEFID)
{
- int id0 = ncgrid[index].gridID, id0Type = typeInq(id0);
+ int id0 = cdfGridVec[index].gridID, id0Type = typeInq(id0);
if (id0Type == searchType)
{
SizeType size0 = sizeInq(id0);
if (searchSize == size0)
{
- foundID = ncgrid[index].ncIDs[ncIDType];
+ foundID = cdfGridVec[index].ncIdVec[ncIDType];
foundIdx = index;
break;
}
@@ -121,7 +121,7 @@ cdfSearchIDBySize(size_t startIdx, size_t numIDs, const ncgrid_t ncgrid[/*numIDs
}
}
}
- return (struct idSearch){ .numNonMatching = numNonMatching, .foundID = foundID, .foundIdx = foundIdx };
+ return (struct idSearch) { .numNonMatching = numNonMatching, .foundID = foundID, .foundIdx = foundIdx };
}
static SizeType
@@ -133,12 +133,12 @@ cdfGridInqHalfSize(int gridID)
static void
cdfDefSPorFC(stream_t *streamptr, int gridID, int gridIndex, char *axisname, size_t maxlen, int gridRefType)
{
- ncgrid_t *ncgrid = streamptr->ncgrid;
+ CdfGrid *cdfGridVec = streamptr->cdfInfo.cdfGridVec;
SizeType dimlen = gridInqSize(gridID) / 2;
struct idSearch search
- = cdfSearchIDBySize(0, (size_t) gridIndex, ncgrid, CDF_DIMID_Y, gridRefType, dimlen, gridInqType, cdfGridInqHalfSize);
+ = cdfSearchIDBySize(0, (size_t) gridIndex, cdfGridVec, CDF_DIMID_Y, gridRefType, dimlen, gridInqType, cdfGridInqHalfSize);
int dimID = search.foundID;
int iz = search.numNonMatching;
@@ -164,8 +164,8 @@ cdfDefSPorFC(stream_t *streamptr, int gridID, int gridIndex, char *axisname, siz
}
}
- ncgrid[gridIndex].gridID = gridID;
- ncgrid[gridIndex].ncIDs[CDF_DIMID_Y] = dimID;
+ cdfGridVec[gridIndex].gridID = gridID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_DIMID_Y] = dimID;
}
static void
@@ -256,12 +256,12 @@ static void
cdfDefTrajLatLon(stream_t *streamptr, int gridID, int gridIndex, const struct cdfDefGridAxisInqs *inqs)
{
nc_type xtype = grid_inq_xtype(gridID);
- ncgrid_t *ncgrid = streamptr->ncgrid;
+ CdfGrid *ncgrid = streamptr->cdfInfo.cdfGridVec;
SizeType dimlen = inqs->axisSize(gridID);
if (dimlen != 1) Error("%c size isn't 1 for %s grid!", inqs->axisSym, gridNamePtr(gridInqType(gridID)));
- int ncvarid = ncgrid[gridIndex].ncIDs[inqs->dimIdx];
+ int ncvarid = ncgrid[gridIndex].ncIdVec[inqs->dimIdx];
if (ncvarid == CDI_UNDEFID)
{
int dimNcID = streamptr->basetime.ncvarid;
@@ -290,7 +290,7 @@ cdfDefTrajLatLon(stream_t *streamptr, int gridID, int gridIndex, const struct cd
ncgrid[gridIndex].gridID = gridID;
// var ID for trajectory !!!
- ncgrid[gridIndex].ncIDs[inqs->dimIdx] = ncvarid;
+ ncgrid[gridIndex].ncIdVec[inqs->dimIdx] = ncvarid;
}
static void
@@ -522,7 +522,7 @@ cdfPostDefActionAddPutVal(struct cdfPostDefActionList **list_, int fileID, int n
delayedPutVals->fileID = fileID;
delayedPutVals->ncvarid = ncvarid;
*list_ = cdfPostDefActionAdd(
- *list_, (struct cdfPostDefAction){ .data = (void *) delayedPutVals, .action = cdfDelayedPutVarDouble, .cleanup = cleanup });
+ *list_, (struct cdfPostDefAction) { .data = (void *) delayedPutVals, .action = cdfDelayedPutVarDouble, .cleanup = cleanup });
}
static inline void
@@ -533,7 +533,7 @@ cdfPostDefActionAddPut1Int(struct cdfPostDefActionList **list_, int fileID, int
delayedPutVals->fileID = fileID;
delayedPutVals->ncvarid = ncvarid;
*list_ = cdfPostDefActionAdd(
- *list_, (struct cdfPostDefAction){ .data = (void *) delayedPutVals, .action = cdfDelayedPutVarInt1, .cleanup = cleanup });
+ *list_, (struct cdfPostDefAction) { .data = (void *) delayedPutVals, .action = cdfDelayedPutVarInt1, .cleanup = cleanup });
}
static void
@@ -559,7 +559,7 @@ cdfDefAxisCommon(stream_t *streamptr, int gridID, int gridIndex, int ndims, bool
SizeType dimlen = gridAxisInq->axisSize(gridID);
nc_type xtype = grid_inq_xtype(gridID);
- ncgrid_t *ncgrid = streamptr->ncgrid;
+ CdfGrid *cdfGridVec = streamptr->cdfInfo.cdfGridVec;
bool hasVals = gridInqPropPresence(gridID, gridAxisInq->valsQueryKey);
char dimname[CDI_MAX_NAME + 3];
@@ -569,7 +569,7 @@ cdfDefAxisCommon(stream_t *streamptr, int gridID, int gridIndex, int ndims, bool
for (int index = 0; index < gridIndex; ++index)
{
- int gridID0 = ncgrid[index].gridID;
+ int gridID0 = cdfGridVec[index].gridID;
assert(gridID0 != CDI_UNDEFID);
int gridtype0 = gridInqType(gridID0);
if (gridtype0 == GRID_GAUSSIAN || gridtype0 == GRID_LONLAT || gridtype0 == GRID_PROJECTION || gridtype0 == GRID_GENERIC)
@@ -586,7 +586,7 @@ cdfDefAxisCommon(stream_t *streamptr, int gridID, int gridIndex, int ndims, bool
if (IS_EQUAL(inqVal(gridID0, 0), inqVal(gridID, 0))
&& IS_EQUAL(inqVal(gridID0, dimlen - 1), inqVal(gridID, dimlen - 1)))
{
- dimID = ncgrid[index].ncIDs[(axisLetter == 'X') ? CDF_DIMID_X : CDF_DIMID_Y];
+ dimID = cdfGridVec[index].ncIdVec[(axisLetter == 'X') ? CDF_DIMID_X : CDF_DIMID_Y];
break;
}
}
@@ -691,11 +691,11 @@ cdfDefAxisCommon(stream_t *streamptr, int gridID, int gridIndex, int ndims, bool
streamptr->ncmode = 2;
}
- if (ndims == 0 || addVarToGrid) ncgrid[gridIndex].ncIDs[(axisLetter == 'X') ? CDF_VARID_X : CDF_VARID_Y] = ncvarid;
+ if (ndims == 0 || addVarToGrid) cdfGridVec[gridIndex].ncIdVec[(axisLetter == 'X') ? CDF_VARID_X : CDF_VARID_Y] = ncvarid;
}
- ncgrid[gridIndex].gridID = gridID;
- ncgrid[gridIndex].ncIDs[(axisLetter == 'X') ? CDF_DIMID_X : CDF_DIMID_Y] = dimID;
+ cdfGridVec[gridIndex].gridID = gridID;
+ cdfGridVec[gridIndex].ncIdVec[(axisLetter == 'X') ? CDF_DIMID_X : CDF_DIMID_Y] = dimID;
return delayed;
}
@@ -930,7 +930,7 @@ cdfDefIrregularGridCommon(stream_t *streamptr, int gridID, size_t xsize, size_t
streamptr->ncmode = 2;
}
- return (struct cdfDefIrregularGridCommonIDs){
+ return (struct cdfDefIrregularGridCommonIDs) {
.xdimID = xdimID, .ydimID = ydimID, .ncxvarid = ncxvarid, .ncyvarid = ncyvarid, .ncavarid = ncavarid, .delayed = delayed
};
}
@@ -938,7 +938,7 @@ cdfDefIrregularGridCommon(stream_t *streamptr, int gridID, size_t xsize, size_t
static struct cdfPostDefActionList *
cdfDefCurvilinear(stream_t *streamptr, int gridID, int gridIndex)
{
- ncgrid_t *ncgrid = streamptr->ncgrid;
+ CdfGrid *cdfGridVec = streamptr->cdfInfo.cdfGridVec;
SizeType dimlen = gridInqSize(gridID);
SizeType xdimlen = gridInqXsize(gridID);
@@ -951,20 +951,20 @@ cdfDefCurvilinear(stream_t *streamptr, int gridID, int gridIndex)
do
{
struct idSearch search
- = cdfSearchIDBySize(ofs, (size_t) gridIndex, ncgrid, CDF_DIMID_X, GRID_CURVILINEAR, dimlen, gridInqType, gridInqSize);
+ = cdfSearchIDBySize(ofs, (size_t) gridIndex, cdfGridVec, CDF_DIMID_X, GRID_CURVILINEAR, dimlen, gridInqType, gridInqSize);
size_t index = search.foundIdx;
if (index != SIZE_MAX)
{
- int gridID0 = ncgrid[index].gridID;
+ int gridID0 = cdfGridVec[index].gridID;
if (IS_EQUAL(gridInqXval(gridID0, 0), gridInqXval(gridID, 0))
&& IS_EQUAL(gridInqXval(gridID0, dimlen - 1), gridInqXval(gridID, dimlen - 1))
&& IS_EQUAL(gridInqYval(gridID0, 0), gridInqYval(gridID, 0))
&& IS_EQUAL(gridInqYval(gridID0, dimlen - 1), gridInqYval(gridID, dimlen - 1)))
{
- xdimID = ncgrid[index].ncIDs[CDF_DIMID_X];
- ydimID = ncgrid[index].ncIDs[CDF_DIMID_Y];
- ncxvarid = ncgrid[index].ncIDs[CDF_VARID_X];
- ncyvarid = ncgrid[index].ncIDs[CDF_VARID_Y];
+ xdimID = cdfGridVec[index].ncIdVec[CDF_DIMID_X];
+ ydimID = cdfGridVec[index].ncIdVec[CDF_DIMID_Y];
+ ncxvarid = cdfGridVec[index].ncIdVec[CDF_VARID_X];
+ ncyvarid = cdfGridVec[index].ncIdVec[CDF_VARID_Y];
break;
}
ofs = search.foundIdx;
@@ -987,19 +987,19 @@ cdfDefCurvilinear(stream_t *streamptr, int gridID, int gridIndex)
delayed = createdIDs.delayed;
}
- ncgrid[gridIndex].gridID = gridID;
- ncgrid[gridIndex].ncIDs[CDF_DIMID_X] = xdimID;
- ncgrid[gridIndex].ncIDs[CDF_DIMID_Y] = ydimID;
- ncgrid[gridIndex].ncIDs[CDF_VARID_X] = ncxvarid;
- ncgrid[gridIndex].ncIDs[CDF_VARID_Y] = ncyvarid;
- ncgrid[gridIndex].ncIDs[CDF_VARID_A] = ncavarid;
+ cdfGridVec[gridIndex].gridID = gridID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_DIMID_X] = xdimID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_DIMID_Y] = ydimID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_VARID_X] = ncxvarid;
+ cdfGridVec[gridIndex].ncIdVec[CDF_VARID_Y] = ncyvarid;
+ cdfGridVec[gridIndex].ncIdVec[CDF_VARID_A] = ncavarid;
return delayed;
}
static struct cdfPostDefActionList *
cdfDefUnstructured(stream_t *streamptr, int gridID, int gridIndex)
{
- ncgrid_t *ncgrid = streamptr->ncgrid;
+ CdfGrid *cdfGridVec = streamptr->cdfInfo.cdfGridVec;
SizeType dimlen = gridInqSize(gridID);
@@ -1009,21 +1009,21 @@ cdfDefUnstructured(stream_t *streamptr, int gridID, int gridIndex)
size_t ofs = 0;
do
{
- struct idSearch search
- = cdfSearchIDBySize(ofs, (size_t) gridIndex, ncgrid, CDF_DIMID_X, GRID_UNSTRUCTURED, dimlen, gridInqType, gridInqSize);
+ struct idSearch search = cdfSearchIDBySize(ofs, (size_t) gridIndex, cdfGridVec, CDF_DIMID_X, GRID_UNSTRUCTURED, dimlen,
+ gridInqType, gridInqSize);
size_t index = search.foundIdx;
if (index != SIZE_MAX)
{
- int gridID0 = ncgrid[index].gridID;
+ int gridID0 = cdfGridVec[index].gridID;
if (gridInqNvertex(gridID0) == gridInqNvertex(gridID) && IS_EQUAL(gridInqXval(gridID0, 0), gridInqXval(gridID, 0))
&& IS_EQUAL(gridInqXval(gridID0, dimlen - 1), gridInqXval(gridID, dimlen - 1))
&& IS_EQUAL(gridInqYval(gridID0, 0), gridInqYval(gridID, 0))
&& IS_EQUAL(gridInqYval(gridID0, dimlen - 1), gridInqYval(gridID, dimlen - 1)))
{
- dimID = ncgrid[index].ncIDs[CDF_DIMID_X];
- ncxvarid = ncgrid[index].ncIDs[CDF_VARID_X];
- ncyvarid = ncgrid[index].ncIDs[CDF_VARID_Y];
- ncavarid = ncgrid[index].ncIDs[CDF_VARID_A];
+ dimID = cdfGridVec[index].ncIdVec[CDF_DIMID_X];
+ ncxvarid = cdfGridVec[index].ncIdVec[CDF_VARID_X];
+ ncyvarid = cdfGridVec[index].ncIdVec[CDF_VARID_Y];
+ ncavarid = cdfGridVec[index].ncIdVec[CDF_VARID_A];
break;
}
ofs = search.foundIdx;
@@ -1045,11 +1045,11 @@ cdfDefUnstructured(stream_t *streamptr, int gridID, int gridIndex)
delayed = createdIDs.delayed;
}
- ncgrid[gridIndex].gridID = gridID;
- ncgrid[gridIndex].ncIDs[CDF_DIMID_X] = dimID;
- ncgrid[gridIndex].ncIDs[CDF_VARID_X] = ncxvarid;
- ncgrid[gridIndex].ncIDs[CDF_VARID_Y] = ncyvarid;
- ncgrid[gridIndex].ncIDs[CDF_VARID_A] = ncavarid;
+ cdfGridVec[gridIndex].gridID = gridID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_DIMID_X] = dimID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_VARID_X] = ncxvarid;
+ cdfGridVec[gridIndex].ncIdVec[CDF_VARID_Y] = ncyvarid;
+ cdfGridVec[gridIndex].ncIdVec[CDF_VARID_A] = ncavarid;
return delayed;
}
@@ -1075,10 +1075,10 @@ cdf_def_vct_echam(stream_t *streamptr, int zaxisID)
if ((type == ZAXIS_HYBRID || type == ZAXIS_HYBRID_HALF) && (ilev = zaxisInqVctSize(zaxisID) / 2) != 0)
{
int mlev = ilev - 1;
-
- if (streamptr->vct.ilev > 0)
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ if (cdfInfo->vct.ilev > 0)
{
- if (streamptr->vct.ilev != ilev) Error("More than one VCT for each file unsupported!");
+ if (cdfInfo->vct.ilev != ilev) Error("More than one VCT for each file unsupported!");
return delayed;
}
@@ -1104,10 +1104,10 @@ cdf_def_vct_echam(stream_t *streamptr, int zaxisID)
cdf_def_var(fileID, "hybm", NC_DOUBLE, 1, &ncdimid, &hybmid);
}
- streamptr->vct.ilev = ilev;
- streamptr->vct.mlev = mlev;
- streamptr->vct.mlevID = ncdimid;
- streamptr->vct.ilevID = ncdimid2;
+ cdfInfo->vct.ilev = ilev;
+ cdfInfo->vct.mlev = mlev;
+ cdfInfo->vct.mlevID = ncdimid;
+ cdfInfo->vct.ilevID = ncdimid2;
{
static const char lname_n[] = "long_name", units_n[] = "units", lname_v_ai[] = "hybrid A coefficient at layer interfaces",
@@ -1177,10 +1177,10 @@ cdf_def_vct_cf(stream_t *streamptr, int zaxisID, int nclevID, int ncbndsID, int
if ((type == ZAXIS_HYBRID || type == ZAXIS_HYBRID_HALF) && (ilev = zaxisInqVctSize(zaxisID) / 2) != 0)
{
int mlev = ilev - 1;
-
- if (streamptr->vct.ilev > 0)
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ if (cdfInfo->vct.ilev > 0)
{
- if (streamptr->vct.ilev != ilev) Error("more than one VCT for each file unsupported!");
+ if (cdfInfo->vct.ilev != ilev) Error("more than one VCT for each file unsupported!");
return delayed;
}
@@ -1195,10 +1195,10 @@ cdf_def_vct_cf(stream_t *streamptr, int zaxisID, int nclevID, int ncbndsID, int
int dimIDs[2] = { nclevID, ncbndsID };
- streamptr->vct.mlev = mlev;
- streamptr->vct.ilev = ilev;
- streamptr->vct.mlevID = nclevID;
- streamptr->vct.ilevID = nclevID;
+ cdfInfo->vct.mlev = mlev;
+ cdfInfo->vct.ilev = ilev;
+ cdfInfo->vct.mlevID = nclevID;
+ cdfInfo->vct.ilevID = nclevID;
int hyamid, hybmid;
cdf_def_var(fileID, (p0status == 0) ? "a" : "ap", NC_DOUBLE, 1, dimIDs, &hyamid);
@@ -1350,7 +1350,8 @@ cdf_def_zaxis_hybrid_echam(stream_t *streamptr, int type, int *ncvaridp, int zax
Free(delayedVct);
}
- if (*dimID == CDI_UNDEFID) streamptr->zaxisID[zaxisindex] = type == ZAXIS_HYBRID ? streamptr->vct.mlevID : streamptr->vct.ilevID;
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ if (*dimID == CDI_UNDEFID) cdfInfo->zaxisIdVec[zaxisindex] = (type == ZAXIS_HYBRID) ? cdfInfo->vct.mlevID : cdfInfo->vct.ilevID;
if (switchNCMode)
{
@@ -1550,7 +1551,8 @@ cdf_def_zaxis_hybrid_cf(stream_t *streamptr, int type, int *ncvaridp, int zaxisI
Free(delayedVct);
}
- if (*dimID == CDI_UNDEFID) streamptr->zaxisID[zaxisindex] = type == ZAXIS_HYBRID ? streamptr->vct.mlevID : streamptr->vct.ilevID;
+ CdfInfo *cdfInfo = &(streamptr->cdfInfo);
+ if (*dimID == CDI_UNDEFID) cdfInfo->zaxisIdVec[zaxisindex] = (type == ZAXIS_HYBRID) ? cdfInfo->vct.mlevID : cdfInfo->vct.ilevID;
free(buffer);
return delayed;
@@ -1560,7 +1562,7 @@ static struct cdfPostDefActionList *
cdf_def_zaxis_hybrid(stream_t *streamptr, int type, int *ncvarid, int zaxisID, int zaxisindex, int xtype, size_t dimlen, int *dimID,
char *axisname)
{
- struct cdfPostDefActionList *(*def_zaxis_hybrid_delegate)(stream_t * streamptr, int type, int *ncvarid, int zaxisID,
+ struct cdfPostDefActionList *(*def_zaxis_hybrid_delegate)(stream_t *streamptr, int type, int *ncvarid, int zaxisID,
int zaxisindex, int xtype, size_t dimlen, int *dimID, char *axisname)
= ((!CDI_CMOR_Mode && CDI_Convention == CDI_CONVENTION_ECHAM) || type == ZAXIS_HYBRID_HALF) ? cdf_def_zaxis_hybrid_echam
: cdf_def_zaxis_hybrid_cf;
@@ -1646,7 +1648,7 @@ cdfDefZaxisChar(stream_t *streamptr, int zaxisID, char *axisname, int *dimID, si
cdf_put_att_text(fileID, ncvarID, "axis", 1, "Z");
cdfDefineAttributes(streamptr->filetype, zaxisID, CDI_GLOBAL, fileID, ncvarID);
- streamptr->nczvarID[zaxisindex] = ncvarID;
+ streamptr->cdfInfo.ncZvarIdVec[zaxisindex] = ncvarID;
cdf_enddef(fileID, streamptr->self);
// Write Stringvalues
@@ -1827,10 +1829,10 @@ cdfDefZaxis(stream_t *streamptr, int zaxisID)
streamptr->ncmode = 2;
}
- if (zaxisInqLevels(zaxisID, NULL) && ndims == 0) streamptr->nczvarID[zaxisindex] = ncvarid;
+ if (zaxisInqLevels(zaxisID, NULL) && ndims == 0) streamptr->cdfInfo.ncZvarIdVec[zaxisindex] = ncvarid;
}
- if (dimID != CDI_UNDEFID) streamptr->zaxisID[zaxisindex] = dimID;
+ if (dimID != CDI_UNDEFID) streamptr->cdfInfo.zaxisIdVec[zaxisindex] = dimID;
return delayed;
}
@@ -1881,18 +1883,18 @@ cdf_def_mapping(stream_t *streamptr, int gridID)
static void
cdfDefCharacter(stream_t *streamptr, int gridID, int gridIndex, int cdiAxisID, int strlen)
{
- if (streamptr->ncgrid[gridIndex].ncIDs[CDF_DIMID_X] != CDI_UNDEFID) return;
+ CdfGrid *cdfGridVec = streamptr->cdfInfo.cdfGridVec;
+ if (cdfGridVec[gridIndex].ncIdVec[CDF_DIMID_X] != CDI_UNDEFID) return;
bool isXaxis = (cdiAxisID == CDI_XAXIS);
SizeType dimlen = isXaxis ? gridInqXsize(gridID) : gridInqYsize(gridID);
- ncgrid_t *ncgrid = streamptr->ncgrid;
// Check for all grids up to gridIndex whether it already is defined
for (int index = 0; index < gridIndex; index++)
{
- int gridID0 = ncgrid[index].gridID;
+ int gridID0 = cdfGridVec[index].gridID;
int gridtype0 = gridInqType(gridID0);
if (gridtype0 == GRID_CHARXY)
{
@@ -1957,9 +1959,9 @@ cdfDefCharacter(stream_t *streamptr, int gridID, int gridIndex, int cdiAxisID, i
(void) nc_put_vara_text(fileID, ncaxisid, start, count, cvals[i]);
}
- ncgrid[gridIndex].gridID = gridID;
- ncgrid[gridIndex].ncIDs[isXaxis ? CDF_DIMID_X : CDF_DIMID_Y] = dimID;
- ncgrid[gridIndex].ncIDs[isXaxis ? CDF_VARID_X : CDF_VARID_Y] = ncaxisid;
+ cdfGridVec[gridIndex].gridID = gridID;
+ cdfGridVec[gridIndex].ncIdVec[isXaxis ? CDF_DIMID_X : CDF_DIMID_Y] = dimID;
+ cdfGridVec[gridIndex].ncIdVec[isXaxis ? CDF_VARID_X : CDF_VARID_Y] = ncaxisid;
streamptr->ncmode = 2;
}
@@ -1968,15 +1970,15 @@ cdfDefCharacter(stream_t *streamptr, int gridID, int gridIndex, int cdiAxisID, i
static void
cdfDefReducedGrid(stream_t *streamptr, int gridID, int gridIndex)
{
- ncgrid_t *ncgrid = streamptr->ncgrid;
+ CdfGrid *cdfGridVec = streamptr->cdfInfo.cdfGridVec;
- ncgrid[gridIndex].gridID = gridID;
+ cdfGridVec[gridIndex].gridID = gridID;
{
SizeType dimlen = gridInqSize(gridID);
- struct idSearch search
- = cdfSearchIDBySize(0, (size_t) gridIndex, ncgrid, CDF_DIMID_X, GRID_GAUSSIAN_REDUCED, dimlen, gridInqType, gridInqSize);
+ struct idSearch search = cdfSearchIDBySize(0, (size_t) gridIndex, cdfGridVec, CDF_DIMID_X, GRID_GAUSSIAN_REDUCED, dimlen,
+ gridInqType, gridInqSize);
int iz = search.numNonMatching;
int dimID = search.foundID;
@@ -2004,14 +2006,14 @@ cdfDefReducedGrid(stream_t *streamptr, int gridID, int gridIndex)
}
}
- ncgrid[gridIndex].ncIDs[CDF_DIMID_X] = dimID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_DIMID_X] = dimID;
}
{
SizeType dimlen = gridInqYsize(gridID);
- struct idSearch search
- = cdfSearchIDBySize(0, (size_t) gridIndex, ncgrid, CDF_DIMID_RP, GRID_GAUSSIAN_REDUCED, dimlen, gridInqType, gridInqSize);
+ struct idSearch search = cdfSearchIDBySize(0, (size_t) gridIndex, cdfGridVec, CDF_DIMID_RP, GRID_GAUSSIAN_REDUCED, dimlen,
+ gridInqType, gridInqSize);
int iz = search.numNonMatching;
int dimID = search.foundID;
@@ -2038,17 +2040,17 @@ cdfDefReducedGrid(stream_t *streamptr, int gridID, int gridIndex)
cdf_put_var_int(fileID, ncvarid, reducedPoints);
Free(reducedPoints);
- ncgrid[gridIndex].ncIDs[CDF_VARID_RP] = ncvarid;
+ cdfGridVec[gridIndex].ncIdVec[CDF_VARID_RP] = ncvarid;
}
- ncgrid[gridIndex].ncIDs[CDF_DIMID_RP] = dimID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_DIMID_RP] = dimID;
}
}
static void
cdf_define_generic_dim(stream_t *streamptr, int gridID, int gridIndex)
{
- ncgrid_t *ncgrid = streamptr->ncgrid;
+ CdfGrid *cdfGridVec = streamptr->cdfInfo.cdfGridVec;
int dimID = CDI_UNDEFID;
SizeType dimlen = gridInqSize(gridID);
@@ -2056,14 +2058,14 @@ cdf_define_generic_dim(stream_t *streamptr, int gridID, int gridIndex)
if (gridInqYsize(gridID) == 0)
{
struct idSearch search
- = cdfSearchIDBySize(0, (size_t) gridIndex, ncgrid, CDF_DIMID_X, GRID_GENERIC, dimlen, gridInqType, gridInqSize);
+ = cdfSearchIDBySize(0, (size_t) gridIndex, cdfGridVec, CDF_DIMID_X, GRID_GENERIC, dimlen, gridInqType, gridInqSize);
dimID = search.foundID;
}
if (gridInqXsize(gridID) == 0)
{
struct idSearch search
- = cdfSearchIDBySize(0, (size_t) gridIndex, ncgrid, CDF_DIMID_Y, GRID_GENERIC, dimlen, gridInqType, gridInqSize);
+ = cdfSearchIDBySize(0, (size_t) gridIndex, cdfGridVec, CDF_DIMID_Y, GRID_GENERIC, dimlen, gridInqType, gridInqSize);
dimID = search.foundID;
}
@@ -2096,8 +2098,8 @@ cdf_define_generic_dim(stream_t *streamptr, int gridID, int gridIndex)
}
}
- ncgrid[gridIndex].gridID = gridID;
- ncgrid[gridIndex].ncIDs[CDF_DIMID_X] = dimID;
+ cdfGridVec[gridIndex].gridID = gridID;
+ cdfGridVec[gridIndex].ncIdVec[CDF_DIMID_X] = dimID;
}
static struct cdfPostDefActionList *
@@ -2105,7 +2107,8 @@ cdf_define_grid(stream_t *streamptr, int gridID, int gridIndex)
{
struct cdfPostDefActionList *delayed = NULL;
- if (streamptr->ncgrid[gridIndex].ncIDs[CDF_DIMID_X] != CDI_UNDEFID) return delayed;
+ CdfGrid *ncgrid = &(streamptr->cdfInfo.cdfGridVec[gridIndex]);
+ if (ncgrid->ncIdVec[CDF_DIMID_X] != CDI_UNDEFID) return delayed;
int gridtype = gridInqType(gridID);
SizeType size = gridInqSize(gridID);
@@ -2114,7 +2117,7 @@ cdf_define_grid(stream_t *streamptr, int gridID, int gridIndex)
if (CDI_Reduce_Dim && size == 1) // no grid information
{
- streamptr->ncgrid[gridIndex].gridID = gridID;
+ ncgrid->gridID = gridID;
return delayed;
}
@@ -2151,7 +2154,7 @@ cdf_define_grid(stream_t *streamptr, int gridID, int gridIndex)
if (size == 1 && xsize == 0 && ysize == 0)
{
// no grid information
- streamptr->ncgrid[gridIndex].gridID = gridID;
+ ncgrid->gridID = gridID;
}
else
{
@@ -2248,11 +2251,11 @@ cdfDefCoordinateVars(stream_t *streamptr)
struct cdfPostDefActionList *delayed = NULL;
- ncgrid_t *ncgrid = streamptr->ncgrid;
+ CdfGrid *ncgrid = streamptr->cdfInfo.cdfGridVec;
for (int index = 0; index < 2 * ngrids; ++index)
{
ncgrid[index].gridID = CDI_UNDEFID;
- for (size_t i = 0; i < CDF_SIZE_ncIDs; ++i) ncgrid[index].ncIDs[i] = CDI_UNDEFID;
+ for (size_t i = 0; i < CDF_SIZE_NCID; ++i) ncgrid[index].ncIdVec[i] = CDI_UNDEFID;
}
for (int index = 0; index < ngrids; ++index)
@@ -2281,7 +2284,7 @@ cdfDefCoordinateVars(stream_t *streamptr)
for (int index = 0; index < nzaxis; ++index)
{
int zaxisID = vlistZaxis(vlistID, index);
- if (streamptr->zaxisID[index] == CDI_UNDEFID)
+ if (streamptr->cdfInfo.zaxisIdVec[index] == CDI_UNDEFID)
{
struct cdfPostDefActionList *zaxisdelayed = cdfDefZaxis(streamptr, zaxisID);
delayed = cdfPostDefActionConcat(delayed, zaxisdelayed);
diff --git a/src/stream_cdf_time.c b/src/stream_cdf_time.c
index dc594c44d4d14dd8080fc484636b7cdff7f8ecfb..1a9adac28daffac1c1e89c7987129fbaec9fc31b 100644
--- a/src/stream_cdf_time.c
+++ b/src/stream_cdf_time.c
@@ -10,10 +10,8 @@
#include "cdi.h"
#include "cdi_int.h"
-#include "dmemory.h"
#include "stream_cdf.h"
#include "cdf_int.h"
-#include "vlist.h"
static int
cdfDefTimeBounds(int fileID, int nctimevarid, int nctimedimid, const char *taxis_name, taxis_t *taxis)
@@ -153,7 +151,7 @@ cdfDefTime(stream_t *streamptr)
if (streamptr->ncmode == 0) streamptr->ncmode = 1;
if (streamptr->ncmode == 2) cdf_redef(fileID);
- taxis_t *taxis = taxisPtr(vlistInqTaxis(streamptr->vlistID));
+ taxis_t *taxis = taxis_to_pointer(vlistInqTaxis(streamptr->vlistID));
const char *taxisName = (taxis->name && taxis->name[0]) ? taxis->name : defaultTimeAxisName;
@@ -170,7 +168,8 @@ cdfDefTime(stream_t *streamptr)
cdf_def_dim(fileID, taxisName, timeDimLen, &timeDimId);
streamptr->basetime.ncdimid = timeDimId;
- int datatype = taxis->datatype;
+ int datatype = CDI_UNDEFID;
+ cdiInqKeyInt(taxis->self, CDI_GLOBAL, CDI_KEY_DATATYPE, &datatype);
nc_type xtype = (datatype == CDI_DATATYPE_INT32) ? NC_INT : ((datatype == CDI_DATATYPE_FLT32) ? NC_FLOAT : NC_DOUBLE);
int timeVarId;
@@ -245,7 +244,7 @@ cdfDefTimestep(stream_t *streamptr, int tsID, size_t valCount)
int time_varid = streamptr->basetime.ncvarid;
if (time_varid != CDI_UNDEFID && tsID == 0)
{
- taxis_t *taxis = taxisPtr(vlistInqTaxis(streamptr->vlistID));
+ taxis_t *taxis = taxis_to_pointer(vlistInqTaxis(streamptr->vlistID));
int fileID = streamptr->fileID;
const char *unitstr = cdfGetTimeUnits(taxis);
size_t len = strlen(unitstr);
diff --git a/src/stream_cgribex.c b/src/stream_cgribex.c
index a2c73b7f0c104ce5fc2657e94d659287bcd380b2..94d9e134db3968894ab9b1fcdf23c45f6861e5fd 100644
--- a/src/stream_cgribex.c
+++ b/src/stream_cgribex.c
@@ -14,7 +14,7 @@
#include "stream_grb.h"
#include "stream_cgribex.h"
-#ifdef HAVE_LIBCGRIBEX
+#if defined(HAVE_LIBCGRIBEX) && defined(HAVE_LIBGRIB)
#include "cgribex.h"
@@ -32,12 +32,12 @@ typedef struct
typedef struct
{
+ size_t gridsize;
int param;
int level1;
int level2;
- int ltype;
- int tsteptype;
- size_t gridsize;
+ short ltype;
+ short tsteptype;
} compvar_t;
typedef struct
@@ -548,7 +548,8 @@ cgribexAddRecord(stream_t *streamptr, cgribexrec_t *cgribexp, int param, size_t
int vlistID = streamptr->vlistID;
int tsID = streamptr->curTsID;
int recID = recordNewEntry(streamptr, tsID);
- record_t *record = &streamptr->tsteps[tsID].records[recID];
+ recinfo_t *recinfo = &(streamptr->tsteps[tsID].recinfo[recID]);
+ record_t *record = &(streamptr->tsteps[tsID].records[recID]);
int tsteptype = cgribexGetTsteptype(ISEC1_TimeRange);
@@ -562,7 +563,7 @@ cgribexAddRecord(stream_t *streamptr, cgribexrec_t *cgribexp, int param, size_t
record->param = param;
record->ilevel = level1;
record->ilevel2 = level2;
- record->ltype = leveltype;
+ record->ltype = (short) leveltype;
record->tsteptype = (short) tsteptype;
record->gridsize = cgribexGetGridsize(cgribexp->sec4);
@@ -602,8 +603,8 @@ cgribexAddRecord(stream_t *streamptr, cgribexrec_t *cgribexp, int param, size_t
varAddRecord(recID, param, gridID, zaxistype, lbounds, level1, level2, 0, 0, datatype, &varID, &levelID, tsteptype, leveltype, -1,
NULL, NULL, NULL, NULL);
- record->varID = (short) varID;
- record->levelID = levelID;
+ recinfo->varID = (short) varID;
+ recinfo->levelID = levelID;
varDefCompType(varID, comptype);
@@ -717,8 +718,8 @@ cgribexVarSet(int param, int level1, int level2, int leveltype, int trange, size
compVar.param = param;
compVar.level1 = level1;
compVar.level2 = level2;
- compVar.ltype = leveltype;
- compVar.tsteptype = tsteptype;
+ compVar.ltype = (short) leveltype;
+ compVar.tsteptype = (short) tsteptype;
compVar.gridsize = gridsize;
return compVar;
@@ -958,7 +959,8 @@ cgribexScanTimestep2(stream_t *streamptr)
fileSetPos(fileID, streamptr->tsteps[tsID].position, SEEK_SET);
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
+ recinfo_t *recinfo = streamptr->tsteps[tsID].recinfo;
record_t *records = streamptr->tsteps[tsID].records;
int nrecords = streamScanInitRecords2(streamptr);
@@ -1044,19 +1046,19 @@ cgribexScanTimestep2(stream_t *streamptr)
if (CDI_Inventory_Mode == 1)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
{
break;
}
else
{
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
}
}
else
{
- if (records[recID].used)
+ if (recinfo[recID].used)
{
if (cdiDateTime_isNE(vDateTime, vDateTime0)) break;
@@ -1065,7 +1067,7 @@ cgribexScanTimestep2(stream_t *streamptr)
}
else
{
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
}
}
@@ -1084,7 +1086,7 @@ cgribexScanTimestep2(stream_t *streamptr)
records[recID].position = recpos;
records[recID].size = recsize;
- int varID = records[recID].varID;
+ int varID = recinfo[recID].varID;
int gridID = vlistInqVarGrid(vlistID, varID);
if (gridInqSize(gridID) == 1 && gridInqType(gridID) == GRID_LONLAT)
{
@@ -1102,10 +1104,10 @@ cgribexScanTimestep2(stream_t *streamptr)
int nrecs = 0;
for (recID = 0; recID < nrecords; recID++)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
nrecs++;
else
- vlistDefVarTimetype(vlistID, records[recID].varID, TIME_CONSTANT);
+ vlistDefVarTimetype(vlistID, recinfo[recID].varID, TIME_CONSTANT);
}
streamptr->tsteps[tsID].nrecs = nrecs;
@@ -1143,7 +1145,8 @@ cgribexScanTimestep(stream_t *streamptr)
void *gribbuffer = streamptr->record->buffer;
size_t buffersize = streamptr->record->buffersize;
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
+ recinfo_t *recinfo = streamptr->tsteps[tsID].recinfo;
record_t *records = streamptr->tsteps[tsID].records;
nrecs = streamScanInitRecords(streamptr, tsID);
@@ -1243,12 +1246,12 @@ cgribexScanTimestep(stream_t *streamptr)
if (CDI_Inventory_Mode == 1)
{
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
}
else
{
- if (records[recID].used)
+ if (recinfo[recID].used)
{
char paramstr_[32];
cdiParamToString(param, paramstr_, sizeof(paramstr_));
@@ -1262,7 +1265,7 @@ cgribexScanTimestep(stream_t *streamptr)
}
else
{
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
}
}
@@ -1287,7 +1290,7 @@ cgribexScanTimestep(stream_t *streamptr)
for (vrecID = 0; vrecID < nrecs; vrecID++)
{
recID = streamptr->tsteps[tsID].recIDs[vrecID];
- if (!records[recID].used) break;
+ if (!recinfo[recID].used) break;
}
if (vrecID < nrecs)
diff --git a/src/stream_ext.c b/src/stream_ext.c
index 616ef92dc08043afedb8b2f06dc9aec377039ef0..a5cd4f5aeda29c2a26d3ef0d709ffc5cfc9f92d1 100644
--- a/src/stream_ext.c
+++ b/src/stream_ext.c
@@ -47,7 +47,7 @@ ext_read_recordSP(stream_t *streamptr, float *data, size_t *numMissVals)
int vrecID = streamptr->tsteps[tsID].curRecID;
int recID = streamptr->tsteps[tsID].recIDs[vrecID];
- int varID = streamptr->tsteps[tsID].records[recID].varID;
+ int varID = streamptr->tsteps[tsID].recinfo[recID].varID;
off_t recpos = streamptr->tsteps[tsID].records[recID].position;
fileSetPos(fileID, recpos, SEEK_SET);
@@ -79,7 +79,7 @@ ext_read_recordDP(stream_t *streamptr, double *data, size_t *numMissVals)
int vrecID = streamptr->tsteps[tsID].curRecID;
int recID = streamptr->tsteps[tsID].recIDs[vrecID];
- int varID = streamptr->tsteps[tsID].records[recID].varID;
+ int varID = streamptr->tsteps[tsID].recinfo[recID].varID;
off_t recpos = streamptr->tsteps[tsID].records[recID].position;
fileSetPos(fileID, recpos, SEEK_SET);
@@ -169,7 +169,8 @@ extAddRecord(stream_t *streamptr, int param, int level, size_t xysize, size_t re
int vlistID = streamptr->vlistID;
int tsID = streamptr->curTsID;
int recID = recordNewEntry(streamptr, tsID);
- record_t *record = &streamptr->tsteps[tsID].records[recID];
+ recinfo_t *recinfo = &(streamptr->tsteps[tsID].recinfo[recID]);
+ record_t *record = &(streamptr->tsteps[tsID].records[recID]);
record->size = recsize;
record->position = position;
@@ -196,8 +197,8 @@ extAddRecord(stream_t *streamptr, int param, int level, size_t xysize, size_t re
varAddRecord(recID, param, gridID, leveltype, 0, level, 0, 0, 0, datatype, &varID, &levelID, TSTEP_INSTANT, 0, -1, NULL, NULL,
NULL, NULL);
- record->varID = (short) varID;
- record->levelID = levelID;
+ recinfo->varID = (short) varID;
+ recinfo->levelID = levelID;
streamptr->tsteps[tsID].nallrecs++;
streamptr->nrecs++;
@@ -304,7 +305,8 @@ extScanTimestep2(stream_t *streamptr)
fileSetPos(fileID, streamptr->tsteps[tsID].position, SEEK_SET);
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
+ recinfo_t *recinfo = streamptr->tsteps[tsID].recinfo;
record_t *records = streamptr->tsteps[tsID].records;
int nrecords = streamScanInitRecords2(streamptr);
@@ -340,13 +342,13 @@ extScanTimestep2(stream_t *streamptr)
{
if (param == records[recID].param && rlevel == records[recID].ilevel)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
{
nextstep = true;
}
else
{
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
}
break;
@@ -376,10 +378,10 @@ extScanTimestep2(stream_t *streamptr)
int nrecs = 0;
for (int recID = 0; recID < nrecords; recID++)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
nrecs++;
else
- vlistDefVarTimetype(vlistID, records[recID].varID, TIME_CONSTANT);
+ vlistDefVarTimetype(vlistID, recinfo[recID].varID, TIME_CONSTANT);
}
streamptr->tsteps[tsID].nrecs = nrecs;
@@ -417,7 +419,7 @@ extScanTimestep(stream_t *streamptr)
if (streamptr->tsteps[tsID].recordSize == 0)
{
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
record_t *records = streamptr->tsteps[tsID].records;
nrecs = streamScanInitRecords(streamptr, tsID);
diff --git a/src/stream_grb.c b/src/stream_grb.c
index 9441a53e3876091937dc1881c924dd5b05afde71..80943755164a82727eee42f46a054cf339dad9c1 100644
--- a/src/stream_grb.c
+++ b/src/stream_grb.c
@@ -256,6 +256,7 @@ grbDefField(stream_t *streamptr)
UNUSED(streamptr);
}
+#ifdef HAVE_LIBGRIB
static long
grbScanTimestep1(stream_t *streamptr)
{
@@ -318,6 +319,7 @@ grbScanTimestep(stream_t *streamptr)
return status;
}
+#endif
#ifdef HAVE_LIBGRIB
long
@@ -346,7 +348,6 @@ fdbInqContents(stream_t *streamptr)
#endif
}
#endif
-#endif
int
fdbInqTimestep(stream_t *streamptr, int tsID)
@@ -401,32 +402,6 @@ grbInqTimestep(stream_t *streamptr, int tsID)
return nrecs;
}
-// used in CDO!!!
-void
-streamInqGRIBinfo(int streamID, int *intnum, float *fltnum, off_t *bignum)
-{
- stream_t *streamptr = stream_to_pointer(streamID);
-
- int filetype = streamptr->filetype;
-
- if (filetype == CDI_FILETYPE_GRB)
- {
- int tsID = streamptr->curTsID;
- int vrecID = streamptr->tsteps[tsID].curRecID;
- int recID = streamptr->tsteps[tsID].recIDs[vrecID];
- off_t recpos = streamptr->tsteps[tsID].records[recID].position;
- int zip = streamptr->tsteps[tsID].records[recID].zip;
-
- void *gribbuffer = streamptr->record->buffer;
- size_t gribbuffersize = streamptr->record->buffersize;
-
- if (zip > 0)
- Error("Compressed GRIB records unsupported!");
- else
- grib_info_for_grads(recpos, (long) gribbuffersize, (unsigned char *) gribbuffer, intnum, fltnum, bignum);
- }
-}
-
int
grbGetGridtype(int *gridID, SizeType gridsize, bool *gridIsRotated, bool *gridIsCurvilinear)
{
@@ -497,6 +472,35 @@ grbGetGridtype(int *gridID, SizeType gridsize, bool *gridIsRotated, bool *gridIs
return gridtype;
}
+#endif
+
+// used in CDO!!!
+void
+streamInqGRIBinfo(int streamID, int *intnum, float *fltnum, off_t *bignum)
+{
+ stream_t *streamptr = stream_to_pointer(streamID);
+
+ if (streamptr->filetype == CDI_FILETYPE_GRB)
+ {
+#ifdef HAVE_LIBGRIB
+ int tsID = streamptr->curTsID;
+ int vrecID = streamptr->tsteps[tsID].curRecID;
+ int recID = streamptr->tsteps[tsID].recIDs[vrecID];
+ off_t recpos = streamptr->tsteps[tsID].records[recID].position;
+ int zip = streamptr->tsteps[tsID].records[recID].zip;
+
+ void *gribbuffer = streamptr->record->buffer;
+ size_t gribbuffersize = streamptr->record->buffersize;
+
+ if (zip > 0)
+ Error("Compressed GRIB records unsupported!");
+ else
+ grib_info_for_grads(recpos, (long) gribbuffersize, (unsigned char *) gribbuffer, intnum, fltnum, bignum);
+#else
+ Error("GRIB support unavailable!");
+#endif
+ }
+}
/*
* Local Variables:
diff --git a/src/stream_gribapi.c b/src/stream_gribapi.c
index 30c14eba1bfd748fa5a7910663f93bc2ba17ec2d..9e92946f6d3d2d808d1a16403ec785a23e9c9a16 100644
--- a/src/stream_gribapi.c
+++ b/src/stream_gribapi.c
@@ -28,12 +28,12 @@ static const var_tile_t dummy_tiles = { 0, -1, -1, -1, -1, -1 };
typedef struct
{
+ size_t gridsize;
int param;
int level1;
int level2;
- int ltype;
- int tsteptype;
- size_t gridsize;
+ short ltype;
+ short tsteptype;
char name[32];
VarScanKeys scanKeys;
var_tile_t tiles;
@@ -710,7 +710,8 @@ gribapiAddRecord(stream_t *streamptr, int param, grib_handle *gh, size_t recsize
int vlistID = streamptr->vlistID;
int tsID = streamptr->curTsID;
int recID = recordNewEntry(streamptr, tsID);
- record_t *record = &streamptr->tsteps[tsID].records[recID];
+ recinfo_t *recinfo = &(streamptr->tsteps[tsID].recinfo[recID]);
+ record_t *record = &(streamptr->tsteps[tsID].records[recID]);
int tsteptype = gribapiGetTsteptype(gh);
@@ -721,7 +722,7 @@ gribapiAddRecord(stream_t *streamptr, int param, grib_handle *gh, size_t recsize
record->param = param;
record->ilevel = level1;
record->ilevel2 = level2;
- record->ltype = leveltype1;
+ record->ltype = (short) leveltype1;
record->tsteptype = (short) tsteptype;
record->gridsize = gribapiGetGridsize(gh);
record->scanKeys = *scanKeys;
@@ -743,7 +744,7 @@ gribapiAddRecord(stream_t *streamptr, int param, grib_handle *gh, size_t recsize
CdiQuery *query = streamptr->query;
if (query && cdiQueryName(query, varname) < 0)
{
- record->used = false;
+ recinfo->used = false;
return;
}
@@ -814,8 +815,8 @@ gribapiAddRecord(stream_t *streamptr, int param, grib_handle *gh, size_t recsize
varAddRecord(recID, param, gridID, zaxistype, lbounds, level1, level2, level_sf, level_unit, datatype, &varID, &levelID,
tsteptype, leveltype1, leveltype2, varname, scanKeys, tiles, &tile_index);
- record->varID = (short) varID;
- record->levelID = levelID;
+ recinfo->varID = (short) varID;
+ recinfo->levelID = levelID;
varDefCompType(varID, comptype);
@@ -910,8 +911,8 @@ gribapiVarCompare(const compvar2_t *compVar, const record_t *record, int flag)
compVar0.param = record->param;
compVar0.level1 = record->ilevel;
compVar0.level2 = record->ilevel2;
- compVar0.ltype = record->ltype;
- compVar0.tsteptype = record->tsteptype;
+ compVar0.ltype = (short) record->ltype;
+ compVar0.tsteptype = (short) record->tsteptype;
compVar0.gridsize = record->gridsize;
memcpy(compVar0.name, record->varname, sizeof(compVar->name));
@@ -1173,7 +1174,8 @@ fdbScanTimesteps(stream_t *streamptr)
taxis = &streamptr->tsteps[tsID].taxis;
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
+ recinfo_t *recinfo = streamptr->tsteps[tsID].recinfo;
record_t *records = streamptr->tsteps[tsID].records;
int nrecs = (tsID == 1) ? streamScanInitRecords2(streamptr) : streamScanInitRecords(streamptr, tsID);
@@ -1184,7 +1186,7 @@ fdbScanTimesteps(stream_t *streamptr)
int rindex = 0;
for (int recID = 0; recID < numRecords; recID++)
{
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
rindex++;
@@ -1209,6 +1211,7 @@ fdbScanTimesteps(stream_t *streamptr)
}
#endif
+/*
static int
records_cmp_varname(const void *s1, const void *s2)
{
@@ -1216,13 +1219,14 @@ records_cmp_varname(const void *s1, const void *s2)
return strcmp(x->varname, y->varname);
}
-void
+static void
sort_records(stream_t *streamptr)
{
record_t *records = streamptr->tsteps[0].records;
size_t numRecords = (size_t) streamptr->tsteps[0].recordSize;
qsort(records, numRecords, sizeof(records[0]), records_cmp_varname);
}
+*/
long
gribapiScanTimestep1(stream_t *streamptr)
@@ -1373,7 +1377,7 @@ gribapiScanTimestep1(stream_t *streamptr)
streamScanTsFixNtsteps(streamptr, recpos);
streamScanTimeConstAdjust(streamptr, taxis);
- if (streamptr->sortname) sort_records(streamptr);
+ // if (streamptr->sortname) sort_records(streamptr);
return 0;
}
@@ -1404,7 +1408,8 @@ gribapiScanTimestep2(stream_t *streamptr)
fileSetPos(fileID, streamptr->tsteps[tsID].position, SEEK_SET);
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
+ recinfo_t *recinfo = streamptr->tsteps[tsID].recinfo;
record_t *records = streamptr->tsteps[tsID].records;
int nrecords = streamScanInitRecords2(streamptr);
@@ -1492,7 +1497,7 @@ gribapiScanTimestep2(stream_t *streamptr)
}
}
- if (records[recID].used)
+ if (recinfo[recID].used)
{
if (CDI_Inventory_Mode == 1)
break;
@@ -1505,7 +1510,7 @@ gribapiScanTimestep2(stream_t *streamptr)
}
}
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
if (CDI_Debug)
@@ -1526,7 +1531,7 @@ gribapiScanTimestep2(stream_t *streamptr)
records[recID].position = recpos;
records[recID].size = recsize;
- int varID = records[recID].varID;
+ int varID = recinfo[recID].varID;
if (tsteptype != vlistInqVarTsteptype(vlistID, varID)) vlistDefVarTsteptype(vlistID, varID, tsteptype);
@@ -1539,10 +1544,10 @@ gribapiScanTimestep2(stream_t *streamptr)
int nrecs = 0;
for (recID = 0; recID < nrecords; recID++)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
nrecs++;
else
- vlistDefVarTimetype(vlistID, records[recID].varID, TIME_CONSTANT);
+ vlistDefVarTimetype(vlistID, recinfo[recID].varID, TIME_CONSTANT);
}
streamptr->tsteps[tsID].nrecs = nrecs;
@@ -1570,7 +1575,8 @@ gribapiScanTimestep(stream_t *streamptr)
void *gribbuffer = streamptr->record->buffer;
size_t buffersize = streamptr->record->buffersize;
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
+ recinfo_t *recinfo = streamptr->tsteps[tsID].recinfo;
record_t *records = streamptr->tsteps[tsID].records;
nrecs = streamScanInitRecords(streamptr, tsID);
@@ -1679,7 +1685,7 @@ gribapiScanTimestep(stream_t *streamptr)
if (CDI_Inventory_Mode != 1)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
{
if (cdiDateTime_isNE(vDateTime, vDateTime0)) break;
@@ -1690,7 +1696,7 @@ gribapiScanTimestep(stream_t *streamptr)
}
}
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
if (CDI_Debug)
@@ -1717,7 +1723,7 @@ gribapiScanTimestep(stream_t *streamptr)
for (vrecID = 0; vrecID < nrecs; vrecID++)
{
recID = streamptr->tsteps[tsID].recIDs[vrecID];
- if (!records[recID].used) break;
+ if (!recinfo[recID].used) break;
}
if (vrecID < nrecs)
@@ -2749,7 +2755,7 @@ gribapiDefLevel(int editionNumber, grib_handle *gh, int zaxisID, int levelID, in
}
long grib_ltype2 = (ltype != ltype2 && ltype2 != -1) ? ltype2 : grib_ltype;
- void (*defLevel)(grib_handle * gh, int gcinit, long leveltype1, long leveltype2, bool hasBounds, double level, double dlevel1,
+ void (*defLevel)(grib_handle *gh, int gcinit, long leveltype1, long leveltype2, bool hasBounds, double level, double dlevel1,
double dlevel2)
= (editionNumber <= 1) ? grib1DefLevel : grib2DefLevel;
@@ -3176,7 +3182,7 @@ convertDataScanningMode(int scanModeIN, int scanModeOUT, double *data, size_t gr
// printf(".\n");
}
} // end if (scanModeOUT==96)
- } // end if (scanModeIN==64)
+ } // end if (scanModeIN==64)
if (scanModeIN
== 00) // Scanning Mode (00 dec) +i, -j; i direction consecutive (row-major order West->East & South->North )
@@ -3206,7 +3212,7 @@ convertDataScanningMode(int scanModeIN, int scanModeOUT, double *data, size_t gr
for (size_t i = 0; i < iDim; i++) data[j + i * jDim] = dataCopy[i + jInv * iDim]; // source data has -j
}
} // end if (scanModeOUT==96)
- } // end if (scanModeIN==00)
+ } // end if (scanModeIN==00)
if (scanModeIN
== 96) // Scanning Mode (00 dec) +i, -j; i direction consecutive (row-major order West->East & South->North )
@@ -3239,7 +3245,7 @@ convertDataScanningMode(int scanModeIN, int scanModeOUT, double *data, size_t gr
data[i + jXiDim] = dataCopy[jInv + i * jDim]; // target data has -j
}
} // end if (scanModeOUT==00)
- } // end if (scanModeIN==96)
+ } // end if (scanModeIN==96)
if (cdiDebugExt >= 100)
{
diff --git a/src/stream_ieg.c b/src/stream_ieg.c
index 4194ed0373cba5a384ee4cbfc4515d54dbee1aa6..9caeadf6f28781c4bdeae575890e6ed60ae21418 100644
--- a/src/stream_ieg.c
+++ b/src/stream_ieg.c
@@ -44,7 +44,7 @@ ieg_read_recordSP(stream_t *streamptr, float *data, size_t *numMissVals)
int vrecID = streamptr->tsteps[tsID].curRecID;
int recID = streamptr->tsteps[tsID].recIDs[vrecID];
- int varID = streamptr->tsteps[tsID].records[recID].varID;
+ int varID = streamptr->tsteps[tsID].recinfo[recID].varID;
off_t recpos = streamptr->tsteps[tsID].records[recID].position;
fileSetPos(fileID, recpos, SEEK_SET);
@@ -71,7 +71,7 @@ ieg_read_recordDP(stream_t *streamptr, double *data, size_t *numMissVals)
int vrecID = streamptr->tsteps[tsID].curRecID;
int recID = streamptr->tsteps[tsID].recIDs[vrecID];
- int varID = streamptr->tsteps[tsID].records[recID].varID;
+ int varID = streamptr->tsteps[tsID].recinfo[recID].varID;
off_t recpos = streamptr->tsteps[tsID].records[recID].position;
fileSetPos(fileID, recpos, SEEK_SET);
@@ -521,7 +521,8 @@ iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vct, si
int vlistID = streamptr->vlistID;
int tsID = streamptr->curTsID;
int recID = recordNewEntry(streamptr, tsID);
- record_t *record = &streamptr->tsteps[tsID].records[recID];
+ recinfo_t *recinfo = &(streamptr->tsteps[tsID].recinfo[recID]);
+ record_t *record = &(streamptr->tsteps[tsID].records[recID]);
int level1, level2;
if (IEG_P_LevelType(pdb) == IEG_LTYPE_HYBRID_LAYER)
@@ -541,7 +542,7 @@ iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vct, si
record->param = param;
record->ilevel = level1;
record->ilevel2 = level2;
- record->ltype = IEG_P_LevelType(pdb);
+ record->ltype = (short) IEG_P_LevelType(pdb);
int gridtype = (IEG_G_GridType(gdb) == 0) ? GRID_LONLAT
: (IEG_G_GridType(gdb) == 10) ? GRID_PROJECTION
@@ -641,8 +642,8 @@ iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vct, si
varAddRecord(recID, param, gridID, leveltype, lbounds, level1, level2, 0, 0, datatype, &varID, &levelID, TSTEP_INSTANT, 0, -1,
NULL, NULL, NULL, NULL);
- record->varID = (short) varID;
- record->levelID = levelID;
+ recinfo->varID = (short) varID;
+ recinfo->levelID = levelID;
streamptr->tsteps[tsID].nallrecs++;
streamptr->nrecs++;
@@ -791,7 +792,8 @@ iegScanTimestep2(stream_t *streamptr)
fileSetPos(fileID, streamptr->tsteps[tsID].position, SEEK_SET);
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
+ recinfo_t *recinfo = streamptr->tsteps[tsID].recinfo;
record_t *records = streamptr->tsteps[tsID].records;
int nrecords = streamScanInitRecords2(streamptr);
@@ -828,13 +830,13 @@ iegScanTimestep2(stream_t *streamptr)
{
if (param == records[recID].param && rlevel == records[recID].ilevel)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
{
nextstep = true;
}
else
{
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
}
break;
@@ -866,10 +868,10 @@ iegScanTimestep2(stream_t *streamptr)
int nrecs = 0;
for (int recID = 0; recID < nrecords; recID++)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
nrecs++;
else
- vlistDefVarTimetype(vlistID, records[recID].varID, TIME_CONSTANT);
+ vlistDefVarTimetype(vlistID, recinfo[recID].varID, TIME_CONSTANT);
}
streamptr->tsteps[tsID].nrecs = nrecs;
@@ -908,7 +910,7 @@ iegScanTimestep(stream_t *streamptr)
int nrecs = 0;
if (streamptr->tsteps[tsID].recordSize == 0)
{
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
record_t *records = streamptr->tsteps[tsID].records;
nrecs = streamScanInitRecords(streamptr, tsID);
diff --git a/src/stream_record.c b/src/stream_record.c
index 114b0df4065a60eb624c4f4eff57a749c80807cf..5e36249758bf40be8a63772f6144608f0e7c176c 100644
--- a/src/stream_record.c
+++ b/src/stream_record.c
@@ -17,6 +17,14 @@
#include "stream_ieg.h"
void
+recinfoInitEntry(recinfo_t *recinfo)
+{
+ recinfo->varID = CDI_UNDEFID;
+ recinfo->levelID = CDI_UNDEFID;
+ recinfo->used = false;
+}
+
+static void
recordInitEntry(record_t *record)
{
record->position = CDI_UNDEFID;
@@ -24,13 +32,14 @@ recordInitEntry(record_t *record)
record->gridsize = 0;
record->param = 0;
record->ilevel = CDI_UNDEFID;
- record->used = false;
record->tsteptype = CDI_UNDEFID;
- record->varID = CDI_UNDEFID;
- record->levelID = CDI_UNDEFID;
- memset(record->varname, 0, sizeof(record->varname));
+#ifdef HAVE_LIBGRIB
varScanKeysInit(&record->scanKeys);
memset(&record->tiles, 0, sizeof(record->tiles));
+#ifdef HAVE_LIBGRIB_API
+ memset(record->varname, 0, sizeof(record->varname));
+#endif
+#endif
#ifdef HAVE_LIBFDB5
record->fdbItemIndex = -1;
#endif
@@ -40,19 +49,21 @@ int
recordNewEntry(stream_t *streamptr, int tsID)
{
int recordSize = streamptr->tsteps[tsID].recordSize;
+ recinfo_t *recinfo = streamptr->tsteps[tsID].recinfo;
record_t *records = streamptr->tsteps[tsID].records;
// Look for a free slot in record.
int recordID = 0;
if (recordSize)
{
- while (recordID < recordSize && records[recordID].used != CDI_UNDEFID) ++recordID;
+ while (recordID < recordSize && recinfo[recordID].used != CDI_UNDEFID) ++recordID;
}
else // Create the table the first time through.
{
recordSize = 1; // <<<<----
+ recinfo = (recinfo_t *) Malloc((size_t) recordSize * sizeof(recinfo_t));
records = (record_t *) Malloc((size_t) recordSize * sizeof(record_t));
- for (int i = recordID; i < recordSize; i++) records[i].used = CDI_UNDEFID;
+ for (int i = recordID; i < recordSize; i++) recinfo[i].used = CDI_UNDEFID;
}
// If the table overflows, double its size.
@@ -63,16 +74,19 @@ recordNewEntry(stream_t *streamptr, int tsID)
else if (recordSize < INT_MAX) recordSize = INT_MAX;
else Error("Cannot handle this many records!\n");
// clang-format on
+ recinfo = (recinfo_t *) Realloc(recinfo, (size_t) recordSize * sizeof(recinfo_t));
records = (record_t *) Realloc(records, (size_t) recordSize * sizeof(record_t));
- for (int i = recordID; i < recordSize; i++) records[i].used = CDI_UNDEFID;
+ for (int i = recordID; i < recordSize; i++) recinfo[i].used = CDI_UNDEFID;
}
+ recinfoInitEntry(&recinfo[recordID]);
recordInitEntry(&records[recordID]);
- records[recordID].used = true;
+ recinfo[recordID].used = true;
streamptr->tsteps[tsID].recordSize = recordSize;
+ streamptr->tsteps[tsID].recinfo = recinfo;
streamptr->tsteps[tsID].records = records;
return recordID;
@@ -97,38 +111,48 @@ cdiInitRecord(stream_t *streamptr)
}
void
-streamInqField(int streamID, int *varID, int *levelID)
+stream_inq_field(stream_t *streamPtr, int *varID, int *levelID)
{
check_parg(varID);
check_parg(levelID);
- stream_t *streamptr = stream_to_pointer(streamID);
-
- cdiDefAccesstype(streamID, TYPE_REC);
-
- if (!streamptr->record) cdiInitRecord(streamptr);
+ stream_def_accesstype(streamPtr, TYPE_REC);
- int tsID = streamptr->curTsID;
- int rindex = streamptr->tsteps[tsID].curRecID + 1;
+ if (!streamPtr->record) cdiInitRecord(streamPtr);
- if (rindex >= streamptr->tsteps[tsID].nrecs) Error("record %d not available at timestep %d", rindex + 1, tsID + 1);
+ const int tsID = streamPtr->curTsID;
+ tsteps_t *tstep = &(streamPtr->tsteps[tsID]);
- int recID = streamptr->tsteps[tsID].recIDs[rindex];
+ int rindex = tstep->curRecID + 1;
+ if (rindex >= tstep->nrecs) Error("record %d not available at timestep %d", rindex + 1, tsID + 1);
- if (recID == -1 || recID >= streamptr->tsteps[tsID].nallrecs) Error("Internal problem! tsID = %d recID = %d", tsID, recID);
+ int recID = tstep->recIDs[rindex];
+ if (recID == -1 || recID >= tstep->nallrecs) Error("Internal problem! tsID = %d recID = %d", tsID, recID);
- *varID = streamptr->tsteps[tsID].records[recID].varID;
+ *varID = tstep->recinfo[recID].varID;
if (*varID == -1) Error("Internal problem! varID = %d recID = %d", *varID, recID);
- int lindex = streamptr->tsteps[tsID].records[recID].levelID;
+ int lindex = tstep->recinfo[recID].levelID;
+ int isub = subtypeInqActiveIndex(streamPtr->vars[*varID].subtypeID);
+ *levelID = streamPtr->vars[*varID].recordTable[isub].lindex[lindex];
+
+ if (CDI_Debug)
+ Message("streamID = %d tsID = %d, recID = %d, varID = %d, levelID = %d", streamPtr->self, tsID, recID, *varID, *levelID);
- int isub = subtypeInqActiveIndex(streamptr->vars[*varID].subtypeID);
- *levelID = streamptr->vars[*varID].recordTable[isub].lindex[lindex];
+ streamPtr->curTsID = tsID;
+ tstep->curRecID = rindex;
+}
- if (CDI_Debug) Message("streamID = %d tsID = %d, recID = %d, varID = %d, levelID = %d", streamID, tsID, recID, *varID, *levelID);
+void
+pstreamInqField(void *streamPtr, int *varID, int *levelID)
+{
+ stream_inq_field((stream_t *) streamPtr, varID, levelID);
+}
- streamptr->curTsID = tsID;
- streamptr->tsteps[tsID].curRecID = rindex;
+void
+streamInqField(int streamID, int *varID, int *levelID)
+{
+ stream_inq_field(stream_to_pointer(streamID), varID, levelID);
}
/*
@@ -202,8 +226,11 @@ streamDefField(int streamID, int varID, int levelID)
void
streamCopyField(int streamID2, int streamID1)
{
- stream_t *streamptr1 = stream_to_pointer(streamID1), *streamptr2 = stream_to_pointer(streamID2);
- int filetype1 = streamptr1->filetype, filetype2 = streamptr2->filetype, filetype = CDI_FILETYPE_UNDEF;
+ stream_t *streamptr1 = stream_to_pointer(streamID1);
+ stream_t *streamptr2 = stream_to_pointer(streamID2);
+ int filetype1 = streamptr1->filetype;
+ int filetype2 = streamptr2->filetype;
+ int filetype = CDI_FILETYPE_UNDEF;
if (cdiBaseFiletype(filetype1) == cdiBaseFiletype(filetype2)) filetype = filetype2;
@@ -225,21 +252,21 @@ streamCopyField(int streamID2, int streamID1)
case CDI_FILETYPE_IEG: iegCopyField(streamptr2, streamptr1); break;
#endif
#ifdef HAVE_LIBNETCDF
- case CDI_FILETYPE_NETCDF: cdfCopyRecord(streamptr2, streamptr1); break;
+ case CDI_FILETYPE_NETCDF: cdfCopyField(streamptr2, streamptr1); break;
#endif
default: Error("%s support not compiled in!", strfiletype(filetype));
}
}
void
-cdi_create_records(stream_t *streamptr, int tsID)
+cdi_create_records(stream_t *streamptr, int tsID, bool allocRecords)
{
unsigned nrecords, maxrecords;
tsteps_t *sourceTstep = streamptr->tsteps;
tsteps_t *destTstep = sourceTstep + tsID;
- if (destTstep->records) return;
+ if (destTstep->recinfo) return;
int vlistID = streamptr->vlistID;
@@ -268,7 +295,7 @@ cdi_create_records(stream_t *streamptr, int tsID)
{
for (size_t recID = 0; recID < maxrecords; recID++)
{
- int varID = sourceTstep->records[recID].varID;
+ int varID = sourceTstep->recinfo[recID].varID;
nrecords += (varID == CDI_UNDEFID /* varID = CDI_UNDEFID for write mode !!! */
|| vlistInqVarTimetype(vlistID, varID) != TIME_CONSTANT);
// printf("varID nrecords %d %d %d \n", varID, nrecords, vlistInqVarTsteptype(vlistID, varID));
@@ -285,34 +312,39 @@ cdi_create_records(stream_t *streamptr, int tsID)
}
// printf("tsID, nrecords %d %d\n", tsID, nrecords);
- record_t *records = (maxrecords > 0) ? (record_t *) (Malloc(maxrecords * sizeof(record_t))) : (record_t *) NULL;
+ recinfo_t *recinfo = (maxrecords > 0) ? (recinfo_t *) Malloc(maxrecords * sizeof(recinfo_t)) : (recinfo_t *) NULL;
+ record_t *records = (allocRecords && maxrecords > 0) ? (record_t *) Malloc(maxrecords * sizeof(record_t)) : (record_t *) NULL;
+ destTstep->recinfo = recinfo;
destTstep->records = records;
destTstep->recordSize = (int) maxrecords;
destTstep->nallrecs = (int) nrecords;
#ifdef HAVE_LIBFDB5
- destTstep->records->fdbItemIndex = -1;
+ if (destTstep->records) destTstep->records->fdbItemIndex = -1;
#endif
if (tsID == 0)
{
- for (unsigned recID = 0; recID < maxrecords; recID++) recordInitEntry(&destTstep->records[recID]);
+ for (unsigned recID = 0; recID < maxrecords; recID++) recinfoInitEntry(&destTstep->recinfo[recID]);
+ if (allocRecords)
+ for (unsigned recID = 0; recID < maxrecords; recID++) recordInitEntry(&destTstep->records[recID]);
}
- else if (sourceTstep->records)
+ else if (sourceTstep->recinfo)
{
- memcpy(destTstep->records, sourceTstep->records, (size_t) maxrecords * sizeof(record_t));
+ memcpy(destTstep->recinfo, sourceTstep->recinfo, (size_t) maxrecords * sizeof(recinfo_t));
+ if (allocRecords) memcpy(destTstep->records, sourceTstep->records, (size_t) maxrecords * sizeof(record_t));
for (size_t recID = 0; recID < maxrecords; recID++)
{
- record_t *curRecord = &sourceTstep->records[recID];
- destTstep->records[recID].used = curRecord->used;
+ recinfo_t *curRecord = &sourceTstep->recinfo[recID];
+ destTstep->recinfo[recID].used = curRecord->used;
if (curRecord->used != CDI_UNDEFID && curRecord->varID != -1) // curRecord->varID = -1 for write mode !!!
{
if (vlistInqVarTimetype(vlistID, curRecord->varID) != TIME_CONSTANT)
{
- destTstep->records[recID].position = CDI_UNDEFID;
- destTstep->records[recID].size = 0;
- destTstep->records[recID].used = false;
+ if (allocRecords) destTstep->records[recID].position = CDI_UNDEFID;
+ if (allocRecords) destTstep->records[recID].size = 0;
+ destTstep->recinfo[recID].used = false;
}
}
}
diff --git a/src/stream_scan.c b/src/stream_scan.c
index b1f4488a75c11d0ab4e836e030391f443ff89053..a4531bf581db4259ed3accf30ed60cd60ca905ff 100644
--- a/src/stream_scan.c
+++ b/src/stream_scan.c
@@ -16,10 +16,11 @@
void
streamScanResizeRecords1(stream_t *streamptr)
{
- const int nrecords = streamptr->tsteps[0].nallrecs;
+ int nrecords = streamptr->tsteps[0].nallrecs;
if (nrecords < streamptr->tsteps[0].recordSize)
{
streamptr->tsteps[0].recordSize = nrecords;
+ streamptr->tsteps[0].recinfo = (recinfo_t *) Realloc(streamptr->tsteps[0].recinfo, (size_t) nrecords * sizeof(recinfo_t));
streamptr->tsteps[0].records = (record_t *) Realloc(streamptr->tsteps[0].records, (size_t) nrecords * sizeof(record_t));
}
@@ -31,7 +32,7 @@ streamScanResizeRecords1(stream_t *streamptr)
int
streamScanInitRecords2(stream_t *streamptr)
{
- const int nrecords = streamptr->tsteps[1].nallrecs;
+ int nrecords = streamptr->tsteps[1].nallrecs;
streamptr->tsteps[1].recIDs = (int *) Malloc((size_t) nrecords * sizeof(int));
streamptr->tsteps[1].nrecs = 0;
@@ -48,7 +49,7 @@ streamScanInitRecords2(stream_t *streamptr)
int
streamScanInitRecords(stream_t *streamptr, int tsID)
{
- const int nrecs = streamptr->tsteps[1].nrecs;
+ int nrecs = streamptr->tsteps[1].nrecs;
streamptr->tsteps[tsID].nrecs = nrecs;
streamptr->tsteps[tsID].recIDs = (int *) Malloc((size_t) nrecs * sizeof(int));
@@ -61,7 +62,7 @@ streamScanInitRecords(stream_t *streamptr, int tsID)
void
streamScanTimeConstAdjust(stream_t *streamptr, const taxis_t *taxis)
{
- const int vlistID = streamptr->vlistID;
+ int vlistID = streamptr->vlistID;
if (streamptr->ntsteps == 1 && cdiDateTime_isNull(taxis->vDateTime))
{
streamptr->ntsteps = 0;
@@ -74,7 +75,7 @@ streamScanTsFixNtsteps(stream_t *streamptr, off_t recpos)
{
if (streamptr->ntsteps == -1)
{
- const int tsID = tstepsNewEntry(streamptr);
+ int tsID = tstepsNewEntry(streamptr);
if (tsID != streamptr->rtsteps) Error("Internal error. tsID = %d", tsID);
streamptr->tsteps[tsID - 1].next = true;
diff --git a/src/stream_srv.c b/src/stream_srv.c
index fa1beba762d18c1133569a7ef733b72232458318..61bf91f74eedb2ad94864ae5cea9f490da0869b5 100644
--- a/src/stream_srv.c
+++ b/src/stream_srv.c
@@ -43,7 +43,7 @@ srv_read_recordSP(stream_t *streamptr, float *data, size_t *numMissVals)
int vrecID = streamptr->tsteps[tsID].curRecID;
int recID = streamptr->tsteps[tsID].recIDs[vrecID];
- int varID = streamptr->tsteps[tsID].records[recID].varID;
+ int varID = streamptr->tsteps[tsID].recinfo[recID].varID;
off_t recpos = streamptr->tsteps[tsID].records[recID].position;
fileSetPos(fileID, recpos, SEEK_SET);
@@ -72,7 +72,7 @@ srv_read_recordDP(stream_t *streamptr, double *data, size_t *numMissVals)
int vrecID = streamptr->tsteps[tsID].curRecID;
int recID = streamptr->tsteps[tsID].recIDs[vrecID];
- int varID = streamptr->tsteps[tsID].records[recID].varID;
+ int varID = streamptr->tsteps[tsID].recinfo[recID].varID;
off_t recpos = streamptr->tsteps[tsID].records[recID].position;
fileSetPos(fileID, recpos, SEEK_SET);
@@ -175,7 +175,8 @@ srv_add_record(stream_t *streamptr, int param, int level, size_t xsize, size_t y
int vlistID = streamptr->vlistID;
int tsID = streamptr->curTsID;
int recID = recordNewEntry(streamptr, tsID);
- record_t *record = &streamptr->tsteps[tsID].records[recID];
+ recinfo_t *recinfo = &(streamptr->tsteps[tsID].recinfo[recID]);
+ record_t *record = &(streamptr->tsteps[tsID].records[recID]);
record->size = recsize;
record->position = position;
@@ -203,8 +204,8 @@ srv_add_record(stream_t *streamptr, int param, int level, size_t xsize, size_t y
NULL, NULL);
xassert(varID <= SHRT_MAX && levelID <= SHRT_MAX);
- record->varID = (short) varID;
- record->levelID = levelID;
+ recinfo->varID = (short) varID;
+ recinfo->levelID = levelID;
streamptr->tsteps[tsID].nallrecs++;
streamptr->nrecs++;
@@ -313,7 +314,8 @@ srvScanTimestep2(stream_t *streamptr)
fileSetPos(fileID, streamptr->tsteps[tsID].position, SEEK_SET);
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
+ recinfo_t *recinfo = streamptr->tsteps[tsID].recinfo;
record_t *records = streamptr->tsteps[tsID].records;
int nrecords = streamScanInitRecords2(streamptr);
@@ -349,13 +351,13 @@ srvScanTimestep2(stream_t *streamptr)
{
if (param == records[recID].param && rlevel == records[recID].ilevel)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
{
nextstep = true;
}
else
{
- records[recID].used = true;
+ recinfo[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
}
break;
@@ -385,10 +387,10 @@ srvScanTimestep2(stream_t *streamptr)
int nrecs = 0;
for (int recID = 0; recID < nrecords; recID++)
{
- if (records[recID].used)
+ if (recinfo[recID].used)
nrecs++;
else
- vlistDefVarTimetype(vlistID, records[recID].varID, TIME_CONSTANT);
+ vlistDefVarTimetype(vlistID, recinfo[recID].varID, TIME_CONSTANT);
}
streamptr->tsteps[tsID].nrecs = nrecs;
@@ -426,7 +428,7 @@ srvScanTimestep(stream_t *streamptr)
if (streamptr->tsteps[tsID].recordSize == 0)
{
- cdi_create_records(streamptr, tsID);
+ cdi_create_records(streamptr, tsID, true);
record_t *records = streamptr->tsteps[tsID].records;
nrecs = streamScanInitRecords(streamptr, tsID);
diff --git a/src/taxis.c b/src/taxis.c
index 5acf45b5715e6dba9f64f41f1473927f3a56ddfd..a252db8b187e6d64c52b75b43383d3f70fe18b07 100644
--- a/src/taxis.c
+++ b/src/taxis.c
@@ -102,7 +102,6 @@ void
ptaxisInit(taxis_t *taxisptr)
{
taxisptr->self = CDI_UNDEFID;
- taxisptr->datatype = CDI_DATATYPE_FLT64;
taxisptr->type = DefaultTimeType;
taxisptr->calendar = CDI_Default_Calendar;
taxisptr->unit = DefaultTimeUnit;
@@ -120,6 +119,9 @@ ptaxisInit(taxis_t *taxisptr)
taxisptr->name = NULL;
taxisptr->longname = NULL;
taxisptr->units = NULL;
+
+ cdiInitKeys(&taxisptr->keys);
+ cdiDefVarKeyInt(&taxisptr->keys, CDI_KEY_DATATYPE, CDI_DATATYPE_FLT64);
}
static taxis_t *
@@ -235,7 +237,7 @@ taxisDefType(int taxisID, int taxistype)
if (taxisptr->type != taxistype)
{
taxisptr->type = taxistype;
- taxisptr->datatype = CDI_DATATYPE_FLT64;
+ cdiDefVarKeyInt(&taxisptr->keys, CDI_KEY_DATATYPE, CDI_DATATYPE_FLT64);
delete_refcount_string(taxisptr->units);
taxisptr->units = NULL;
reshSetStatus(taxisID, &taxisOps, RESH_DESYNC_IN_USE);
@@ -840,7 +842,7 @@ taxisInqNumavg(int taxisID)
}
taxis_t *
-taxisPtr(int taxisID)
+taxis_to_pointer(int taxisID)
{
taxis_t *taxisptr = (taxis_t *) reshGetVal(taxisID, &taxisOps);
return taxisptr;
@@ -849,7 +851,7 @@ taxisPtr(int taxisID)
void
ptaxisDefDatatype(taxis_t *taxisptr, int datatype)
{
- taxisptr->datatype = datatype;
+ cdiDefVarKeyInt(&taxisptr->keys, CDI_KEY_DATATYPE, datatype);
}
void
@@ -1349,7 +1351,6 @@ ptaxisCopy(taxis_t *dest, taxis_t *source)
reshLock();
// memcpy(dest, source, sizeof(taxis_t));
- dest->datatype = source->datatype;
dest->type = source->type;
dest->calendar = source->calendar;
dest->unit = source->unit;
@@ -1374,6 +1375,9 @@ ptaxisCopy(taxis_t *dest, taxis_t *source)
dest->units = dup_refcount_string(source->units);
if (dest->self != CDI_UNDEFID) reshSetStatus(dest->self, &taxisOps, RESH_DESYNC_IN_USE);
+ cdiInitKeys(&dest->keys);
+ cdiCopyVarKeys(&source->keys, &dest->keys);
+
reshUnlock();
}
@@ -1480,6 +1484,7 @@ taxisGetPackSize(void *p, void *context)
+ (taxisptr->longname ? serializeGetSize((int) strlen(taxisptr->longname), CDI_DATATYPE_TXT, context) : 0)
+ (taxisptr->units ? serializeGetSize((int) strlen(taxisptr->units), CDI_DATATYPE_TXT, context) : 0)
+ serializeGetSize(1, CDI_DATATYPE_UINT32, context);
+ packBufferSize += serializeKeysGetPackSize(&taxisptr->keys, context);
return packBufferSize;
}
@@ -1546,6 +1551,8 @@ taxisUnpack(char *unpackBuffer, int unpackBufferSize, int *unpackBufferPos, int
taxisP->units = units;
}
+ serializeKeysUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos, &taxisP->keys, context);
+
reshSetStatus(taxisP->self, &taxisOps, reshGetStatus(taxisP->self, &taxisOps) & ~RESH_SYNC_BIT);
#undef adaptKey
@@ -1596,6 +1603,8 @@ taxisPack(void *voidP, void *packBuffer, int packBufferSize, int *packBufferPos,
if (taxisP->longname)
serializePack(taxisP->longname, lnameLen, CDI_DATATYPE_TXT, packBuffer, packBufferSize, packBufferPos, context);
if (taxisP->units) serializePack(taxisP->units, unitsLen, CDI_DATATYPE_TXT, packBuffer, packBufferSize, packBufferPos, context);
+
+ serializeKeysPack(&taxisP->keys, packBuffer, packBufferSize, packBufferPos, context);
}
/*
diff --git a/src/taxis.h b/src/taxis.h
index b7eac28932fc67368597f4fc030714c3782325e6..5888b513d4ba6715044d2d936faae5638f780dd4 100644
--- a/src/taxis.h
+++ b/src/taxis.h
@@ -4,6 +4,8 @@
#include <stdbool.h>
#include "cdi.h"
+#include "cdi_key.h"
+
#ifndef RESOURCE_HANDLE_H
#include "resource_handle.h"
#endif
@@ -11,8 +13,7 @@
typedef struct
{
int self;
- int datatype; // datatype
- int type; // time type
+ int type; // time type
int calendar;
int unit; // time units
int numavg;
@@ -29,6 +30,7 @@ typedef struct
char *units;
bool climatology;
bool hasBounds;
+ cdi_keys_t keys;
} taxis_t;
// taxisInqSdatetime: Get the start date/time
@@ -36,7 +38,7 @@ CdiDateTime taxisInqSdatetime(int taxisID);
void ptaxisInit(taxis_t *taxis);
void ptaxisCopy(taxis_t *dest, taxis_t *source);
-taxis_t *taxisPtr(int taxisID);
+taxis_t *taxis_to_pointer(int taxisID);
void cdi_set_forecast_period(double timevalue, taxis_t *taxis);
CdiDateTime cdi_decode_timeval(double timevalue, const taxis_t *taxis);
double cdi_encode_timeval(CdiDateTime datetime, taxis_t *taxis);
diff --git a/src/tsteps.c b/src/tsteps.c
index 7a22bd24830f69e86993eb41c1e537f8d98a5cc7..d2a6da608ef3a7387a63aef2c74d902e3fd7640e 100644
--- a/src/tsteps.c
+++ b/src/tsteps.c
@@ -20,6 +20,7 @@ static void
tstepsInitEntry(tsteps_t *tstep)
{
tstep->recIDs = NULL;
+ tstep->recinfo = NULL;
tstep->records = NULL;
tstep->recordSize = 0;
tstep->nrecs = 0;
@@ -35,7 +36,7 @@ tstepsInitEntry(tsteps_t *tstep)
int
tstepsNewEntry(stream_t *streamptr)
{
- const int tsID = streamptr->tstepsNextID++;
+ int tsID = streamptr->tstepsNextID++;
int tstepsTableSize = streamptr->tstepsTableSize;
tsteps_t *tstepsTable = streamptr->tsteps;
diff --git a/src/util.c b/src/util.c
index 7eada35c9d6a99e63190757c9da6c3011af3e68e..df97d6a0cc6fdafd74a53c62f8848022d6c3c771 100644
--- a/src/util.c
+++ b/src/util.c
@@ -100,6 +100,7 @@ cdiUnescapeSpaces(const char *string, const char **outStringEnd)
return result;
}
+#ifndef _WIN32
#if defined(HAVE_DECL_UUID_GENERATE) && defined(HAVE_UUID_UUID_H)
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
@@ -252,6 +253,7 @@ cdiCreateUUID(unsigned char *uuid)
#endif
}
#endif
+#endif
/*
* Local Variables:
diff --git a/src/vlist.c b/src/vlist.c
index be99645856a386166af6443eb295fb48b9dd6be2..a6bf4888ee0e7ebcea82061e0bcf35a52c14eb74 100644
--- a/src/vlist.c
+++ b/src/vlist.c
@@ -44,6 +44,19 @@ static bool vlistIsInitialized = false;
if (!vlistIsInitialized) vlist_initialize()
#endif
+void *
+stream_get_pointer(int streamID)
+{
+ return stream_to_pointer(streamID);
+}
+
+void *
+stream_get_vlist_pointer(int streamID)
+{
+ stream_t *streamPtr = stream_to_pointer(streamID);
+ return vlist_to_pointer(streamPtr->vlistID);
+}
+
static int
vlist_compare(vlist_t *a, vlist_t *b)
{
@@ -1000,10 +1013,15 @@ int
vlistNumGrids(int vlistID)
{
vlist_t *vlistptr = vlist_to_pointer(vlistID);
-
return vlistptr->ngrids;
}
+int
+vlistNgrids(int vlistID)
+{
+ return vlistNumGrids(vlistID);
+}
+
/*
@Function vlistNumZaxis
@Title Number of zaxis in a variable list
@@ -1024,15 +1042,19 @@ int
vlistNumZaxis(int vlistID)
{
vlist_t *vlistptr = vlist_to_pointer(vlistID);
-
return vlistptr->nzaxis;
}
+int
+vlistNzaxis(int vlistID)
+{
+ return vlistNumZaxis(vlistID);
+}
+
int
vlistNsubtypes(int vlistID)
{
vlist_t *vlistptr = vlist_to_pointer(vlistID);
-
return vlistptr->nsubtypes;
}
@@ -1053,7 +1075,6 @@ int
vlistNtsteps(int vlistID)
{
vlist_t *vlistptr = vlist_to_pointer(vlistID);
-
return (int) vlistptr->ntsteps;
}
@@ -1329,6 +1350,22 @@ vlistGridIndex(int vlistID, int gridID)
return index;
}
+static void
+delete_chunks(int vlistID, int varID)
+{
+ int chunkKeys[4] = { CDI_KEY_CHUNKSIZE_DIMX, CDI_KEY_CHUNKSIZE_DIMY, CDI_KEY_CHUNKSIZE_DIMZ, CDI_KEY_CHUNKSIZE_DIMT };
+ for (int i = 0; i < 4; ++i)
+ {
+ int chunkSize = 0;
+ cdiInqKeyInt(vlistID, varID, chunkKeys[i], &chunkSize);
+ if (chunkSize != 0) cdiDeleteKey(vlistID, varID, chunkKeys[i]);
+ }
+
+ int chunkSize = 0;
+ cdiInqKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE, &chunkSize);
+ if (chunkSize > 0) cdiDeleteKey(vlistID, varID, CDI_KEY_CHUNKSIZE);
+}
+
void
vlistChangeGridIndex(int vlistID, int index, int gridID)
{
@@ -1344,9 +1381,7 @@ vlistChangeGridIndex(int vlistID, int index, int gridID)
if (vlistptr->vars[varID].gridID == gridIDold)
{
vlistptr->vars[varID].gridID = gridID;
- int chunkSize = 0;
- cdiInqKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE, &chunkSize);
- if (chunkSize > 0) cdiDeleteKey(vlistID, varID, CDI_KEY_CHUNKSIZE);
+ delete_chunks(vlistID, varID);
if (gridInqXsize(gridIDold) == 0 && gridInqXsize(gridID) > 0 && vlistInqVarXYZ(vlistID, varID) != 0)
vlistDefVarXYZ(vlistID, varID, 0);
}
@@ -1372,7 +1407,11 @@ vlistChangeGrid(int vlistID, int gridID1, int gridID2)
}
int nvars = vlistptr->nvars;
for (int varID = 0; varID < nvars; varID++)
- if (vlistptr->vars[varID].gridID == gridID1) vlistptr->vars[varID].gridID = gridID2;
+ if (vlistptr->vars[varID].gridID == gridID1)
+ {
+ vlistptr->vars[varID].gridID = gridID2;
+ delete_chunks(vlistID, varID);
+ }
reshSetStatus(vlistID, &vlistOps, RESH_DESYNC_IN_USE);
}
}
diff --git a/src/vlist_var.c b/src/vlist_var.c
index 9965f49e83622724117a943d8d8ccaa9fbde2bb2..4174a111f189514a4e8f5739beb5d6533d251bec 100644
--- a/src/vlist_var.c
+++ b/src/vlist_var.c
@@ -1077,16 +1077,28 @@ vlistDefFlag(int vlistID, int varID, int levID, int flag)
}
int
-vlistInqFlag(int vlistID, int varID, int levID)
+vlist_inq_flag(vlist_t *vlistPtr, int varID, int levelID)
{
- var_t *varptr = vlistptr_get_varptr(__func__, vlist_to_pointer(vlistID), varID);
+ var_t *varPtr = vlistptr_get_varptr(__func__, vlistPtr, varID);
- if (varptr->levinfo) return varptr->levinfo[levID].flag;
+ if (varPtr->levinfo) return varPtr->levinfo[levelID].flag;
- levinfo_t li = DEFAULT_LEVINFO(levID);
+ levinfo_t li = DEFAULT_LEVINFO(levelID);
return li.flag;
}
+int
+pvlistInqFlag(void *vlistPtr, int varID, int levelID)
+{
+ return vlist_inq_flag((vlist_t *) vlistPtr, varID, levelID);
+}
+
+int
+vlistInqFlag(int vlistID, int varID, int levelID)
+{
+ return vlist_inq_flag(vlist_to_pointer(vlistID), varID, levelID);
+}
+
int
vlistFindVar(int vlistID, int fvarID)
{
diff --git a/src/zaxis.c b/src/zaxis.c
index a026f71361df46dfe756c1cffa89f54fb4ae07fb..447defcdffb6b1465a7312f073cd1715d630a264 100644
--- a/src/zaxis.c
+++ b/src/zaxis.c
@@ -1139,7 +1139,7 @@ static inline void
zaxisCopyKeyStr(zaxis_t *zaxisptr1, zaxis_t *zaxisptr2, int key)
{
cdi_key_t *keyp = find_key(&zaxisptr1->keys, key);
- if (keyp && keyp->type == KEY_BYTES)
+ if (keyp && keyp->type == KeyBytes)
cdiDefVarKeyBytes(&zaxisptr2->keys, key, (const unsigned char *) keyp->v.s, (int) keyp->length);
}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2e02cf49b4dee098c5d3cc809d18159f47944de3
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,43 @@
+
+add_executable(calendar_test1.run calendar_test1.c)
+add_executable(cksum_read.run cksum_read.c )
+add_executable(cksum_verify.run cksum_verify.c)
+add_executable(cksum_write.run cksum_write.c)
+add_executable(cksum_write_chunk.run cksum_write_chunk.c)
+add_executable(deco2d_model.run deco2d_model.c)
+add_executable(ensure_array_size.run ensure_array_size.c)
+add_executable(pio_write.run pio_write.c)
+add_executable(pio_write_setup_grid.run pio_write_setup_grid.c)
+add_executable(simple_model.run simple_model.c)
+add_executable(simple_model_helper.run simple_model_helper.c)
+add_executable(stream_cksum.run stream_cksum.c)
+add_executable(test_byteswap.run test_byteswap.c)
+add_executable(test_cdf_read.run test_cdf_read.c)
+add_executable(test_cdf_write.run test_cdf_write.c)
+add_executable(test_grib.run test_grib.c)
+add_executable(test_month_adjust.run test_month_adjust.c)
+add_executable(test_resource_copy.run test_resource_copy.c)
+add_executable(test_table.run test_table.c)
+
+get_property(current_targets DIRECTORY ${dir} PROPERTY BUILDSYSTEM_TARGETS)
+list(APPEND test_lib_src
+ var_cksum.c
+ ensure_array_size.c
+ stream_cksum.c
+ simple_model.c
+ simple_model_helper.c
+ pio_write_setup_grid.c
+)
+
+add_library(test_lib ${test_lib_src})
+target_include_directories(test_lib PRIVATE ../src/)
+target_link_libraries(test_lib PRIVATE cdilib ${cdi_linked_libs})
+
+foreach(target ${current_targets})
+ target_include_directories(${target} PRIVATE ../src/)
+ target_link_libraries(${target} PRIVATE cdilib test_lib ${cdi_linked_libs})
+ add_test(NAME ${target} COMMAND ${target})
+ if(labels_${target})
+ set_property(TEST ${target} PROPERTY LABELS labels_${target})
+ endif()
+endforeach()
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d530636e10f01568e32e65549577637f058d3f70..701e1f520f770f9ff03ba40a0483491176c98200 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,7 @@
TEST_EXTENSIONS = @EXEEXT@ .run
+EXTRA_DIST = CMakeLists.txt
+
# Serial tests:
TESTS = \
calendar_test1 \
diff --git a/tests/test_resource_copy.c b/tests/test_resource_copy.c
index ce789c30dabe9dfd5fbf8f62c897b1481afd9b83..ffd2c7793e01a36f2764ec7b56c31b66bdd1d596 100644
--- a/tests/test_resource_copy.c
+++ b/tests/test_resource_copy.c
@@ -63,7 +63,7 @@ defineGrid(void)
cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_UNITS, "myXunits");
cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_UNITS, "myYunits");
- gridDefDatatype(gridID, DOUBLE_PRECISION);
+ cdiDefKeyInt(gridID, CDI_GLOBAL, CDI_KEY_DATATYPE, DOUBLE_PRECISION);
gridDefTrunc(gridID, 1);
gridDefParamGME(gridID, 2, 3, 4, 5);
@@ -164,7 +164,7 @@ defineVlist(int gridID, int zaxisID, int taxisID)
cdiDefAttTxt(vlistID, varID2, "txt demo", 6, "banana");
vlistDefTaxis(vlistID, taxisID);
int vlistID2 = vlistDuplicate(vlistID);
- return (struct idPair){ vlistID, vlistID2 };
+ return (struct idPair) { vlistID, vlistID2 };
}
static int