From 43d434d42ec3bac9814981975f6187e9d86a1a19 Mon Sep 17 00:00:00 2001 From: Tor Harald Sandve Date: Tue, 16 Jun 2020 15:01:29 +0200 Subject: [PATCH] trivial clean up --- opm/simulators/wells/MSWellHelpers.hpp | 2 ++ opm/simulators/wells/MultisegmentWell.hpp | 3 --- opm/simulators/wells/MultisegmentWell_impl.hpp | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/opm/simulators/wells/MSWellHelpers.hpp b/opm/simulators/wells/MSWellHelpers.hpp index 4ba1b20dc..a3b0cfcc2 100644 --- a/opm/simulators/wells/MSWellHelpers.hpp +++ b/opm/simulators/wells/MSWellHelpers.hpp @@ -206,6 +206,8 @@ namespace mswellhelpers template ValueType velocityHead(const double area, const ValueType& mass_rate, const ValueType& density) { + // \Note: a factor of 2 is added to the formulation in order to match results from the + // reference simulator. This is inline with what is done for the friction loss. return (mass_rate * mass_rate / (area * area * density)); } diff --git a/opm/simulators/wells/MultisegmentWell.hpp b/opm/simulators/wells/MultisegmentWell.hpp index f23218119..21eede7b0 100644 --- a/opm/simulators/wells/MultisegmentWell.hpp +++ b/opm/simulators/wells/MultisegmentWell.hpp @@ -278,9 +278,6 @@ namespace Opm mutable int debug_cost_counter_ = 0; - // TODO: this is the old implementation, it is possible the new value does not need it anymore - std::vector segment_reservoir_volume_rates_; - std::vector> segment_phase_fractions_; std::vector> segment_phase_viscosities_; diff --git a/opm/simulators/wells/MultisegmentWell_impl.hpp b/opm/simulators/wells/MultisegmentWell_impl.hpp index e3899ed1a..55cebf338 100644 --- a/opm/simulators/wells/MultisegmentWell_impl.hpp +++ b/opm/simulators/wells/MultisegmentWell_impl.hpp @@ -50,7 +50,6 @@ namespace Opm , segment_mass_rates_(numberOfSegments(), 0.0) , segment_depth_diffs_(numberOfSegments(), 0.0) , upwinding_segments_(numberOfSegments(), 0) - , segment_reservoir_volume_rates_(numberOfSegments(), 0.0) , segment_phase_fractions_(numberOfSegments(), std::vector(num_components_, 0.0)) // number of phase here? , segment_phase_viscosities_(numberOfSegments(), std::vector(num_components_, 0.0)) // number of phase here? { @@ -1656,8 +1655,6 @@ namespace Opm const EvalWell rate = getSegmentRateUpwinding(seg, comp_idx); segment_mass_rates_[seg] += rate * surf_dens[comp_idx]; } - - segment_reservoir_volume_rates_[seg] = segment_mass_rates_[seg] / segment_densities_[seg]; } }