OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-27 16:26:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

BlackoilModel: use appropriate Scalar type

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-08-22 08:15:17 +02:00
parent fda7298374
commit b5bd290887
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/flow/BlackoilModelNldd.hpp
View File

@ -473,7 +473,8 @@ private:
bool oscillate = false;
bool stagnate = false;
const int numPhases = convergence_history.front().size();
detail::detectOscillations(convergence_history, iter, numPhases, 0.2, 1, oscillate, stagnate);
detail::detectOscillations(convergence_history, iter, numPhases,
Scalar{0.2}, 1, oscillate, stagnate);
if (oscillate) {
damping_factor *= 0.85;
logger.debug(fmt::format("| Damping factor is now {}", damping_factor));

5
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -1351,7 +1351,7 @@ namespace Opm {
WellBhpThpCalculator<Scalar>::bruteForceBracketCommonTHP(mismatch, min_thp, max_thp);
// Narrow down the bracket
Scalar low1, high1;
std::array<Scalar, 2> range = {0.9*min_thp, 1.1*max_thp};
std::array<Scalar, 2> range = {Scalar{0.9}*min_thp, Scalar{1.1}*max_thp};
std::optional<Scalar> appr_sol;
WellBhpThpCalculator<Scalar>::bruteForceBracketCommonTHP(mismatch, range, low1, high1, appr_sol, 0.0, local_deferredLogger);
min_thp = low1;
@ -1362,7 +1362,8 @@ namespace Opm {
if (!autochoke_thp.has_value() || autochoke_thp.value() > nodal_pressure) {
// The bracket is based on the initial bracket or on a range based on a previous calculated group thp
std::array<Scalar, 2> range = autochoke_thp.has_value() ?
std::array<Scalar, 2>{0.9 * autochoke_thp.value(), 1.1 * autochoke_thp.value()} : range_initial;
std::array<Scalar, 2>{Scalar{0.9} * autochoke_thp.value(),
Scalar{1.1} * autochoke_thp.value()} : range_initial;
Scalar low, high;
std::optional<Scalar> approximate_solution;
const Scalar tolerance1 = thp_tolerance;