computePerfRate and crossFlowAllowed protected in StandardWell

This commit is contained in:
Kai Bao 2017-08-21 16:40:10 +02:00
parent bc78553686
commit 96340a23ff
2 changed files with 8 additions and 10 deletions

View File

@ -107,19 +107,11 @@ namespace Opm
virtual void initPrimaryVariablesEvaluation() const;
// TODO: to check whether all the paramters are required
void computePerfRate(const IntensiveQuantities& intQuants,
const std::vector<EvalWell>& mob_perfcells_dense,
const double Tw, const EvalWell& bhp, const double& cdp,
const bool& allow_cf, std::vector<EvalWell>& cq_s) const;
virtual void assembleWellEq(Simulator& ebosSimulator,
const double dt,
WellState& well_state,
bool only_wells);
virtual bool crossFlowAllowed(const Simulator& ebosSimulator) const;
/// updating the well state based the control mode specified with current
// TODO: later will check wheter we need current
virtual void updateWellStateWithTarget(const int current,
@ -239,6 +231,8 @@ namespace Opm
EvalWell extendEval(const Eval& in) const;
bool crossFlowAllowed(const Simulator& ebosSimulator) const;
// xw = inv(D)*(rw - C*x)
void recoverSolutionWell(const BVector& x, BVectorWell& xw) const;
@ -275,6 +269,12 @@ namespace Opm
virtual void solveEqAndUpdateWellState(const ModelParameters& param,
WellState& well_state);
// TODO: to check whether all the paramters are required
void computePerfRate(const IntensiveQuantities& intQuants,
const std::vector<EvalWell>& mob_perfcells_dense,
const double Tw, const EvalWell& bhp, const double& cdp,
const bool& allow_cf, std::vector<EvalWell>& cq_s) const;
// TODO: maybe we should provide a light version of computePerfRate, which does not include the
// calculation of the derivatives
void computeWellRatesWithBhp(const Simulator& ebosSimulator,

View File

@ -240,8 +240,6 @@ namespace Opm
// TODO: it is dumplicated with StandardWellsDense
int numComponents() const;
virtual bool crossFlowAllowed(const Simulator& ebosSimulator) const = 0;
double wsolvent() const;
double wpolymer() const;