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

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