moving localWellsActive and wellsActive to StandardWells

maybe later it can be something general for different types of wells.
This commit is contained in:
Kai Bao
2016-04-01 14:55:58 +02:00
parent 48483b23c7
commit 3947ff5b1d
8 changed files with 48 additions and 26 deletions

View File

@@ -179,7 +179,6 @@ namespace Opm {
// Need to declare Base members we want to use here.
using Base::stdWells;
using Base::wellsActive;
using Base::variableState;
using Base::computePressures;
using Base::computeGasPressure;

View File

@@ -525,7 +525,7 @@ namespace Opm {
assembleMassBalanceEq(state);
// -------- Well equations ----------
if ( ! wellsActive() ) {
if ( ! stdWells().wellsActive() ) {
return;
}
@@ -710,7 +710,7 @@ namespace Opm {
BlackoilPolymerModel<Grid>::computeWaterShearVelocityWells(const SolutionState& state, WellState& xw, const ADB& cq_sw,
std::vector<double>& water_vel_wells, std::vector<double>& visc_mult_wells)
{
if( ! wellsActive() ) return ;
if( ! stdWells().wellsActive() ) return ;
const int nw = stdWells().wells().number_of_wells;
const int nperf = stdWells().wells().well_connpos[nw];