From 8fe3b05c2449a0fc9c0a49df2054728fe272b3a3 Mon Sep 17 00:00:00 2001 From: David Bold Date: Thu, 19 Mar 2026 12:27:56 +0100 Subject: [PATCH 1/3] Apply clang-tidy recommendations --- include/bout/paralleltransform.hxx | 1 + src/mesh/parallel/fci.cxx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/bout/paralleltransform.hxx b/include/bout/paralleltransform.hxx index 0b425de209..d9ed397bb5 100644 --- a/include/bout/paralleltransform.hxx +++ b/include/bout/paralleltransform.hxx @@ -9,6 +9,7 @@ #include "bout/bout_types.hxx" #include "bout/dcomplex.hxx" #include "bout/field3d.hxx" +#include "bout/field_data.hxx" #include "bout/options.hxx" #include "bout/unused.hxx" diff --git a/src/mesh/parallel/fci.cxx b/src/mesh/parallel/fci.cxx index 6b7dfaa26b..c92cdfd6c9 100644 --- a/src/mesh/parallel/fci.cxx +++ b/src/mesh/parallel/fci.cxx @@ -41,6 +41,7 @@ #include "bout/assert.hxx" #include "bout/bout_types.hxx" #include "bout/boutexception.hxx" +#include "bout/build_defines.hxx" #include "bout/field2d.hxx" #include "bout/field3d.hxx" #include "bout/field_data.hxx" @@ -66,7 +67,7 @@ using namespace std::string_view_literals; namespace { // Get a unique name for a field based on the sign/magnitude of the offset -std::string parallel_slice_field_name(std::string field, int offset) { +std::string parallel_slice_field_name(const std::string& field, int offset) { const std::string direction = (offset > 0) ? "forward" : "backward"; // We only have a suffix for parallel slices beyond the first // This is for backwards compatibility From ce5d26adfe528cf55c090e59461301889268a488 Mon Sep 17 00:00:00 2001 From: David Bold Date: Thu, 19 Mar 2026 12:28:57 +0100 Subject: [PATCH 2/3] coords is only used for 3D build --- src/mesh/parallel/fci.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh/parallel/fci.cxx b/src/mesh/parallel/fci.cxx index c92cdfd6c9..bf89932479 100644 --- a/src/mesh/parallel/fci.cxx +++ b/src/mesh/parallel/fci.cxx @@ -456,7 +456,7 @@ void FCITransform::outputVars(Options& output_options) { output_options["Z"].force(Z, "FCI"); } -void FCITransform::loadParallelMetrics(Coordinates* coords) { +void FCITransform::loadParallelMetrics([[maybe_unused]] Coordinates* coords) { #if BOUT_USE_METRIC_3D const auto JB0 = coords->J * coords->Bxy; coords->J.splitParallelSlices(); From aa8cc4cd8ca74b6d67a2a71d92c1c87b54c020b9 Mon Sep 17 00:00:00 2001 From: David Bold Date: Thu, 7 May 2026 08:27:21 +0200 Subject: [PATCH 3/3] zoidberg 0.3.0 is released This includes the needed fixes, thus no workaround needed anymore --- .ci_fedora.sh | 2 -- .github/workflows/tests.yml | 1 - requirements.txt | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.ci_fedora.sh b/.ci_fedora.sh index 8214a40ccc..e1dc563c6c 100755 --- a/.ci_fedora.sh +++ b/.ci_fedora.sh @@ -47,8 +47,6 @@ test . != ".$1" && mpi="$1" || mpi=openmpi export OMP_NUM_THREADS=1 cd cd BOUT-dev - python3 -m ensurepip - python3 -m pip install git+https://github.com/boutproject/zoidberg@better-metric echo "starting configure" time cmake -S . -B build -DBOUT_USE_PETSC=ON \ -DBOUT_UPDATE_GIT_SUBMODULE=OFF \ diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8919f82df1..ff11a2a4c9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -166,7 +166,6 @@ jobs: run: | python -m pip install --upgrade pip setuptools python -m pip install -r requirements.txt - python -m pip install git+https://github.com/boutproject/zoidberg@better-metric - name: Cache Zenodo test data uses: actions/cache@v5 diff --git a/requirements.txt b/requirements.txt index 078eecac6d..9b06edfd8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ netcdf4>=1.7.1 matplotlib>=3.7.0 Cython>=3.0.0 boutdata>=0.3.0 -zoidberg>=0.2.2 +zoidberg>=0.3.0