OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1167 from akva2/adjust_parameters

Browse Source 
adjust for changed ParameterGroup namespacing
This commit is contained in:
Atgeirr Flø Rasmussen 2017-05-02 07:19:29 +02:00 committed by GitHub
commit 9892edb24b
60 changed files with 95 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/sim_2p_comp_reorder.cpp
View File

@ -62,7 +62,7 @@
namespace
{
void warnIfUnusedParams(const Opm::parameter::ParameterGroup& param)
void warnIfUnusedParams(const Opm::ParameterGroup& param)
{
if (param.anyUnused()) {
std::cout << "-------------------- Unused parameters: --------------------\n";
@ -82,7 +82,7 @@ try
using namespace Opm;
std::cout << "\n================ Test program for weakly compressible two-phase flow ===============\n\n";
parameter::ParameterGroup param(argc, argv, false);
ParameterGroup param(argc, argv, false);
std::cout << "--------------- Reading parameters ---------------" << std::endl;
// If we have a "deck_filename", grid and props will be read from that.

4
examples/sim_2p_incomp.cpp
View File

@ -62,7 +62,7 @@
namespace
{
void warnIfUnusedParams(const Opm::parameter::ParameterGroup& param)
void warnIfUnusedParams(const Opm::ParameterGroup& param)
{
if (param.anyUnused()) {
std::cout << "-------------------- Unused parameters: --------------------\n";
@ -82,7 +82,7 @@ try
using namespace Opm;
std::cout << "\n================ Test program for incompressible two-phase flow ===============\n\n";
parameter::ParameterGroup param(argc, argv, false);
ParameterGroup param(argc, argv, false);
std::cout << "--------------- Reading parameters ---------------" << std::endl;
#if ! HAVE_SUITESPARSE_UMFPACK_H

4
examples/sim_2p_incomp_ad.cpp
View File

@ -62,7 +62,7 @@
namespace
{
void warnIfUnusedParams(const Opm::parameter::ParameterGroup& param)
void warnIfUnusedParams(const Opm::ParameterGroup& param)
{
if (param.anyUnused()) {
std::cout << "-------------------- Unused parameters: --------------------\n";
@ -82,7 +82,7 @@ try
using namespace Opm;
std::cout << "\n================ Test program for incompressible two-phase flow ===============\n\n";
parameter::ParameterGroup param(argc, argv, false);
ParameterGroup param(argc, argv, false);
std::cout << "--------------- Reading parameters ---------------" << std::endl;
#if ! HAVE_SUITESPARSE_UMFPACK_H

4
examples/sim_poly2p_comp_reorder.cpp
View File

@ -64,7 +64,7 @@
namespace
{
void warnIfUnusedParams(const Opm::parameter::ParameterGroup& param)
void warnIfUnusedParams(const Opm::ParameterGroup& param)
{
if (param.anyUnused()) {
std::cout << "-------------------- Unused parameters: --------------------\n";
@ -84,7 +84,7 @@ try
using namespace Opm;
std::cout << "\n================ Test program for weakly compressible two-phase flow with polymer ===============\n\n";
parameter::ParameterGroup param(argc, argv, false);
ParameterGroup param(argc, argv, false);
std::cout << "--------------- Reading parameters ---------------" << std::endl;
// If we have a "deck_filename", grid and props will be read from that.

4
examples/sim_poly2p_incomp_reorder.cpp
View File

@ -64,7 +64,7 @@
namespace
{
void warnIfUnusedParams(const Opm::parameter::ParameterGroup& param)
void warnIfUnusedParams(const Opm::ParameterGroup& param)
{
if (param.anyUnused()) {
std::cout << "-------------------- Unused parameters: --------------------\n";
@ -84,7 +84,7 @@ try
using namespace Opm;
std::cout << "\n================ Test program for incompressible two-phase flow with polymer ===============\n\n";
parameter::ParameterGroup param(argc, argv, false);
ParameterGroup param(argc, argv, false);
std::cout << "--------------- Reading parameters ---------------" << std::endl;
// If we have a "deck_filename", grid and props will be read from that.

4
examples/sim_poly_fi2p_comp_ad.cpp
View File

@ -84,7 +84,7 @@
namespace
{
void warnIfUnusedParams(const Opm::parameter::ParameterGroup& param)
void warnIfUnusedParams(const Opm::ParameterGroup& param)
{
if (param.anyUnused()) {
std::cout << "-------------------- Unused parameters: --------------------\n";
@ -104,7 +104,7 @@ try
using namespace Opm;
std::cout << "\n================ Test program for fully implicit three-phase black-oil flow ===============\n\n";
parameter::ParameterGroup param(argc, argv, false);
ParameterGroup param(argc, argv, false);
std::cout << "--------------- Reading parameters ---------------" << std::endl;
// If we have a "deck_filename", grid and props will be read from that.

1
examples/wells_example.cpp
View File

@ -26,7 +26,6 @@
int main(int argc, char** argv)
try
{
using namespace Opm::parameter;
using namespace Opm;
ParameterGroup parameters(argc, argv, false);
std::string file_name = parameters.getDefault<std::string > ("inputdeck", "data.data");

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();

2
opm/polymer/IncompPropertiesDefaultPolymer.hpp
View File

@ -40,7 +40,7 @@ namespace Opm
/// mu1 [mu2, mu3] (1.0) Viscosity in cP
/// porosity (1.0) Porosity
/// permeability (100.0) Permeability in mD
IncompPropertiesDefaultPolymer(const Opm::parameter::ParameterGroup& param, int dim, int num_cells)
IncompPropertiesDefaultPolymer(const Opm::ParameterGroup& param, int dim, int num_cells)
: Opm::IncompPropertiesBasic(param, dim, num_cells)
{
assert(numPhases() == 2);

6
opm/polymer/SimulatorCompressiblePolymer.cpp
View File

@ -91,7 +91,7 @@ namespace Opm
class SimulatorCompressiblePolymer::Impl
{
public:
Impl(const parameter::ParameterGroup& param,
Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const PolymerProperties& poly_props,
@ -140,7 +140,7 @@ namespace Opm
SimulatorCompressiblePolymer::SimulatorCompressiblePolymer(const parameter::ParameterGroup& param,
SimulatorCompressiblePolymer::SimulatorCompressiblePolymer(const ParameterGroup& param,
const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const PolymerProperties& poly_props,
@ -169,7 +169,7 @@ namespace Opm
SimulatorCompressiblePolymer::Impl::Impl(const parameter::ParameterGroup& param,
SimulatorCompressiblePolymer::Impl::Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const PolymerProperties& poly_props,

4
opm/polymer/SimulatorCompressiblePolymer.hpp
View File

@ -30,7 +30,7 @@ struct FlowBoundaryConditions;
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class BlackoilPropertiesInterface;
class PolymerProperties;
class RockCompressibility;
@ -70,7 +70,7 @@ namespace Opm
/// \param[in] polymer_inflow polymer inflow controls
/// \param[in] linsolver linear solver
/// \param[in] gravity if non-null, gravity vector
SimulatorCompressiblePolymer(const parameter::ParameterGroup& param,
SimulatorCompressiblePolymer(const ParameterGroup& param,
const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const PolymerProperties& poly_props,

6
opm/polymer/SimulatorPolymer.cpp
View File

@ -95,7 +95,7 @@ namespace Opm
class SimulatorPolymer::Impl
{
public:
Impl(const parameter::ParameterGroup& param,
Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const PolymerProperties& poly_props,
@ -147,7 +147,7 @@ namespace Opm
SimulatorPolymer::SimulatorPolymer(const parameter::ParameterGroup& param,
SimulatorPolymer::SimulatorPolymer(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const PolymerProperties& poly_props,
@ -178,7 +178,7 @@ namespace Opm
SimulatorPolymer::Impl::Impl(const parameter::ParameterGroup& param,
SimulatorPolymer::Impl::Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const PolymerProperties& poly_props,

4
opm/polymer/SimulatorPolymer.hpp
View File

@ -30,7 +30,7 @@ struct FlowBoundaryConditions;
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class IncompPropertiesInterface;
class PolymerProperties;
class RockCompressibility;
@ -72,7 +72,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
SimulatorPolymer(const parameter::ParameterGroup& param,
SimulatorPolymer(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const PolymerProperties& poly_props,

2
opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp
View File

@ -152,7 +152,7 @@ namespace Opm {
int wellIterations() const;
/// Not used by this class except to satisfy interface requirements.
typedef parameter::ParameterGroup SolverParameters;
typedef ParameterGroup SolverParameters;
/// There is no separate model class for this solver, return itself.
const FullyImplicitCompressiblePolymerSolver& model() const;

2
opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp
View File

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

2
opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp
View File

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

4
opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp
View File

@ -85,7 +85,7 @@ namespace Opm
/// Dummy class, this Solver does not use a Model.
struct Model
{
typedef parameter::ParameterGroup ModelParameters;
typedef ParameterGroup ModelParameters;
};
};
@ -101,7 +101,7 @@ namespace Opm
public:
/// Initialise from parameters and objects to observe.
SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param,
SimulatorFullyImplicitCompressiblePolymer(const ParameterGroup& param,
const GridT& grid,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,

2
opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp
View File

@ -26,7 +26,7 @@ namespace Opm
/// Class collecting all necessary components for a two-phase simulation.
template <class GridT>
SimulatorFullyImplicitCompressiblePolymer<GridT>::
SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param,
SimulatorFullyImplicitCompressiblePolymer(const ParameterGroup& param,
const GridT& grid,
DerivedGeology& geo,
BlackoilPropsAdFromDeck& props,

6
opm/simulators/SimulatorCompressibleTwophase.cpp
View File

@ -66,7 +66,7 @@ namespace Opm
class SimulatorCompressibleTwophase::Impl
{
public:
Impl(const parameter::ParameterGroup& param,
Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const RockCompressibility* rock_comp_props,
@ -115,7 +115,7 @@ namespace Opm
SimulatorCompressibleTwophase::SimulatorCompressibleTwophase(const parameter::ParameterGroup& param,
SimulatorCompressibleTwophase::SimulatorCompressibleTwophase(const ParameterGroup& param,
const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const RockCompressibility* rock_comp_props,
@ -226,7 +226,7 @@ namespace Opm
// \TODO: make CompressibleTpfa take src and bcs.
SimulatorCompressibleTwophase::Impl::Impl(const parameter::ParameterGroup& param,
SimulatorCompressibleTwophase::Impl::Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const RockCompressibility* rock_comp_props,

4
opm/simulators/SimulatorCompressibleTwophase.hpp
View File

@ -29,7 +29,7 @@ struct FlowBoundaryConditions;
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class BlackoilPropertiesInterface;
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
SimulatorCompressibleTwophase(const parameter::ParameterGroup& param,
SimulatorCompressibleTwophase(const ParameterGroup& param,
const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const RockCompressibility* rock_comp_props,

6
opm/simulators/SimulatorIncompTwophase.cpp
View File

@ -67,7 +67,7 @@ namespace Opm
struct SimulatorIncompTwophase::Impl
{
Impl(const parameter::ParameterGroup& param,
Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props,
@ -116,7 +116,7 @@ namespace Opm
SimulatorIncompTwophase::SimulatorIncompTwophase(const parameter::ParameterGroup& param,
SimulatorIncompTwophase::SimulatorIncompTwophase(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props,
@ -312,7 +312,7 @@ namespace Opm
SimulatorIncompTwophase::Impl::Impl(const parameter::ParameterGroup& param,
SimulatorIncompTwophase::Impl::Impl(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props,

4
opm/simulators/SimulatorIncompTwophase.hpp
View File

@ -30,7 +30,7 @@ struct FlowBoundaryConditions;
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class IncompPropertiesInterface;
class RockCompressibility;
class WellsManager;
@ -69,7 +69,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
SimulatorIncompTwophase(const parameter::ParameterGroup& param,
SimulatorIncompTwophase(const ParameterGroup& param,
const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props,

6
opm/simulators/timestepping/AdaptiveTimeStepping.hpp
View File

@ -42,7 +42,7 @@ namespace Opm {
//! \param param The parameter object
//! \param pinfo The information about the data distribution
//! and communication for a parallel run.
AdaptiveTimeStepping( const parameter::ParameterGroup& param,
AdaptiveTimeStepping( const ParameterGroup& param,
const bool terminal_output = true );
//! \brief contructor taking parameter object
@ -53,7 +53,7 @@ namespace Opm {
//! and communication for a parallel run.
AdaptiveTimeStepping( const Tuning& tuning,
size_t time_step,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const bool terminal_output = true );
/** \brief step method that acts like the solver::step method
@ -105,7 +105,7 @@ namespace Opm {
Output* outputWriter,
const std::vector<int>* fipnum);
void init(const parameter::ParameterGroup& param);
void init(const ParameterGroup& param);
typedef std::unique_ptr< TimeStepControlInterface > TimeStepControlType;

6
opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
View File

@ -76,7 +76,7 @@ namespace Opm {
AdaptiveTimeStepping::AdaptiveTimeStepping( const Tuning& tuning,
size_t time_step,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const bool terminal_output )
: timeStepControl_()
, restart_factor_( tuning.getTSFCNV(time_step) )
@ -96,7 +96,7 @@ namespace Opm {
}
AdaptiveTimeStepping::AdaptiveTimeStepping( const parameter::ParameterGroup& param,
AdaptiveTimeStepping::AdaptiveTimeStepping( const ParameterGroup& param,
const bool terminal_output )
: timeStepControl_()
, restart_factor_( param.getDefault("solver.restartfactor", double(0.33) ) )
@ -116,7 +116,7 @@ namespace Opm {
}
void AdaptiveTimeStepping::
init(const parameter::ParameterGroup& param)
init(const ParameterGroup& param)
{
// valid are "pid" and "pid+iteration"
std::string control = param.getDefault("timestep.control", std::string("pid") );

2
opm/simulators/timestepping/SimulatorTimer.cpp
View File

@ -38,7 +38,7 @@ namespace Opm
/// Initialize from parameters. Accepts the following:
/// num_psteps (default 1)
/// stepsize_days (default 1)
void SimulatorTimer::init(const parameter::ParameterGroup& param)
void SimulatorTimer::init(const ParameterGroup& param)
{
const int num_psteps = param.getDefault("num_psteps", 1);
const double stepsize_days = param.getDefault("stepsize_days", 1.0);

4
opm/simulators/timestepping/SimulatorTimer.hpp
View File

@ -29,7 +29,7 @@
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class SimulatorTimer : public SimulatorTimerInterface
{
@ -44,7 +44,7 @@ namespace Opm
/// Initialize from parameters. Accepts the following:
/// num_psteps (default 1)
/// stepsize_days (default 1)
void init(const parameter::ParameterGroup& param);
void init(const ParameterGroup& param);
/// Use the SimulatorTimer as a shim around opm-parser's Opm::TimeMap
void init(const TimeMap& timeMap, size_t report_step = 0);

2
opm/simulators/timestepping/SimulatorTimerInterface.hpp
View File

@ -29,7 +29,7 @@
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
/// Interface class for SimulatorTimer objects, to be improved.
class SimulatorTimerInterface

2
tests/test_boprops_ad.cpp
View File

@ -57,7 +57,7 @@ struct SetupSimple {
param.insertParameter("sat_tab_size" , "0" );
}
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
Opm::Deck deck;
Opm::EclipseState eclState;
};

2
tests/test_rateconverter.cpp
View File

@ -57,7 +57,7 @@ struct SetupSimple {
param.insertParameter("sat_tab_size" , "0" );
}
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
Opm::Deck deck;
Opm::EclipseState eclState;
};

2
tests/test_singlecellsolves.cpp
View File

@ -65,7 +65,7 @@ try
using namespace Opm;
// std::cout << "\n================ Test program for single-cell solves with polymer ===============\n\n";
parameter::ParameterGroup param(argc, argv, false);
ParameterGroup param(argc, argv, false);
param.disableOutput();
// std::cout << "--------------- Reading parameters ---------------" << std::endl;

4
tests/test_transmissibilitymultipliers.cpp
View File

@ -156,7 +156,7 @@ void checkTransmissibilityValues(const G& grid,
BOOST_AUTO_TEST_CASE(TransmissibilityMultipliersLegacyGridInterface)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
Opm::Parser parser;
Opm::ParseContext parseContext;
@ -271,7 +271,7 @@ BOOST_AUTO_TEST_CASE(TransmissibilityMultipliersCpGrid)
Dune::MPIHelper::instance(argc, argv);
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
Opm::Parser parser;
Opm::ParseContext parseContext;