Use WellStateFullyImplicitBlackoil class instead of WellState.

This commit is contained in:
Atgeirr Flø Rasmussen
2014-03-18 11:27:40 +01:00
parent e7f4637461
commit 295677c8c1
6 changed files with 29 additions and 33 deletions

View File

@@ -33,7 +33,7 @@ namespace Opm {
class RockCompressibility;
class LinearSolverInterface;
class BlackoilState;
class WellState;
class WellStateFullyImplicitBlackoil;
/// A fully implicit solver for the black-oil problem.
@@ -76,7 +76,7 @@ namespace Opm {
void
step(const double dt ,
BlackoilState& state ,
WellState& wstate);
WellStateFullyImplicitBlackoil& wstate);
private:
// Types and enums
@@ -148,11 +148,11 @@ namespace Opm {
// Private methods.
SolutionState
constantState(const BlackoilState& x,
const WellState& xw);
const WellStateFullyImplicitBlackoil& xw);
SolutionState
variableState(const BlackoilState& x,
const WellState& xw);
const WellStateFullyImplicitBlackoil& xw);
void
computeAccum(const SolutionState& state,
@@ -160,14 +160,14 @@ namespace Opm {
void
assemble(const V& dtpv,
const BlackoilState& x ,
const WellState& xw );
const BlackoilState& x,
const WellStateFullyImplicitBlackoil& xw);
V solveJacobianSystem() const;
void updateState(const V& dx,
BlackoilState& state,
WellState& well_state);
WellStateFullyImplicitBlackoil& well_state);
std::vector<ADB>
computePressures(const SolutionState& state) const;