diff --git a/config/default b/config/default
index e4077c1c3653356c81993cc2acc60e2d4b404ae5..946513ceae0241bca6a3a3f1077c5b661e17bacd 100755
--- a/config/default
+++ b/config/default
@@ -71,55 +71,55 @@ case "${HOSTNAME}" in
--enable-maintainer-mode \
$CDOLIBS \
LDFLAGS="$LDFLAGS" \
- CXX=clang++ CXXFLAGS="-g -Wall -Wextra -Wshadow -O3 -std=c++23" \
- CC=clang CFLAGS="-g -Wall -Wextra -Wshadow -O3"
+ CXX=clang++ CXXFLAGS="-g -Wall -Wextra -Wshadow -O3 -std=c++23" \
+ CC=clang CFLAGS="-g -Wall -Wextra -Wshadow -O3"
elif test "$COMP" = gnu4.9 ; then
${CONFPATH}configure --prefix=$HOME/local \
$CDOLIBS \
LDFLAGS="$LDFLAGS" \
- CXX=g++-mp-4.9 CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3" \
+ CXX=g++-mp-4.9 CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3" \
CC=gcc-mp-4.9 CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3"
elif test "$COMP" = gnu5 ; then
${CONFPATH}configure --prefix=$HOME/local \
$CDOLIBS \
LDFLAGS="$LDFLAGS" \
- CXX=g++-mp-5 CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3" \
+ CXX=g++-mp-5 CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3" \
CC=gcc-mp-5 CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3"
elif test "$COMP" = gnu_pic ; then
- ${CONFPATH}configure \
+ ${CONFPATH}configure \
$CDOLIBS \
LDFLAGS="$LDFLAGS" \
- CXX=g++ CXXFLAGS="-g -fPIC" \
+ CXX=g++ CXXFLAGS="-g -fPIC" \
CC=gcc CFLAGS="-g -fPIC"
elif test "$COMP" = gnu_stack ; then
- ${CONFPATH}configure \
+ ${CONFPATH}configure \
$CDOLIBS \
LDFLAGS="$LDFLAGS" \
- CXX=g++ CXXFLAGS="-g -O2 -fstack-protector-strong" \
+ CXX=g++ CXXFLAGS="-g -O2 -fstack-protector-strong" \
CC=gcc CFLAGS="-g -O2 -fstack-protector-strong"
elif test "$COMP" = gribapi ; then
- ${CONFPATH}configure --disable-cgribex \
+ ${CONFPATH}configure --disable-cgribex \
$CDOLIBS \
LDFLAGS="$LDFLAGS" \
- CXX=g++ CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3" \
+ CXX=g++ CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3" \
CC=gcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3"
elif test "$COMP" = hirlam_extensions ; then
- ${CONFPATH}configure --enable-hirlam-extensions \
+ ${CONFPATH}configure --enable-hirlam-extensions \
$CDOLIBS \
LDFLAGS="$LDFLAGS" \
- CXX=g++ CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3" \
+ CXX=g++ CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3" \
CC=gcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3"
elif test "$COMP" = without_threads ; then
- ${CONFPATH}configure --without-threads \
+ ${CONFPATH}configure --without-threads \
$CDOLIBS \
LDFLAGS="$LDFLAGS" \
- CXX=clang++ CXXFLAGS="-g -Wall -Wextra -O3 -fsanitize=address -fno-omit-frame-pointer" \
+ CXX=clang++ CXXFLAGS="-g -Wall -Wextra -O3 -fsanitize=address -fno-omit-frame-pointer" \
CC=clang CFLAGS="-g -Wall -Wextra -O3 -fsanitize=address -fno-omit-frame-pointer"
elif test "$COMP" = disable_openmp ; then
- ${CONFPATH}configure --disable-openmp \
+ ${CONFPATH}configure --disable-openmp \
$CDOLIBS \
LDFLAGS="$LDFLAGS" \
- CXX=clang++ CXXFLAGS="-g -Wall -Wextra -O3 -fsanitize=address -fno-omit-frame-pointer" \
+ CXX=clang++ CXXFLAGS="-g -Wall -Wextra -O3 -fsanitize=address -fno-omit-frame-pointer" \
CC=clang CFLAGS="-g -Wall -Wextra -O3 -fsanitize=address -fno-omit-frame-pointer"
elif test "$COMP" = sanitize_address ; then
${CONFPATH}configure \
diff --git a/libcdi b/libcdi
index 26fa6b8dba31cd80dcbcaef2b4991837800567af..cf8e957e756279c23be849352d55ae0e55ddf164 160000
--- a/libcdi
+++ b/libcdi
@@ -1 +1 @@
-Subproject commit 26fa6b8dba31cd80dcbcaef2b4991837800567af
+Subproject commit cf8e957e756279c23be849352d55ae0e55ddf164
diff --git a/src/Diff.cc b/src/Diff.cc
index e139f4c6c84a9bdcffea39b485d007eee04a89c2..9b74d3db70934832bb1e02ca09fe9b6ee95c1f00 100644
--- a/src/Diff.cc
+++ b/src/Diff.cc
@@ -356,7 +356,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
auto operatorID = cdo_operator_id();
operfunc = cdo_operator_f1(operatorID);
diff --git a/src/Filedes.cc b/src/Filedes.cc
index cd143cb6a01f0b62c05ef8501277de9e2826e64f..a9f80dec6686ef615df8b0498bbbee567b6d3abc 100644
--- a/src/Filedes.cc
+++ b/src/Filedes.cc
@@ -272,7 +272,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
auto GRIDDES = module.get_id("griddes");
auto GRIDDES2 = module.get_id("griddes2");
diff --git a/src/Getgridcell.cc b/src/Getgridcell.cc
index 5f54166d5494f619af4aa6c4a256eae7ff104c92..baaad7896476478fc30726a624662ad9791b85da 100644
--- a/src/Getgridcell.cc
+++ b/src/Getgridcell.cc
@@ -132,7 +132,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
gridPoint = get_parameter();
diff --git a/src/Info.cc b/src/Info.cc
index 27a27a6beecf2ee8e21eeff0c9410320f4c28c04..7107bb9445f961a6b367d613c1c8f03f5e73a32f 100644
--- a/src/Info.cc
+++ b/src/Info.cc
@@ -478,7 +478,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
auto VINFON = module.get_id("vinfon");
auto XINFON = module.get_id("xinfon");
diff --git a/src/Longinfo.cc b/src/Longinfo.cc
index ba157d8178d73ff1458f021f7d0902ed7bc7b321..f5cfba61bbf3c641777001dfb303c7fbdc788949 100644
--- a/src/Longinfo.cc
+++ b/src/Longinfo.cc
@@ -178,7 +178,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
operator_check_argc(0);
diff --git a/src/Ninfo.cc b/src/Ninfo.cc
index 35a5c041a9e44df1fb1bcdd3cfc7934093831c8e..c40677bfd38fd1f39b99213b64e3bedd48f27dfc 100644
--- a/src/Ninfo.cc
+++ b/src/Ninfo.cc
@@ -68,7 +68,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
auto operatorID = cdo_operator_id();
operfunc = cdo_operator_f1(operatorID);
@@ -167,10 +167,10 @@ public:
}
case NPAR: fprintf(stdout, "%d\n", numVars); break;
case NLEVEL:
- for (int varID = 0; varID < numVars; ++varID) { fprintf(stdout, "%d\n", varList.vars[varID].nlevels); }
+ for (const auto &var : varList.vars) { fprintf(stdout, "%d\n", var.nlevels); }
break;
case NGRIDPOINTS:
- for (int varID = 0; varID < numVars; ++varID) { fprintf(stdout, "%zu\n", varList.vars[varID].gridsize); }
+ for (const auto &var : varList.vars) { fprintf(stdout, "%zu\n", var.gridsize); }
break;
case NGRIDS: fprintf(stdout, "%d\n", ngrids); break;
default: cdo_abort("operator not implemented!"); break;
diff --git a/src/Showattribute.cc b/src/Showattribute.cc
index a7f61b6ef022c63e7bf5bfb81507c34f16a26c14..49c11cff15489e6709d47d730444eaac9ea8d589 100644
--- a/src/Showattribute.cc
+++ b/src/Showattribute.cc
@@ -238,7 +238,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
SHOWATTRIBUTE = module.get_id("showattribute");
SHOWATTSVAR = module.get_id("showattsvar");
diff --git a/src/Showinfo.cc b/src/Showinfo.cc
index 35b194edfaab84c2a0a368ad12e8772d56c4a5aa..ade7baaf4e7d7ce6b77d023ae53216dfd99e4f2d 100644
--- a/src/Showinfo.cc
+++ b/src/Showinfo.cc
@@ -360,7 +360,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
auto SHOWYEAR = module.get_id("showyear");
auto SHOWMON = module.get_id("showmon");
diff --git a/src/Sinfo.cc b/src/Sinfo.cc
index 49ac21dbe005355ed67b22de47daf4d09dfcc343..95c4d1801c042c6535825bc8c146e83a7ace75a2 100644
--- a/src/Sinfo.cc
+++ b/src/Sinfo.cc
@@ -400,7 +400,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
auto operatorID = cdo_operator_id();
diff --git a/src/Tinfo.cc b/src/Tinfo.cc
index fa3d2246bc5a63e515dad882f16d7c8e436eb0f4..f95a43e9b7cf88425b4e9aef8788986ee7ec0d97 100644
--- a/src/Tinfo.cc
+++ b/src/Tinfo.cc
@@ -148,7 +148,7 @@ public:
void
init() override
{
- if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
+ // if (this_is_the_only_process()) { cdiDefGlobal("NETCDF_LAZY_GRID_LOAD", true); }
operator_check_argc(0);