BlackoilModelParameters: introduce translation unit

CMakeLists_files.cmake

@@ -57,6 +57,7 @@ endmacro()
 list (APPEND MAIN_SOURCE_FILES
   opm/simulators/flow/ActionHandler.cpp
   opm/simulators/flow/Banners.cpp
+  opm/simulators/flow/BlackoilModelParameters.cpp
   opm/simulators/flow/CollectDataOnIORank.cpp
   opm/simulators/flow/ConvergenceOutputConfiguration.cpp
   opm/simulators/flow/EclGenericWriter.cpp

flowexperimental/flowexp.hpp

@@ -124,6 +124,7 @@ struct LinearSolverBackend<TypeTag, TTag::FlowExpTypeTag> {
 } // namespace Opm::Properties
 
 namespace Opm {
+
 template <class TypeTag>
 class FlowExpProblem : public FlowProblem<TypeTag> //, public FvBaseProblem<TypeTag>
 {
@@ -150,7 +151,7 @@ public:
     {
         ParentType::registerParameters();
 
-        BlackoilModelParameters<TypeTag>::registerParameters();
+        BlackoilModelParameters<double>::registerParameters();
         Parameters::Register<Parameters::EnableTerminalOutput>("Do *NOT* use!");
         Parameters::Hide<Parameters::DbhpMaxRel<Scalar>>();
         Parameters::Hide<Parameters::DwellFractionMax<Scalar>>();
@@ -204,6 +205,7 @@ public:
     // inherit the constructors
     using ParentType::FlowProblem;
 };
+
 }
 
 #endif

opm/simulators/flow/BlackoilModel.hpp

@@ -161,8 +161,6 @@ namespace Opm {
     {
     public:
         // ---------  Types and enums  ---------
-        using ModelParameters = BlackoilModelParameters<TypeTag>;
-
         using Simulator = GetPropType<TypeTag, Properties::Simulator>;
         using Grid = GetPropType<TypeTag, Properties::Grid>;
         using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
@@ -175,6 +173,7 @@ namespace Opm {
         using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
         using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
         using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+        using ModelParameters = BlackoilModelParameters<Scalar>;
 
         static constexpr int numEq = Indices::numEq;
         static constexpr int contiSolventEqIdx = Indices::contiSolventEqIdx;

opm/simulators/flow/BlackoilModelNldd.hpp

@@ -82,8 +82,8 @@ public:
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using Grid = GetPropType<TypeTag, Properties::Grid>;
     using Indices = GetPropType<TypeTag, Properties::Indices>;
-    using ModelParameters = BlackoilModelParameters<TypeTag>;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+    using ModelParameters = BlackoilModelParameters<Scalar>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
 
     using BVector = typename BlackoilModel<TypeTag>::BVector;

opm/simulators/flow/BlackoilModelParameters.cpp

@@ -0,0 +1,227 @@
+/*
+  Copyright 2015 SINTEF ICT, Applied Mathematics.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
+#include <opm/simulators/flow/BlackoilModelParameters.hpp>
+
+#include <opm/models/discretization/common/fvbaseparameters.hh>
+
+#include <opm/models/utils/parametersystem.hh>
+
+#include <algorithm>
+#include <stdexcept>
+
+namespace Opm {
+
+template<class Scalar>
+BlackoilModelParameters<Scalar>::BlackoilModelParameters()
+{
+    dbhp_max_rel_ = Parameters::Get<Parameters::DbhpMaxRel<Scalar>>();
+    dwell_fraction_max_ = Parameters::Get<Parameters::DwellFractionMax<Scalar>>();
+    max_residual_allowed_ = Parameters::Get<Parameters::MaxResidualAllowed<Scalar>>();
+    relaxed_max_pv_fraction_ = Parameters::Get<Parameters::RelaxedMaxPvFraction<Scalar>>();
+    tolerance_mb_ = Parameters::Get<Parameters::ToleranceMb<Scalar>>();
+    tolerance_mb_relaxed_ = std::max(tolerance_mb_, Parameters::Get<Parameters::ToleranceMbRelaxed<Scalar>>());
+    tolerance_cnv_ = Parameters::Get<Parameters::ToleranceCnv<Scalar>>();
+    tolerance_cnv_relaxed_ = std::max(tolerance_cnv_, Parameters::Get<Parameters::ToleranceCnvRelaxed<Scalar>>());
+    tolerance_wells_ = Parameters::Get<Parameters::ToleranceWells<Scalar>>();
+    tolerance_well_control_ = Parameters::Get<Parameters::ToleranceWellControl<Scalar>>();
+    max_welleq_iter_ = Parameters::Get<Parameters::MaxWelleqIter>();
+    use_multisegment_well_ = Parameters::Get<Parameters::UseMultisegmentWell>();
+    tolerance_pressure_ms_wells_ = Parameters::Get<Parameters::TolerancePressureMsWells<Scalar>>();
+    relaxed_tolerance_flow_well_ = Parameters::Get<Parameters::RelaxedWellFlowTol<Scalar>>();
+    relaxed_tolerance_pressure_ms_well_ = Parameters::Get<Parameters::RelaxedPressureTolMsw<Scalar>>();
+    max_pressure_change_ms_wells_ = Parameters::Get<Parameters::MaxPressureChangeMsWells<Scalar>>();
+    max_inner_iter_ms_wells_ = Parameters::Get<Parameters::MaxInnerIterMsWells>();
+    strict_inner_iter_wells_ = Parameters::Get<Parameters::StrictInnerIterWells>();
+    strict_outer_iter_wells_ = Parameters::Get<Parameters::StrictOuterIterWells>();
+    regularization_factor_wells_ = Parameters::Get<Parameters::RegularizationFactorWells<Scalar>>();
+    max_niter_inner_well_iter_ = Parameters::Get<Parameters::MaxNewtonIterationsWithInnerWellIterations>();
+    shut_unsolvable_wells_ = Parameters::Get<Parameters::ShutUnsolvableWells>();
+    max_inner_iter_wells_ = Parameters::Get<Parameters::MaxInnerIterWells>();
+    maxSinglePrecisionTimeStep_ = Parameters::Get<Parameters::MaxSinglePrecisionDays<Scalar>>() * 24 * 60 * 60;
+    min_strict_cnv_iter_ = Parameters::Get<Parameters::MinStrictCnvIter>();
+    min_strict_mb_iter_ = Parameters::Get<Parameters::MinStrictMbIter>();
+    solve_welleq_initially_ = Parameters::Get<Parameters::SolveWelleqInitially>();
+    update_equations_scaling_ = Parameters::Get<Parameters::UpdateEquationsScaling>();
+    use_update_stabilization_ = Parameters::Get<Parameters::UseUpdateStabilization>();
+    matrix_add_well_contributions_ = Parameters::Get<Parameters::MatrixAddWellContributions>();
+    check_well_operability_ = Parameters::Get<Parameters::EnableWellOperabilityCheck>();
+    check_well_operability_iter_ = Parameters::Get<Parameters::EnableWellOperabilityCheckIter>();
+    max_number_of_well_switches_ = Parameters::Get<Parameters::MaximumNumberOfWellSwitches>();
+    use_average_density_ms_wells_ = Parameters::Get<Parameters::UseAverageDensityMsWells>();
+    local_well_solver_control_switching_ = Parameters::Get<Parameters::LocalWellSolveControlSwitching>();
+    use_implicit_ipr_ = Parameters::Get<Parameters::UseImplicitIpr>();
+    nonlinear_solver_ = Parameters::Get<Parameters::NonlinearSolver>();
+    const auto approach = Parameters::Get<Parameters::LocalSolveApproach>();
+    if (approach == "jacobi") {
+        local_solve_approach_ = DomainSolveApproach::Jacobi;
+    } else if (approach == "gauss-seidel") {
+        local_solve_approach_ = DomainSolveApproach::GaussSeidel;
+    } else {
+        throw std::runtime_error("Invalid domain solver approach '" + approach + "' specified.");
+    }
+
+    max_local_solve_iterations_ = Parameters::Get<Parameters::MaxLocalSolveIterations>();
+    local_tolerance_scaling_mb_ = Parameters::Get<Parameters::LocalToleranceScalingMb<Scalar>>();
+    local_tolerance_scaling_cnv_ = Parameters::Get<Parameters::LocalToleranceScalingCnv<Scalar>>();
+    nldd_num_initial_newton_iter_ = Parameters::Get<Parameters::NlddNumInitialNewtonIter>();
+    num_local_domains_ = Parameters::Get<Parameters::NumLocalDomains>();
+    local_domain_partition_imbalance_ = std::max(Scalar{1.0}, Parameters::Get<Parameters::LocalDomainsPartitioningImbalance<Scalar>>());
+    local_domain_partition_method_ = Parameters::Get<Parameters::LocalDomainsPartitioningMethod>();
+    deck_file_name_ = Parameters::Get<Parameters::EclDeckFileName>();
+    network_max_strict_iterations_ = Parameters::Get<Parameters::NetworkMaxStrictIterations>();
+    network_max_iterations_ = Parameters::Get<Parameters::NetworkMaxIterations>();
+    local_domain_ordering_ = domainOrderingMeasureFromString(Parameters::Get<Parameters::LocalDomainsOrderingMeasure>());
+    write_partitions_ = Parameters::Get<Parameters::DebugEmitCellPartition>();
+}
+
+template<class Scalar>
+void BlackoilModelParameters<Scalar>::registerParameters()
+{
+    Parameters::Register<Parameters::DbhpMaxRel<Scalar>>
+        ("Maximum relative change of the bottom-hole pressure in a single iteration");
+    Parameters::Register<Parameters::DwellFractionMax<Scalar>>
+        ("Maximum absolute change of a well's volume fraction in a single iteration");
+    Parameters::Register<Parameters::MaxResidualAllowed<Scalar>>
+        ("Absolute maximum tolerated for residuals without cutting the time step size");
+    Parameters::Register<Parameters::RelaxedMaxPvFraction<Scalar>>
+        ("The fraction of the pore volume of the reservoir "
+         "where the volumetric error (CNV) may be voilated "
+         "during strict Newton iterations.");
+    Parameters::Register<Parameters::ToleranceMb<Scalar>>
+        ("Tolerated mass balance error relative to total mass present");
+    Parameters::Register<Parameters::ToleranceMbRelaxed<Scalar>>
+        ("Relaxed tolerated mass balance error that applies for iterations "
+         "after the iterations with the strict tolerance");
+    Parameters::Register<Parameters::ToleranceCnv<Scalar>>
+        ("Local convergence tolerance (Maximum of local saturation errors)");
+    Parameters::Register<Parameters::ToleranceCnvRelaxed<Scalar>>
+        ("Relaxed local convergence tolerance that applies for iterations "
+         "after the iterations with the strict tolerance");
+    Parameters::Register<Parameters::ToleranceWells<Scalar>>
+        ("Well convergence tolerance");
+    Parameters::Register<Parameters::ToleranceWellControl<Scalar>>
+        ("Tolerance for the well control equations");
+    Parameters::Register<Parameters::MaxWelleqIter>
+        ("Maximum number of iterations to determine solution the well equations");
+    Parameters::Register<Parameters::UseMultisegmentWell>
+        ("Use the well model for multi-segment wells instead of the "
+         "one for single-segment wells");
+    Parameters::Register<Parameters::TolerancePressureMsWells<Scalar>>
+        ("Tolerance for the pressure equations for multi-segment wells");
+    Parameters::Register<Parameters::RelaxedWellFlowTol<Scalar>>
+        ("Relaxed tolerance for the well flow residual");
+    Parameters::Register<Parameters::RelaxedPressureTolMsw<Scalar>>
+        ("Relaxed tolerance for the MSW pressure solution");
+    Parameters::Register<Parameters::MaxPressureChangeMsWells<Scalar>>
+        ("Maximum relative pressure change for a single iteration "
+         "of the multi-segment well model");
+    Parameters::Register<Parameters::MaxInnerIterMsWells>
+        ("Maximum number of inner iterations for multi-segment wells");
+    Parameters::Register<Parameters::StrictInnerIterWells>
+        ("Number of inner well iterations with strict tolerance");
+    Parameters::Register<Parameters::StrictOuterIterWells>
+        ("Number of newton iterations for which wells are checked with strict tolerance");
+    Parameters::Register<Parameters::MaxNewtonIterationsWithInnerWellIterations>
+        ("Maximum newton iterations with inner well iterations");
+    Parameters::Register<Parameters::ShutUnsolvableWells>
+        ("Shut unsolvable wells");
+    Parameters::Register<Parameters::MaxInnerIterWells>
+        ("Maximum number of inner iterations for standard wells");
+    Parameters::Register<Parameters::AlternativeWellRateInit>
+        ("Use alternative well rate initialization procedure");
+    Parameters::Register<Parameters::RegularizationFactorWells<Scalar>>
+        ("Regularization factor for wells");
+    Parameters::Register<Parameters::MaxSinglePrecisionDays<Scalar>>
+        ("Maximum time step size where single precision floating point "
+         "arithmetic can be used solving for the linear systems of equations");
+    Parameters::Register<Parameters::MinStrictCnvIter>
+        ("Minimum number of Newton iterations before relaxed tolerances "
+         "can be used for the CNV convergence criterion");
+    Parameters::Register<Parameters::MinStrictMbIter>
+        ("Minimum number of Newton iterations before relaxed tolerances "
+         "can be used for the MB convergence criterion. "
+         "Default -1 means that the relaxed tolerance is used when maximum "
+         "number of Newton iterations are reached.");
+    Parameters::Register<Parameters::SolveWelleqInitially>
+        ("Fully solve the well equations before each iteration of the reservoir model");
+    Parameters::Register<Parameters::UpdateEquationsScaling>
+        ("Update scaling factors for mass balance equations during the run");
+    Parameters::Register<Parameters::UseUpdateStabilization>
+        ("Try to detect and correct oscillations or stagnation during the Newton method");
+    Parameters::Register<Parameters::MatrixAddWellContributions>
+        ("Explicitly specify the influences of wells between cells in "
+         "the Jacobian and preconditioner matrices");
+    Parameters::Register<Parameters::EnableWellOperabilityCheck>
+        ("Enable the well operability checking");
+    Parameters::Register<Parameters::EnableWellOperabilityCheckIter>
+        ("Enable the well operability checking during iterations");
+    Parameters::Register<Parameters::MaximumNumberOfWellSwitches>
+        ("Maximum number of times a well can switch to the same control");
+    Parameters::Register<Parameters::UseAverageDensityMsWells>
+        ("Approximate segment densitities by averaging over segment and its outlet");
+    Parameters::Register<Parameters::LocalWellSolveControlSwitching>
+        ("Allow control switching during local well solutions");
+    Parameters::Register<Parameters::UseImplicitIpr>
+        ("Compute implict IPR for stability checks and stable solution search");
+    Parameters::Register<Parameters::NetworkMaxStrictIterations>
+        ("Maximum iterations in network solver before relaxing tolerance");
+    Parameters::Register<Parameters::NetworkMaxIterations>
+        ("Maximum number of iterations in the network solver before giving up");
+    Parameters::Register<Parameters::NonlinearSolver>
+        ("Choose nonlinear solver. Valid choices are newton or nldd.");
+    Parameters::Register<Parameters::LocalSolveApproach>
+        ("Choose local solve approach. Valid choices are jacobi and gauss-seidel");
+    Parameters::Register<Parameters::MaxLocalSolveIterations>
+        ("Max iterations for local solves with NLDD nonlinear solver.");
+    Parameters::Register<Parameters::LocalToleranceScalingMb<Scalar>>
+        ("Set lower than 1.0 to use stricter convergence tolerance for local solves.");
+    Parameters::Register<Parameters::LocalToleranceScalingCnv<Scalar>>
+        ("Set lower than 1.0 to use stricter convergence tolerance for local solves.");
+    Parameters::Register<Parameters::NlddNumInitialNewtonIter>
+        ("Number of initial global Newton iterations when running the NLDD nonlinear solver.");
+    Parameters::Register<Parameters::NumLocalDomains>
+        ("Number of local domains for NLDD nonlinear solver.");
+    Parameters::Register<Parameters::LocalDomainsPartitioningImbalance<Scalar>>
+        ("Subdomain partitioning imbalance tolerance. 1.03 is 3 percent imbalance.");
+    Parameters::Register<Parameters::LocalDomainsPartitioningMethod>
+        ("Subdomain partitioning method. Allowed values are "
+         "'zoltan', "
+         "'simple', "
+         "and the name of a partition file ending with '.partition'.");
+    Parameters::Register<Parameters::LocalDomainsOrderingMeasure>
+        ("Subdomain ordering measure. Allowed values are "
+         "'maxpressure', "
+         "'averagepressure' "
+         "and  'residual'.");
+    Parameters::Register<Parameters::DebugEmitCellPartition>
+        ("Whether or not to emit cell partitions as a debugging aid.");
+
+    Parameters::Hide<Parameters::DebugEmitCellPartition>();
+
+    // if openMP is available, determine the number threads per process automatically.
+#if _OPENMP
+    Parameters::SetDefault<Parameters::ThreadsPerProcess>(-1);
+#endif
+}
+
+template struct BlackoilModelParameters<double>;
+
+} // namespace Opm

opm/simulators/flow/BlackoilModelParameters.hpp

@@ -20,16 +20,8 @@
 #ifndef OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED
 #define OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED
 
-#include <opm/models/discretization/common/fvbaseparameters.hh>
-#include <opm/models/discretization/common/fvbaseproperties.hh>
-
-#include <opm/models/utils/basicproperties.hh>
-#include <opm/models/utils/parametersystem.hh>
-
 #include <opm/simulators/flow/SubDomain.hpp>
 
-#include <algorithm>
-#include <stdexcept>
 #include <string>
 
 namespace Opm::Parameters {
@@ -138,12 +130,9 @@ struct LocalDomainsOrderingMeasure { static constexpr auto value = "maxpressure"
 namespace Opm {
 
 /// Solver parameters for the BlackoilModel.
-template <class TypeTag>
+template <class Scalar>
 struct BlackoilModelParameters
 {
-private:
-    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-
 public:
     /// Max relative change in bhp in single iteration.
     Scalar dbhp_max_rel_;
@@ -276,197 +265,9 @@ public:
     bool write_partitions_{false};
 
     /// Construct from user parameters or defaults.
-    BlackoilModelParameters()
+    BlackoilModelParameters();
-    {
-        dbhp_max_rel_ = Parameters::Get<Parameters::DbhpMaxRel<Scalar>>();
-        dwell_fraction_max_ = Parameters::Get<Parameters::DwellFractionMax<Scalar>>();
-        max_residual_allowed_ = Parameters::Get<Parameters::MaxResidualAllowed<Scalar>>();
-        relaxed_max_pv_fraction_ = Parameters::Get<Parameters::RelaxedMaxPvFraction<Scalar>>();
-        tolerance_mb_ = Parameters::Get<Parameters::ToleranceMb<Scalar>>();
-        tolerance_mb_relaxed_ = std::max(tolerance_mb_, Parameters::Get<Parameters::ToleranceMbRelaxed<Scalar>>());
-        tolerance_cnv_ = Parameters::Get<Parameters::ToleranceCnv<Scalar>>();
-        tolerance_cnv_relaxed_ = std::max(tolerance_cnv_, Parameters::Get<Parameters::ToleranceCnvRelaxed<Scalar>>());
-        tolerance_wells_ = Parameters::Get<Parameters::ToleranceWells<Scalar>>();
-        tolerance_well_control_ = Parameters::Get<Parameters::ToleranceWellControl<Scalar>>();
-        max_welleq_iter_ = Parameters::Get<Parameters::MaxWelleqIter>();
-        use_multisegment_well_ = Parameters::Get<Parameters::UseMultisegmentWell>();
-        tolerance_pressure_ms_wells_ = Parameters::Get<Parameters::TolerancePressureMsWells<Scalar>>();
-        relaxed_tolerance_flow_well_ = Parameters::Get<Parameters::RelaxedWellFlowTol<Scalar>>();
-        relaxed_tolerance_pressure_ms_well_ = Parameters::Get<Parameters::RelaxedPressureTolMsw<Scalar>>();
-        max_pressure_change_ms_wells_ = Parameters::Get<Parameters::MaxPressureChangeMsWells<Scalar>>();
-        max_inner_iter_ms_wells_ = Parameters::Get<Parameters::MaxInnerIterMsWells>();
-        strict_inner_iter_wells_ = Parameters::Get<Parameters::StrictInnerIterWells>();
-        strict_outer_iter_wells_ = Parameters::Get<Parameters::StrictOuterIterWells>();
-        regularization_factor_wells_ = Parameters::Get<Parameters::RegularizationFactorWells<Scalar>>();
-        max_niter_inner_well_iter_ = Parameters::Get<Parameters::MaxNewtonIterationsWithInnerWellIterations>();
-        shut_unsolvable_wells_ = Parameters::Get<Parameters::ShutUnsolvableWells>();
-        max_inner_iter_wells_ = Parameters::Get<Parameters::MaxInnerIterWells>();
-        maxSinglePrecisionTimeStep_ = Parameters::Get<Parameters::MaxSinglePrecisionDays<Scalar>>() * 24 * 60 * 60;
-        min_strict_cnv_iter_ = Parameters::Get<Parameters::MinStrictCnvIter>();
-        min_strict_mb_iter_ = Parameters::Get<Parameters::MinStrictMbIter>();
-        solve_welleq_initially_ = Parameters::Get<Parameters::SolveWelleqInitially>();
-        update_equations_scaling_ = Parameters::Get<Parameters::UpdateEquationsScaling>();
-        use_update_stabilization_ = Parameters::Get<Parameters::UseUpdateStabilization>();
-        matrix_add_well_contributions_ = Parameters::Get<Parameters::MatrixAddWellContributions>();
-        check_well_operability_ = Parameters::Get<Parameters::EnableWellOperabilityCheck>();
-        check_well_operability_iter_ = Parameters::Get<Parameters::EnableWellOperabilityCheckIter>();
-        max_number_of_well_switches_ = Parameters::Get<Parameters::MaximumNumberOfWellSwitches>();
-        use_average_density_ms_wells_ = Parameters::Get<Parameters::UseAverageDensityMsWells>();
-        local_well_solver_control_switching_ = Parameters::Get<Parameters::LocalWellSolveControlSwitching>();
-        use_implicit_ipr_ = Parameters::Get<Parameters::UseImplicitIpr>();
-        nonlinear_solver_ = Parameters::Get<Parameters::NonlinearSolver>();
-        const auto approach = Parameters::Get<Parameters::LocalSolveApproach>();
-        if (approach == "jacobi") {
-            local_solve_approach_ = DomainSolveApproach::Jacobi;
-        } else if (approach == "gauss-seidel") {
-            local_solve_approach_ = DomainSolveApproach::GaussSeidel;
-        } else {
-            throw std::runtime_error("Invalid domain solver approach '" + approach + "' specified.");
-        }
 
-        max_local_solve_iterations_ = Parameters::Get<Parameters::MaxLocalSolveIterations>();
+    static void registerParameters();
-        local_tolerance_scaling_mb_ = Parameters::Get<Parameters::LocalToleranceScalingMb<Scalar>>();
-        local_tolerance_scaling_cnv_ = Parameters::Get<Parameters::LocalToleranceScalingCnv<Scalar>>();
-        nldd_num_initial_newton_iter_ = Parameters::Get<Parameters::NlddNumInitialNewtonIter>();
-        num_local_domains_ = Parameters::Get<Parameters::NumLocalDomains>();
-        local_domain_partition_imbalance_ = std::max(Scalar{1.0}, Parameters::Get<Parameters::LocalDomainsPartitioningImbalance<Scalar>>());
-        local_domain_partition_method_ = Parameters::Get<Parameters::LocalDomainsPartitioningMethod>();
-        deck_file_name_ = Parameters::Get<Parameters::EclDeckFileName>();
-        network_max_strict_iterations_ = Parameters::Get<Parameters::NetworkMaxStrictIterations>();
-        network_max_iterations_ = Parameters::Get<Parameters::NetworkMaxIterations>();
-        local_domain_ordering_ = domainOrderingMeasureFromString(Parameters::Get<Parameters::LocalDomainsOrderingMeasure>());
-        write_partitions_ = Parameters::Get<Parameters::DebugEmitCellPartition>();
-    }
-
-    static void registerParameters()
-    {
-        Parameters::Register<Parameters::DbhpMaxRel<Scalar>>
-            ("Maximum relative change of the bottom-hole pressure in a single iteration");
-        Parameters::Register<Parameters::DwellFractionMax<Scalar>>
-            ("Maximum absolute change of a well's volume fraction in a single iteration");
-        Parameters::Register<Parameters::MaxResidualAllowed<Scalar>>
-            ("Absolute maximum tolerated for residuals without cutting the time step size");
-        Parameters::Register<Parameters::RelaxedMaxPvFraction<Scalar>>
-            ("The fraction of the pore volume of the reservoir "
-             "where the volumetric error (CNV) may be voilated "
-             "during strict Newton iterations.");
-        Parameters::Register<Parameters::ToleranceMb<Scalar>>
-            ("Tolerated mass balance error relative to total mass present");
-        Parameters::Register<Parameters::ToleranceMbRelaxed<Scalar>>
-            ("Relaxed tolerated mass balance error that applies for iterations "
-             "after the iterations with the strict tolerance");
-        Parameters::Register<Parameters::ToleranceCnv<Scalar>>
-            ("Local convergence tolerance (Maximum of local saturation errors)");
-        Parameters::Register<Parameters::ToleranceCnvRelaxed<Scalar>>
-            ("Relaxed local convergence tolerance that applies for iterations "
-             "after the iterations with the strict tolerance");
-        Parameters::Register<Parameters::ToleranceWells<Scalar>>
-            ("Well convergence tolerance");
-        Parameters::Register<Parameters::ToleranceWellControl<Scalar>>
-            ("Tolerance for the well control equations");
-        Parameters::Register<Parameters::MaxWelleqIter>
-            ("Maximum number of iterations to determine solution the well equations");
-        Parameters::Register<Parameters::UseMultisegmentWell>
-            ("Use the well model for multi-segment wells instead of the "
-             "one for single-segment wells");
-        Parameters::Register<Parameters::TolerancePressureMsWells<Scalar>>
-            ("Tolerance for the pressure equations for multi-segment wells");
-        Parameters::Register<Parameters::RelaxedWellFlowTol<Scalar>>
-            ("Relaxed tolerance for the well flow residual");
-        Parameters::Register<Parameters::RelaxedPressureTolMsw<Scalar>>
-            ("Relaxed tolerance for the MSW pressure solution");
-        Parameters::Register<Parameters::MaxPressureChangeMsWells<Scalar>>
-            ("Maximum relative pressure change for a single iteration "
-             "of the multi-segment well model");
-        Parameters::Register<Parameters::MaxInnerIterMsWells>
-            ("Maximum number of inner iterations for multi-segment wells");
-        Parameters::Register<Parameters::StrictInnerIterWells>
-            ("Number of inner well iterations with strict tolerance");
-        Parameters::Register<Parameters::StrictOuterIterWells>
-            ("Number of newton iterations for which wells are checked with strict tolerance");
-        Parameters::Register<Parameters::MaxNewtonIterationsWithInnerWellIterations>
-            ("Maximum newton iterations with inner well iterations");
-        Parameters::Register<Parameters::ShutUnsolvableWells>
-            ("Shut unsolvable wells");
-        Parameters::Register<Parameters::MaxInnerIterWells>
-            ("Maximum number of inner iterations for standard wells");
-        Parameters::Register<Parameters::AlternativeWellRateInit>
-            ("Use alternative well rate initialization procedure");
-        Parameters::Register<Parameters::RegularizationFactorWells<Scalar>>
-            ("Regularization factor for wells");
-        Parameters::Register<Parameters::MaxSinglePrecisionDays<Scalar>>
-            ("Maximum time step size where single precision floating point "
-             "arithmetic can be used solving for the linear systems of equations");
-        Parameters::Register<Parameters::MinStrictCnvIter>
-            ("Minimum number of Newton iterations before relaxed tolerances "
-             "can be used for the CNV convergence criterion");
-        Parameters::Register<Parameters::MinStrictMbIter>
-            ("Minimum number of Newton iterations before relaxed tolerances "
-             "can be used for the MB convergence criterion. "
-             "Default -1 means that the relaxed tolerance is used when maximum "
-             "number of Newton iterations are reached.");
-        Parameters::Register<Parameters::SolveWelleqInitially>
-            ("Fully solve the well equations before each iteration of the reservoir model");
-        Parameters::Register<Parameters::UpdateEquationsScaling>
-            ("Update scaling factors for mass balance equations during the run");
-        Parameters::Register<Parameters::UseUpdateStabilization>
-            ("Try to detect and correct oscillations or stagnation during the Newton method");
-        Parameters::Register<Parameters::MatrixAddWellContributions>
-            ("Explicitly specify the influences of wells between cells in "
-             "the Jacobian and preconditioner matrices");
-        Parameters::Register<Parameters::EnableWellOperabilityCheck>
-            ("Enable the well operability checking");
-        Parameters::Register<Parameters::EnableWellOperabilityCheckIter>
-            ("Enable the well operability checking during iterations");
-        Parameters::Register<Parameters::MaximumNumberOfWellSwitches>
-            ("Maximum number of times a well can switch to the same control");
-        Parameters::Register<Parameters::UseAverageDensityMsWells>
-            ("Approximate segment densitities by averaging over segment and its outlet");
-        Parameters::Register<Parameters::LocalWellSolveControlSwitching>
-            ("Allow control switching during local well solutions");
-        Parameters::Register<Parameters::UseImplicitIpr>
-            ("Compute implict IPR for stability checks and stable solution search");
-        Parameters::Register<Parameters::NetworkMaxStrictIterations>
-            ("Maximum iterations in network solver before relaxing tolerance");
-        Parameters::Register<Parameters::NetworkMaxIterations>
-            ("Maximum number of iterations in the network solver before giving up");
-        Parameters::Register<Parameters::NonlinearSolver>
-            ("Choose nonlinear solver. Valid choices are newton or nldd.");
-        Parameters::Register<Parameters::LocalSolveApproach>
-            ("Choose local solve approach. Valid choices are jacobi and gauss-seidel");
-        Parameters::Register<Parameters::MaxLocalSolveIterations>
-            ("Max iterations for local solves with NLDD nonlinear solver.");
-        Parameters::Register<Parameters::LocalToleranceScalingMb<Scalar>>
-            ("Set lower than 1.0 to use stricter convergence tolerance for local solves.");
-        Parameters::Register<Parameters::LocalToleranceScalingCnv<Scalar>>
-            ("Set lower than 1.0 to use stricter convergence tolerance for local solves.");
-        Parameters::Register<Parameters::NlddNumInitialNewtonIter>
-            ("Number of initial global Newton iterations when running the NLDD nonlinear solver.");
-        Parameters::Register<Parameters::NumLocalDomains>
-            ("Number of local domains for NLDD nonlinear solver.");
-        Parameters::Register<Parameters::LocalDomainsPartitioningImbalance<Scalar>>
-            ("Subdomain partitioning imbalance tolerance. 1.03 is 3 percent imbalance.");
-        Parameters::Register<Parameters::LocalDomainsPartitioningMethod>
-            ("Subdomain partitioning method. Allowed values are "
-             "'zoltan', "
-             "'simple', "
-             "and the name of a partition file ending with '.partition'.");
-        Parameters::Register<Parameters::LocalDomainsOrderingMeasure>
-            ("Subdomain ordering measure. Allowed values are "
-             "'maxpressure', "
-             "'averagepressure' "
-             "and  'residual'.");
-        Parameters::Register<Parameters::DebugEmitCellPartition>
-            ("Whether or not to emit cell partitions as a debugging aid.");
-
-
-        Parameters::Hide<Parameters::DebugEmitCellPartition>();
-
-        // if openMP is available, determine the number threads per process automatically.
-#if _OPENMP
-        Parameters::SetDefault<Parameters::ThreadsPerProcess>(-1);
-#endif
-    }
 };
 
 } // namespace Opm

opm/simulators/flow/FlowBaseVanguard.hpp

@@ -36,6 +36,7 @@
 #include <opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 
+#include <opm/models/discretization/common/fvbaseparameters.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/models/io/basevanguard.hh>
 #include <opm/models/utils/parametersystem.hh>

opm/simulators/wells/BlackoilWellModel.hpp

@@ -98,8 +98,6 @@ template<class Scalar> class WellContributions;
         {
         public:
             // ---------      Types      ---------
-            using ModelParameters = BlackoilModelParameters<TypeTag>;
-
             using Grid = GetPropType<TypeTag, Properties::Grid>;
             using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
             using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
@@ -117,6 +115,9 @@ template<class Scalar> class WellContributions;
                 typename BlackoilWellModelGeneric<Scalar>::GLiftWellStateMap;
             using GLiftEclWells = typename GasLiftGroupInfo<Scalar>::GLiftEclWells;
             using GLiftSyncGroups = typename GasLiftSingleWellGeneric<Scalar>::GLiftSyncGroups;
+
+            using ModelParameters = BlackoilModelParameters<Scalar>;
+
             constexpr static std::size_t pressureVarIndex = GetPropType<TypeTag, Properties::Indices>::pressureSwitchIdx;
             typedef typename BaseAuxiliaryModule<TypeTag>::NeighborSet NeighborSet;
 

opm/simulators/wells/WellInterface.hpp

@@ -74,8 +74,6 @@ class WellInterface : public WellInterfaceIndices<GetPropType<TypeTag, Propertie
     using Base = WellInterfaceIndices<GetPropType<TypeTag, Properties::FluidSystem>,
                                       GetPropType<TypeTag, Properties::Indices>>;
 public:
-    using ModelParameters = BlackoilModelParameters<TypeTag>;
-
     using Grid = GetPropType<TypeTag, Properties::Grid>;
     using Simulator = GetPropType<TypeTag, Properties::Simulator>;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -105,6 +103,8 @@ public:
     using WellInterfaceFluidSystem<FluidSystem>::Oil;
     using WellInterfaceFluidSystem<FluidSystem>::Water;
 
+    using ModelParameters = BlackoilModelParameters<Scalar>;
+
     static constexpr bool has_solvent = getPropValue<TypeTag, Properties::EnableSolvent>();
     static constexpr bool has_zFraction = getPropValue<TypeTag, Properties::EnableExtbo>();
     static constexpr bool has_polymer = getPropValue<TypeTag, Properties::EnablePolymer>();

tests/test_RestartSerialization.cpp

@@ -513,7 +513,7 @@ struct AquiferFixture {
         };
         Opm::ThreadManager<TT>::registerParameters();
         AdaptiveTimeStepping<TT>::registerParameters();
-        BlackoilModelParameters<TT>::registerParameters();
+        BlackoilModelParameters<double>::registerParameters();
         Parameters::Register<Parameters::EnableTerminalOutput>("Do *NOT* use!");
         setupParameters_<TT>(2, argv, /*registerParams=*/true);
         Opm::FlowGenericVanguard::setCommunication(std::make_unique<Opm::Parallel::Communication>());

tests/test_equil.cpp

@@ -233,7 +233,7 @@ struct EquilFixture {
         using namespace Opm;
         FlowGenericVanguard::setCommunication(std::make_unique<Opm::Parallel::Communication>());
         Opm::ThreadManager<TypeTag>::registerParameters();
-        BlackoilModelParameters<TypeTag>::registerParameters();
+        BlackoilModelParameters<double>::registerParameters();
         AdaptiveTimeStepping<TypeTag>::registerParameters();
         Parameters::Register<Parameters::EnableTerminalOutput>("Dummy added for the well model to compile.");
         registerAllParameters_<TypeTag>();

tests/test_glift1.cpp

@@ -88,7 +88,7 @@ initSimulator(const char *filename)
     Parameters::reset();
     registerAllParameters_<TypeTag>(false);
     registerEclTimeSteppingParameters<double>();
-    BlackoilModelParameters<TypeTag>::registerParameters();
+    BlackoilModelParameters<double>::registerParameters();
     Parameters::Register<Parameters::EnableTerminalOutput>("Do *NOT* use!");
     Opm::Parameters::SetDefault<Opm::Parameters::ThreadsPerProcess>(2);
     Parameters::endRegistration();

tests/test_wellmodel.cpp

@@ -124,7 +124,7 @@ BOOST_AUTO_TEST_CASE(TestStandardWellInput) {
     const auto& wells_ecl = setup_test.schedule->getWells(setup_test.current_timestep);
     BOOST_CHECK_EQUAL( wells_ecl.size(), 2);
     const Opm::Well& well = wells_ecl[1];
-    const Opm::BlackoilModelParameters<Opm::Properties::TTag::FlowProblem> param;
+    const Opm::BlackoilModelParameters<double> param;
 
     // For the conversion between the surface volume rate and resrevoir voidage rate
     typedef Opm::BlackOilFluidSystem<double> FluidSystem;
@@ -156,11 +156,11 @@ BOOST_AUTO_TEST_CASE(TestBehavoir) {
 
     {
         const int nw = wells_ecl.size();
-        const Opm::BlackoilModelParameters<Opm::Properties::TTag::FlowProblem> param;
+        const Opm::BlackoilModelParameters<double> param;
 
         for (int w = 0; w < nw; ++w) {
             // For the conversion between the surface volume rate and resrevoir voidage rate
-            typedef Opm::BlackOilFluidSystem<double> FluidSystem;
+            using FluidSystem = Opm::BlackOilFluidSystem<double>;
             using RateConverterType = Opm::RateConverter::
                 SurfaceToReservoirVoidage<FluidSystem, std::vector<int> >;
             // Compute reservoir volumes for RESV controls.