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

Added opm-parallelization to column solver for gravity. Did a (minor) interface change on extractColumn

Browse Source
This commit is contained in:
Kjetil Olsen Lye
2012-03-23 12:32:25 +01:00
parent 1a873633c1
commit bceee40b4f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -599,7 +599,7 @@ namespace Opm
void TransportModelTwophase::solveGravity(const std::map<int, std::vector<int> >& columns,
void TransportModelTwophase::solveGravity(const std::pair<std::vector<int>, std::vector<std::vector<int> > >& columns,
const double* porevolume,
const double dt,
std::vector<double>& saturation)
@@ -626,10 +626,10 @@ namespace Opm
saturation_ = &saturation[0];
// Solve on all columns.
std::map<int, std::vector<int> >::const_iterator it;
for (it = columns.begin(); it != columns.end(); ++it) {
for (int i = 0; i < columns.second.size(); i++) {
// std::cout << "==== new column" << std::endl;
solveGravityColumn(it->second);
solveGravityColumn(columns.second[i]);
}
}

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

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