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

Changed namespace Dune -> namespace Opm.

Browse Source
This commit is contained in:
Bjørn Spjelkavik 2012-01-19 13:50:57 +01:00
parent 55102ee23f
commit 7d6fb03142
15 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/fluid/BlackoilPropertiesBasic.cpp
View File

@ -25,13 +25,13 @@
namespace Opm
{
BlackoilPropertiesBasic::BlackoilPropertiesBasic(const Dune::parameter::ParameterGroup& param,
BlackoilPropertiesBasic::BlackoilPropertiesBasic(const parameter::ParameterGroup& param,
const int dim,
const int num_cells)
{
double poro = param.getDefault("porosity", 1.0);
using namespace Dune::unit;
using namespace Dune::prefix;
using namespace Opm::unit;
using namespace Opm::prefix;
double perm = param.getDefault("permeability", 100)*milli*darcy;
rock_.init(dim, num_cells, poro, perm);
pvt_.init(param);

2
opm/core/fluid/BlackoilPropertiesBasic.hpp
View File

@ -42,7 +42,7 @@ namespace Opm
/// mu1 [mu2, mu3] (1.0) Viscosity in cP
/// porosity (1.0) Porosity
/// permeability (100.0) Permeability in mD
BlackoilPropertiesBasic(const Dune::parameter::ParameterGroup& param,
BlackoilPropertiesBasic(const parameter::ParameterGroup& param,
const int dim,
const int num_cells);

2
opm/core/fluid/BlackoilPropertiesFromDeck.cpp
View File

@ -22,7 +22,7 @@
namespace Opm
{
BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const Dune::EclipseGridParser& deck,
BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
const std::vector<int>& global_cell)
{
rock_.init(deck, global_cell);

2
opm/core/fluid/BlackoilPropertiesFromDeck.hpp
View File

@ -39,7 +39,7 @@ namespace Opm
/// \param deck eclipse input parser
/// \param global_cell mapping from cell indices (typically from a processed grid)
/// to logical cartesian indices consistent with the deck.
BlackoilPropertiesFromDeck(const Dune::EclipseGridParser& deck,
BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
const std::vector<int>& global_cell);
/// Destructor.

6
opm/core/fluid/IncompPropertiesBasic.cpp
View File

@ -27,13 +27,13 @@
namespace Opm
{
IncompPropertiesBasic::IncompPropertiesBasic(const Dune::parameter::ParameterGroup& param,
IncompPropertiesBasic::IncompPropertiesBasic(const parameter::ParameterGroup& param,
const int dim,
const int num_cells)
{
double poro = param.getDefault("porosity", 1.0);
using namespace Dune::unit;
using namespace Dune::prefix;
using namespace Opm::unit;
using namespace Opm::prefix;
double perm = param.getDefault("permeability", 100)*milli*darcy;
rock_.init(dim, num_cells, poro, perm);
pvt_.init(param);

2
opm/core/fluid/IncompPropertiesBasic.hpp
View File

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

6
opm/core/fluid/PvtPropertiesBasic.cpp
View File

@ -32,7 +32,7 @@ namespace Opm
}
void PvtPropertiesBasic::init(const Dune::parameter::ParameterGroup& param)
void PvtPropertiesBasic::init(const parameter::ParameterGroup& param)
{
int num_phases = param.getDefault("num_phases", 2);
if (num_phases > 3 || num_phases < 1) {
@ -45,8 +45,8 @@ namespace Opm
formation_volume_factor_.resize(num_phases, 1.0);
// Setting mu and rho from parameters
using namespace Dune::prefix;
using namespace Dune::unit;
using namespace Opm::prefix;
using namespace Opm::unit;
const double kgpm3 = kilogram/cubic(meter);
const double cP = centi*Poise;
std::string rname[3] = { "rho1", "rho2", "rho3" };

2
opm/core/fluid/PvtPropertiesBasic.hpp
View File

@ -42,7 +42,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 Dune::parameter::ParameterGroup& param);
void init(const parameter::ParameterGroup& param);
/// Number of active phases.
int numPhases() const;

16
opm/core/fluid/RockFromDeck.cpp
View File

@ -29,10 +29,10 @@ namespace Opm
{
enum PermeabilityKind { ScalarPerm, DiagonalPerm, TensorPerm, None, Invalid };
PermeabilityKind classifyPermeability(const Dune::EclipseGridParser& parser);
PermeabilityKind classifyPermeability(const EclipseGridParser& parser);
void setScalarPermIfNeeded(std::tr1::array<int,9>& kmap,
int i, int j, int k);
PermeabilityKind fillTensor(const Dune::EclipseGridParser& parser,
PermeabilityKind fillTensor(const EclipseGridParser& parser,
std::vector<const std::vector<double>*>& tensor,
std::tr1::array<int,9>& kmap);
} // anonymous namespace
@ -52,7 +52,7 @@ namespace Opm
/// \param deck Deck input parser
/// \param global_cell mapping from cell indices (typically from a processed grid)
/// to logical cartesian indices consistent with the deck.
void RockFromDeck::init(const Dune::EclipseGridParser& deck,
void RockFromDeck::init(const EclipseGridParser& deck,
const std::vector<int>& global_cell)
{
assignPorosity(deck, global_cell);
@ -62,7 +62,7 @@ namespace Opm
}
void RockFromDeck::assignPorosity(const Dune::EclipseGridParser& parser,
void RockFromDeck::assignPorosity(const EclipseGridParser& parser,
const std::vector<int>& global_cell)
{
porosity_.assign(global_cell.size(), 1.0);
@ -78,12 +78,12 @@ namespace Opm
void RockFromDeck::assignPermeability(const Dune::EclipseGridParser& parser,
void RockFromDeck::assignPermeability(const EclipseGridParser& parser,
const std::vector<int>& global_cell,
double perm_threshold)
{
const int dim = 3;
Dune::EclipseGridInspector insp(parser);
EclipseGridInspector insp(parser);
std::tr1::array<int, 3> dims = insp.gridSize();
int num_global_cells = dims[0]*dims[1]*dims[2];
ASSERT (num_global_cells > 0);
@ -154,7 +154,7 @@ namespace Opm
/// TensorPerm at least one cross-component given.
/// None no components given.
/// Invalid invalid set of components given.
PermeabilityKind classifyPermeability(const Dune::EclipseGridParser& parser)
PermeabilityKind classifyPermeability(const EclipseGridParser& parser)
{
const bool xx = parser.hasField("PERMX" );
const bool xy = parser.hasField("PERMXY");
@ -262,7 +262,7 @@ namespace Opm
///
/// @param [out] tensor
/// @param [out] kmap
PermeabilityKind fillTensor(const Dune::EclipseGridParser& parser,
PermeabilityKind fillTensor(const EclipseGridParser& parser,
std::vector<const std::vector<double>*>& tensor,
std::tr1::array<int,9>& kmap)
{

6
opm/core/fluid/RockFromDeck.hpp
View File

@ -38,7 +38,7 @@ namespace Opm
/// \param deck Deck input parser
/// \param global_cell mapping from cell indices (typically from a processed grid)
/// to logical cartesian indices consistent with the deck.
void init(const Dune::EclipseGridParser& deck,
void init(const EclipseGridParser& deck,
const std::vector<int>& global_cell);
/// \return D, the number of spatial dimensions. Always 3 for deck input.
@ -68,9 +68,9 @@ namespace Opm
}
private:
void assignPorosity(const Dune::EclipseGridParser& parser,
void assignPorosity(const EclipseGridParser& parser,
const std::vector<int>& global_cell);
void assignPermeability(const Dune::EclipseGridParser& parser,
void assignPermeability(const EclipseGridParser& parser,
const std::vector<int>& global_cell,
const double perm_threshold);

2
opm/core/fluid/SaturationPropsBasic.cpp
View File

@ -106,7 +106,7 @@ namespace Opm
/// Initialize from parameters.
void SaturationPropsBasic::init(const Dune::parameter::ParameterGroup& param)
void SaturationPropsBasic::init(const parameter::ParameterGroup& param)
{
int num_phases = param.getDefault("num_phases", 2);
if (num_phases > 2 || num_phases < 1) {

2
opm/core/fluid/SaturationPropsBasic.hpp
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 Dune::parameter::ParameterGroup& param);
void init(const parameter::ParameterGroup& param);
/// \return P, the number of phases.
int numPhases() const;

14
opm/core/fluid/SaturationPropsFromDeck.hpp
View File

@ -34,7 +34,7 @@ namespace Opm
SaturationPropsFromDeck();
/// Initialize from deck.
void init(const Dune::EclipseGridParser& deck);
void init(const EclipseGridParser& deck);
/// \return P, the number of phases.
int numPhases() const;
@ -75,12 +75,12 @@ namespace Opm
private:
PhaseUsage phase_usage_;
Dune::utils::UniformTableLinear<double> krw_;
Dune::utils::UniformTableLinear<double> krow_;
Dune::utils::UniformTableLinear<double> pcow_;
Dune::utils::UniformTableLinear<double> krg_;
Dune::utils::UniformTableLinear<double> krog_;
Dune::utils::UniformTableLinear<double> pcog_;
utils::UniformTableLinear<double> krw_;
utils::UniformTableLinear<double> krow_;
utils::UniformTableLinear<double> pcow_;
utils::UniformTableLinear<double> krg_;
utils::UniformTableLinear<double> krog_;
utils::UniformTableLinear<double> pcog_;
double krocw_; // = krow_(s_wc)
};

2
opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
View File

@ -47,7 +47,7 @@ namespace Opm
BlackoilPvtProperties();
/// Initialize from deck.
void init(const Dune::EclipseGridParser& deck);
void init(const EclipseGridParser& deck);
/// Number of active phases.
int numPhases() const;

2
opm/core/fluid/blackoil/phaseUsageFromDeck.hpp
View File

@ -31,7 +31,7 @@ namespace Opm
/// Looks at presence of WATER, OIL and GAS keywords in deck
/// to determine active phases.
inline PhaseUsage phaseUsageFromDeck(const Dune::EclipseGridParser& deck)
inline PhaseUsage phaseUsageFromDeck(const EclipseGridParser& deck)
{
PhaseUsage pu;
std::fill(pu.phase_used, pu.phase_used + BlackoilPhases::MaxNumPhases, 0);