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

make THPRESFT support non-experimental

Browse Source
This commit is contained in:
Arne Morten Kvarving 2022-11-23 12:48:28 +01:00
parent a7c0661669
commit b325fe65aa
3 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ebos/eclgenericthresholdpressure.cc
View File

@ -61,14 +61,12 @@ EclGenericThresholdPressure(const CartesianIndexMapper& cartMapper,
const GridView& gridView,
const ElementMapper& elementMapper,
const EclipseState& eclState,
const Deck& deck,
bool enableExperiments)
const Deck& deck)
: cartMapper_(cartMapper)
, gridView_(gridView)
, elementMapper_(elementMapper)
, eclState_(eclState)
, deck_(deck)
, enableExperiments_(enableExperiments)
{
}
@ -79,28 +77,26 @@ thresholdPressure(int elem1Idx, int elem2Idx) const
if (!enableThresholdPressure_)
return 0.0;
if (enableExperiments_) {
// threshold pressure accross faults
if (!thpresftValues_.empty()) {
int cartElem1Idx = cartMapper_.cartesianIndex(elem1Idx);
int cartElem2Idx = cartMapper_.cartesianIndex(elem2Idx);
// threshold pressure accross faults
if (!thpresftValues_.empty()) {
int cartElem1Idx = cartMapper_.cartesianIndex(elem1Idx);
int cartElem2Idx = cartMapper_.cartesianIndex(elem2Idx);
assert(0 <= cartElem1Idx && static_cast<int>(cartElemFaultIdx_.size()) > cartElem1Idx);
assert(0 <= cartElem2Idx && static_cast<int>(cartElemFaultIdx_.size()) > cartElem2Idx);
assert(0 <= cartElem1Idx && static_cast<int>(cartElemFaultIdx_.size()) > cartElem1Idx);
assert(0 <= cartElem2Idx && static_cast<int>(cartElemFaultIdx_.size()) > cartElem2Idx);
int fault1Idx = cartElemFaultIdx_[cartElem1Idx];
int fault2Idx = cartElemFaultIdx_[cartElem2Idx];
if (fault1Idx != -1 && fault1Idx == fault2Idx)
// inside a fault there's no threshold pressure, even accross EQUIL
// regions.
return 0.0;
if (fault1Idx != fault2Idx) {
// TODO: which value if a cell is part of multiple faults? we take
// the maximum here.
Scalar val1 = (fault1Idx >= 0) ? thpresftValues_[fault1Idx] : 0.0;
Scalar val2 = (fault2Idx >= 0) ? thpresftValues_[fault2Idx] : 0.0;
return std::max(val1, val2);
}
int fault1Idx = cartElemFaultIdx_[cartElem1Idx];
int fault2Idx = cartElemFaultIdx_[cartElem2Idx];
if (fault1Idx != -1 && fault1Idx == fault2Idx)
// inside a fault there's no threshold pressure, even accross EQUIL
// regions.
return 0.0;
if (fault1Idx != fault2Idx) {
// TODO: which value if a cell is part of multiple faults? we take
// the maximum here.
Scalar val1 = (fault1Idx >= 0) ? thpresftValues_[fault1Idx] : 0.0;
Scalar val2 = (fault2Idx >= 0) ? thpresftValues_[fault2Idx] : 0.0;
return std::max(val1, val2);
}
}
@ -199,11 +195,9 @@ applyExplicitThresholdPressures_()
}
}
if (enableExperiments_) {
// apply threshold pressures accross faults (experimental!)
if (thpres.ftSize() > 0)
configureThpresft_();
}
// apply threshold pressures across faults
if (thpres.ftSize() > 0)
configureThpresft_();
}
template<class Grid, class GridView, class ElementMapper, class Scalar>
@ -215,7 +209,7 @@ configureThpresft_()
const SimulationConfig& simConfig = eclState_.getSimulationConfig();
const auto& thpres = simConfig.getThresholdPressure();
// extract the multipliers from the deck keyword
// extract the multipliers
int numFaults = faults.size();
int numCartesianElem = eclState_.getInputGrid().getCartesianSize();
thpresftValues_.resize(numFaults, -1.0);

4
ebos/eclgenericthresholdpressure.hh
View File

@ -47,8 +47,7 @@ public:
const GridView& gridView,
const ElementMapper& elementMapper,
const EclipseState& eclState,
const Deck& deck,
bool enableExperiments);
const Deck& deck);
/*!
* \brief Returns the theshold pressure [Pa] for the intersection between two elements.
@ -103,7 +102,6 @@ protected:
std::vector<int> cartElemFaultIdx_;
bool enableThresholdPressure_;
bool enableExperiments_;
};
} // namespace Opm

4
ebos/eclthresholdpressure.hh
View File

@ -67,7 +67,6 @@ class EclThresholdPressure : public EclGenericThresholdPressure<GetPropType<Type
using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
enum { enableExperiments = getPropValue<TypeTag, Properties::EnableExperiments>() };
enum { numPhases = FluidSystem::numPhases };
public:
@ -76,8 +75,7 @@ public:
simulator.vanguard().gridView(),
simulator.model().elementMapper(),
simulator.vanguard().eclState(),
simulator.vanguard().deck(),
enableExperiments)
simulator.vanguard().deck())
, simulator_(simulator)
{
}