renaming function allCrossFlow() in StandardWell

to avoid confusion. and the detail of the function needs to be
justified.
This commit is contained in:
Kai Bao 2017-06-27 16:59:52 +02:00
parent e5b5e250fe
commit 48dee6bd7a
3 changed files with 6 additions and 4 deletions

View File

@ -107,7 +107,7 @@ namespace Opm
WellState& well_state,
bool only_wells);
bool allow_cross_flow(const Simulator& ebosSimulator) const;
bool crossFlowAllowed(const Simulator& ebosSimulator) const;
void getMobility(const Simulator& ebosSimulator,
const int perf,

View File

@ -614,7 +614,7 @@ namespace Opm
// TODO: it probably can be static member for StandardWell
const double volume = 0.002831684659200; // 0.1 cu ft;
const bool allow_cf = allow_cross_flow(ebosSimulator);
const bool allow_cf = crossFlowAllowed(ebosSimulator);
const EvalWell& bhp = getBhp();
@ -721,7 +721,7 @@ namespace Opm
template<typename TypeTag>
bool
StandardWell<TypeTag>::
allow_cross_flow(const Simulator& ebosSimulator) const
crossFlowAllowed(const Simulator& ebosSimulator) const
{
if (allowCrossFlow()) {
return true;

View File

@ -260,13 +260,15 @@ namespace Opm {
WellState& well_state,
bool only_wells)
{
// TODO: incoporate the new change to StandardWell
for (int w = 0; w < number_of_wells_; ++w) {
well_container_[w]->assembleWellEq(ebosSimulator, dt, well_state, only_wells);
}
}
template<typename TypeTag>
void
StandardWellsDense<TypeTag >::