Merge pull request #2429 from endJunction/ResolveCircularDependencyBheBC

[PL] Resolve circular dep. HTBHE<->BC.

ProcessLib/BoundaryCondition/BHEBottomDirichletBoundaryCondition.cpp → ProcessLib/HeatTransportBHE/BoundaryConditions/BHEBottomDirichletBoundaryCondition.cpp

 /**
+ * \file
  * \copyright
  * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
@@ -10,7 +11,7 @@
 #include "BHEBottomDirichletBoundaryCondition.h"
 #include "BaseLib/Error.h"
 
-namespace ProcessLib
+namespace ProcessLib::HeatTransportBHE
 {
 void BHEBottomDirichletBoundaryCondition::getEssentialBCValues(
     const double /*t*/, GlobalVector const& x,
@@ -54,4 +55,4 @@ createBHEBottomDirichletBoundaryCondition(
     return std::make_unique<BHEBottomDirichletBoundaryCondition>(
         std::move(in_out_global_indices));
 }
-}  // namespace ProcessLib
+}  // namespace ProcessLib::HeatTransportBHE

ProcessLib/BoundaryCondition/BHEBottomDirichletBoundaryCondition.h → ProcessLib/HeatTransportBHE/BoundaryConditions/BHEBottomDirichletBoundaryCondition.h

 /**
+ * \file
  * \copyright
  * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
@@ -9,10 +10,10 @@
 
 #pragma once
 
-#include "BoundaryCondition.h"
 #include "NumLib/IndexValueVector.h"
+#include "ProcessLib/BoundaryCondition/BoundaryCondition.h"
 
-namespace ProcessLib
+namespace ProcessLib::HeatTransportBHE
 {
 class BHEBottomDirichletBoundaryCondition final : public BoundaryCondition
 {
@@ -34,4 +35,4 @@ private:
 std::unique_ptr<BHEBottomDirichletBoundaryCondition>
 createBHEBottomDirichletBoundaryCondition(
     std::pair<GlobalIndexType, GlobalIndexType>&& in_out_global_indices);
-}  // namespace ProcessLib
+}  // namespace ProcessLib::HeatTransportBHE

ProcessLib/BoundaryCondition/BHEInflowDirichletBoundaryCondition.h → ProcessLib/HeatTransportBHE/BoundaryConditions/BHEInflowDirichletBoundaryCondition.h

 /**
+ * \file
  * \copyright
  * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
@@ -9,20 +10,20 @@
 
 #pragma once
 
-#include "BoundaryCondition.h"
 #include "NumLib/IndexValueVector.h"
-#include "ProcessLib/HeatTransportBHE/BHE/BHETypes.h"
+#include "ProcessLib/BoundaryCondition/BoundaryCondition.h"
 
-namespace ProcessLib
+namespace ProcessLib::HeatTransportBHE
 {
-template <typename BHEType>
+template <typename BHEUpdateCallback>
 class BHEInflowDirichletBoundaryCondition final : public BoundaryCondition
 {
 public:
     BHEInflowDirichletBoundaryCondition(
         std::pair<GlobalIndexType, GlobalIndexType>&& in_out_global_indices,
-        BHEType& bhe)
-        : _in_out_global_indices(std::move(in_out_global_indices)), _bhe(bhe)
+        BHEUpdateCallback bhe_update_callback)
+        : _in_out_global_indices(std::move(in_out_global_indices)),
+          _bhe_update_callback(bhe_update_callback)
     {
     }
 
@@ -36,19 +37,19 @@ public:
         bc_values.ids[0] = _in_out_global_indices.first;
         // here call the corresponding BHE functions
         auto const T_out = x[_in_out_global_indices.second];
-        bc_values.values[0] = _bhe.updateFlowRateAndTemperature(T_out, t);
+        bc_values.values[0] = _bhe_update_callback(T_out, t);
     }
 
 private:
     std::pair<GlobalIndexType, GlobalIndexType> const _in_out_global_indices;
-    BHEType& _bhe;
+    BHEUpdateCallback _bhe_update_callback;
 };
 
-template <typename BHEType>
-std::unique_ptr<BHEInflowDirichletBoundaryCondition<BHEType>>
+template <typename BHEUpdateCallback>
+std::unique_ptr<BHEInflowDirichletBoundaryCondition<BHEUpdateCallback>>
 createBHEInflowDirichletBoundaryCondition(
     std::pair<GlobalIndexType, GlobalIndexType>&& in_out_global_indices,
-    BHEType& bhe)
+    BHEUpdateCallback bhe_update_callback)
 {
     DBUG("Constructing BHEInflowDirichletBoundaryCondition.");
 
@@ -71,7 +72,8 @@ createBHEInflowDirichletBoundaryCondition(
     }
 #endif  // USE_PETSC
 
-    return std::make_unique<BHEInflowDirichletBoundaryCondition<BHEType>>(
-        std::move(in_out_global_indices), bhe);
+    return std::make_unique<
+        BHEInflowDirichletBoundaryCondition<BHEUpdateCallback>>(
+        std::move(in_out_global_indices), bhe_update_callback);
 }
-}  // namespace ProcessLib
+}  // namespace ProcessLib::HeatTransportBHE

ProcessLib/HeatTransportBHE/CMakeLists.txt

 APPEND_SOURCE_FILES(SOURCES)
 APPEND_SOURCE_FILES(SOURCES BHE)
+APPEND_SOURCE_FILES(SOURCES BoundaryConditions)
 APPEND_SOURCE_FILES(SOURCES LocalAssemblers)
 
 add_library(HeatTransportBHE ${SOURCES})

ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp

@@ -16,8 +16,8 @@
 #include "ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerBHE.h"
 #include "ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerSoil.h"
 
-#include "ProcessLib/BoundaryCondition/BHEBottomDirichletBoundaryCondition.h"
-#include "ProcessLib/BoundaryCondition/BHEInflowDirichletBoundaryCondition.h"
+#include "BoundaryConditions/BHEBottomDirichletBoundaryCondition.h"
+#include "BoundaryConditions/BHEInflowDirichletBoundaryCondition.h"
 
 namespace ProcessLib
 {
@@ -241,14 +241,16 @@ void HeatTransportBHEProcess::createBHEBoundaryConditionTopBottom(
             {
                 // Top, inflow.
                 bcs.addBoundaryCondition(
-                    ProcessLib::createBHEInflowDirichletBoundaryCondition(
+                    createBHEInflowDirichletBoundaryCondition(
                         get_global_bhe_bc_indices(bc_top_node_id,
                                                   in_out_component_id),
-                        bhe));
+                        [&bhe](double const T, double const t) {
+                            return bhe.updateFlowRateAndTemperature(T, t);
+                        }));
 
                 // Bottom, outflow.
                 bcs.addBoundaryCondition(
-                    ProcessLib::createBHEBottomDirichletBoundaryCondition(
+                    createBHEBottomDirichletBoundaryCondition(
                         get_global_bhe_bc_indices(bc_bottom_node_id,
                                                   in_out_component_id)));
             }