OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-17 18:04:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

changed: remove embedded 'parameters' namespace in ParamGroup

Browse Source 
inconsistent and unnecessary.

this is purely a cosmetic change, the only exception was a function with
the generic name 'split', which was renamed to splitParam to avoid confusion.
This commit is contained in:
Arne Morten Kvarving
2017-04-28 15:34:11 +02:00
parent ce6801df7a
commit ca2288ac37
28 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/core/flowdiagnostics/TofDiscGalReorder.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ namespace Opm
/// Construct solver.
TofDiscGalReorder::TofDiscGalReorder(const UnstructuredGrid& grid,
const parameter::ParameterGroup& param)
const ParameterGroup& param)
: grid_(grid),
use_cvi_(false),
use_limiter_(false),
opm/core/flowdiagnostics/TofDiscGalReorder.hpp
+2 -2
View File
@@ -32,9 +32,9 @@ namespace Opm
{
class IncompPropertiesInterface;
class ParameterGroup;
class VelocityInterpolationInterface;
class DGBasisInterface;
namespace parameter { class ParameterGroup; }
template <typename T> class SparseTable;
/// Implements a discontinuous Galerkin solver for
@@ -72,7 +72,7 @@ namespace Opm
/// - AsSimultaneousPostProcess -- Apply to each cell independently, using un-
/// limited solution in neighbouring cells.
TofDiscGalReorder(const UnstructuredGrid& grid,
const parameter::ParameterGroup& param);
const ParameterGroup& param);
/// Solve for time-of-flight.
opm/core/linalg/LinearSolverFactory.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ namespace Opm
LinearSolverFactory::LinearSolverFactory(const parameter::ParameterGroup& param)
LinearSolverFactory::LinearSolverFactory(const ParameterGroup& param)
{
#if HAVE_SUITESPARSE_UMFPACK_H
std::string default_solver = "umfpack";
opm/core/linalg/LinearSolverFactory.hpp
+2 -2
View File
@@ -27,7 +27,7 @@
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
/// Concrete class encapsulating any available linear solver.
@@ -55,7 +55,7 @@ namespace Opm
/// Any further parameters are passed on to the constructors
/// of the actual solver used, see LinearSolverUmfpack,
/// LinearSolverIstl and LinearSolverPetsc for details.
LinearSolverFactory(const parameter::ParameterGroup& param);
LinearSolverFactory(const ParameterGroup& param);
/// Destructor.
virtual ~LinearSolverFactory();
opm/core/linalg/LinearSolverIstl.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ namespace Opm
LinearSolverIstl::LinearSolverIstl(const parameter::ParameterGroup& param)
LinearSolverIstl::LinearSolverIstl(const ParameterGroup& param)
: linsolver_residual_tolerance_(1e-8),
linsolver_verbosity_(0),
linsolver_type_(CG_AMG),
opm/core/linalg/LinearSolverIstl.hpp
+1 -1
View File
@@ -52,7 +52,7 @@ namespace Opm
/// Construct from parameters
/// Accepted parameters are, with defaults, listed in the
/// default constructor.
LinearSolverIstl(const parameter::ParameterGroup& param);
LinearSolverIstl(const ParameterGroup& param);
/// Destructor.
virtual ~LinearSolverIstl();
opm/core/props/BlackoilPropertiesBasic.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
namespace Opm
{
BlackoilPropertiesBasic::BlackoilPropertiesBasic(const parameter::ParameterGroup& param,
BlackoilPropertiesBasic::BlackoilPropertiesBasic(const ParameterGroup& param,
const int dim,
const int num_cells)
{
opm/core/props/BlackoilPropertiesBasic.hpp
+1 -1
View File
@@ -43,7 +43,7 @@ namespace Opm
/// - mu1, mu2, mu3 (1.0) -- Viscosity in cP
/// - porosity (1.0) -- Porosity
/// - permeability (100.0) -- Permeability in mD
BlackoilPropertiesBasic(const parameter::ParameterGroup& param,
BlackoilPropertiesBasic(const ParameterGroup& param,
const int dim,
const int num_cells);
opm/core/props/BlackoilPropertiesFromDeck.cpp
+4 -4
View File
@@ -47,7 +47,7 @@ namespace Opm
BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const Opm::Deck& deck,
const Opm::EclipseState& eclState,
const UnstructuredGrid& grid,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
bool init_rock)
{
std::vector<int> compressedToCartesianIdx
@@ -81,7 +81,7 @@ namespace Opm
int number_of_cells,
const int* global_cell,
const int* cart_dims,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
bool init_rock)
{
std::vector<int> compressedToCartesianIdx
@@ -106,7 +106,7 @@ namespace Opm
int number_of_cells,
const int* global_cell,
const int* cart_dims,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
bool init_rock)
{
init(deck,
@@ -151,7 +151,7 @@ namespace Opm
int number_of_cells,
const int* global_cell,
const int* cart_dims,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
bool init_rock)
{
// retrieve the cell specific PVT table index from the deck
opm/core/props/BlackoilPropertiesFromDeck.hpp
+4 -4
View File
@@ -68,7 +68,7 @@ namespace Opm
BlackoilPropertiesFromDeck(const Opm::Deck& deck,
const Opm::EclipseState& eclState,
const UnstructuredGrid& grid,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
bool init_rock=true);
BlackoilPropertiesFromDeck(const Opm::Deck& deck,
@@ -83,7 +83,7 @@ namespace Opm
int number_of_cells,
const int* global_cell,
const int* cart_dims,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
bool init_rock=true);
BlackoilPropertiesFromDeck(const Opm::Deck& deck,
@@ -92,7 +92,7 @@ namespace Opm
int number_of_cells,
const int* global_cell,
const int* cart_dims,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
bool init_rock=true);
/// Destructor.
@@ -304,7 +304,7 @@ namespace Opm
int number_of_cells,
const int* global_cell,
const int* cart_dims,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
bool init_rock);
RockFromDeck rock_;
opm/core/props/IncompPropertiesBasic.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
namespace Opm
{
IncompPropertiesBasic::IncompPropertiesBasic(const parameter::ParameterGroup& param,
IncompPropertiesBasic::IncompPropertiesBasic(const ParameterGroup& param,
const int dim,
const int num_cells)
{
opm/core/props/IncompPropertiesBasic.hpp
+1 -1
View File
@@ -51,7 +51,7 @@ namespace Opm
/// - \c mu1 \c mu2, \c mu3 (1.0) -- Viscosity in cP.
/// - \c porosity (1.0) -- Porosity.
/// - \c permeability (100.0) -- Permeability in mD.
IncompPropertiesBasic(const parameter::ParameterGroup& param,
IncompPropertiesBasic(const ParameterGroup& param,
const int dim,
const int num_cells);
opm/core/props/pvt/PvtPropertiesBasic.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ namespace Opm
}
void PvtPropertiesBasic::init(const parameter::ParameterGroup& param)
void PvtPropertiesBasic::init(const ParameterGroup& param)
{
int num_phases = param.getDefault("num_phases", 2);
if (num_phases > 3 || num_phases < 1) {
opm/core/props/pvt/PvtPropertiesBasic.hpp
+1 -1
View File
@@ -44,7 +44,7 @@ namespace Opm
/// - num_phases (2) -- Must be 1, 2 or 3.
/// - rho1, rho2, rho3 (1.0e3) -- Density in kg/m^3
/// - mu1, mu2, mu3 (1.0) -- Viscosity in cP
void init(const parameter::ParameterGroup& param);
void init(const ParameterGroup& param);
/// Initialize from arguments.
/// Basic multi phase fluid pvt properties.
opm/core/props/rock/RockCompressibility.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
namespace Opm
{
RockCompressibility::RockCompressibility(const parameter::ParameterGroup& param)
RockCompressibility::RockCompressibility(const ParameterGroup& param)
: pref_(0.0),
rock_comp_(0.0)
{
opm/core/props/rock/RockCompressibility.hpp
+2 -2
View File
@@ -27,7 +27,7 @@
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class RockCompressibility
{
@@ -41,7 +41,7 @@ namespace Opm
/// Accepts the following parameters (with defaults).
/// rock_compressibility_pref (100.0) [given in bar]
/// rock_compressibility (0.0) [given in bar^{-1}]
RockCompressibility(const parameter::ParameterGroup& param);
RockCompressibility(const ParameterGroup& param);
/// Returns true if there are compressibility effects.
bool isActive() const;
opm/core/props/satfunc/SaturationPropsBasic.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ namespace Opm
/// Initialize from parameters.
void SaturationPropsBasic::init(const parameter::ParameterGroup& param)
void SaturationPropsBasic::init(const ParameterGroup& param)
{
int num_phases = param.getDefault("num_phases", 2);
if (num_phases > 2 || num_phases < 1) {
opm/core/props/satfunc/SaturationPropsBasic.hpp
+1 -1
View File
@@ -43,7 +43,7 @@ namespace Opm
/// The following parameters are accepted (defaults):
/// - num_phases (2) -- Must be 1 or 2.
/// - relperm_func ("Linear") -- Must be "Constant", "Linear" or "Quadratic".
void init(const parameter::ParameterGroup& param);
void init(const ParameterGroup& param);
enum RelPermFunc { Constant, Linear, Quadratic };
opm/core/simulator/initState.hpp
+5 -5
View File
@@ -27,7 +27,7 @@ struct UnstructuredGrid;
namespace Opm
{
namespace parameter { class ParameterGroup; }
class ParameterGroup;
class IncompPropertiesInterface;
class BlackoilPropertiesInterface;
class SimulationDataContainer;
@@ -75,7 +75,7 @@ namespace Opm
template <class State>
void initStateBasic(const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const double gravity,
State& state);
@@ -113,7 +113,7 @@ namespace Opm
CCI begin_cell_centroids,
int dimensions,
const IncompPropertiesInterface& props,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const double gravity,
State& state);
@@ -136,7 +136,7 @@ namespace Opm
template <class State>
void initStateBasic(const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const double gravity,
State& state);
@@ -166,7 +166,7 @@ namespace Opm
CCI begin_cell_centroids,
int dimensions,
const BlackoilPropertiesInterface& props,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const double gravity,
State& state);
opm/core/simulator/initState_impl.hpp
+4 -4
View File
@@ -411,7 +411,7 @@ namespace Opm
template <class State>
void initStateBasic(const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const double gravity,
State& state)
{
@@ -432,7 +432,7 @@ namespace Opm
CCI begin_cell_centroids,
int dimensions,
const IncompPropertiesInterface& props,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const double gravity,
State& state)
{
@@ -535,7 +535,7 @@ namespace Opm
template <class State>
void initStateBasic(const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const double gravity,
State& state)
{
@@ -555,7 +555,7 @@ namespace Opm
CCI begin_cell_centroids,
int dimensions,
const BlackoilPropertiesInterface& props,
const parameter::ParameterGroup& param,
const ParameterGroup& param,
const double gravity,
State& state)
{