using well name and allow_cf form well_ecl.

This commit is contained in:
Kai Bao
2017-08-21 11:26:21 +02:00
parent a908bd7cf1
commit 9a4a9a2bcc
4 changed files with 49 additions and 43 deletions

View File

@@ -157,27 +157,6 @@ namespace Opm
virtual void setWellSolutions(const WellState& well_state) const = 0;
protected:
const std::vector<bool>& active() const;
const PhaseUsage& phaseUsage() const;
int flowPhaseToEbosCompIdx( const int phaseIdx ) const;
int flowToEbosPvIdx( const int flowPv ) const;
int flowPhaseToEbosPhaseIdx( const int phaseIdx ) const;
// TODO: it is dumplicated with StandardWellsDense
int numComponents() const;
virtual bool crossFlowAllowed(const Simulator& ebosSimulator) const = 0;
double wsolvent() const;
double wpolymer() const;
bool checkRateEconLimits(const WellEconProductionLimits& econ_production_limits,
const WellState& well_state) const;
// to indicate a invalid connection
static const int INVALIDCONNECTION = -100000;
@@ -186,10 +165,6 @@ namespace Opm
const int current_step_;
// TODO: some variables shared by all the wells should be made static
// well name
std::string name_;
// the index of well in Wells struct
int index_of_well_;
@@ -197,9 +172,6 @@ namespace Opm
// INJECTOR or PRODUCER
enum WellType well_type_;
// whether the well allows crossflow
bool allow_cf_;
// number of phases
int number_of_phases_;
@@ -248,12 +220,36 @@ namespace Opm
const PhaseUsage* phase_usage_;
bool getAllowCrossFlow() const;
const std::vector<bool>* active_;
const VFPProperties* vfp_properties_;
double gravity_;
const std::vector<bool>& active() const;
const PhaseUsage& phaseUsage() const;
int flowPhaseToEbosCompIdx( const int phaseIdx ) const;
int flowToEbosPvIdx( const int flowPv ) const;
int flowPhaseToEbosPhaseIdx( const int phaseIdx ) const;
// TODO: it is dumplicated with StandardWellsDense
int numComponents() const;
virtual bool crossFlowAllowed(const Simulator& ebosSimulator) const = 0;
double wsolvent() const;
double wpolymer() const;
bool checkRateEconLimits(const WellEconProductionLimits& econ_production_limits,
const WellState& well_state) const;
bool wellHasTHPConstraints() const;
// Component fractions for each phase for the well