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

adjust for changed ParameterGroup namespacing

Browse Source
This commit is contained in:
Arne Morten Kvarving
2017-04-28 15:36:25 +02:00
parent 46fff9a926
commit 3c0cb9e950
60 changed files with 95 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilModelBase.hpp
View File

@@ -47,7 +47,7 @@ struct Wells;
namespace Opm {
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class DerivedGeology;
class RockCompressibility;
class NewtonIterationBlackoilInterface;

2
opm/autodiff/BlackoilModelEbos.hpp
View File

@@ -92,7 +92,7 @@ SET_BOOL_PROP(EclFlowProblem, EnableSwatinit, false);
namespace Opm {
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class DerivedGeology;
class RockCompressibility;
class NewtonIterationBlackoilInterface;

2
opm/autodiff/BlackoilModelParameters.cpp
View File

@@ -34,7 +34,7 @@ namespace Opm
BlackoilModelParameters::BlackoilModelParameters( const parameter::ParameterGroup& param )
BlackoilModelParameters::BlackoilModelParameters( const ParameterGroup& param )
{
// set default values
reset();

4
opm/autodiff/BlackoilModelParameters.hpp
View File

@@ -25,7 +25,7 @@
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
/// Solver parameters for the BlackoilModel.
struct BlackoilModelParameters
@@ -69,7 +69,7 @@ namespace Opm
std::string deck_file_name_;
/// Construct from user parameters or defaults.
explicit BlackoilModelParameters( const parameter::ParameterGroup& param );
explicit BlackoilModelParameters( const ParameterGroup& param );
/// Construct with default parameters.
BlackoilModelParameters();

2
opm/autodiff/BlackoilSequentialModel.hpp
View File

@@ -35,7 +35,7 @@ namespace Opm {
struct BlackoilSequentialModelParameters : public BlackoilModelParameters
{
bool iterate_to_fully_implicit;
explicit BlackoilSequentialModelParameters( const parameter::ParameterGroup& param )
explicit BlackoilSequentialModelParameters( const ParameterGroup& param )
: BlackoilModelParameters(param),
iterate_to_fully_implicit(param.getDefault("iterate_to_fully_implicit", false))
{

2
opm/autodiff/CPRPreconditioner.hpp
View File

@@ -324,7 +324,7 @@ createAMGPreconditionerPointer( Op& opA, const double relax, const P& comm, std:
CPRParameter() { reset(); }
CPRParameter( const parameter::ParameterGroup& param)
CPRParameter( const ParameterGroup& param)
{
// reset values to default
reset();

4
opm/autodiff/FlowMain.hpp
View File

@@ -213,7 +213,7 @@ namespace Opm
bool output_cout_ = false;
bool must_distribute_ = false;
// setupParameters()
parameter::ParameterGroup param_;
ParameterGroup param_;
// setupOutput()
bool output_to_files_ = false;
std::string output_dir_ = std::string(".");
@@ -330,7 +330,7 @@ namespace Opm
// Returns true if ok, false if not.
bool setupParameters(int argc, char** argv)
{
param_ = parameter::ParameterGroup(argc, argv, false, output_cout_);
param_ = ParameterGroup(argc, argv, false, output_cout_);
// See if a deck was specified on the command line.
if (!param_.unhandledArguments().empty()) {

4
opm/autodiff/FlowMainEbos.hpp
View File

@@ -215,7 +215,7 @@ namespace Opm
// Returns true if ok, false if not.
bool setupParameters(int argc, char** argv)
{
param_ = parameter::ParameterGroup(argc, argv, false, output_cout_);
param_ = ParameterGroup(argc, argv, false, output_cout_);
// See if a deck was specified on the command line.
if (!param_.unhandledArguments().empty()) {
@@ -775,7 +775,7 @@ namespace Opm
int mpi_rank_ = 0;
bool output_cout_ = false;
bool must_distribute_ = false;
parameter::ParameterGroup param_;
ParameterGroup param_;
bool output_to_files_ = false;
std::string output_dir_ = std::string(".");
std::unique_ptr<BlackoilPropsAdFromDeck> fluidprops_;

2
opm/autodiff/ISTLSolver.hpp
View File

@@ -203,7 +203,7 @@ namespace Opm
/// \param[in] param ParameterGroup controlling the behaviour of the linear solvers
/// \param[in] parallelInformation In the case of a parallel run
/// with dune-istl the information about the parallelization.
ISTLSolver(const parameter::ParameterGroup& param,
ISTLSolver(const ParameterGroup& param,
const boost::any& parallelInformation_arg=boost::any())
: iterations_( 0 ),
parallelInformation_(parallelInformation_arg),

2
opm/autodiff/NewtonIterationBlackoilCPR.cpp
View File

@@ -53,7 +53,7 @@ namespace Opm
/// Construct a system solver.
NewtonIterationBlackoilCPR::NewtonIterationBlackoilCPR(const parameter::ParameterGroup& param,
NewtonIterationBlackoilCPR::NewtonIterationBlackoilCPR(const ParameterGroup& param,
const boost::any& parallelInformation_arg)
: cpr_param_( param ),
iterations_( 0 ),

2
opm/autodiff/NewtonIterationBlackoilCPR.hpp
View File

@@ -63,7 +63,7 @@ namespace Opm
/// cpr_use_bicgstab (default true) if true, use BiCGStab (else use CG) for elliptic part
/// \param[in] parallelInformation In the case of a parallel run
/// with dune-istl the information about the parallelization.
NewtonIterationBlackoilCPR(const parameter::ParameterGroup& param,
NewtonIterationBlackoilCPR(const ParameterGroup& param,
const boost::any& parallelInformation=boost::any());
/// Solve the system of linear equations Ax = b, with A being the

2
opm/autodiff/NewtonIterationBlackoilInterleaved.cpp
View File

@@ -297,7 +297,7 @@ namespace Opm
/// Construct a system solver.
NewtonIterationBlackoilInterleaved::NewtonIterationBlackoilInterleaved(const parameter::ParameterGroup& param,
NewtonIterationBlackoilInterleaved::NewtonIterationBlackoilInterleaved(const ParameterGroup& param,
const boost::any& parallelInformation_arg)
: newtonIncrementDoublePrecision_(),
newtonIncrementSinglePrecision_(),

4
opm/autodiff/NewtonIterationBlackoilInterleaved.hpp
View File

@@ -47,7 +47,7 @@ namespace Opm
NewtonIterationBlackoilInterleavedParameters() { reset(); }
// read values from parameter class
NewtonIterationBlackoilInterleavedParameters( const parameter::ParameterGroup& param )
NewtonIterationBlackoilInterleavedParameters( const ParameterGroup& param )
{
// set default parameters
reset();
@@ -89,7 +89,7 @@ namespace Opm
/// \param[in] param parameters controlling the behaviour of the linear solvers
/// \param[in] parallelInformation In the case of a parallel run
/// with dune-istl the information about the parallelization.
NewtonIterationBlackoilInterleaved(const parameter::ParameterGroup& param,
NewtonIterationBlackoilInterleaved(const ParameterGroup& param,
const boost::any& parallelInformation=boost::any());
/// Solve the system of linear equations Ax = b, with A being the

2
opm/autodiff/NewtonIterationBlackoilSimple.cpp
View File

@@ -32,7 +32,7 @@ namespace Opm
/// \param[in] linsolver linear solver to use
/// \param[in] parallelInformation In the case of a parallel run
/// with dune-istl the information about the parallelization.
NewtonIterationBlackoilSimple::NewtonIterationBlackoilSimple(const parameter::ParameterGroup& param,
NewtonIterationBlackoilSimple::NewtonIterationBlackoilSimple(const ParameterGroup& param,
const boost::any& parallelInformation_arg)
: iterations_( 0 ), parallelInformation_(parallelInformation_arg)
{

2
opm/autodiff/NewtonIterationBlackoilSimple.hpp
View File

@@ -42,7 +42,7 @@ namespace Opm
/// choice of linear solver.
/// \param[in] parallelInformation In the case of a parallel run
/// with dune-istl the information about the parallelization.
NewtonIterationBlackoilSimple(const parameter::ParameterGroup& param,
NewtonIterationBlackoilSimple(const ParameterGroup& param,
const boost::any& parallelInformation=boost::any());
/// Solve the system of linear equations Ax = b, with A being the

2
opm/autodiff/NonlinearSolver.hpp
View File

@@ -50,7 +50,7 @@ namespace Opm {
int max_iter_; // max nonlinear iterations
int min_iter_; // min nonlinear iterations
explicit SolverParameters( const parameter::ParameterGroup& param );
explicit SolverParameters( const ParameterGroup& param );
SolverParameters();
void reset();

2
opm/autodiff/NonlinearSolver_impl.hpp
View File

@@ -201,7 +201,7 @@ namespace Opm
template <class PhysicalModel>
NonlinearSolver<PhysicalModel>::SolverParameters::
SolverParameters( const parameter::ParameterGroup& param )
SolverParameters( const ParameterGroup& param )
{
// set default values
reset();

4
opm/autodiff/SimulatorBase.hpp
View File

@@ -121,7 +121,7 @@ namespace Opm
/// \param[in] eclipse_state the object which represents an internalized ECL deck
/// \param[in] output_writer
/// \param[in] threshold_pressures_by_face if nonempty, threshold pressures that inhibit flow
SimulatorBase(const parameter::ParameterGroup& param,
SimulatorBase(const ParameterGroup& param,
const Grid& grid,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,
@@ -193,7 +193,7 @@ namespace Opm
typedef typename Model::ModelParameters ModelParameters;
typedef typename Solver::SolverParameters SolverParameters;
const parameter::ParameterGroup param_;
const ParameterGroup param_;
ModelParameters model_param_;
SolverParameters solver_param_;

2
opm/autodiff/SimulatorBase_impl.hpp
View File

@@ -33,7 +33,7 @@ namespace Opm
{
template <class Implementation>
SimulatorBase<Implementation>::SimulatorBase(const parameter::ParameterGroup& param,
SimulatorBase<Implementation>::SimulatorBase(const ParameterGroup& param,
const Grid& grid,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,

2
opm/autodiff/SimulatorFullyImplicitBlackoil.hpp
View File

@@ -51,7 +51,7 @@ class SimulatorFullyImplicitBlackoil
typedef SimulatorBase<SimulatorFullyImplicitBlackoil<GridT> > Base;
public:
// forward the constructor to the base class
SimulatorFullyImplicitBlackoil(const parameter::ParameterGroup& param,
SimulatorFullyImplicitBlackoil(const ParameterGroup& param,
const typename Base::Grid& grid,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,

4
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@@ -94,7 +94,7 @@ public:
/// \param[in] output_writer
/// \param[in] threshold_pressures_by_face if nonempty, threshold pressures that inhibit flow
SimulatorFullyImplicitBlackoilEbos(Simulator& ebosSimulator,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,
NewtonIterationBlackoilInterface& linsolver,
@@ -816,7 +816,7 @@ protected:
SimulatorReport failureReport_;
const parameter::ParameterGroup param_;
const ParameterGroup param_;
ModelParameters model_param_;
SolverParameters solver_param_;

2
opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment.hpp
View File

@@ -62,7 +62,7 @@ public:
typedef typename Traits::WellModel WellModel;
// forward the constructor to the base class
SimulatorFullyImplicitBlackoilMultiSegment(const parameter::ParameterGroup& param,
SimulatorFullyImplicitBlackoilMultiSegment(const ParameterGroup& param,
const GridT& grid,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,

4
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@@ -209,7 +209,7 @@ namespace Opm
// constructor creating different sub writers
template <class Grid>
BlackoilOutputWriter(const Grid& grid,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const Opm::EclipseState& eclipseState,
std::unique_ptr<EclipseIO>&& eclIO,
const Opm::PhaseUsage &phaseUsage);
@@ -329,7 +329,7 @@ namespace Opm
inline
BlackoilOutputWriter::
BlackoilOutputWriter(const Grid& grid,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const Opm::EclipseState& eclipseState,
std::unique_ptr<EclipseIO>&& eclIO,
const Opm::PhaseUsage &phaseUsage)

2
opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp
View File

@@ -108,7 +108,7 @@ namespace Opm
typedef typename Traits::WellModel WellModel;
public:
SimulatorFullyImplicitBlackoilSolvent(const parameter::ParameterGroup& param,
SimulatorFullyImplicitBlackoilSolvent(const ParameterGroup& param,
const GridT& grid,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,

2
opm/autodiff/SimulatorFullyImplicitBlackoilSolvent_impl.hpp
View File

@@ -24,7 +24,7 @@ namespace Opm
{
template <class GridT>
SimulatorFullyImplicitBlackoilSolvent<GridT>::
SimulatorFullyImplicitBlackoilSolvent(const parameter::ParameterGroup& param,
SimulatorFullyImplicitBlackoilSolvent(const ParameterGroup& param,
const GridT& grid,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,

6
opm/autodiff/SimulatorIncompTwophaseAd.cpp
View File

@@ -68,7 +68,7 @@ namespace Opm
class SimulatorIncompTwophaseAd::Impl
{
public:
Impl(const parameter::ParameterGroup& param,
Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props,
@@ -114,7 +114,7 @@ namespace Opm
SimulatorIncompTwophaseAd::SimulatorIncompTwophaseAd(const parameter::ParameterGroup& param,
SimulatorIncompTwophaseAd::SimulatorIncompTwophaseAd(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props,
@@ -297,7 +297,7 @@ namespace Opm
SimulatorIncompTwophaseAd::Impl::Impl(const parameter::ParameterGroup& param,
SimulatorIncompTwophaseAd::Impl::Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props,

4
opm/autodiff/SimulatorIncompTwophaseAd.hpp
View File

@@ -29,7 +29,7 @@ struct FlowBoundaryConditions;
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class IncompPropertiesInterface;
class RockCompressibility;
class WellsManager;
@@ -67,7 +67,7 @@ namespace Opm
/// \param[in] bcs boundary conditions, treat as all noflow if null
/// \param[in] linsolver linear solver
/// \param[in] gravity if non-null, gravity vector
SimulatorIncompTwophaseAd(const parameter::ParameterGroup& param,
SimulatorIncompTwophaseAd(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props,

2
opm/autodiff/SimulatorSequentialBlackoil.hpp
View File

@@ -52,7 +52,7 @@ class SimulatorSequentialBlackoil
typedef SimulatorBase<SimulatorSequentialBlackoil<GridT> > Base;
public:
// forward the constructor to the base class
SimulatorSequentialBlackoil(const parameter::ParameterGroup& param,
SimulatorSequentialBlackoil(const ParameterGroup& param,
const typename Base::Grid& grid,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,

2
opm/autodiff/TransportSolverTwophaseAd.cpp
View File

@@ -44,7 +44,7 @@ namespace Opm
const IncompPropertiesInterface& props,
const LinearSolverInterface& linsolver,
const double* gravity,
const parameter::ParameterGroup& param)
const ParameterGroup& param)
: grid_(grid),
props_(props),
linsolver_(linsolver),

4
opm/autodiff/TransportSolverTwophaseAd.hpp
View File

@@ -32,7 +32,7 @@ namespace Opm
class IncompPropertiesInterface;
class LinearSolverInterface;
namespace parameter { class ParameterGroup; }
class ParameterGroup;
/// Implements an implicit transport solver for incompressible two-phase flow,
/// using automatic differentiation.
@@ -49,7 +49,7 @@ namespace Opm
const IncompPropertiesInterface& props,
const LinearSolverInterface& linsolver,
const double* gravity,
const parameter::ParameterGroup& param);
const ParameterGroup& param);
// Virtual destructor.
virtual ~TransportSolverTwophaseAd();