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 #5 from atgeirr/hnil-scaled_blackoil_new

Browse Source 
Fix compile errors for non-blackoil models.
This commit is contained in:
Halvor Møll Nilsen 2024-01-19 09:27:51 +01:00 committed by GitHub
commit f858b65602
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
opm/models/blackoil/blackoilprimaryvariables.hh
View File

@ -208,38 +208,41 @@ public:
return result; return result;
} }
//template <class TypeTag>
static void init() static void init()
{ {
// TODO: these parameters have undocumented non-trivial dependencies // TODO: these parameters have undocumented non-trivial dependencies
pressureScale_ = EWOMS_GET_PARAM(TypeTag, double, PressureScale); pressureScale_ = EWOMS_GET_PARAM(TypeTag, double, PressureScale);
} }
//template <class TypeTag>
static void registerParameters() static void registerParameters()
{ {
EWOMS_REGISTER_PARAM(TypeTag, double, PressureScale, "Scaling of pressure primary variable"); EWOMS_REGISTER_PARAM(TypeTag, double, PressureScale, "Scaling of pressure primary variable");
} }
void setPressureScale(Scalar val){ void setPressureScale(Scalar val)
{
pressureScale_ = val; pressureScale_ = val;
} }
Evaluation makeEvaluation(unsigned varIdx, unsigned timeIdx, LinearizationType linearizationType = LinearizationType()) const Evaluation
makeEvaluation(unsigned varIdx, unsigned timeIdx, LinearizationType linearizationType = LinearizationType()) const
{ {
Scalar scale = 1.0; Scalar scale = 1.0;
if(varIdx == pressureSwitchIdx){ if (varIdx == pressureSwitchIdx) {
scale = this->pressureScale_; scale = this->pressureScale_;
} }
if (std::is_same<Evaluation, Scalar>::value) if (std::is_same<Evaluation, Scalar>::value)
return (*this)[varIdx]*scale; // finite differences return (*this)[varIdx] * scale; // finite differences
else { else {
// automatic differentiation // automatic differentiation
if (timeIdx == linearizationType.time) if (timeIdx == linearizationType.time)
return Toolbox::createVariable((*this)[varIdx], varIdx)*scale; return Toolbox::createVariable((*this)[varIdx], varIdx) * scale;
else else
return Toolbox::createConstant((*this)[varIdx])*scale; return Toolbox::createConstant((*this)[varIdx]) * scale;
} }
} }
/*! /*!
* \brief Set the index of the region which should be used for PVT properties. * \brief Set the index of the region which should be used for PVT properties.
* *
@ -693,7 +696,7 @@ public:
// if gas phase disappeares: Sw (water saturation) -> Rsw (fraction of gas in water phase) // if gas phase disappeares: Sw (water saturation) -> Rsw (fraction of gas in water phase)
// and Pg (gas pressure) -> Pw ( water pressure) // and Pg (gas pressure) -> Pw ( water pressure)
if(sg < -eps && sw > eps && FluidSystem::enableDissolvedGasInWater()) { if(sg < -eps && sw > eps && FluidSystem::enableDissolvedGasInWater()) {
const Scalar& pg = this->pressure_(); const Scalar pg = this->pressure_();
assert(primaryVarsMeaningPressure() == PressureMeaning::Pg); assert(primaryVarsMeaningPressure() == PressureMeaning::Pg);
std::array<Scalar, numPhases> pC = { 0.0 }; std::array<Scalar, numPhases> pC = { 0.0 };
const MaterialLawParams& matParams = problem.materialLawParams(globalDofIdx); const MaterialLawParams& matParams = problem.materialLawParams(globalDofIdx);
@ -757,7 +760,7 @@ public:
std::array<Scalar, numPhases> pC = { 0.0 }; std::array<Scalar, numPhases> pC = { 0.0 };
const MaterialLawParams& matParams = problem.materialLawParams(globalDofIdx); const MaterialLawParams& matParams = problem.materialLawParams(globalDofIdx);
computeCapillaryPressures_(pC, /*so=*/ 0.0, /*sg=*/ 0.0, /*sw=*/ 1.0, matParams); computeCapillaryPressures_(pC, /*so=*/ 0.0, /*sg=*/ 0.0, /*sw=*/ 1.0, matParams);
Scalar pg = pw + (pC[gasPhaseIdx] - pC[waterPhaseIdx]); Scalar pg = pw + pcFactor_ * (pC[gasPhaseIdx] - pC[waterPhaseIdx]);
this->setScaledPressure_(pg); this->setScaledPressure_(pg);
changed = true; changed = true;
} }
@ -784,7 +787,7 @@ public:
{ {
Scalar s = 1.0 - sw - solventSaturation_(); Scalar s = 1.0 - sw - solventSaturation_();
if (sg < -eps && s > 0.0 && FluidSystem::enableDissolvedGas()) { if (sg < -eps && s > 0.0 && FluidSystem::enableDissolvedGas()) {
const Scalar& po = this->pressure_(); const Scalar po = this->pressure_();
setPrimaryVarsMeaningGas(GasMeaning::Rs); setPrimaryVarsMeaningGas(GasMeaning::Rs);
Scalar soMax = std::max(s, problem.maxOilSaturation(globalDofIdx)); Scalar soMax = std::max(s, problem.maxOilSaturation(globalDofIdx));
Scalar rsMax = problem.maxGasDissolutionFactor(/*timeIdx=*/0, globalDofIdx); Scalar rsMax = problem.maxGasDissolutionFactor(/*timeIdx=*/0, globalDofIdx);
@ -805,7 +808,7 @@ public:
// present, i.e., switch the primary variables to GasMeaning::Rv. // present, i.e., switch the primary variables to GasMeaning::Rv.
// we only have the oil pressure readily available, but we need the gas // we only have the oil pressure readily available, but we need the gas
// pressure, i.e. we must determine capillary pressure // pressure, i.e. we must determine capillary pressure
const Scalar& po = this->pressure_(); const Scalar po = this->pressure_();
std::array<Scalar, numPhases> pC = { 0.0 }; std::array<Scalar, numPhases> pC = { 0.0 };
const MaterialLawParams& matParams = problem.materialLawParams(globalDofIdx); const MaterialLawParams& matParams = problem.materialLawParams(globalDofIdx);
computeCapillaryPressures_(pC, /*so=*/0.0, sg + solventSaturation_(), sw, matParams); computeCapillaryPressures_(pC, /*so=*/0.0, sg + solventSaturation_(), sw, matParams);
@ -836,7 +839,7 @@ public:
// Gas phase not present. The hydrocarbon gas phase // Gas phase not present. The hydrocarbon gas phase
// appears as soon as more of the gas component is present in the oil phase // appears as soon as more of the gas component is present in the oil phase
// than what saturated oil can hold. // than what saturated oil can hold.
const Scalar& po = this->pressure_(); const Scalar po = this->pressure_();
Scalar so = 1.0 - sw - solventSaturation_(); Scalar so = 1.0 - sw - solventSaturation_();
Scalar soMax = std::max(so, problem.maxOilSaturation(globalDofIdx)); Scalar soMax = std::max(so, problem.maxOilSaturation(globalDofIdx));
Scalar rsMax = problem.maxGasDissolutionFactor(/*timeIdx=*/0, globalDofIdx); Scalar rsMax = problem.maxGasDissolutionFactor(/*timeIdx=*/0, globalDofIdx);
@ -864,7 +867,7 @@ public:
// soon as more of the oil component is present in the hydrocarbon gas phase // soon as more of the oil component is present in the hydrocarbon gas phase
// than what saturated gas contains. Note that we use the blackoil specific // than what saturated gas contains. Note that we use the blackoil specific
// low-level PVT objects here for performance reasons. // low-level PVT objects here for performance reasons.
const Scalar& pg = this->pressure_(); const Scalar pg = this->pressure_();
Scalar soMax = problem.maxOilSaturation(globalDofIdx); Scalar soMax = problem.maxOilSaturation(globalDofIdx);
Scalar rvMax = problem.maxOilVaporizationFactor(/*timeIdx=*/0, globalDofIdx); Scalar rvMax = problem.maxOilVaporizationFactor(/*timeIdx=*/0, globalDofIdx);
Scalar rvSat = enableExtbo ? ExtboModule::rv(pvtRegionIndex(), Scalar rvSat = enableExtbo ? ExtboModule::rv(pvtRegionIndex(),
@ -1131,12 +1134,12 @@ private:
Scalar pressure_() const Scalar pressure_() const
{ {
return (*this)[Indices::pressureSwitchIdx]*this->pressureScale_; return (*this)[Indices::pressureSwitchIdx] * this->pressureScale_;
} }
void setScaledPressure_(Scalar pressure) void setScaledPressure_(Scalar pressure)
{ {
(*this)[Indices::pressureSwitchIdx]=pressure/(this->pressureScale_); (*this)[Indices::pressureSwitchIdx] = pressure / (this->pressureScale_);
} }
WaterMeaning primaryVarsMeaningWater_; WaterMeaning primaryVarsMeaningWater_;

10
opm/models/discretization/common/fvbaseprimaryvariables.hh
View File

@ -80,6 +80,16 @@ public:
*/ */
FvBasePrimaryVariables& operator=(const FvBasePrimaryVariables& value) = default; FvBasePrimaryVariables& operator=(const FvBasePrimaryVariables& value) = default;
static void init()
{
// Nothing required by default.
}
static void registerParameters()
{
// No parameters to register by default.
}
/*! /*!
* \brief Return a primary variable intensive evaluation. * \brief Return a primary variable intensive evaluation.
* *