mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
changed: remove NEW_PROP_TAG macro usage
This commit is contained in:
Arne Morten Kvarving
@@ -31,36 +31,120 @@ namespace TTag {
|
||||
struct FlowModelParameters {};
|
||||
}
|
||||
|
||||
NEW_PROP_TAG(DbhpMaxRel);
|
||||
NEW_PROP_TAG(DwellFractionMax);
|
||||
NEW_PROP_TAG(MaxResidualAllowed);
|
||||
NEW_PROP_TAG(RelaxedMaxPvFraction);
|
||||
NEW_PROP_TAG(ToleranceMb);
|
||||
NEW_PROP_TAG(ToleranceCnv);
|
||||
NEW_PROP_TAG(ToleranceCnvRelaxed);
|
||||
NEW_PROP_TAG(ToleranceWells);
|
||||
NEW_PROP_TAG(ToleranceWellControl);
|
||||
NEW_PROP_TAG(MaxWelleqIter);
|
||||
NEW_PROP_TAG(UseMultisegmentWell);
|
||||
NEW_PROP_TAG(MaxSinglePrecisionDays);
|
||||
NEW_PROP_TAG(MaxStrictIter);
|
||||
NEW_PROP_TAG(SolveWelleqInitially);
|
||||
NEW_PROP_TAG(UpdateEquationsScaling);
|
||||
NEW_PROP_TAG(UseUpdateStabilization);
|
||||
NEW_PROP_TAG(MatrixAddWellContributions);
|
||||
NEW_PROP_TAG(EnableWellOperabilityCheck);
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct DbhpMaxRel {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct DwellFractionMax {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MaxResidualAllowed {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct RelaxedMaxPvFraction {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct ToleranceMb {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct ToleranceCnv {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct ToleranceCnvRelaxed {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct ToleranceWells {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct ToleranceWellControl {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MaxWelleqIter {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct UseMultisegmentWell {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MaxSinglePrecisionDays {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MaxStrictIter {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolveWelleqInitially {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct UpdateEquationsScaling {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct UseUpdateStabilization {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MatrixAddWellContributions {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct EnableWellOperabilityCheck {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
|
||||
// parameters for multisegment wells
|
||||
NEW_PROP_TAG(TolerancePressureMsWells);
|
||||
NEW_PROP_TAG(MaxPressureChangeMsWells);
|
||||
NEW_PROP_TAG(UseInnerIterationsMsWells);
|
||||
NEW_PROP_TAG(MaxInnerIterMsWells);
|
||||
NEW_PROP_TAG(StrictInnerIterMsWells);
|
||||
NEW_PROP_TAG(RelaxedFlowTolInnerIterMsw);
|
||||
NEW_PROP_TAG(RelaxedPressureTolInnerIterMsw);
|
||||
NEW_PROP_TAG(RegularizationFactorMsw);
|
||||
NEW_PROP_TAG(UseInnerIterationsWells);
|
||||
NEW_PROP_TAG(MaxInnerIterWells);
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TolerancePressureMsWells {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MaxPressureChangeMsWells {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct UseInnerIterationsMsWells {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MaxInnerIterMsWells {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct StrictInnerIterMsWells {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct RelaxedFlowTolInnerIterMsw {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct RelaxedPressureTolInnerIterMsw {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct RegularizationFactorMsw {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct UseInnerIterationsWells {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MaxInnerIterWells {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct DbhpMaxRel<TypeTag, TTag::FlowModelParameters> {
|
||||
|
||||
@@ -50,9 +50,18 @@
|
||||
|
||||
namespace Opm::Properties {
|
||||
|
||||
NEW_PROP_TAG(EnableDryRun);
|
||||
NEW_PROP_TAG(OutputInterval);
|
||||
NEW_PROP_TAG(EnableLoggingFalloutWarning);
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct EnableDryRun {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct OutputInterval {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct EnableLoggingFalloutWarning {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
|
||||
// TODO: enumeration parameters. we use strings for now.
|
||||
template<class TypeTag>
|
||||
|
||||
@@ -40,10 +40,22 @@ namespace TTag {
|
||||
struct FlowNonLinearSolver {};
|
||||
}
|
||||
|
||||
NEW_PROP_TAG(NewtonMaxRelax);
|
||||
NEW_PROP_TAG(FlowNewtonMaxIterations);
|
||||
NEW_PROP_TAG(FlowNewtonMinIterations);
|
||||
NEW_PROP_TAG(NewtonRelaxationType);
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct NewtonMaxRelax {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct FlowNewtonMaxIterations {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct FlowNewtonMinIterations{
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct NewtonRelaxationType{
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct NewtonMaxRelax<TypeTag, TTag::FlowNonLinearSolver> {
|
||||
|
||||
@@ -36,8 +36,14 @@
|
||||
|
||||
namespace Opm::Properties {
|
||||
|
||||
NEW_PROP_TAG(EnableAdaptiveTimeStepping);
|
||||
NEW_PROP_TAG(EnableTuning);
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct EnableAdaptiveTimeStepping {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct EnableTuning {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct EnableTerminalOutput<TypeTag, TTag::EclFlowProblem> {
|
||||
|
||||
@@ -45,33 +45,114 @@ namespace TTag {
|
||||
struct FlowIstlSolverParams {};
|
||||
}
|
||||
|
||||
NEW_PROP_TAG(LinearSolverReduction);
|
||||
NEW_PROP_TAG(IluRelaxation);
|
||||
NEW_PROP_TAG(LinearSolverMaxIter);
|
||||
NEW_PROP_TAG(LinearSolverRestart);
|
||||
NEW_PROP_TAG(FlowLinearSolverVerbosity);
|
||||
NEW_PROP_TAG(IluFillinLevel);
|
||||
NEW_PROP_TAG(MiluVariant);
|
||||
NEW_PROP_TAG(IluRedblack);
|
||||
NEW_PROP_TAG(IluReorderSpheres);
|
||||
NEW_PROP_TAG(UseGmres);
|
||||
NEW_PROP_TAG(LinearSolverRequireFullSparsityPattern);
|
||||
NEW_PROP_TAG(LinearSolverIgnoreConvergenceFailure);
|
||||
NEW_PROP_TAG(UseAmg);
|
||||
NEW_PROP_TAG(UseCpr);
|
||||
NEW_PROP_TAG(PreconditionerAddWellContributions);
|
||||
NEW_PROP_TAG(SystemStrategy);
|
||||
NEW_PROP_TAG(ScaleLinearSystem);
|
||||
NEW_PROP_TAG(CprSolverVerbose);
|
||||
NEW_PROP_TAG(CprUseDrs);
|
||||
NEW_PROP_TAG(CprMaxEllIter);
|
||||
NEW_PROP_TAG(CprEllSolvetype);
|
||||
NEW_PROP_TAG(CprReuseSetup);
|
||||
NEW_PROP_TAG(LinearSolverConfiguration);
|
||||
NEW_PROP_TAG(LinearSolverConfigurationJsonFile);
|
||||
NEW_PROP_TAG(GpuMode);
|
||||
NEW_PROP_TAG(BdaDeviceId);
|
||||
NEW_PROP_TAG(OpenclPlatformId);
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct LinearSolverReduction {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct IluRelaxation {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct LinearSolverMaxIter {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct LinearSolverRestart {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct FlowLinearSolverVerbosity {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct IluFillinLevel {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MiluVariant {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct IluRedblack {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct IluReorderSpheres {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct UseGmres {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct LinearSolverRequireFullSparsityPattern {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct LinearSolverIgnoreConvergenceFailure{
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct UseAmg {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct UseCpr {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct PreconditionerAddWellContributions {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SystemStrategy {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct ScaleLinearSystem {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct CprSolverVerbose {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct CprUseDrs {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct CprMaxEllIter {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct CprEllSolvetype {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct CprReuseSetup {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct LinearSolverConfiguration {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct LinearSolverConfigurationJsonFile {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct GpuMode {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct BdaDeviceId {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct OpenclPlatformId {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct LinearSolverReduction<TypeTag, TTag::FlowIstlSolverParams> {
|
||||
|
||||
@@ -23,25 +23,82 @@ namespace TTag {
|
||||
struct FlowTimeSteppingParameters {};
|
||||
}
|
||||
|
||||
NEW_PROP_TAG(SolverRestartFactor);
|
||||
NEW_PROP_TAG(SolverGrowthFactor);
|
||||
NEW_PROP_TAG(SolverMaxGrowth);
|
||||
NEW_PROP_TAG(SolverMaxTimeStepInDays);
|
||||
NEW_PROP_TAG(SolverMinTimeStep);
|
||||
NEW_PROP_TAG(SolverMaxRestarts);
|
||||
NEW_PROP_TAG(SolverVerbosity);
|
||||
NEW_PROP_TAG(TimeStepVerbosity);
|
||||
NEW_PROP_TAG(InitialTimeStepInDays);
|
||||
NEW_PROP_TAG(FullTimeStepInitially);
|
||||
NEW_PROP_TAG(TimeStepAfterEventInDays);
|
||||
NEW_PROP_TAG(TimeStepControl);
|
||||
NEW_PROP_TAG(TimeStepControlTolerance);
|
||||
NEW_PROP_TAG(TimeStepControlTargetIterations);
|
||||
NEW_PROP_TAG(TimeStepControlTargetNewtonIterations);
|
||||
NEW_PROP_TAG(TimeStepControlDecayRate);
|
||||
NEW_PROP_TAG(TimeStepControlGrowthRate);
|
||||
NEW_PROP_TAG(TimeStepControlFileName);
|
||||
NEW_PROP_TAG(MinTimeStepBeforeShuttingProblematicWellsInDays);
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverRestartFactor {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverGrowthFactor {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverMaxGrowth {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverMaxTimeStepInDays {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverMinTimeStep {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverMaxRestarts {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverVerbosity {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepVerbosity {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct InitialTimeStepInDays {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct FullTimeStepInitially {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepAfterEventInDays {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControl {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlTolerance {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlTargetIterations {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlTargetNewtonIterations {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlDecayRate {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlGrowthRate {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlFileName {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MinTimeStepBeforeShuttingProblematicWellsInDays {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct SolverRestartFactor<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
|
||||
@@ -63,7 +63,10 @@
|
||||
|
||||
namespace Opm::Properties {
|
||||
|
||||
NEW_PROP_TAG(EnableTerminalOutput);
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct EnableTerminalOutput {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
|
||||
} // namespace Opm::Properties
|
||||
|
||||
|
||||
Reference in New Issue
Block a user