From 9aeb48887cfa441592fc9f1c1f90b52cb5725ba8 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 21 Nov 2022 13:20:34 +0100 Subject: [PATCH] rename computePropertiesForWellConnectionPressure to computePropertiesForPressure that it applies to connections are now implied by class --- .../wells/StandardWellConnections.cpp | 22 +++++++++---------- .../wells/StandardWellConnections.hpp | 22 +++++++++---------- opm/simulators/wells/StandardWell_impl.hpp | 22 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/opm/simulators/wells/StandardWellConnections.cpp b/opm/simulators/wells/StandardWellConnections.cpp index 925a359e3..5fc8b5f3d 100644 --- a/opm/simulators/wells/StandardWellConnections.cpp +++ b/opm/simulators/wells/StandardWellConnections.cpp @@ -278,17 +278,17 @@ computeDensities(const std::vector& perfComponentRates, template void StandardWellConnections:: -computePropertiesForWellConnectionPressures(const WellState& well_state, - const std::function& getTemperature, - const std::function& getSaltConcentration, - const std::function& pvtRegionIdx, - const std::function& solventInverseFormationVolumeFactor, - const std::function& solventRefDensity, - std::vector& b_perf, - std::vector& rsmax_perf, - std::vector& rvmax_perf, - std::vector& rvwmax_perf, - std::vector& surf_dens_perf) const +computePropertiesForPressures(const WellState& well_state, + const std::function& getTemperature, + const std::function& getSaltConcentration, + const std::function& pvtRegionIdx, + const std::function& solventInverseFormationVolumeFactor, + const std::function& solventRefDensity, + std::vector& b_perf, + std::vector& rsmax_perf, + std::vector& rvmax_perf, + std::vector& rvwmax_perf, + std::vector& surf_dens_perf) const { const int nperf = well_.numPerfs(); const PhaseUsage& pu = well_.phaseUsage(); diff --git a/opm/simulators/wells/StandardWellConnections.hpp b/opm/simulators/wells/StandardWellConnections.hpp index 73ee9fa67..ae75661ed 100644 --- a/opm/simulators/wells/StandardWellConnections.hpp +++ b/opm/simulators/wells/StandardWellConnections.hpp @@ -50,17 +50,17 @@ public: const std::vector& surf_dens_perf, DeferredLogger& deferred_logger); - void computePropertiesForWellConnectionPressures(const WellState& well_state, - const std::function& getTemperature, - const std::function& getSaltConcentration, - const std::function& pvtRegionIdx, - const std::function& solventInverseFormationVolumeFactor, - const std::function& solventRefDensity, - std::vector& b_perf, - std::vector& rsmax_perf, - std::vector& rvmax_perf, - std::vector& rvwmax_perf, - std::vector& surf_dens_perf) const; + void computePropertiesForPressures(const WellState& well_state, + const std::function& getTemperature, + const std::function& getSaltConcentration, + const std::function& pvtRegionIdx, + const std::function& solventInverseFormationVolumeFactor, + const std::function& solventRefDensity, + std::vector& b_perf, + std::vector& rsmax_perf, + std::vector& rvmax_perf, + std::vector& rvwmax_perf, + std::vector& surf_dens_perf) const; Scalar getRho() const { diff --git a/opm/simulators/wells/StandardWell_impl.hpp b/opm/simulators/wells/StandardWell_impl.hpp index 77db7b5f9..2c31cb7c7 100644 --- a/opm/simulators/wells/StandardWell_impl.hpp +++ b/opm/simulators/wells/StandardWell_impl.hpp @@ -1314,17 +1314,17 @@ namespace Opm return ebosSimulator.model().cachedIntensiveQuantities(cell_idx, 0)->solventRefDensity(); }; - this->connections_.computePropertiesForWellConnectionPressures(well_state, - getTemperature, - getSaltConcentration, - getPvtRegionIdx, - getInvFac, - getSolventDensity, - b_perf, - rsmax_perf, - rvmax_perf, - rvwmax_perf, - surf_dens_perf); + this->connections_.computePropertiesForPressures(well_state, + getTemperature, + getSaltConcentration, + getPvtRegionIdx, + getInvFac, + getSolventDensity, + b_perf, + rsmax_perf, + rvmax_perf, + rvwmax_perf, + surf_dens_perf); }