OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed initTwophaseStateBasic() -> initStateBasic().

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-05-16 12:33:42 +02:00
parent 9379263646
commit 4c37676338
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/spu_2p.cpp
View File

@ -327,7 +327,7 @@ main(int argc, char** argv)
gravity[2] = deck.hasField("NOGRAV") ? 0.0 : Opm::unit::gravity;
// Init state variables (saturation and pressure).
if (param.has("init_saturation")) {
initStateTwophaseBasic(*grid->c_grid(), *props, param, gravity[2], state);
initStateBasic(*grid->c_grid(), *props, param, gravity[2], state);
} else {
initStateFromDeck(*grid->c_grid(), *props, deck, gravity[2], state);
}
@ -351,7 +351,7 @@ main(int argc, char** argv)
// Gravity.
gravity[2] = param.getDefault("gravity", 0.0);
// Init state variables (saturation and pressure).
initStateTwophaseBasic(*grid->c_grid(), *props, param, gravity[2], state);
initStateBasic(*grid->c_grid(), *props, param, gravity[2], state);
}
// Extra fluid init for transport solver.

10
opm/core/utility/initState.hpp
View File

@ -53,11 +53,11 @@ namespace Opm
/// In all three cases, pressure is initialised hydrostatically.
/// In case 2) and 3), the depth of the first cell is used as reference depth.
template <class State>
void initStateTwophaseBasic(const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const parameter::ParameterGroup& param,
const double gravity,
State& state);
void initStateBasic(const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const parameter::ParameterGroup& param,
const double gravity,
State& state);
/// Initialize a two-phase state from input deck.
/// If EQUIL is present:

10
opm/core/utility/initState_impl.hpp
View File

@ -289,11 +289,11 @@ namespace Opm
/// In all three cases, pressure is initialised hydrostatically.
/// In case 2) and 3), the depth of the first cell is used as reference depth.
template <class State>
void initStateTwophaseBasic(const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const parameter::ParameterGroup& param,
const double gravity,
State& state)
void initStateBasic(const UnstructuredGrid& grid,
const IncompPropertiesInterface& props,
const parameter::ParameterGroup& param,
const double gravity,
State& state)
{
const int num_phases = props.numPhases();
if (num_phases != 2) {