OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplified data structure for extracted columns.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-05-11 09:37:12 +02:00
parent a865f01478
commit 0677f58026
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/core/transport/reorder/TransportModelTwophase.cpp
View File

@ -602,7 +602,7 @@ namespace Opm
void TransportModelTwophase::solveGravity(const std::pair<std::vector<int>, std::vector<std::vector<int> > >& columns, void TransportModelTwophase::solveGravity(const std::vector<std::vector<int> >& columns,
const double* porevolume, const double* porevolume,
const double dt, const double dt,
std::vector<double>& saturation) std::vector<double>& saturation)
@ -630,12 +630,12 @@ namespace Opm
// Solve on all columns. // Solve on all columns.
int num_iters = 0; int num_iters = 0;
for (std::vector<std::vector<int> >::size_type i = 0; i < columns.second.size(); i++) { for (std::vector<std::vector<int> >::size_type i = 0; i < columns.size(); i++) {
// std::cout << "==== new column" << std::endl; // std::cout << "==== new column" << std::endl;
num_iters += solveGravityColumn(columns.second[i]); num_iters += solveGravityColumn(columns[i]);
} }
std::cout << "Gauss-Seidel column solver average iterations: " std::cout << "Gauss-Seidel column solver average iterations: "
<< double(num_iters)/double(columns.second.size()) << std::endl; << double(num_iters)/double(columns.size()) << std::endl;
} }
} // namespace Opm } // namespace Opm

2
opm/core/transport/reorder/TransportModelTwophase.hpp
View File

@ -53,7 +53,7 @@ namespace Opm
const int pos, const int pos,
const double* gravflux); const double* gravflux);
int solveGravityColumn(const std::vector<int>& cells); int solveGravityColumn(const std::vector<int>& cells);
void solveGravity(const std::pair<std::vector<int>, std::vector<std::vector<int> > >& columns, void solveGravity(const std::vector<std::vector<int> >& columns,
const double* porevolume, const double* porevolume,
const double dt, const double dt,
std::vector<double>& saturation); std::vector<double>& saturation);