From 5f2a048132273ca5a7d8d3ac31b05a3cb2fa7072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= <hakon.hagland@gmail.com>
Date: Wed, 18 Mar 2026 16:37:26 +0100
Subject: [PATCH] Fix build without Zoltan when MPI is enabled

Move general MPI includes (DeferredLogger, DeferredLoggingErrorHelpers,
gatherDeferredLogger, MPISerializer, Well headers) from
These are used by partitionCellsFromFileMPI() which is in a

Move ParallelNLDDPartitioningZoltan.cpp from the MPI source list to
a nested if(ZOLTAN_FOUND) block in CMakeLists_files.cmake, since it
directly includes <zoltan.h>.
---
 CMakeLists_files.cmake                 |  4 +++-
 opm/simulators/flow/partitionCells.cpp | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 0f162f12aec..efe40e22980 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -457,11 +457,13 @@ endif()
 if(MPI_FOUND)
   list(APPEND MAIN_SOURCE_FILES opm/simulators/utils/MPIPacker.cpp
                                 opm/simulators/utils/ParallelEclipseState.cpp
-                                opm/simulators/utils/ParallelNLDDPartitioningZoltan.cpp
                                 opm/simulators/utils/ParallelSerialization.cpp
                                 opm/simulators/utils/SetupPartitioningParams.cpp)
   list(APPEND PUBLIC_HEADER_FILES opm/simulators/utils/MPIPacker.hpp
                                   opm/simulators/utils/MPISerializer.hpp)
+  if(ZOLTAN_FOUND)
+    list(APPEND MAIN_SOURCE_FILES opm/simulators/utils/ParallelNLDDPartitioningZoltan.cpp)
+  endif()
 endif()
 if(HDF5_FOUND)
   list(APPEND MAIN_SOURCE_FILES opm/simulators/utils/HDF5File.cpp)
diff --git a/opm/simulators/flow/partitionCells.cpp b/opm/simulators/flow/partitionCells.cpp
index 8d4e42e396c..b18e0a8c959 100644
--- a/opm/simulators/flow/partitionCells.cpp
+++ b/opm/simulators/flow/partitionCells.cpp
@@ -25,21 +25,21 @@
 
 #include <opm/simulators/utils/compressPartition.hpp>
 
-#if HAVE_MPI && HAVE_ZOLTAN
+#if HAVE_MPI
 #include <opm/simulators/utils/DeferredLogger.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/gatherDeferredLogger.hpp>
-#include <opm/simulators/utils/ParallelNLDDPartitioningZoltan.hpp>
-#include <opm/simulators/utils/SetupPartitioningParams.hpp>
+#include <opm/simulators/utils/MPISerializer.hpp>
 
 #include <opm/input/eclipse/Schedule/Well/Connection.hpp>
 #include <opm/input/eclipse/Schedule/Well/Well.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellConnections.hpp>
-#endif // HAVE_MPI && HAVE_ZOLTAN
+#endif // HAVE_MPI
 
-#if HAVE_MPI
-#include <opm/simulators/utils/MPISerializer.hpp>
-#endif
+#if HAVE_MPI && HAVE_ZOLTAN
+#include <opm/simulators/utils/ParallelNLDDPartitioningZoltan.hpp>
+#include <opm/simulators/utils/SetupPartitioningParams.hpp>
+#endif // HAVE_MPI && HAVE_ZOLTAN
 
 #include <opm/grid/CpGrid.hpp>
 #include <opm/grid/polyhedralgrid.hh>