cleaning up some functions from StandardWellsDense.

This commit is contained in:
Kai Bao
2017-07-25 10:15:27 +02:00
parent e6d2b8550b
commit 8130b32791
2 changed files with 14 additions and 571 deletions

View File

@@ -157,13 +157,6 @@ enum WellVariablePositions {
WellState& well_state,
bool only_wells);
void
getMobility(const Simulator& ebosSimulator,
const int w,
const int perf,
const int cell_idx,
std::vector<EvalWell>& mob) const;
void localInvert(Mat& istlA) const;
void print(Mat& istlA) const;
@@ -222,9 +215,6 @@ enum WellVariablePositions {
void computeAccumWells();
void computeWellFlux(const int& w, const double& Tw, const IntensiveQuantities& intQuants, const std::vector<EvalWell>& mob_perfcells_dense,
const EvalWell& bhp, const double& cdp, const bool& allow_cf, std::vector<EvalWell>& cq_s) const;
SimulatorReport solveWellEq(Simulator& ebosSimulator,
const double dt,
WellState& well_state);
@@ -284,6 +274,8 @@ enum WellVariablePositions {
// TODO: maybe a better name to emphasize it is local?
const int number_of_wells_;
const int number_of_phases_;
// a vector of all the wells.
// eventually, the wells_ above should be gone.
// the name is just temporary
@@ -330,24 +322,10 @@ enum WellVariablePositions {
std::vector<EvalWell> wellVariables_;
BVector resWell_;
long int global_nc_;
mutable BVector scaleAddRes_;
// protected methods
EvalWell getBhp(const int wellIdx) const;
EvalWell getQs(const int wellIdx, const int compIdx) const;
EvalWell wellVolumeFraction(const int wellIdx, const int compIdx) const;
EvalWell wellVolumeFractionScaled(const int wellIdx, const int compIdx) const;
// Q_p / (Q_w + Q_g + Q_o) for three phase cases.
EvalWell wellSurfaceVolumeFraction(const int well_index, const int compIdx) const;
bool checkRateEconLimits(const WellEconProductionLimits& econ_production_limits,
const WellState& well_state,
const int well_number) const;
@@ -382,24 +360,6 @@ enum WellVariablePositions {
const int well_index,
WellState& xw) const;
bool wellHasTHPConstraints(const int well_index) const;
// TODO: maybe we should provide a light version of computeWellFlux, which does not include the
// calculation of the derivatives
void computeWellRatesWithBhp(const Simulator& ebosSimulator,
const EvalWell& bhp,
const int well_index,
std::vector<double>& well_flux) const;
double mostStrictBhpFromBhpLimits(const int well_index) const;
// TODO: maybe it should be improved to be calculate general rates for THP control later
std::vector<double>
computeWellPotentialWithTHP(const Simulator& ebosSimulator,
const int well_index,
const double initial_bhp, // bhp from BHP constraints
const std::vector<double>& initial_potential) const;
double wsolvent(const int well_index) const;
double wpolymer(const int well_index) const;