diff --git a/opm/simulators/wells/StandardWellConnections.cpp b/opm/simulators/wells/StandardWellConnections.cpp index 3f66ecf4d..324fdb2f4 100644 --- a/opm/simulators/wells/StandardWellConnections.cpp +++ b/opm/simulators/wells/StandardWellConnections.cpp @@ -447,17 +447,17 @@ computePropertiesForPressures(const WellState& well_state, template void StandardWellConnections:: -computeWellConnectionDensitesPressures(const WellState& well_state, - const std::function& invB, - const std::function& mobility, - const std::function& solventInverseFormationVolumeFactor, - const std::function& solventMobility, - const std::vector& b_perf, - const std::vector& rsmax_perf, - const std::vector& rvmax_perf, - const std::vector& rvwmax_perf, - const std::vector& surf_dens_perf, - DeferredLogger& deferred_logger) +computeProperties(const WellState& well_state, + const std::function& invB, + const std::function& mobility, + const std::function& solventInverseFormationVolumeFactor, + const std::function& solventMobility, + const std::vector& b_perf, + const std::vector& rsmax_perf, + const std::vector& rvmax_perf, + const std::vector& rvwmax_perf, + const std::vector& surf_dens_perf, + DeferredLogger& deferred_logger) { // Compute densities const int nperf = well_.numPerfs(); diff --git a/opm/simulators/wells/StandardWellConnections.hpp b/opm/simulators/wells/StandardWellConnections.hpp index 2f8135878..cbb83a23e 100644 --- a/opm/simulators/wells/StandardWellConnections.hpp +++ b/opm/simulators/wells/StandardWellConnections.hpp @@ -39,18 +39,6 @@ class StandardWellConnections public: StandardWellConnections(const WellInterfaceIndices& well); - void computePressureDelta(); - - // TODO: not total sure whether it is a good idea to put this function here - // the major reason to put here is to avoid the usage of Wells struct - void computeDensities(const std::vector& perfComponentRates, - const std::vector& b_perf, - const std::vector& rsmax_perf, - const std::vector& rvmax_perf, - const std::vector& rvwmax_perf, - const std::vector& surf_dens_perf, - DeferredLogger& deferred_logger); - void computePropertiesForPressures(const WellState& well_state, const std::function& getTemperature, const std::function& getSaltConcentration, @@ -63,17 +51,18 @@ public: std::vector& rvwmax_perf, std::vector& surf_dens_perf) const; - void computeWellConnectionDensitesPressures(const WellState& well_state, - const std::function& invB, - const std::function& mobility, - const std::function& solventInverseFormationVolumeFactor, - const std::function& solventMobility, - const std::vector& b_perf, - const std::vector& rsmax_perf, - const std::vector& rvmax_perf, - const std::vector& rvwmax_perf, - const std::vector& surf_dens_perf, - DeferredLogger& deferred_logger); + //! \brief Compute connection properties (densities, pressure drop, ...) + void computeProperties(const WellState& well_state, + const std::function& invB, + const std::function& mobility, + const std::function& solventInverseFormationVolumeFactor, + const std::function& solventMobility, + const std::vector& b_perf, + const std::vector& rsmax_perf, + const std::vector& rvmax_perf, + const std::vector& rvwmax_perf, + const std::vector& surf_dens_perf, + DeferredLogger& deferred_logger); //! \brief Returns density for first perforation. Scalar rho() const @@ -86,6 +75,18 @@ public: { return perf_pressure_diffs_[perf]; } private: + void computePressureDelta(); + + // TODO: not total sure whether it is a good idea to put this function here + // the major reason to put here is to avoid the usage of Wells struct + void computeDensities(const std::vector& perfComponentRates, + const std::vector& b_perf, + const std::vector& rsmax_perf, + const std::vector& rvmax_perf, + const std::vector& rvwmax_perf, + const std::vector& surf_dens_perf, + DeferredLogger& deferred_logger); + const WellInterfaceIndices& well_; //!< Reference to well interface std::vector perf_densities_; //!< densities of the fluid in each perforation diff --git a/opm/simulators/wells/StandardWell_impl.hpp b/opm/simulators/wells/StandardWell_impl.hpp index f73afa686..9fafbb04a 100644 --- a/opm/simulators/wells/StandardWell_impl.hpp +++ b/opm/simulators/wells/StandardWell_impl.hpp @@ -1470,17 +1470,17 @@ namespace Opm return ebosSimulator.model().cachedIntensiveQuantities(cell_idx, 0)->solventMobility().value(); }; - this->connections_.computeWellConnectionDensitesPressures(well_state, - invB, - mobility, - invFac, - solventMobility, - b_perf, - rsmax_perf, - rvmax_perf, - rvwmax_perf, - surf_dens_perf, - deferred_logger); + this->connections_.computeProperties(well_state, + invB, + mobility, + invFac, + solventMobility, + b_perf, + rsmax_perf, + rvmax_perf, + rvwmax_perf, + surf_dens_perf, + deferred_logger); }