From 4f403bbc429cf7783955cf534e778cc7a1b868d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Wed, 25 Apr 2012 08:59:31 +0200 Subject: [PATCH] Changed order of functions to match order in header file. --- opm/core/utility/miscUtilities.cpp | 39 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/opm/core/utility/miscUtilities.cpp b/opm/core/utility/miscUtilities.cpp index 8f69c246..fdcc3662 100644 --- a/opm/core/utility/miscUtilities.cpp +++ b/opm/core/utility/miscUtilities.cpp @@ -416,22 +416,6 @@ namespace Opm } } - void Watercut::push(double time, double fraction, double produced) - { - data_.push_back(time); - data_.push_back(fraction); - data_.push_back(produced); - } - - void Watercut::write(std::ostream& os) const - { - int sz = data_.size() / 3; - for (int i = 0; i < sz; ++i) { - os << data_[3 * i] / Opm::unit::day << " " - << data_[3 * i + 1] << " " - << data_[3 * i + 2] << '\n'; - } - } void computeWDP(const Wells& wells, const UnstructuredGrid& grid, const std::vector& saturations, const double* densities, std::vector& wdp, bool per_grid_cell) @@ -475,7 +459,8 @@ namespace Opm } } } - + + void computeFlowRatePerWell(const Wells& wells, const std::vector& flow_rates_per_cell, std::vector& flow_rates_per_well) { @@ -491,4 +476,24 @@ namespace Opm } + + void Watercut::push(double time, double fraction, double produced) + { + data_.push_back(time); + data_.push_back(fraction); + data_.push_back(produced); + } + + void Watercut::write(std::ostream& os) const + { + int sz = data_.size() / 3; + for (int i = 0; i < sz; ++i) { + os << data_[3 * i] / Opm::unit::day << " " + << data_[3 * i + 1] << " " + << data_[3 * i + 2] << '\n'; + } + } + + + } // namespace Opm