Changed order of functions to match order in header file.

This commit is contained in:
Atgeirr Flø Rasmussen 2012-04-25 08:59:31 +02:00
parent d59d648e93
commit 4f403bbc42

View File

@ -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<double>& saturations, void computeWDP(const Wells& wells, const UnstructuredGrid& grid, const std::vector<double>& saturations,
const double* densities, std::vector<double>& wdp, bool per_grid_cell) const double* densities, std::vector<double>& wdp, bool per_grid_cell)
@ -476,6 +460,7 @@ namespace Opm
} }
} }
void computeFlowRatePerWell(const Wells& wells, const std::vector<double>& flow_rates_per_cell, void computeFlowRatePerWell(const Wells& wells, const std::vector<double>& flow_rates_per_cell,
std::vector<double>& flow_rates_per_well) std::vector<double>& 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 } // namespace Opm