Adapt to renaming and other small modifications of state and initialization.

This commit is contained in:
Atgeirr Flø Rasmussen 2012-05-16 15:59:37 +02:00
parent 360ec5f86d
commit c115ba2c28
2 changed files with 4 additions and 4 deletions

View File

@ -369,7 +369,7 @@ main(int argc, char** argv)
// Gravity.
gravity[2] = deck.hasField("NOGRAV") ? 0.0 : Opm::unit::gravity;
// Init state variables (saturation and pressure).
initStateTwophaseFromDeck(*grid->c_grid(), *props, deck, gravity[2], state);
initStateFromDeck(*grid->c_grid(), *props, deck, gravity[2], state);
// Init polymer properties.
polyprop.readFromDeck(deck);
} else {
@ -393,7 +393,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);
// Init polymer properties.
// Setting defaults to provide a simple example case.
double c_max = param.getDefault("c_max_limit", 5.0);

View File

@ -34,9 +34,9 @@ namespace Opm
class PolymerState : public TwophaseState
{
public:
void init(const UnstructuredGrid& g)
void init(const UnstructuredGrid& g, int num_phases)
{
TwophaseState::init(g);
TwophaseState::init(g, num_phases);
concentration_.resize(g.number_of_cells, 0.0);
cmax_.resize(g.number_of_cells, 0.0);
}