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

Use plural for parameter class names.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-05-21 08:54:56 +02:00
parent 270a7c59fb
commit 603b9657a1
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/autodiff/BlackoilModel.hpp
View File

@ -65,7 +65,7 @@ namespace Opm {
typedef WellStateFullyImplicitBlackoil WellState; typedef WellStateFullyImplicitBlackoil WellState;
/// Model-specific solver parameters. /// Model-specific solver parameters.
struct ModelParameter struct ModelParameters
{ {
double dp_max_rel_; double dp_max_rel_;
double ds_max_; double ds_max_;
@ -75,8 +75,8 @@ namespace Opm {
double tolerance_cnv_; double tolerance_cnv_;
double tolerance_wells_; double tolerance_wells_;
ModelParameter( const parameter::ParameterGroup& param ); explicit ModelParameters( const parameter::ParameterGroup& param );
ModelParameter(); ModelParameters();
void reset(); void reset();
}; };
@ -96,7 +96,7 @@ namespace Opm {
/// \param[in] has_disgas turn on dissolved gas /// \param[in] has_disgas turn on dissolved gas
/// \param[in] has_vapoil turn on vaporized oil feature /// \param[in] has_vapoil turn on vaporized oil feature
/// \param[in] terminal_output request output to cout/cerr /// \param[in] terminal_output request output to cout/cerr
BlackoilModel(const ModelParameter& param, BlackoilModel(const ModelParameters& param,
const Grid& grid , const Grid& grid ,
const BlackoilPropsAdInterface& fluid, const BlackoilPropsAdInterface& fluid,
const DerivedGeology& geo , const DerivedGeology& geo ,
@ -241,7 +241,7 @@ namespace Opm {
const bool has_disgas_; const bool has_disgas_;
const bool has_vapoil_; const bool has_vapoil_;
ModelParameter param_; ModelParameters param_;
bool use_threshold_pressure_; bool use_threshold_pressure_;
V threshold_pressures_by_interior_face_; V threshold_pressures_by_interior_face_;

12
opm/autodiff/BlackoilModel_impl.hpp
View File

@ -136,7 +136,7 @@ namespace detail {
} // namespace detail } // namespace detail
template <class Grid> template <class Grid>
void BlackoilModel<Grid>::ModelParameter:: void BlackoilModel<Grid>::ModelParameters::
reset() reset()
{ {
// default values for the solver parameters // default values for the solver parameters
@ -150,16 +150,16 @@ namespace detail {
} }
template <class Grid> template <class Grid>
BlackoilModel<Grid>::ModelParameter:: BlackoilModel<Grid>::ModelParameters::
ModelParameter() ModelParameters()
{ {
// set default values // set default values
reset(); reset();
} }
template <class Grid> template <class Grid>
BlackoilModel<Grid>::ModelParameter:: BlackoilModel<Grid>::ModelParameters::
ModelParameter( const parameter::ParameterGroup& param ) ModelParameters( const parameter::ParameterGroup& param )
{ {
// set default values // set default values
reset(); reset();
@ -177,7 +177,7 @@ namespace detail {
template <class Grid> template <class Grid>
BlackoilModel<Grid>:: BlackoilModel<Grid>::
BlackoilModel(const ModelParameter& param, BlackoilModel(const ModelParameters& param,
const Grid& grid , const Grid& grid ,
const BlackoilPropsAdInterface& fluid, const BlackoilPropsAdInterface& fluid,
const DerivedGeology& geo , const DerivedGeology& geo ,

10
opm/autodiff/NewtonSolver.hpp
View File

@ -41,7 +41,7 @@ namespace Opm {
enum RelaxType { DAMPEN, SOR }; enum RelaxType { DAMPEN, SOR };
// Solver parameters controlling nonlinear Newton process. // Solver parameters controlling nonlinear Newton process.
struct SolverParameter struct SolverParameters
{ {
enum RelaxType relax_type_; enum RelaxType relax_type_;
double relax_max_; double relax_max_;
@ -50,8 +50,8 @@ namespace Opm {
int max_iter_; // max newton iterations int max_iter_; // max newton iterations
int min_iter_; // min newton iterations int min_iter_; // min newton iterations
SolverParameter( const parameter::ParameterGroup& param ); explicit SolverParameters( const parameter::ParameterGroup& param );
SolverParameter(); SolverParameters();
void reset(); void reset();
}; };
@ -65,7 +65,7 @@ namespace Opm {
/// Construct solver for a given model. /// Construct solver for a given model.
/// \param[in] param parameters controlling nonlinear Newton process /// \param[in] param parameters controlling nonlinear Newton process
/// \param[in, out] model physical simulation model /// \param[in, out] model physical simulation model
explicit NewtonSolver(const SolverParameter& param, explicit NewtonSolver(const SolverParameters& param,
PhysicalModel& model); PhysicalModel& model);
/// Take a single forward step, after which the states will be modified /// Take a single forward step, after which the states will be modified
@ -87,7 +87,7 @@ namespace Opm {
private: private:
// --------- Data members --------- // --------- Data members ---------
SolverParameter param_; SolverParameters param_;
PhysicalModel& model_; PhysicalModel& model_;
unsigned int newtonIterations_; unsigned int newtonIterations_;
unsigned int linearIterations_; unsigned int linearIterations_;

12
opm/autodiff/NewtonSolver_impl.hpp
View File

@ -28,7 +28,7 @@
namespace Opm namespace Opm
{ {
template <class PhysicalModel> template <class PhysicalModel>
NewtonSolver<PhysicalModel>::NewtonSolver(const SolverParameter& param, NewtonSolver<PhysicalModel>::NewtonSolver(const SolverParameters& param,
PhysicalModel& model) PhysicalModel& model)
: param_(param), : param_(param),
model_(model), model_(model),
@ -131,7 +131,7 @@ namespace Opm
template <class PhysicalModel> template <class PhysicalModel>
void NewtonSolver<PhysicalModel>::SolverParameter:: void NewtonSolver<PhysicalModel>::SolverParameters::
reset() reset()
{ {
// default values for the solver parameters // default values for the solver parameters
@ -144,16 +144,16 @@ namespace Opm
} }
template <class PhysicalModel> template <class PhysicalModel>
NewtonSolver<PhysicalModel>::SolverParameter:: NewtonSolver<PhysicalModel>::SolverParameters::
SolverParameter() SolverParameters()
{ {
// set default values // set default values
reset(); reset();
} }
template <class PhysicalModel> template <class PhysicalModel>
NewtonSolver<PhysicalModel>::SolverParameter:: NewtonSolver<PhysicalModel>::SolverParameters::
SolverParameter( const parameter::ParameterGroup& param ) SolverParameters( const parameter::ParameterGroup& param )
{ {
// set default values // set default values
reset(); reset();

12
opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp
View File

@ -234,11 +234,11 @@ namespace Opm
typedef T Grid; typedef T Grid;
typedef BlackoilModel<Grid> Model; typedef BlackoilModel<Grid> Model;
typedef typename Model::ModelParameter ModelParam; typedef typename Model::ModelParameters ModelParams;
ModelParam modelParam( param_ ); ModelParams modelParams( param_ );
typedef NewtonSolver<Model> Solver; typedef NewtonSolver<Model> Solver;
typedef typename Solver::SolverParameter SolverParam; typedef typename Solver::SolverParameters SolverParams;
SolverParam solverParam( param_ ); SolverParams solverParams( param_ );
// adaptive time stepping // adaptive time stepping
std::unique_ptr< AdaptiveTimeStepping > adaptiveTimeStepping; std::unique_ptr< AdaptiveTimeStepping > adaptiveTimeStepping;
@ -298,11 +298,11 @@ namespace Opm
// Run a multiple steps of the solver depending on the time step control. // Run a multiple steps of the solver depending on the time step control.
solver_timer.start(); solver_timer.start();
Model model(modelParam, grid_, props_, geo_, rock_comp_props_, wells, solver_, has_disgas_, has_vapoil_, terminal_output_); Model model(modelParams, grid_, props_, geo_, rock_comp_props_, wells, solver_, has_disgas_, has_vapoil_, terminal_output_);
if (!threshold_pressures_by_face_.empty()) { if (!threshold_pressures_by_face_.empty()) {
model.setThresholdPressures(threshold_pressures_by_face_); model.setThresholdPressures(threshold_pressures_by_face_);
} }
Solver solver(solverParam, model); Solver solver(solverParams, model);
// If sub stepping is enabled allow the solver to sub cycle // If sub stepping is enabled allow the solver to sub cycle
// in case the report steps are to large for the solver to converge // in case the report steps are to large for the solver to converge