MultisegmentWell: move getBhp to MultisegmentWellPrimaryVariables

opm/simulators/wells/MultisegmentWellEval.cpp

@@ -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>::

opm/simulators/wells/MultisegmentWellEval.hpp

@@ -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;

opm/simulators/wells/MultisegmentWellPrimaryVariables.cpp

@@ -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>;
 

opm/simulators/wells/MultisegmentWellPrimaryVariables.hpp

@@ -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;
 

opm/simulators/wells/MultisegmentWell_impl.hpp

@@ -1654,7 +1654,7 @@ namespace Opm
                                         prod_controls,
                                         getRefDensity(),
                                         this->getWQTotal(),
-                                        this->getBhp(),
+                                        this->primary_variables_.getBhp(),
                                         gQ,
                                         this->linSys_,
                                         deferred_logger);