OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -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:35:20 +02:00
parent 932a358f34
commit b2d29b7209
43 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/SimulatorTesterFlexibleBC.hpp
View File

@@ -51,7 +51,7 @@ namespace Opm
typedef typename Super::GridInterface GI;
typedef typename Super::Vector Vector;
virtual void initSources(const Opm::parameter::ParameterGroup& param)
virtual void initSources(const Opm::ParameterGroup& param)
{
// Zero-initializing first.
int nc = this->ginterf_.numberOfCells();
@@ -99,7 +99,7 @@ namespace Opm
}
}
virtual void initBoundaryConditions(const Opm::parameter::ParameterGroup& param)
virtual void initBoundaryConditions(const Opm::ParameterGroup& param)
{
setupBoundaryConditions(param, this->ginterf_, this->bcond_);
}

2
examples/aniso_implicitcap_test.cpp
View File

@@ -69,7 +69,7 @@ typedef SimulatorTesterFlexibleBC<SimTraits> Simulator;
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
#ifdef USE_TBB

2
examples/aniso_simulator_test.cpp
View File

@@ -70,7 +70,7 @@ typedef SimulatorTesterFlexibleBC<SimTraits> Simulator;
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
#ifdef USE_TBB

2
examples/cpchop.cpp
View File

@@ -72,7 +72,7 @@ try
Dune::MPIHelper::instance(argc, argv);
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
std::string gridfilename = param.get<std::string>("gridfilename");
Opm::CornerPointChopper ch(gridfilename);

2
examples/cpchop_depthtrend.cpp
View File

@@ -78,7 +78,7 @@ try
Dune::MPIHelper::instance(argc, argv);
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
std::string gridfilename = param.get<std::string>("gridfilename");
Opm::CornerPointChopper ch(gridfilename);

2
examples/cpregularize.cpp
View File

@@ -82,7 +82,7 @@ try
Dune::MPIHelper::instance(argc, argv);
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
std::string gridfilename = param.get<std::string>("gridfilename");
Opm::CornerPointChopper ch(gridfilename);

2
examples/exp_variogram.cpp
View File

@@ -70,7 +70,7 @@ try
{
Dune::MPIHelper::instance(argc, argv);
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
std::string gridfilename = param.get<std::string>("gridfilename");
Opm::CornerPointChopper ch(gridfilename);

2
examples/grdecldips.cpp
View File

@@ -65,7 +65,7 @@ int main(int argc, char** argv) try {
Dune::MPIHelper::instance(argc, argv);
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
std::string gridfilename = param.get<std::string>("gridfilename");
double minCellVolume = param.getDefault("mincellvolume", 1e-8);

2
examples/implicitcap_test.cpp
View File

@@ -69,7 +69,7 @@ typedef SimulatorTesterFlexibleBC<SimTraits> Simulator;
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
#ifdef USE_TBB

2
examples/known_answer_test.cpp
View File

@@ -249,7 +249,7 @@ void test_flowsolver(const GI& g, const RI& r, double tol, int kind)
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
// Make a Dune::CpGrid.

2
examples/mimetic_aniso_solver_test.cpp
View File

@@ -205,7 +205,7 @@ void test_flowsolver(const GI& g, const RI& r)
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc, argv);
auto parser = std::make_shared<Opm::Parser>();

2
examples/mimetic_periodic_test.cpp
View File

@@ -69,7 +69,7 @@ try
Dune::CpGrid grid;
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Opm::initCPGrid(grid , param);
grid.setUniqueBoundaryIds(true);
}

2
examples/mimetic_solver_test.cpp
View File

@@ -172,7 +172,7 @@ using namespace Opm;
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
// Make a grid

2
examples/sim_blackoil_impes.cpp
View File

@@ -60,7 +60,7 @@ typedef Opm::BlackoilSimulator<Grid, Rock, Fluid, Wells, FlowSolver, TransportSo
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
// Initialize.

2
examples/sim_co2_impes.cpp
View File

@@ -62,7 +62,7 @@ typedef Opm::BlackoilSimulator<Grid, Rock, Fluid, Wells, FlowSolver, TransportSo
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
// Initialize.

2
examples/sim_steadystate_explicit.cpp
View File

@@ -54,7 +54,7 @@ typedef SimulatorTesterFlexibleBC<SimTraits> Simulator;
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
#ifdef USE_TBB

2
examples/sim_steadystate_implicit.cpp
View File

@@ -56,7 +56,7 @@ typedef SimulatorTesterFlexibleBC<SimTraits> Simulator;
int main(int argc, char** argv)
try
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
Simulator sim;

2
examples/steadystate_test_implicit.cpp
View File

@@ -83,7 +83,7 @@ try
Dune::MPIHelper::instance(argc, argv);
// Initialize.
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
// MPIHelper::instance(argc,argv) ;
typedef SteadyStateUpscalerImplicit<UpscalingTraitsBasicImplicit> upscaler_t;

2
examples/upscale_elasticity.cpp
View File

@@ -150,7 +150,7 @@ struct Params {
//! \brief Parse the command line arguments
void parseCommandLine(int argc, char** argv, Params& p)
{
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
p.max[0] = param.getDefault("xmax",-1);
p.max[1] = param.getDefault("ymax",-1);
p.max[2] = param.getDefault("zmax",-1);

2
examples/upscale_singlephase.cpp
View File

@@ -51,7 +51,7 @@ try
SinglePhaseUpscaler upscaler;
{
auto param = Opm::parameter::ParameterGroup(argc, argv);
auto param = Opm::ParameterGroup(argc, argv);
upscaler.init(param);
}

2
examples/upscale_steadystate_implicit.cpp
View File

@@ -185,7 +185,7 @@ try
}
// Initialize.
Opm::parameter::ParameterGroup param(argc, argv);
Opm::ParameterGroup param(argc, argv);
std::string gridfilename = param.get<std::string>("gridfilename");
auto deck = Opm::RelPermUpscaleHelper::parseEclipseFile(gridfilename);

2
opm/elasticity/elasticity_upscale.hpp
View File

@@ -121,7 +121,7 @@ struct LinSolParams {
//! \brief Parse command line parameters
//! \param[in] param The parameter group to parse
void parse(Opm::parameter::ParameterGroup& param)
void parse(Opm::ParameterGroup& param)
{
std::string solver = param.getDefault<std::string>("linsolver_type","iterative");
if (solver == "iterative")

6
opm/porsol/blackoil/BlackoilInitialization.hpp
View File

@@ -38,7 +38,7 @@ namespace Opm
typedef typename Simulator::Grid Grid;
typedef typename Simulator::Fluid Fluid;
virtual void init(const Opm::parameter::ParameterGroup& param,
virtual void init(const Opm::ParameterGroup& param,
const Grid& grid,
const Fluid& fluid,
typename Grid::Vector gravity,
@@ -56,7 +56,7 @@ namespace Opm
typedef typename Simulator::Grid Grid;
typedef typename Simulator::Fluid Fluid;
virtual void init(const Opm::parameter::ParameterGroup& param,
virtual void init(const Opm::ParameterGroup& param,
const Grid& grid,
const Fluid& fluid,
typename Grid::Vector gravity,
@@ -197,7 +197,7 @@ namespace Opm
typedef typename Simulator::Grid Grid;
typedef typename Simulator::Fluid Fluid;
virtual void init(const Opm::parameter::ParameterGroup& param,
virtual void init(const Opm::ParameterGroup& param,
const Grid& grid,
const Fluid& fluid,
typename Grid::Vector gravity,

4
opm/porsol/blackoil/BlackoilSimulator.hpp
View File

@@ -52,7 +52,7 @@ namespace Opm
class BlackoilSimulator
{
public:
void init(const Opm::parameter::ParameterGroup& param);
void init(const Opm::ParameterGroup& param);
void simulate();
typedef GridT Grid;
@@ -117,7 +117,7 @@ namespace Opm
template<class Grid, class Rock, class Fluid, class Wells, class FlowSolver, class TransportSolver>
void
BlackoilSimulator<Grid, Rock, Fluid, Wells, FlowSolver, TransportSolver>::
init(const Opm::parameter::ParameterGroup& param)
init(const Opm::ParameterGroup& param)
{
using namespace Opm;
std::string fileformat = param.getDefault<std::string>("fileformat", "cartesian");

2
opm/porsol/blackoil/ComponentTransport.hpp
View File

@@ -53,7 +53,7 @@ public:
{
}
void init(const Opm::parameter::ParameterGroup& param)
void init(const Opm::ParameterGroup& param)
{
min_surfvol_threshold_ = param.getDefault("min_surfvol_threshold", min_surfvol_threshold_);
single_step_only_ = param.getDefault("single_step_only", single_step_only_);

2
opm/porsol/common/ImplicitTransportDefs.hpp
View File

@@ -203,7 +203,7 @@ namespace Opm {
public:
LinearSolverISTLAMG()
{
Opm::parameter::ParameterGroup params;
Opm::ParameterGroup params;
params.insertParameter("linsolver_tolerance",
boost::lexical_cast<std::string>(5.0e-9));

14
opm/porsol/common/SimulatorBase.hpp
View File

@@ -101,7 +101,7 @@ namespace Opm
/// @brief Initialization from parameters.
/// @param param a parameter object
void init(const Opm::parameter::ParameterGroup& param)
void init(const Opm::ParameterGroup& param)
{
initControl(param);
initGridAndProps(param);
@@ -146,14 +146,14 @@ namespace Opm
TransportSolver transport_solver_;
virtual void initControl(const Opm::parameter::ParameterGroup& param)
virtual void initControl(const Opm::ParameterGroup& param)
{
simulation_steps_ = param.getDefault("simulation_steps", simulation_steps_);
stepsize_ = Opm::unit::convert::from(param.getDefault("stepsize", stepsize_),
Opm::unit::day);
}
virtual void initGridAndProps(const Opm::parameter::ParameterGroup& param)
virtual void initGridAndProps(const Opm::ParameterGroup& param)
{
setupGridAndProps(param, grid_, res_prop_);
ginterf_.init(grid_);
@@ -163,7 +163,7 @@ namespace Opm
gravity_[2] = param.getDefault("gz", 0.0); //Dune::unit::gravity);
}
virtual void initInitialConditions(const Opm::parameter::ParameterGroup& param)
virtual void initInitialConditions(const Opm::ParameterGroup& param)
{
if (param.getDefault("init_saturation_from_file", false)) {
std::string filename = param.get<std::string>("init_saturation_filename");
@@ -191,12 +191,12 @@ namespace Opm
}
}
virtual void initBoundaryConditions(const Opm::parameter::ParameterGroup& param)
virtual void initBoundaryConditions(const Opm::ParameterGroup& param)
{
setupBoundaryConditions(param, ginterf_, bcond_);
}
virtual void initSources(const Opm::parameter::ParameterGroup& /* param */)
virtual void initSources(const Opm::ParameterGroup& /* param */)
{
int nc = ginterf_.numberOfCells();
injection_rates_ = Opm::SparseVector<double>(nc);
@@ -207,7 +207,7 @@ namespace Opm
// injection_rates_psolver_[nc - 1] = -1.0;
}
virtual void initSolvers(const Opm::parameter::ParameterGroup& param)
virtual void initSolvers(const Opm::ParameterGroup& param)
{
// Initialize flow solver.
flow_solver_.init(ginterf_, res_prop_, gravity_, bcond_);

4
opm/porsol/common/setupBoundaryConditions.hpp
View File

@@ -48,7 +48,7 @@ namespace Opm
/// It is assumed that the boundary ids are 1-6, similar to cartesian case/Yaspgrid,
/// unless periodic, in which case we assume unique boundary ids.
template <class GridInterface, class BCs>
inline void setupBoundaryConditions(const Opm::parameter::ParameterGroup& param,
inline void setupBoundaryConditions(const Opm::ParameterGroup& param,
const GridInterface& g,
BCs& bcs)
{
@@ -180,7 +180,7 @@ namespace Opm
template <class GridInterface, class BCs>
inline void setupRegionBasedConditions(const Opm::parameter::ParameterGroup& param,
inline void setupRegionBasedConditions(const Opm::ParameterGroup& param,
const GridInterface& g,
BCs& bcs)
{

2
opm/porsol/common/setupGridAndProps.hpp
View File

@@ -67,7 +67,7 @@ namespace Opm
/// @todo Doc me!
/// @param
template <template <int> class ResProp>
inline void setupGridAndProps(const Opm::parameter::ParameterGroup& param,
inline void setupGridAndProps(const Opm::ParameterGroup& param,
Dune::CpGrid& grid,
ResProp<3>& res_prop)
{

4
opm/porsol/euler/EulerUpstream.hpp
View File

@@ -64,11 +64,11 @@ namespace Opm {
/// @brief
/// @todo Doc me
/// @param
void init(const Opm::parameter::ParameterGroup& param);
void init(const Opm::ParameterGroup& param);
/// @brief
/// @todo Doc me
/// @param
void init(const Opm::parameter::ParameterGroup& param,
void init(const Opm::ParameterGroup& param,
const GridInterface& grid,
const ReservoirProperties& resprop,
const BoundaryConditions& boundary);

4
opm/porsol/euler/EulerUpstreamImplicit.hpp
View File

@@ -72,11 +72,11 @@ namespace Opm {
/// @brief
/// @todo Doc me
/// @param
void init(const Opm::parameter::ParameterGroup& param);
void init(const Opm::ParameterGroup& param);
/// @brief
/// @todo Doc me
/// @param
void init(const Opm::parameter::ParameterGroup& param,
void init(const Opm::ParameterGroup& param,
const GridInterface& grid,
const ReservoirProperties& resprop,
const BoundaryConditions& boundary);

4
opm/porsol/euler/EulerUpstreamImplicit_impl.hpp
View File

@@ -71,7 +71,7 @@ namespace Opm
}
template <class GI, class RP, class BC>
inline void EulerUpstreamImplicit<GI, RP, BC>::init(const Opm::parameter::ParameterGroup& param)
inline void EulerUpstreamImplicit<GI, RP, BC>::init(const Opm::ParameterGroup& param)
{
check_sat_ = param.getDefault("check_sat", check_sat_);
clamp_sat_ = param.getDefault("clamp_sat", clamp_sat_);
@@ -86,7 +86,7 @@ namespace Opm
}
template <class GI, class RP, class BC>
inline void EulerUpstreamImplicit<GI, RP, BC>::init(const Opm::parameter::ParameterGroup& param,
inline void EulerUpstreamImplicit<GI, RP, BC>::init(const Opm::ParameterGroup& param,
const GI& g, const RP& r, const BC& b)
{
init(param);

4
opm/porsol/euler/EulerUpstream_impl.hpp
View File

@@ -92,7 +92,7 @@ namespace Opm
template <class GI, class RP, class BC>
inline void EulerUpstream<GI, RP, BC>::init(const Opm::parameter::ParameterGroup& param)
inline void EulerUpstream<GI, RP, BC>::init(const Opm::ParameterGroup& param)
{
courant_number_ = param.getDefault("courant_number", courant_number_);
method_viscous_ = param.getDefault("method_viscous", method_viscous_);
@@ -108,7 +108,7 @@ namespace Opm
}
template <class GI, class RP, class BC>
inline void EulerUpstream<GI, RP, BC>::init(const Opm::parameter::ParameterGroup& param,
inline void EulerUpstream<GI, RP, BC>::init(const Opm::ParameterGroup& param,
const GI& g, const RP& r, const BC& b)
{
init(param);

4
opm/porsol/euler/ImplicitCapillarity.hpp
View File

@@ -69,11 +69,11 @@ namespace Opm {
/// @brief
/// @todo Doc me
/// @param
void init(const Opm::parameter::ParameterGroup& param);
void init(const Opm::ParameterGroup& param);
/// @brief
/// @todo Doc me
/// @param
void init(const Opm::parameter::ParameterGroup& param,
void init(const Opm::ParameterGroup& param,
const GridInterface& grid,
const ReservoirProperties& resprop,
const BoundaryConditions& boundary);

4
opm/porsol/euler/ImplicitCapillarity_impl.hpp
View File

@@ -86,7 +86,7 @@ namespace Opm
template <class GI, class RP, class BC, template <class, class> class IP>
inline void ImplicitCapillarity<GI, RP, BC, IP>::init(const Opm::parameter::ParameterGroup& param)
inline void ImplicitCapillarity<GI, RP, BC, IP>::init(const Opm::ParameterGroup& param)
{
method_viscous_ = param.getDefault("method_viscous", method_viscous_);
method_gravity_ = param.getDefault("method_gravity", method_gravity_);
@@ -99,7 +99,7 @@ namespace Opm
}
template <class GI, class RP, class BC, template <class, class> class IP>
inline void ImplicitCapillarity<GI, RP, BC, IP>::init(const Opm::parameter::ParameterGroup& param,
inline void ImplicitCapillarity<GI, RP, BC, IP>::init(const Opm::ParameterGroup& param,
const GI& g, const RP& r, const BC& b)
{
init(param);

2
opm/porsol/mimetic/TpfaCompressible.hpp
View File

@@ -57,7 +57,7 @@ namespace Opm
/// @brief
/// Initializes run-time parameters of the solver.
void init(const Opm::parameter::ParameterGroup& param)
void init(const Opm::ParameterGroup& param)
{
// Initialize inflow mixture to a fixed, user-provided mix.
typename FluidInterface::CompVec mix(0.0);

2
opm/upscaling/SteadyStateUpscalerImplicit.hpp
View File

@@ -109,7 +109,7 @@ namespace Opm
const FlowSol& flow_solution,
const std::vector<double>& saturations) const;
/// Override from superclass.
virtual void initImpl(const Opm::parameter::ParameterGroup& param);
virtual void initImpl(const Opm::ParameterGroup& param);
// ------- Data members -------

2
opm/upscaling/SteadyStateUpscalerImplicit_impl.hpp
View File

@@ -77,7 +77,7 @@ namespace Opm
template <class Traits>
inline void SteadyStateUpscalerImplicit<Traits>::initImpl(const Opm::parameter::ParameterGroup& param)
inline void SteadyStateUpscalerImplicit<Traits>::initImpl(const Opm::ParameterGroup& param)
{
Super::initImpl(param);
use_gravity_ = param.getDefault("use_gravity", use_gravity_);

2
opm/upscaling/SteadyStateUpscalerManagerImplicit.hpp
View File

@@ -137,7 +137,7 @@ namespace Opm
class SteadyStateUpscalerManagerImplicit
{
public:
void upscale(const Opm::parameter::ParameterGroup& param)
void upscale(const Opm::ParameterGroup& param)
{
// Control structure.
std::vector<double> saturations;

6
opm/upscaling/UpscalerBase.hpp
View File

@@ -75,7 +75,7 @@ namespace Opm
virtual ~UpscalerBase() {;} ;
/// Initializes the upscaler from parameters.
void init(const Opm::parameter::ParameterGroup& param);
void init(const Opm::ParameterGroup& param);
/// Initializes the upscaler from given arguments.
void init(const Opm::Deck& deck,
@@ -144,9 +144,9 @@ namespace Opm
template <class FluidInterface>
permtensor_t upscaleEffectivePerm(const FluidInterface& fluid);
virtual void initImpl(const Opm::parameter::ParameterGroup& param);
virtual void initImpl(const Opm::ParameterGroup& param);
virtual void initFinal(const Opm::parameter::ParameterGroup& param);
virtual void initFinal(const Opm::ParameterGroup& param);
// ------- Data members -------
BoundaryConditionType bctype_;

8
opm/upscaling/UpscalerBase_impl.hpp
View File

@@ -61,7 +61,7 @@ namespace Opm
template <class Traits>
inline void UpscalerBase<Traits>::init(const Opm::parameter::ParameterGroup& param)
inline void UpscalerBase<Traits>::init(const Opm::ParameterGroup& param)
{
initImpl(param);
initFinal(param);
@@ -71,7 +71,7 @@ namespace Opm
template <class Traits>
inline void UpscalerBase<Traits>::initImpl(const Opm::parameter::ParameterGroup& param)
inline void UpscalerBase<Traits>::initImpl(const Opm::ParameterGroup& param)
{
// Request the boundary condition type parameter early since,
// depending on the actual type, we may have to manufacture
@@ -96,7 +96,7 @@ namespace Opm
// Ensure sufficient grid support for requested boundary
// condition type.
//
Opm::parameter::ParameterGroup temp_param = param;
Opm::ParameterGroup temp_param = param;
if (bctype_ == Linear || bctype_ == Periodic) {
if (!temp_param.has("use_unique_boundary_ids")) {
temp_param.insertParameter("use_unique_boundary_ids", "true");
@@ -119,7 +119,7 @@ namespace Opm
template <class Traits>
inline void UpscalerBase<Traits>::initFinal(const Opm::parameter::ParameterGroup& param)
inline void UpscalerBase<Traits>::initFinal(const Opm::ParameterGroup& param)
{
// Report any unused parameters.
std::cout << "==================== Unused parameters: ====================\n";

2
opm/upscaling/initCPGrid.cpp
View File

@@ -47,7 +47,7 @@
#include <opm/upscaling/initCPGrid.hpp>
void Opm::initCPGrid(Dune::CpGrid& grid, const Opm::parameter::ParameterGroup& param) {
void Opm::initCPGrid(Dune::CpGrid& grid, const Opm::ParameterGroup& param) {
std::string fileformat = param.get<std::string>("fileformat");
if (fileformat == "sintef_legacy") {
std::string grid_prefix = param.get<std::string>("grid_prefix");

2
opm/upscaling/initCPGrid.hpp
View File

@@ -25,7 +25,7 @@
namespace Opm {
void initCPGrid(Dune::CpGrid& grid, const parameter::ParameterGroup& param);
void initCPGrid(Dune::CpGrid& grid, const ParameterGroup& param);
}
#endif