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 #5270 from akva2/adjust_ewoms_param_is_set

Browse Source 
adjust to EWOMS_PARAM_IS_SET macro removal
This commit is contained in:
Bård Skaflestad 2024-04-03 21:47:52 +02:00 committed by GitHub
commit 3334726871
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/flow/FlowProblem.hpp
View File

@ -322,7 +322,7 @@ public:
// 1. Command line value (--num-pressure-points-equil=N) // 1. Command line value (--num-pressure-points-equil=N)
// 2. EQLDIMS item 2 // 2. EQLDIMS item 2
// Default value is defined in opm-common/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLDIMS // Default value is defined in opm-common/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLDIMS
if (EWOMS_PARAM_IS_SET(TypeTag, int, NumPressurePointsEquil)) if (Parameters::isSet<TypeTag,int>("NumPressurePointsEquil"))
{ {
this->numPressurePointsEquil_ = EWOMS_GET_PARAM(TypeTag, int, NumPressurePointsEquil); this->numPressurePointsEquil_ = EWOMS_GET_PARAM(TypeTag, int, NumPressurePointsEquil);
} else { } else {

2
opm/simulators/linalg/FlowLinearSolverParameters.hpp
View File

@ -279,7 +279,7 @@ namespace Opm
cpr_reuse_setup_ = EWOMS_GET_PARAM(TypeTag, int, CprReuseSetup); cpr_reuse_setup_ = EWOMS_GET_PARAM(TypeTag, int, CprReuseSetup);
cpr_reuse_interval_ = EWOMS_GET_PARAM(TypeTag, int, CprReuseInterval); cpr_reuse_interval_ = EWOMS_GET_PARAM(TypeTag, int, CprReuseInterval);
if (!EWOMS_PARAM_IS_SET(TypeTag, std::string, LinearSolver) && cprRequestedInDataFile) { if (!Parameters::isSet<TypeTag, std::string>("LinearSolver") && cprRequestedInDataFile) {
linsolver_ = "cpr"; linsolver_ = "cpr";
} else { } else {
linsolver_ = EWOMS_GET_PARAM(TypeTag, std::string, LinearSolver); linsolver_ = EWOMS_GET_PARAM(TypeTag, std::string, LinearSolver);

12
opm/simulators/linalg/ISTLSolver.hpp
View File

@ -224,8 +224,8 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
para.linsolver_ = "cprw"; para.linsolver_ = "cprw";
parameters_.push_back(para); parameters_.push_back(para);
prm_.push_back(setupPropertyTree(parameters_[0], prm_.push_back(setupPropertyTree(parameters_[0],
EWOMS_PARAM_IS_SET(TypeTag, int, LinearSolverMaxIter), Parameters::isSet<TypeTag,int>("LinearSolverMaxIter"),
EWOMS_PARAM_IS_SET(TypeTag, double, LinearSolverReduction))); Parameters::isSet<TypeTag,double>("LinearSolverReduction")));
} }
{ {
FlowLinearSolverParameters para; FlowLinearSolverParameters para;
@ -233,8 +233,8 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
para.linsolver_ = "ilu0"; para.linsolver_ = "ilu0";
parameters_.push_back(para); parameters_.push_back(para);
prm_.push_back(setupPropertyTree(parameters_[1], prm_.push_back(setupPropertyTree(parameters_[1],
EWOMS_PARAM_IS_SET(TypeTag, int, LinearSolverMaxIter), Parameters::isSet<TypeTag,int>("LinearSolverMaxIter"),
EWOMS_PARAM_IS_SET(TypeTag, double, LinearSolverReduction))); Parameters::isSet<TypeTag,double>("LinearSolverReduction")));
} }
// ------------ // ------------
} else { } else {
@ -242,8 +242,8 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
assert(parameters_.size() == 1); assert(parameters_.size() == 1);
assert(prm_.empty()); assert(prm_.empty());
prm_.push_back(setupPropertyTree(parameters_[0], prm_.push_back(setupPropertyTree(parameters_[0],
EWOMS_PARAM_IS_SET(TypeTag, int, LinearSolverMaxIter), Parameters::isSet<TypeTag,int>("LinearSolverMaxIter"),
EWOMS_PARAM_IS_SET(TypeTag, double, LinearSolverReduction))); Parameters::isSet<TypeTag,double>("LinearSolverReduction")));
} }
flexibleSolver_.resize(prm_.size()); flexibleSolver_.resize(prm_.size());