OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #802 from totto82/bc_schedule

Browse Source 
support BC in schedule
This commit is contained in:
Tor Harald Sandve 2023-06-28 16:26:59 +02:00 committed by GitHub
commit f40e7042cb
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/models/blackoil/blackoillocalresidualtpfa.hh
View File

@ -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()." );

5
opm/models/discretization/common/fvbaselinearizer.hh
View File

@ -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.
*

28
opm/models/discretization/common/tpfalinearizer.hh
View File

@ -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_;