OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Kjetil Olsen Lye 2012-03-27 16:57:12 +02:00
commit 1e9072b019
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/core/ColumnExtract.hpp
View File

@ -62,7 +62,8 @@ void extractColumn( const UnstructuredGrid& grid, std::pair<std::vector<int>, st
columns.second[local_index].push_back(i); columns.second[local_index].push_back(i);
} }
for(int i = 0; i < columns.second.size(); ++i) { int num_cols = columns.second.size();
for(int i = 0; i < num_cols; ++i) {
std::sort(columns.second[i].begin(), columns.second[i].end(), ExtractColumnCompare(grid)); std::sort(columns.second[i].begin(), columns.second[i].end(), ExtractColumnCompare(grid));
} }
} }

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

@ -629,7 +629,7 @@ namespace Opm
// Solve on all columns. // Solve on all columns.
for (int i = 0; i < columns.second.size(); i++) { for (std::vector<std::vector<int> >::size_type i = 0; i < columns.second.size(); i++) {
// std::cout << "==== new column" << std::endl; // std::cout << "==== new column" << std::endl;
solveGravityColumn(columns.second[i]); solveGravityColumn(columns.second[i]);
} }