Remove primalvariable_ and use hydroCarbonState instead

the hydrocarbonstate is stored in the reservoir state and
used instead of the primalvariable_
The initial hydrocarbonstate is computed using
initHydroCarbonState(...);
This commit is contained in:
Tor Harald Sandve
2016-05-13 09:04:48 +02:00
parent e8fcf9259c
commit 01c782dbf3
7 changed files with 17 additions and 66 deletions

View File

@@ -305,7 +305,6 @@ namespace Opm {
/// \brief The number of cells of the global grid.
int global_nc_;
std::vector<int> primalVariable_;
V pvdt_;
std::vector<std::string> material_name_;
std::vector<std::vector<double>> residual_norms_history_;
@@ -494,7 +493,7 @@ namespace Opm {
/// Update the phaseCondition_ member based on the primalVariable_ member.
/// Also updates isRs_, isRv_ and isSg_;
void
updatePhaseCondFromPrimalVariable();
updatePhaseCondFromPrimalVariable(const ReservoirState& state);
/// \brief Compute the reduction within the convergence check.
/// \param[in] B A matrix with MaxNumPhases columns and the same number rows