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

10
ebos/eclbasevanguard.hh
View File

@@ -82,8 +82,14 @@ NEW_PROP_TAG(IgnoreKeywords);
NEW_PROP_TAG(EdgeWeightsMethod); NEW_PROP_TAG(EdgeWeightsMethod);
NEW_PROP_TAG(OwnerCellsFirst); NEW_PROP_TAG(OwnerCellsFirst);
SET_STRING_PROP(EclBaseVanguard, IgnoreKeywords, ""); template<class TypeTag>
SET_STRING_PROP(EclBaseVanguard, EclDeckFileName, ""); struct IgnoreKeywords<TypeTag, TTag::EclBaseVanguard> {
static constexpr auto value = "";
};
template<class TypeTag>
struct EclDeckFileName<TypeTag, TTag::EclBaseVanguard> {
static constexpr auto value = "";
};
SET_INT_PROP(EclBaseVanguard, EclOutputInterval, -1); // use the deck-provided value SET_INT_PROP(EclBaseVanguard, EclOutputInterval, -1); // use the deck-provided value
template<class TypeTag> template<class TypeTag>
struct EnableOpmRstFile<TypeTag, TTag::EclBaseVanguard> { struct EnableOpmRstFile<TypeTag, TTag::EclBaseVanguard> {

10
ebos/eclproblem.hh
View File

@@ -349,7 +349,10 @@ struct EclOutputDoublePrecision<TypeTag, TTag::EclBaseProblem> {
}; };
// The default location for the ECL output files // The default location for the ECL output files
SET_STRING_PROP(EclBaseProblem, OutputDir, "."); template<class TypeTag>
struct OutputDir<TypeTag, TTag::EclBaseProblem> {
static constexpr auto value = ".";
};
// the cache for intensive quantities can be used for ECL problems and also yields a // the cache for intensive quantities can be used for ECL problems and also yields a
// decent speedup... // decent speedup...
@@ -443,7 +446,10 @@ struct EclEnableTuning<TypeTag, TTag::EclBaseProblem> {
static constexpr bool value = false; static constexpr bool value = false;
}; };
SET_STRING_PROP(EclBaseProblem, OutputMode, "all"); template<class TypeTag>
struct OutputMode<TypeTag, TTag::EclBaseProblem> {
static constexpr auto value = "all";
};
} // namespace Opm::Properties } // namespace Opm::Properties

10
flow/flow_blackoil_dunecpr.cpp
View File

@@ -51,8 +51,14 @@ namespace Opm {
SET_INT_PROP(EclFlowProblemSimple, CprEllSolvetype, 3); SET_INT_PROP(EclFlowProblemSimple, CprEllSolvetype, 3);
SET_INT_PROP(EclFlowProblemSimple, CprReuseSetup, 3); SET_INT_PROP(EclFlowProblemSimple, CprReuseSetup, 3);
SET_INT_PROP(EclFlowProblemSimple, CprSolverVerbose, 0); SET_INT_PROP(EclFlowProblemSimple, CprSolverVerbose, 0);
SET_STRING_PROP(EclFlowProblemSimple, LinearSolverConfiguration, "ilu0"); template<class TypeTag>
SET_STRING_PROP(EclFlowProblemSimple, SystemStrategy, "quasiimpes"); struct LinearSolverConfiguration<TypeTag, TTag::EclFlowProblemSimple> {
static constexpr auto value = "ilu0";
};
template<class TypeTag>
struct SystemStrategy<TypeTag, TTag::EclFlowProblemSimple> {
static constexpr auto value = "quasiimpes";
};
SET_PROP(EclFlowProblemSimple, FluidSystem) SET_PROP(EclFlowProblemSimple, FluidSystem)
{ {

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

@@ -77,7 +77,10 @@ struct EclFlowProblem {
FlowNonLinearSolver, EclBaseProblem, BlackOilModel>; FlowNonLinearSolver, EclBaseProblem, BlackOilModel>;
}; };
} }
SET_STRING_PROP(EclFlowProblem, OutputDir, ""); template<class TypeTag>
struct OutputDir<TypeTag, TTag::EclFlowProblem> {
static constexpr auto value = "";
};
template<class TypeTag> template<class TypeTag>
struct EnableDebuggingChecks<TypeTag, TTag::EclFlowProblem> { struct EnableDebuggingChecks<TypeTag, TTag::EclFlowProblem> {
static constexpr bool value = false; 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); NEW_PROP_TAG(EnableLoggingFalloutWarning);
// TODO: enumeration parameters. we use strings for now. // 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 // Do not merge parallel output files or warn about them
template<class TypeTag> template<class TypeTag>
struct EnableLoggingFalloutWarning<TypeTag, TTag::EclFlowProblem> { 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_SCALAR_PROP(FlowNonLinearSolver, NewtonMaxRelax, 0.5);
SET_INT_PROP(FlowNonLinearSolver, FlowNewtonMaxIterations, 20); SET_INT_PROP(FlowNonLinearSolver, FlowNewtonMaxIterations, 20);
SET_INT_PROP(FlowNonLinearSolver, FlowNewtonMinIterations, 1); 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 } // namespace Opm::Properties

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

@@ -79,7 +79,10 @@ SET_INT_PROP(FlowIstlSolverParams, LinearSolverMaxIter, 200);
SET_INT_PROP(FlowIstlSolverParams, LinearSolverRestart, 40); SET_INT_PROP(FlowIstlSolverParams, LinearSolverRestart, 40);
SET_INT_PROP(FlowIstlSolverParams, FlowLinearSolverVerbosity, 0); SET_INT_PROP(FlowIstlSolverParams, FlowLinearSolverVerbosity, 0);
SET_INT_PROP(FlowIstlSolverParams, IluFillinLevel, 0); SET_INT_PROP(FlowIstlSolverParams, IluFillinLevel, 0);
SET_STRING_PROP(FlowIstlSolverParams, MiluVariant, "ILU"); template<class TypeTag>
struct MiluVariant<TypeTag, TTag::FlowIstlSolverParams> {
static constexpr auto value = "ILU";
};
template<class TypeTag> template<class TypeTag>
struct IluRedblack<TypeTag, TTag::FlowIstlSolverParams> { struct IluRedblack<TypeTag, TTag::FlowIstlSolverParams> {
static constexpr bool value = false; static constexpr bool value = false;
@@ -113,7 +116,10 @@ template<class TypeTag>
struct PreconditionerAddWellContributions<TypeTag, TTag::FlowIstlSolverParams> { struct PreconditionerAddWellContributions<TypeTag, TTag::FlowIstlSolverParams> {
static constexpr bool value = false; static constexpr bool value = false;
}; };
SET_STRING_PROP(FlowIstlSolverParams, SystemStrategy, "none"); template<class TypeTag>
struct SystemStrategy<TypeTag, TTag::FlowIstlSolverParams> {
static constexpr auto value = "none";
};
template<class TypeTag> template<class TypeTag>
struct ScaleLinearSystem<TypeTag, TTag::FlowIstlSolverParams> { struct ScaleLinearSystem<TypeTag, TTag::FlowIstlSolverParams> {
static constexpr bool value = false; static constexpr bool value = false;
@@ -126,9 +132,18 @@ struct CprUseDrs<TypeTag, TTag::FlowIstlSolverParams> {
SET_INT_PROP(FlowIstlSolverParams, CprMaxEllIter, 20); SET_INT_PROP(FlowIstlSolverParams, CprMaxEllIter, 20);
SET_INT_PROP(FlowIstlSolverParams, CprEllSolvetype, 0); SET_INT_PROP(FlowIstlSolverParams, CprEllSolvetype, 0);
SET_INT_PROP(FlowIstlSolverParams, CprReuseSetup, 3); SET_INT_PROP(FlowIstlSolverParams, CprReuseSetup, 3);
SET_STRING_PROP(FlowIstlSolverParams, LinearSolverConfiguration, "ilu0"); template<class TypeTag>
SET_STRING_PROP(FlowIstlSolverParams, LinearSolverConfigurationJsonFile, "none"); struct LinearSolverConfiguration<TypeTag, TTag::FlowIstlSolverParams> {
SET_STRING_PROP(FlowIstlSolverParams, GpuMode, "none"); static constexpr auto value = "ilu0";
};
template<class TypeTag>
struct LinearSolverConfigurationJsonFile<TypeTag, TTag::FlowIstlSolverParams> {
static constexpr auto value = "none";
};
template<class TypeTag>
struct GpuMode<TypeTag, TTag::FlowIstlSolverParams> {
static constexpr auto value = "none";
};
SET_INT_PROP(FlowIstlSolverParams, BdaDeviceId, 0); SET_INT_PROP(FlowIstlSolverParams, BdaDeviceId, 0);
SET_INT_PROP(FlowIstlSolverParams, OpenclPlatformId, 0); SET_INT_PROP(FlowIstlSolverParams, OpenclPlatformId, 0);

10
opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp
View File

@@ -57,13 +57,19 @@ struct FullTimeStepInitially<TypeTag, TTag::FlowTimeSteppingParameters> {
static constexpr bool value = false; static constexpr bool value = false;
}; };
SET_SCALAR_PROP(FlowTimeSteppingParameters, TimeStepAfterEventInDays, -1.0); SET_SCALAR_PROP(FlowTimeSteppingParameters, TimeStepAfterEventInDays, -1.0);
SET_STRING_PROP(FlowTimeSteppingParameters, TimeStepControl, "pid"); template<class TypeTag>
struct TimeStepControl<TypeTag, TTag::FlowTimeSteppingParameters> {
static constexpr auto value = "pid";
};
SET_SCALAR_PROP(FlowTimeSteppingParameters, TimeStepControlTolerance, 1e-1); SET_SCALAR_PROP(FlowTimeSteppingParameters, TimeStepControlTolerance, 1e-1);
SET_INT_PROP(FlowTimeSteppingParameters, TimeStepControlTargetIterations, 30); SET_INT_PROP(FlowTimeSteppingParameters, TimeStepControlTargetIterations, 30);
SET_INT_PROP(FlowTimeSteppingParameters, TimeStepControlTargetNewtonIterations, 8); SET_INT_PROP(FlowTimeSteppingParameters, TimeStepControlTargetNewtonIterations, 8);
SET_SCALAR_PROP(FlowTimeSteppingParameters, TimeStepControlDecayRate, 0.75); SET_SCALAR_PROP(FlowTimeSteppingParameters, TimeStepControlDecayRate, 0.75);
SET_SCALAR_PROP(FlowTimeSteppingParameters, TimeStepControlGrowthRate, 1.25); SET_SCALAR_PROP(FlowTimeSteppingParameters, TimeStepControlGrowthRate, 1.25);
SET_STRING_PROP(FlowTimeSteppingParameters, TimeStepControlFileName, "timesteps"); template<class TypeTag>
struct TimeStepControlFileName<TypeTag, TTag::FlowTimeSteppingParameters> {
static constexpr auto value = "timesteps";
};
SET_SCALAR_PROP(FlowTimeSteppingParameters, MinTimeStepBeforeShuttingProblematicWellsInDays, 0.001); SET_SCALAR_PROP(FlowTimeSteppingParameters, MinTimeStepBeforeShuttingProblematicWellsInDays, 0.001);
} // namespace Opm::Properties } // namespace Opm::Properties