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

Update for simplified column data structure.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2012-05-11 09:41:01 +02:00
parent 1eb75314e6
commit 67a6674495
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/polymer/GravityColumnSolverPolymer.hpp
View File

@@ -45,7 +45,7 @@ namespace Opm
/// problem. For each column, its cells must be in a single
/// vertical column, and ordered
/// (direction doesn't matter).
void solve(const std::pair<std::vector<int>, std::vector<std::vector<int> > >& columns,
void solve(const std::vector<std::vector<int> >& columns,
const double dt,
std::vector<double>& s,
std::vector<double>& c,

10
opm/polymer/GravityColumnSolverPolymer_impl.hpp
View File

@@ -111,13 +111,13 @@ namespace Opm
/// \param[in] columns for each column (with logical cartesian indices as key),
/// \param[in] columns for each column col, columns[col]
/// contains the cells on which to solve the segregation
/// problem. For each column, its cells must be in a single
/// vertical column, and ordered
/// vertical column, connected and ordered
/// (direction doesn't matter).
template <class Model>
void GravityColumnSolverPolymer<Model>::solve(const std::pair<std::vector<int>, std::vector<std::vector<int> > >& columns,
void GravityColumnSolverPolymer<Model>::solve(const std::vector<std::vector<int> >& columns,
const double dt,
std::vector<double>& s,
std::vector<double>& c,
@@ -134,9 +134,9 @@ namespace Opm
double max_delta = 1e100;
while (iter < maxit_) {
model_.initIteration(state, grid_, sys);
int size = columns.second.size();
int size = columns.size();
for(int i = 0; i < size; ++i) {
solveSingleColumn(columns.second[i], dt, s, c, cmax, increment);
solveSingleColumn(columns[i], dt, s, c, cmax, increment);
}
for (int cell = 0; cell < grid_.number_of_cells; ++cell) {
sys.vector().writableSolution()[2*cell + 0] += increment[2*cell + 0];