From 466bdafabfa27cfdbbf4e8bd61ea7e6adf3d4a3c Mon Sep 17 00:00:00 2001
From: Tor Harald Sandve <tosa@norceresearch.no>
Date: Fri, 21 Apr 2023 15:45:42 +0200
Subject: [PATCH] support BC in schedule

---
 .../blackoil/blackoillocalresidualtpfa.hh     |  2 +-
 .../discretization/common/fvbaselinearizer.hh |  5 ++++
 .../discretization/common/tpfalinearizer.hh   | 28 +++++++++++++++----
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh
index 49257b633..e77fa5ed6 100644
--- a/opm/models/blackoil/blackoillocalresidualtpfa.hh
+++ b/opm/models/blackoil/blackoillocalresidualtpfa.hh
@@ -443,7 +443,7 @@ public:
     {
         if (bdyInfo.type == BCType::RATE) {
             computeBoundaryFluxRate(bdyFlux, bdyInfo);
-        } else if (bdyInfo.type == BCType::FREE) {
+        } else if (bdyInfo.type == BCType::FREE || bdyInfo.type == BCType::DIRICHLET) {
             computeBoundaryFluxFree(problem, bdyFlux, bdyInfo, insideIntQuants, globalSpaceIdx);
         } else {
             throw std::logic_error("Unknown boundary condition type " + std::to_string(static_cast<int>(bdyInfo.type)) + " in computeBoundaryFlux()." );
diff --git a/opm/models/discretization/common/fvbaselinearizer.hh b/opm/models/discretization/common/fvbaselinearizer.hh
index 989809d77..e36a7d272 100644
--- a/opm/models/discretization/common/fvbaselinearizer.hh
+++ b/opm/models/discretization/common/fvbaselinearizer.hh
@@ -306,6 +306,11 @@ public:
         // This linearizer stores no such parameters.
     }
 
+    void updateBoundaryConditionData()
+    {
+        // This linearizer stores no such data.
+    }
+
     /*!
      * \brief Returns the map of constraint degrees of freedom.
      *
diff --git a/opm/models/discretization/common/tpfalinearizer.hh b/opm/models/discretization/common/tpfalinearizer.hh
index 438c87672..0544fe93d 100644
--- a/opm/models/discretization/common/tpfalinearizer.hh
+++ b/opm/models/discretization/common/tpfalinearizer.hh
@@ -331,6 +331,24 @@ public:
         updateStoredTransmissibilities();
     }
 
+    void updateBoundaryConditionData() {
+        for (auto& bdyInfo : boundaryInfo_) {
+            const auto [type, massrateAD] = problem_().boundaryCondition(bdyInfo.cell, bdyInfo.dir);
+
+            // Strip the unnecessary (and zero anyway) derivatives off massrate.
+            VectorBlock massrate(0.0);
+            for (size_t ii = 0; ii < massrate.size(); ++ii) {
+                massrate[ii] = massrateAD[ii].value();
+            }
+            if (type != BCType::NONE) {
+                const auto& exFluidState = problem_().boundaryFluidState(bdyInfo.cell, bdyInfo.dir);
+                bdyInfo.bcdata.type = type;
+                bdyInfo.bcdata.massRate = massrate;
+                bdyInfo.bcdata.exFluidState = exFluidState;
+            }
+        }
+    }
+
     /*!
      * \brief Returns the map of constraint degrees of freedom.
      *
@@ -431,23 +449,22 @@ private:
                 for (unsigned bfIndex = 0; bfIndex < stencil.numBoundaryFaces(); ++bfIndex) {
                     const auto& bf = stencil.boundaryFace(bfIndex);
                     const int dir_id = bf.dirId();
-                    const auto [free, massrateAD] = problem_().boundaryCondition(myIdx, dir_id);
+                    const auto [type, massrateAD] = problem_().boundaryCondition(myIdx, dir_id);
                     // Strip the unnecessary (and zero anyway) derivatives off massrate.
                     VectorBlock massrate(0.0);
                     for (size_t ii = 0; ii < massrate.size(); ++ii) {
                         massrate[ii] = massrateAD[ii].value();
                     }
-                    const bool nonzero_massrate = massrate != VectorBlock(0.0);
-                    if (free || nonzero_massrate) {
+                    if (type!=BCType::NONE) {
                         const auto& exFluidState = problem_().boundaryFluidState(myIdx, dir_id);
-                        BoundaryConditionData bcdata{free ? BCType::FREE : BCType::RATE,
+                        BoundaryConditionData bcdata{type,
                                                      massrate,
                                                      exFluidState.pvtRegionIndex(),
                                                      bfIndex,
                                                      bf.area(),
                                                      bf.integrationPos()[dimWorld - 1],
                                                      exFluidState};
-                        boundaryInfo_.push_back({myIdx, bcdata});
+                        boundaryInfo_.push_back({myIdx, dir_id, bcdata});
                     }
                 }
             }
@@ -804,6 +821,7 @@ private:
     struct BoundaryInfo
     {
         unsigned int cell;
+        int dir;
         BoundaryConditionData bcdata;
     };
     std::vector<BoundaryInfo> boundaryInfo_;