mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
MultisegmentWell: move getBhp to MultisegmentWellPrimaryVariables
This commit is contained in:
@@ -360,14 +360,6 @@ computeSegmentFluidProperties(const EvalWell& temperature,
|
||||
}
|
||||
}
|
||||
|
||||
template<typename FluidSystem, typename Indices, typename Scalar>
|
||||
typename MultisegmentWellEval<FluidSystem,Indices,Scalar>::EvalWell
|
||||
MultisegmentWellEval<FluidSystem,Indices,Scalar>::
|
||||
getBhp() const
|
||||
{
|
||||
return primary_variables_.getSegmentPressure(0);
|
||||
}
|
||||
|
||||
template<typename FluidSystem, typename Indices, typename Scalar>
|
||||
typename MultisegmentWellEval<FluidSystem,Indices,Scalar>::EvalWell
|
||||
MultisegmentWellEval<FluidSystem,Indices,Scalar>::
|
||||
|
||||
@@ -138,7 +138,6 @@ protected:
|
||||
int pvt_region_index,
|
||||
DeferredLogger& deferred_logger);
|
||||
|
||||
EvalWell getBhp() const;
|
||||
EvalWell getFrictionPressureLoss(const int seg) const;
|
||||
EvalWell getHydroPressureLoss(const int seg) const;
|
||||
EvalWell getQs(const int comp_idx) const;
|
||||
|
||||
@@ -369,6 +369,14 @@ getSegmentPressure(const int seg) const
|
||||
return evaluation_[seg][SPres];
|
||||
}
|
||||
|
||||
template<class FluidSystem, class Indices, class Scalar>
|
||||
typename MultisegmentWellPrimaryVariables<FluidSystem,Indices,Scalar>::EvalWell
|
||||
MultisegmentWellPrimaryVariables<FluidSystem,Indices,Scalar>::
|
||||
getBhp() const
|
||||
{
|
||||
return this->getSegmentPressure(0);
|
||||
}
|
||||
|
||||
#define INSTANCE(...) \
|
||||
template class MultisegmentWellPrimaryVariables<BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>,__VA_ARGS__,double>;
|
||||
|
||||
|
||||
@@ -109,6 +109,9 @@ public:
|
||||
const int seg_upwind,
|
||||
const size_t comp_idx) const;
|
||||
|
||||
//! \brief Get bottomhole pressure.
|
||||
EvalWell getBhp() const;
|
||||
|
||||
//! \brief Get pressure for a segment.
|
||||
EvalWell getSegmentPressure(const int seg) const;
|
||||
|
||||
|
||||
@@ -1654,7 +1654,7 @@ namespace Opm
|
||||
prod_controls,
|
||||
getRefDensity(),
|
||||
this->getWQTotal(),
|
||||
this->getBhp(),
|
||||
this->primary_variables_.getBhp(),
|
||||
gQ,
|
||||
this->linSys_,
|
||||
deferred_logger);
|
||||
|
||||
Reference in New Issue
Block a user