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 #890 from akva2/remove_ewoms_register_param_macro

Browse Source 
Remove ewoms register param macro
This commit is contained in:
Bård Skaflestad
2024-04-05 12:42:27 +02:00
committed by GitHub
parent 2066977c8f 48fa0f3c59
commit bdb93b6e62
44 changed files with 475 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
opm/simulators/linalg/istlpreconditionerwrappers.hh
View File

@@ -72,11 +72,10 @@ namespace Linear {
\
static void registerParameters() \
{ \
EWOMS_REGISTER_PARAM(TypeTag, int, PreconditionerOrder, \
"The order of the preconditioner"); \
EWOMS_REGISTER_PARAM(TypeTag, Scalar, PreconditionerRelaxation, \
"The relaxation factor of the " \
"preconditioner"); \
Parameters::registerParam<TypeTag, Properties::PreconditionerOrder> \
("The order of the preconditioner"); \
Parameters::registerParam<TypeTag, Properties::PreconditionerRelaxation> \
("The relaxation factor of the preconditioner"); \
} \
\
void prepare(IstlMatrix& matrix) \
@@ -116,9 +115,8 @@ namespace Linear {
\
static void registerParameters() \
{ \
EWOMS_REGISTER_PARAM(TypeTag, Scalar, PreconditionerRelaxation, \
"The relaxation factor of the " \
"preconditioner"); \
Parameters::registerParam<TypeTag, Properties::PreconditionerRelaxation> \
("The relaxation factor of the preconditioner"); \
} \
\
void prepare(OverlappingMatrix& matrix) \
@@ -164,8 +162,8 @@ public:
static void registerParameters()
{
EWOMS_REGISTER_PARAM(TypeTag, Scalar, PreconditionerRelaxation,
"The relaxation factor of the preconditioner");
Parameters::registerParam<TypeTag, Properties::PreconditionerRelaxation>
("The relaxation factor of the preconditioner");
}
void prepare(OverlappingMatrix& matrix)

4
opm/simulators/linalg/istlsolverwrappers.hh
View File

@@ -124,8 +124,8 @@ public:
static void registerParameters()
{
EWOMS_REGISTER_PARAM(TypeTag, int, GMResRestart,
"Number of iterations after which the GMRES linear solver is restarted");
Parameters::registerParam<TypeTag, Properties::GMResRestart>
("Number of iterations after which the GMRES linear solver is restarted");
}
template <class LinearOperator, class ScalarProduct, class Preconditioner>

12
opm/simulators/linalg/parallelamgbackend.hh
View File

@@ -150,12 +150,12 @@ public:
{
ParentType::registerParameters();
EWOMS_REGISTER_PARAM(TypeTag, Scalar, LinearSolverMaxError,
"The maximum residual error which the linear solver tolerates"
" without giving up");
EWOMS_REGISTER_PARAM(TypeTag, int, AmgCoarsenTarget,
"The coarsening target for the agglomerations of "
"the AMG preconditioner");
Parameters::registerParam<TypeTag, Properties::LinearSolverMaxError>
("The maximum residual error which the linear solver tolerates "
"without giving up");
Parameters::registerParam<TypeTag, Properties::AmgCoarsenTarget>
("The coarsening target for the agglomerations of "
"the AMG preconditioner");
}
protected:

20
opm/simulators/linalg/parallelbasebackend.hh
View File

@@ -152,16 +152,16 @@ public:
*/
static void registerParameters()
{
EWOMS_REGISTER_PARAM(TypeTag, Scalar, LinearSolverTolerance,
"The maximum allowed error between of the linear solver");
EWOMS_REGISTER_PARAM(TypeTag, Scalar, LinearSolverAbsTolerance,
"The maximum accepted error of the norm of the residual");
EWOMS_REGISTER_PARAM(TypeTag, unsigned, LinearSolverOverlapSize,
"The size of the algebraic overlap for the linear solver");
EWOMS_REGISTER_PARAM(TypeTag, int, LinearSolverMaxIterations,
"The maximum number of iterations of the linear solver");
EWOMS_REGISTER_PARAM(TypeTag, int, LinearSolverVerbosity,
"The verbosity level of the linear solver");
Parameters::registerParam<TypeTag, Properties::LinearSolverTolerance>
("The maximum allowed error between of the linear solver");
Parameters::registerParam<TypeTag, Properties::LinearSolverAbsTolerance>
("The maximum accepted error of the norm of the residual");
Parameters::registerParam<TypeTag, Properties::LinearSolverOverlapSize>
("The size of the algebraic overlap for the linear solver");
Parameters::registerParam<TypeTag, Properties::LinearSolverMaxIterations>
("The maximum number of iterations of the linear solver");
Parameters::registerParam<TypeTag, Properties::LinearSolverVerbosity>
("The verbosity level of the linear solver");
PreconditionerWrapper::registerParameters();
}

6
opm/simulators/linalg/parallelbicgstabbackend.hh
View File

@@ -121,9 +121,9 @@ public:
{
ParentType::registerParameters();
EWOMS_REGISTER_PARAM(TypeTag, Scalar, LinearSolverMaxError,
"The maximum residual error which the linear solver tolerates"
" without giving up");
Parameters::registerParam<TypeTag, Properties::LinearSolverMaxError>
("The maximum residual error which the linear solver tolerates"
" without giving up");
}
protected: