making rate_converter to be reference to the one in Simulator

keeping the const property in the Well Model.
This commit is contained in:
Kai Bao
2017-08-10 11:20:09 +02:00
parent 1950052684
commit c59aa9127e
4 changed files with 29 additions and 40 deletions

View File

@@ -113,6 +113,7 @@ enum WellVariablePositions {
WellCollection* well_collection,
const std::vector< const Well* >& wells_ecl,
const ModelParameters& param,
const RateConverterType& rate_converter,
const bool terminal_output,
const int current_index);
@@ -121,7 +122,6 @@ enum WellVariablePositions {
const double gravity_arg,
const std::vector<double>& depth_arg,
const std::vector<double>& pv_arg,
RateConverterType* rate_converter,
long int global_nc,
const Grid& grid);
@@ -291,8 +291,6 @@ enum WellVariablePositions {
void applyVREPGroupControl(WellState& well_state) const;
RateConverterType* rateConverter() const;
protected:
bool wells_active_;
const Wells* wells_;
@@ -311,7 +309,7 @@ enum WellVariablePositions {
std::vector<bool> active_;
const VFPProperties* vfp_properties_;
double gravity_;
RateConverterType* rate_converter_;
const RateConverterType& rate_converter_;
// The efficiency factor for each connection. It is specified based on wells and groups,
// We calculate the factor for each connection for the computation of contributions to the mass balance equations.