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 relaxationFactorFractions an anon helper in StandardWellPrimaryVariables

Browse Source
This commit is contained in:
Arne Morten Kvarving
2022-11-09 10:42:53 +01:00
parent 7b8e88bdd5
commit 0cddc4516e
3 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
opm/simulators/wells/StandardWellGeneric.cpp
View File

@@ -55,7 +55,6 @@ StandardWellGeneric(const WellInterfaceGeneric& baseif)
{
}
template<class Scalar>
double
StandardWellGeneric<Scalar>::
@@ -81,33 +80,6 @@ relaxationFactorRate(const std::vector<double>& primary_variables,
return relaxation_factor;
}
template<class Scalar>
double
StandardWellGeneric<Scalar>::
relaxationFactorFraction(const double old_value,
const double dx)
{
assert(old_value >= 0. && old_value <= 1.0);
double relaxation_factor = 1.;
// updated values without relaxation factor
const double possible_updated_value = old_value - dx;
// 0.95 is an experimental value remains to be optimized
if (possible_updated_value < 0.0) {
relaxation_factor = std::abs(old_value / dx) * 0.95;
} else if (possible_updated_value > 1.0) {
relaxation_factor = std::abs((1. - old_value) / dx) * 0.95;
}
// if possible_updated_value is between 0. and 1.0, then relaxation_factor
// remains to be one
assert(relaxation_factor >= 0. && relaxation_factor <= 1.);
return relaxation_factor;
}
template<class Scalar>
void
StandardWellGeneric<Scalar>::

4
opm/simulators/wells/StandardWellGeneric.hpp
View File

@@ -53,10 +53,6 @@ public:
static double relaxationFactorRate(const std::vector<double>& primary_variables,
const double newton_update);
// relaxation factor considering only one fraction value
static double relaxationFactorFraction(const double old_value,
const double dx);
protected:
StandardWellGeneric(const WellInterfaceGeneric& baseif);

38
opm/simulators/wells/StandardWellPrimaryVariables.cpp
View File

@@ -40,6 +40,36 @@
#include <algorithm>
namespace {
//! \brief Relaxation factor considering only one fraction value.
template<class Scalar>
Scalar relaxationFactorFraction(const Scalar old_value,
const Scalar dx)
{
assert(old_value >= 0. && old_value <= 1.0);
Scalar relaxation_factor = 1.;
// updated values without relaxation factor
const Scalar possible_updated_value = old_value - dx;
// 0.95 is an experimental value remains to be optimized
if (possible_updated_value < 0.0) {
relaxation_factor = std::abs(old_value / dx) * 0.95;
} else if (possible_updated_value > 1.0) {
relaxation_factor = std::abs((1. - old_value) / dx) * 0.95;
}
// if possible_updated_value is between 0. and 1.0, then relaxation_factor
// remains to be one
assert(relaxation_factor >= 0. && relaxation_factor <= 1.);
return relaxation_factor;
}
}
namespace Opm {
template<class FluidSystem, class Indices, class Scalar>
@@ -538,14 +568,14 @@ relaxationFactorFractionsProducer(const std::vector<double>& primary_variables,
if (FluidSystem::numActivePhases() > 1) {
if constexpr (has_wfrac_variable) {
const double relaxation_factor_w = StandardWellGeneric<Scalar>::
relaxationFactorFraction(primary_variables[WFrac], dwells[0][WFrac]);
const double relaxation_factor_w = relaxationFactorFraction(primary_variables[WFrac],
dwells[0][WFrac]);
relaxation_factor = std::min(relaxation_factor, relaxation_factor_w);
}
if constexpr (has_gfrac_variable) {
const double relaxation_factor_g = StandardWellGeneric<Scalar>::
relaxationFactorFraction(primary_variables[GFrac], dwells[0][GFrac]);
const double relaxation_factor_g = relaxationFactorFraction(primary_variables[GFrac],
dwells[0][GFrac]);
relaxation_factor = std::min(relaxation_factor, relaxation_factor_g);
}