Avoid hard-coded appelyard parameter in flow_ebos

Start using the parameters in the parameter file instead of the hard-
coded ones.
Unify the restriction of the drs and drv in black-oil and black-oil-
solvent updateState
This commit is contained in:
Tor Harald Sandve
2016-11-25 12:40:33 +01:00
parent 6e03b9706f
commit e614c42818
5 changed files with 14 additions and 6 deletions

View File

@@ -935,8 +935,8 @@ enum WellVariablePositions {
const int np = wells().number_of_phases;
const int nw = wells().number_of_wells;
double dFLimit = 0.2;
double dBHPLimit = 2.0;
double dFLimit = dWellFractionMax();
double dBHPLimit = dbhpMaxRel();
std::vector<double> xvar_well_old = well_state.wellSolutions();
for (int w = 0; w < nw; ++w) {
@@ -1503,6 +1503,9 @@ enum WellVariablePositions {
mutable BVector invDrw_;
mutable BVector scaleAddRes_;
double dbhpMaxRel() const {return param_.dbhp_max_rel_; }
double dWellFractionMax() const {return param_.dwell_fraction_max_; }
// protected methods
EvalWell getBhp(const int wellIdx) const {
const WellControls* wc = wells().ctrls[wellIdx];