From 3c0cb9e9506d7ebfe89ca372975c6a075bfaf18c Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 28 Apr 2017 15:36:25 +0200 Subject: [PATCH] adjust for changed ParameterGroup namespacing --- examples/sim_2p_comp_reorder.cpp | 4 ++-- examples/sim_2p_incomp.cpp | 4 ++-- examples/sim_2p_incomp_ad.cpp | 4 ++-- examples/sim_poly2p_comp_reorder.cpp | 4 ++-- examples/sim_poly2p_incomp_reorder.cpp | 4 ++-- examples/sim_poly_fi2p_comp_ad.cpp | 4 ++-- examples/wells_example.cpp | 1 - opm/autodiff/BlackoilModelBase.hpp | 2 +- opm/autodiff/BlackoilModelEbos.hpp | 2 +- opm/autodiff/BlackoilModelParameters.cpp | 2 +- opm/autodiff/BlackoilModelParameters.hpp | 4 ++-- opm/autodiff/BlackoilSequentialModel.hpp | 2 +- opm/autodiff/CPRPreconditioner.hpp | 2 +- opm/autodiff/FlowMain.hpp | 4 ++-- opm/autodiff/FlowMainEbos.hpp | 4 ++-- opm/autodiff/ISTLSolver.hpp | 2 +- opm/autodiff/NewtonIterationBlackoilCPR.cpp | 2 +- opm/autodiff/NewtonIterationBlackoilCPR.hpp | 2 +- opm/autodiff/NewtonIterationBlackoilInterleaved.cpp | 2 +- opm/autodiff/NewtonIterationBlackoilInterleaved.hpp | 4 ++-- opm/autodiff/NewtonIterationBlackoilSimple.cpp | 2 +- opm/autodiff/NewtonIterationBlackoilSimple.hpp | 2 +- opm/autodiff/NonlinearSolver.hpp | 2 +- opm/autodiff/NonlinearSolver_impl.hpp | 2 +- opm/autodiff/SimulatorBase.hpp | 4 ++-- opm/autodiff/SimulatorBase_impl.hpp | 2 +- opm/autodiff/SimulatorFullyImplicitBlackoil.hpp | 2 +- opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp | 4 ++-- opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment.hpp | 2 +- opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp | 4 ++-- opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp | 2 +- opm/autodiff/SimulatorFullyImplicitBlackoilSolvent_impl.hpp | 2 +- opm/autodiff/SimulatorIncompTwophaseAd.cpp | 6 +++--- opm/autodiff/SimulatorIncompTwophaseAd.hpp | 4 ++-- opm/autodiff/SimulatorSequentialBlackoil.hpp | 2 +- opm/autodiff/TransportSolverTwophaseAd.cpp | 2 +- opm/autodiff/TransportSolverTwophaseAd.hpp | 4 ++-- opm/polymer/IncompPropertiesDefaultPolymer.hpp | 2 +- opm/polymer/SimulatorCompressiblePolymer.cpp | 6 +++--- opm/polymer/SimulatorCompressiblePolymer.hpp | 4 ++-- opm/polymer/SimulatorPolymer.cpp | 6 +++--- opm/polymer/SimulatorPolymer.hpp | 4 ++-- .../FullyImplicitCompressiblePolymerSolver.hpp | 2 +- .../fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp | 2 +- .../SimulatorFullyImplicitBlackoilPolymer_impl.hpp | 2 +- .../SimulatorFullyImplicitCompressiblePolymer.hpp | 4 ++-- .../SimulatorFullyImplicitCompressiblePolymer_impl.hpp | 2 +- opm/simulators/SimulatorCompressibleTwophase.cpp | 6 +++--- opm/simulators/SimulatorCompressibleTwophase.hpp | 4 ++-- opm/simulators/SimulatorIncompTwophase.cpp | 6 +++--- opm/simulators/SimulatorIncompTwophase.hpp | 4 ++-- opm/simulators/timestepping/AdaptiveTimeStepping.hpp | 6 +++--- opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp | 6 +++--- opm/simulators/timestepping/SimulatorTimer.cpp | 2 +- opm/simulators/timestepping/SimulatorTimer.hpp | 4 ++-- opm/simulators/timestepping/SimulatorTimerInterface.hpp | 2 +- tests/test_boprops_ad.cpp | 2 +- tests/test_rateconverter.cpp | 2 +- tests/test_singlecellsolves.cpp | 2 +- tests/test_transmissibilitymultipliers.cpp | 4 ++-- 60 files changed, 95 insertions(+), 96 deletions(-) diff --git a/examples/sim_2p_comp_reorder.cpp b/examples/sim_2p_comp_reorder.cpp index b8c7b9342..32171bc1d 100644 --- a/examples/sim_2p_comp_reorder.cpp +++ b/examples/sim_2p_comp_reorder.cpp @@ -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. diff --git a/examples/sim_2p_incomp.cpp b/examples/sim_2p_incomp.cpp index 3a03146bb..e0127ced3 100644 --- a/examples/sim_2p_incomp.cpp +++ b/examples/sim_2p_incomp.cpp @@ -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 diff --git a/examples/sim_2p_incomp_ad.cpp b/examples/sim_2p_incomp_ad.cpp index 6fbb6b046..f728a6374 100644 --- a/examples/sim_2p_incomp_ad.cpp +++ b/examples/sim_2p_incomp_ad.cpp @@ -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 diff --git a/examples/sim_poly2p_comp_reorder.cpp b/examples/sim_poly2p_comp_reorder.cpp index a17e226ea..9fd99e08a 100644 --- a/examples/sim_poly2p_comp_reorder.cpp +++ b/examples/sim_poly2p_comp_reorder.cpp @@ -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. diff --git a/examples/sim_poly2p_incomp_reorder.cpp b/examples/sim_poly2p_incomp_reorder.cpp index f5b7aaf95..0ab575dc8 100644 --- a/examples/sim_poly2p_incomp_reorder.cpp +++ b/examples/sim_poly2p_incomp_reorder.cpp @@ -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. diff --git a/examples/sim_poly_fi2p_comp_ad.cpp b/examples/sim_poly_fi2p_comp_ad.cpp index 09833b482..8249135e9 100644 --- a/examples/sim_poly_fi2p_comp_ad.cpp +++ b/examples/sim_poly_fi2p_comp_ad.cpp @@ -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. diff --git a/examples/wells_example.cpp b/examples/wells_example.cpp index 53c6f548e..aaadde200 100644 --- a/examples/wells_example.cpp +++ b/examples/wells_example.cpp @@ -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 ("inputdeck", "data.data"); diff --git a/opm/autodiff/BlackoilModelBase.hpp b/opm/autodiff/BlackoilModelBase.hpp index 0077ad1c6..250c66219 100644 --- a/opm/autodiff/BlackoilModelBase.hpp +++ b/opm/autodiff/BlackoilModelBase.hpp @@ -47,7 +47,7 @@ struct Wells; namespace Opm { - namespace parameter { class ParameterGroup; } + class ParameterGroup; class DerivedGeology; class RockCompressibility; class NewtonIterationBlackoilInterface; diff --git a/opm/autodiff/BlackoilModelEbos.hpp b/opm/autodiff/BlackoilModelEbos.hpp index 31d6a0a45..df6447bcd 100644 --- a/opm/autodiff/BlackoilModelEbos.hpp +++ b/opm/autodiff/BlackoilModelEbos.hpp @@ -92,7 +92,7 @@ SET_BOOL_PROP(EclFlowProblem, EnableSwatinit, false); namespace Opm { - namespace parameter { class ParameterGroup; } + class ParameterGroup; class DerivedGeology; class RockCompressibility; class NewtonIterationBlackoilInterface; diff --git a/opm/autodiff/BlackoilModelParameters.cpp b/opm/autodiff/BlackoilModelParameters.cpp index 8b7bb9485..6ae955458 100644 --- a/opm/autodiff/BlackoilModelParameters.cpp +++ b/opm/autodiff/BlackoilModelParameters.cpp @@ -34,7 +34,7 @@ namespace Opm - BlackoilModelParameters::BlackoilModelParameters( const parameter::ParameterGroup& param ) + BlackoilModelParameters::BlackoilModelParameters( const ParameterGroup& param ) { // set default values reset(); diff --git a/opm/autodiff/BlackoilModelParameters.hpp b/opm/autodiff/BlackoilModelParameters.hpp index bf898437a..9f3427bb9 100644 --- a/opm/autodiff/BlackoilModelParameters.hpp +++ b/opm/autodiff/BlackoilModelParameters.hpp @@ -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(); diff --git a/opm/autodiff/BlackoilSequentialModel.hpp b/opm/autodiff/BlackoilSequentialModel.hpp index 6e8255485..895b38196 100644 --- a/opm/autodiff/BlackoilSequentialModel.hpp +++ b/opm/autodiff/BlackoilSequentialModel.hpp @@ -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)) { diff --git a/opm/autodiff/CPRPreconditioner.hpp b/opm/autodiff/CPRPreconditioner.hpp index 27e81592e..02693d344 100644 --- a/opm/autodiff/CPRPreconditioner.hpp +++ b/opm/autodiff/CPRPreconditioner.hpp @@ -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(); diff --git a/opm/autodiff/FlowMain.hpp b/opm/autodiff/FlowMain.hpp index a041c338f..444c073a8 100644 --- a/opm/autodiff/FlowMain.hpp +++ b/opm/autodiff/FlowMain.hpp @@ -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()) { diff --git a/opm/autodiff/FlowMainEbos.hpp b/opm/autodiff/FlowMainEbos.hpp index 3d5ebcc62..354e853b9 100644 --- a/opm/autodiff/FlowMainEbos.hpp +++ b/opm/autodiff/FlowMainEbos.hpp @@ -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 fluidprops_; diff --git a/opm/autodiff/ISTLSolver.hpp b/opm/autodiff/ISTLSolver.hpp index 580eb0f6c..f2ee4931d 100644 --- a/opm/autodiff/ISTLSolver.hpp +++ b/opm/autodiff/ISTLSolver.hpp @@ -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), diff --git a/opm/autodiff/NewtonIterationBlackoilCPR.cpp b/opm/autodiff/NewtonIterationBlackoilCPR.cpp index db21e4113..796dee06a 100644 --- a/opm/autodiff/NewtonIterationBlackoilCPR.cpp +++ b/opm/autodiff/NewtonIterationBlackoilCPR.cpp @@ -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 ), diff --git a/opm/autodiff/NewtonIterationBlackoilCPR.hpp b/opm/autodiff/NewtonIterationBlackoilCPR.hpp index e9c024ba7..0bbf51b8a 100644 --- a/opm/autodiff/NewtonIterationBlackoilCPR.hpp +++ b/opm/autodiff/NewtonIterationBlackoilCPR.hpp @@ -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 diff --git a/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp b/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp index 7568c203c..d9574fef2 100644 --- a/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp +++ b/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp @@ -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_(), diff --git a/opm/autodiff/NewtonIterationBlackoilInterleaved.hpp b/opm/autodiff/NewtonIterationBlackoilInterleaved.hpp index bc74e429e..0e010a0a0 100644 --- a/opm/autodiff/NewtonIterationBlackoilInterleaved.hpp +++ b/opm/autodiff/NewtonIterationBlackoilInterleaved.hpp @@ -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 diff --git a/opm/autodiff/NewtonIterationBlackoilSimple.cpp b/opm/autodiff/NewtonIterationBlackoilSimple.cpp index 89816fdef..756746a7f 100644 --- a/opm/autodiff/NewtonIterationBlackoilSimple.cpp +++ b/opm/autodiff/NewtonIterationBlackoilSimple.cpp @@ -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) { diff --git a/opm/autodiff/NewtonIterationBlackoilSimple.hpp b/opm/autodiff/NewtonIterationBlackoilSimple.hpp index e6aaf33a6..34e5a8509 100644 --- a/opm/autodiff/NewtonIterationBlackoilSimple.hpp +++ b/opm/autodiff/NewtonIterationBlackoilSimple.hpp @@ -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 diff --git a/opm/autodiff/NonlinearSolver.hpp b/opm/autodiff/NonlinearSolver.hpp index 27692f84b..ff8a5f7e2 100644 --- a/opm/autodiff/NonlinearSolver.hpp +++ b/opm/autodiff/NonlinearSolver.hpp @@ -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(); diff --git a/opm/autodiff/NonlinearSolver_impl.hpp b/opm/autodiff/NonlinearSolver_impl.hpp index 6c64f4cd0..c39f07315 100644 --- a/opm/autodiff/NonlinearSolver_impl.hpp +++ b/opm/autodiff/NonlinearSolver_impl.hpp @@ -201,7 +201,7 @@ namespace Opm template NonlinearSolver::SolverParameters:: - SolverParameters( const parameter::ParameterGroup& param ) + SolverParameters( const ParameterGroup& param ) { // set default values reset(); diff --git a/opm/autodiff/SimulatorBase.hpp b/opm/autodiff/SimulatorBase.hpp index 27508a9ed..8349be465 100644 --- a/opm/autodiff/SimulatorBase.hpp +++ b/opm/autodiff/SimulatorBase.hpp @@ -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_; diff --git a/opm/autodiff/SimulatorBase_impl.hpp b/opm/autodiff/SimulatorBase_impl.hpp index 1455728aa..cdf83a937 100644 --- a/opm/autodiff/SimulatorBase_impl.hpp +++ b/opm/autodiff/SimulatorBase_impl.hpp @@ -33,7 +33,7 @@ namespace Opm { template - SimulatorBase::SimulatorBase(const parameter::ParameterGroup& param, + SimulatorBase::SimulatorBase(const ParameterGroup& param, const Grid& grid, DerivedGeology& geo, BlackoilPropsAdFromDeck& props, diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoil.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoil.hpp index 6fb3ed23f..2c27914b5 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoil.hpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoil.hpp @@ -51,7 +51,7 @@ class SimulatorFullyImplicitBlackoil typedef SimulatorBase > 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, diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp index 30a39096a..0c803a82f 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp @@ -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_; diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment.hpp index 587f39590..cc798baea 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment.hpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment.hpp @@ -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, diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp index dbb05f023..91b89c72f 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp @@ -209,7 +209,7 @@ namespace Opm // constructor creating different sub writers template BlackoilOutputWriter(const Grid& grid, - const parameter::ParameterGroup& param, + const ParameterGroup& param, const Opm::EclipseState& eclipseState, std::unique_ptr&& 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&& eclIO, const Opm::PhaseUsage &phaseUsage) diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp index c8b4ac362..4bc7ee446 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp @@ -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, diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent_impl.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent_impl.hpp index e6e04adc3..02af8af87 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent_impl.hpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent_impl.hpp @@ -24,7 +24,7 @@ namespace Opm { template SimulatorFullyImplicitBlackoilSolvent:: - SimulatorFullyImplicitBlackoilSolvent(const parameter::ParameterGroup& param, + SimulatorFullyImplicitBlackoilSolvent(const ParameterGroup& param, const GridT& grid, DerivedGeology& geo, BlackoilPropsAdFromDeck& props, diff --git a/opm/autodiff/SimulatorIncompTwophaseAd.cpp b/opm/autodiff/SimulatorIncompTwophaseAd.cpp index f21acab06..487a0d4a6 100644 --- a/opm/autodiff/SimulatorIncompTwophaseAd.cpp +++ b/opm/autodiff/SimulatorIncompTwophaseAd.cpp @@ -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, diff --git a/opm/autodiff/SimulatorIncompTwophaseAd.hpp b/opm/autodiff/SimulatorIncompTwophaseAd.hpp index 712092323..dfd6f736f 100644 --- a/opm/autodiff/SimulatorIncompTwophaseAd.hpp +++ b/opm/autodiff/SimulatorIncompTwophaseAd.hpp @@ -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, diff --git a/opm/autodiff/SimulatorSequentialBlackoil.hpp b/opm/autodiff/SimulatorSequentialBlackoil.hpp index da037ada7..249d8b703 100644 --- a/opm/autodiff/SimulatorSequentialBlackoil.hpp +++ b/opm/autodiff/SimulatorSequentialBlackoil.hpp @@ -52,7 +52,7 @@ class SimulatorSequentialBlackoil typedef SimulatorBase > 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, diff --git a/opm/autodiff/TransportSolverTwophaseAd.cpp b/opm/autodiff/TransportSolverTwophaseAd.cpp index 61ba63ab0..443950ae3 100644 --- a/opm/autodiff/TransportSolverTwophaseAd.cpp +++ b/opm/autodiff/TransportSolverTwophaseAd.cpp @@ -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), diff --git a/opm/autodiff/TransportSolverTwophaseAd.hpp b/opm/autodiff/TransportSolverTwophaseAd.hpp index 02ea17977..4be3fb0fe 100644 --- a/opm/autodiff/TransportSolverTwophaseAd.hpp +++ b/opm/autodiff/TransportSolverTwophaseAd.hpp @@ -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(); diff --git a/opm/polymer/IncompPropertiesDefaultPolymer.hpp b/opm/polymer/IncompPropertiesDefaultPolymer.hpp index 6a204bbc0..5396da1ba 100644 --- a/opm/polymer/IncompPropertiesDefaultPolymer.hpp +++ b/opm/polymer/IncompPropertiesDefaultPolymer.hpp @@ -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); diff --git a/opm/polymer/SimulatorCompressiblePolymer.cpp b/opm/polymer/SimulatorCompressiblePolymer.cpp index db3bde1ae..835d70931 100644 --- a/opm/polymer/SimulatorCompressiblePolymer.cpp +++ b/opm/polymer/SimulatorCompressiblePolymer.cpp @@ -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, diff --git a/opm/polymer/SimulatorCompressiblePolymer.hpp b/opm/polymer/SimulatorCompressiblePolymer.hpp index 0430959b1..90d875c2c 100644 --- a/opm/polymer/SimulatorCompressiblePolymer.hpp +++ b/opm/polymer/SimulatorCompressiblePolymer.hpp @@ -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, diff --git a/opm/polymer/SimulatorPolymer.cpp b/opm/polymer/SimulatorPolymer.cpp index 47d84bced..c2a898543 100644 --- a/opm/polymer/SimulatorPolymer.cpp +++ b/opm/polymer/SimulatorPolymer.cpp @@ -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, diff --git a/opm/polymer/SimulatorPolymer.hpp b/opm/polymer/SimulatorPolymer.hpp index 5387aa867..c382c27e8 100644 --- a/opm/polymer/SimulatorPolymer.hpp +++ b/opm/polymer/SimulatorPolymer.hpp @@ -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, diff --git a/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp b/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp index 128ee568b..acb346499 100644 --- a/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp +++ b/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp @@ -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; diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp index 3506b0013..76752b76c 100644 --- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp +++ b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp @@ -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, diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp index 99139af9f..a283b5728 100644 --- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp +++ b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp @@ -23,7 +23,7 @@ namespace Opm { template SimulatorFullyImplicitBlackoilPolymer:: - SimulatorFullyImplicitBlackoilPolymer(const parameter::ParameterGroup& param, + SimulatorFullyImplicitBlackoilPolymer(const ParameterGroup& param, const GridT& grid, DerivedGeology& geo, BlackoilPropsAdFromDeck& props, diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp index b2727a150..084427d30 100644 --- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp +++ b/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp @@ -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, diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp index 4ab0990a7..698026f90 100644 --- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp +++ b/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp @@ -26,7 +26,7 @@ namespace Opm /// Class collecting all necessary components for a two-phase simulation. template SimulatorFullyImplicitCompressiblePolymer:: -SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param, +SimulatorFullyImplicitCompressiblePolymer(const ParameterGroup& param, const GridT& grid, DerivedGeology& geo, BlackoilPropsAdFromDeck& props, diff --git a/opm/simulators/SimulatorCompressibleTwophase.cpp b/opm/simulators/SimulatorCompressibleTwophase.cpp index 8f66dfe7f..424787fa9 100644 --- a/opm/simulators/SimulatorCompressibleTwophase.cpp +++ b/opm/simulators/SimulatorCompressibleTwophase.cpp @@ -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, diff --git a/opm/simulators/SimulatorCompressibleTwophase.hpp b/opm/simulators/SimulatorCompressibleTwophase.hpp index fc690ef5c..bfb10a62e 100644 --- a/opm/simulators/SimulatorCompressibleTwophase.hpp +++ b/opm/simulators/SimulatorCompressibleTwophase.hpp @@ -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, diff --git a/opm/simulators/SimulatorIncompTwophase.cpp b/opm/simulators/SimulatorIncompTwophase.cpp index dce591c5b..8c2996686 100644 --- a/opm/simulators/SimulatorIncompTwophase.cpp +++ b/opm/simulators/SimulatorIncompTwophase.cpp @@ -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, diff --git a/opm/simulators/SimulatorIncompTwophase.hpp b/opm/simulators/SimulatorIncompTwophase.hpp index d44cbbfb0..35605c9a5 100644 --- a/opm/simulators/SimulatorIncompTwophase.hpp +++ b/opm/simulators/SimulatorIncompTwophase.hpp @@ -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, diff --git a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp index 28cca22e8..f44057c5e 100644 --- a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp +++ b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp @@ -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* fipnum); - void init(const parameter::ParameterGroup& param); + void init(const ParameterGroup& param); typedef std::unique_ptr< TimeStepControlInterface > TimeStepControlType; diff --git a/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp b/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp index 66d8050a4..05db6c368 100644 --- a/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp +++ b/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp @@ -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") ); diff --git a/opm/simulators/timestepping/SimulatorTimer.cpp b/opm/simulators/timestepping/SimulatorTimer.cpp index 75a44b644..e9a4a8ddf 100644 --- a/opm/simulators/timestepping/SimulatorTimer.cpp +++ b/opm/simulators/timestepping/SimulatorTimer.cpp @@ -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); diff --git a/opm/simulators/timestepping/SimulatorTimer.hpp b/opm/simulators/timestepping/SimulatorTimer.hpp index 0caf225a5..2dc894532 100644 --- a/opm/simulators/timestepping/SimulatorTimer.hpp +++ b/opm/simulators/timestepping/SimulatorTimer.hpp @@ -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); diff --git a/opm/simulators/timestepping/SimulatorTimerInterface.hpp b/opm/simulators/timestepping/SimulatorTimerInterface.hpp index ae30d381c..d08b8778c 100644 --- a/opm/simulators/timestepping/SimulatorTimerInterface.hpp +++ b/opm/simulators/timestepping/SimulatorTimerInterface.hpp @@ -29,7 +29,7 @@ namespace Opm { - namespace parameter { class ParameterGroup; } + class ParameterGroup; /// Interface class for SimulatorTimer objects, to be improved. class SimulatorTimerInterface diff --git a/tests/test_boprops_ad.cpp b/tests/test_boprops_ad.cpp index 9eb5f2845..299ff9fbb 100644 --- a/tests/test_boprops_ad.cpp +++ b/tests/test_boprops_ad.cpp @@ -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; }; diff --git a/tests/test_rateconverter.cpp b/tests/test_rateconverter.cpp index c1d365620..cb5a6eca4 100644 --- a/tests/test_rateconverter.cpp +++ b/tests/test_rateconverter.cpp @@ -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; }; diff --git a/tests/test_singlecellsolves.cpp b/tests/test_singlecellsolves.cpp index 848f89444..211a6063a 100644 --- a/tests/test_singlecellsolves.cpp +++ b/tests/test_singlecellsolves.cpp @@ -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; diff --git a/tests/test_transmissibilitymultipliers.cpp b/tests/test_transmissibilitymultipliers.cpp index f56a06613..2d3c2764d 100644 --- a/tests/test_transmissibilitymultipliers.cpp +++ b/tests/test_transmissibilitymultipliers.cpp @@ -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;