From 3024fba293515addbfc0f8c851f1f3a6d4fffafc Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Thu, 2 May 2024 11:31:23 +0200
Subject: [PATCH] fixed: properly avoid inclusion of BDA types if BDA is
 disabled

---
 opm/simulators/wells/BlackoilWellModel.hpp      | 6 ++++++
 opm/simulators/wells/BlackoilWellModel_impl.hpp | 5 +++++
 opm/simulators/wells/MultisegmentWellEval.hpp   | 3 ---
 opm/simulators/wells/MultisegmentWell_impl.hpp  | 2 +-
 opm/simulators/wells/StandardWellEval.cpp       | 1 -
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/opm/simulators/wells/BlackoilWellModel.hpp b/opm/simulators/wells/BlackoilWellModel.hpp
index ad2ca97eb..46f830191 100644
--- a/opm/simulators/wells/BlackoilWellModel.hpp
+++ b/opm/simulators/wells/BlackoilWellModel.hpp
@@ -89,6 +89,10 @@ struct EnableTerminalOutput {
 
 namespace Opm {
 
+#if COMPILE_BDA_BRIDGE
+class WellContributions;
+#endif
+
         /// Class for handling the blackoil well model.
         template<typename TypeTag>
         class BlackoilWellModel : public BaseAuxiliaryModule<TypeTag>
@@ -281,8 +285,10 @@ namespace Opm {
             // subtract B*inv(D)*C * x from A*x
             void apply(const BVector& x, BVector& Ax) const;
 
+#if COMPILE_BDA_BRIDGE
             // accumulate the contributions of all Wells in the WellContributions object
             void getWellContributions(WellContributions& x) const;
+#endif
 
             // apply well model with scaling of alpha
             void applyScaleAdd(const Scalar alpha, const BVector& x, BVector& Ax) const;
diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
index c8cb82e96..cfc706db6 100644
--- a/opm/simulators/wells/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -41,7 +41,10 @@
 #include <opm/simulators/wells/ParallelWBPCalculation.hpp>
 #include <opm/simulators/wells/VFPProperties.hpp>
 #include <opm/simulators/utils/MPIPacker.hpp>
+
+#if COMPILE_BDA_BRIDGE
 #include <opm/simulators/linalg/bda/WellContributions.hpp>
+#endif
 
 #if HAVE_MPI
 #include <opm/simulators/utils/MPISerializer.hpp>
@@ -1556,6 +1559,7 @@ namespace Opm {
         }
     }
 
+#if COMPILE_BDA_BRIDGE
     template<typename TypeTag>
     void
     BlackoilWellModel<TypeTag>::
@@ -1591,6 +1595,7 @@ namespace Opm {
             }
         }
     }
+#endif
 
     // Ax = Ax - alpha * C D^-1 B x
     template<typename TypeTag>
diff --git a/opm/simulators/wells/MultisegmentWellEval.hpp b/opm/simulators/wells/MultisegmentWellEval.hpp
index b6a8ff584..93f30e0eb 100644
--- a/opm/simulators/wells/MultisegmentWellEval.hpp
+++ b/opm/simulators/wells/MultisegmentWellEval.hpp
@@ -29,8 +29,6 @@
 
 #include <opm/material/densead/Evaluation.hpp>
 
-#include <array>
-#include <memory>
 #include <utility>
 #include <vector>
 
@@ -39,7 +37,6 @@ namespace Opm
 
 class ConvergenceReport;
 class Schedule;
-class WellContributions;
 class SummaryState;
 
 template<class FluidSystem, class Indices> class WellInterfaceIndices;
diff --git a/opm/simulators/wells/MultisegmentWell_impl.hpp b/opm/simulators/wells/MultisegmentWell_impl.hpp
index ef37a8b9a..a2e936bb7 100644
--- a/opm/simulators/wells/MultisegmentWell_impl.hpp
+++ b/opm/simulators/wells/MultisegmentWell_impl.hpp
@@ -46,7 +46,7 @@
 #include <cstddef>
 #include <string>
 
-#if HAVE_CUDA || HAVE_OPENCL
+#if COMPILE_BDA_BRIDGE && (HAVE_CUDA || HAVE_OPENCL)
 #include <opm/simulators/linalg/bda/WellContributions.hpp>
 #endif
 
diff --git a/opm/simulators/wells/StandardWellEval.cpp b/opm/simulators/wells/StandardWellEval.cpp
index fcb685e1c..f564072d7 100644
--- a/opm/simulators/wells/StandardWellEval.cpp
+++ b/opm/simulators/wells/StandardWellEval.cpp
@@ -35,7 +35,6 @@
 #include <opm/simulators/wells/WellConvergence.hpp>
 #include <opm/simulators/wells/WellInterfaceIndices.hpp>
 #include <opm/simulators/wells/WellState.hpp>
-#include <opm/simulators/linalg/bda/WellContributions.hpp>
 
 #include <cmath>
 #include <cstddef>