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

changed: remove SET_STRING_PROP macro usage

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-08-27 11:38:38 +02:00
parent 0e71c0e29b
commit a79c37a041
8 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@@ -77,7 +77,10 @@ struct EclFlowProblem {
FlowNonLinearSolver, EclBaseProblem, BlackOilModel>;
};
}
SET_STRING_PROP(EclFlowProblem, OutputDir, "");
template<class TypeTag>
struct OutputDir<TypeTag, TTag::EclFlowProblem> {
static constexpr auto value = "";
};
template<class TypeTag>
struct EnableDebuggingChecks<TypeTag, TTag::EclFlowProblem> {
static constexpr bool value = false;

5
opm/simulators/flow/FlowMainEbos.hpp
View File

@@ -55,7 +55,10 @@ NEW_PROP_TAG(OutputInterval);
NEW_PROP_TAG(EnableLoggingFalloutWarning);
// TODO: enumeration parameters. we use strings for now.
SET_STRING_PROP(EclFlowProblem, EnableDryRun, "auto");
template<class TypeTag>
struct EnableDryRun<TypeTag, TTag::EclFlowProblem> {
static constexpr auto value = "auto";
};
// Do not merge parallel output files or warn about them
template<class TypeTag>
struct EnableLoggingFalloutWarning<TypeTag, TTag::EclFlowProblem> {

5
opm/simulators/flow/NonlinearSolverEbos.hpp
View File

@@ -48,7 +48,10 @@ NEW_PROP_TAG(NewtonRelaxationType);
SET_SCALAR_PROP(FlowNonLinearSolver, NewtonMaxRelax, 0.5);
SET_INT_PROP(FlowNonLinearSolver, FlowNewtonMaxIterations, 20);
SET_INT_PROP(FlowNonLinearSolver, FlowNewtonMinIterations, 1);
SET_STRING_PROP(FlowNonLinearSolver, NewtonRelaxationType, "dampen");
template<class TypeTag>
struct NewtonRelaxationType<TypeTag, TTag::FlowNonLinearSolver> {
static constexpr auto value = "dampen";
};
} // namespace Opm::Properties