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

refactor interface_ function.

Browse Source
This commit is contained in:
Liu Ming 2015-10-15 10:36:59 +08:00
parent 60db229072
commit ca87064f47
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
opm/core/grid/PinchProcessor.hpp
View File

@ -177,25 +177,15 @@ namespace Opm
const int cellIdx2) const int cellIdx2)
{ {
auto cell_faces = Opm::UgGridHelpers::cell2Faces(grid); auto cell_faces = Opm::UgGridHelpers::cell2Faces(grid);
std::vector<int> cellFaces1;
std::vector<int> cellFaces2;
int commonFace = -1; int commonFace = -1;
auto actCellIdx1 = getActiveCellIdx_(grid, cellIdx1); auto actCellIdx1 = getActiveCellIdx_(grid, cellIdx1);
auto actCellIdx2 = getActiveCellIdx_(grid, cellIdx2); auto actCellIdx2 = getActiveCellIdx_(grid, cellIdx2);
auto cellFacesRange1 = cell_faces[actCellIdx1]; const auto cellFacesRange1 = cell_faces[actCellIdx1];
const auto cellFacesRange2 = cell_faces[actCellIdx2];
for (auto cellFaceIter1 = cellFacesRange1.begin(); cellFaceIter1 != cellFacesRange1.end(); ++cellFaceIter1) { for (auto cellFaceIter1 = cellFacesRange1.begin(); cellFaceIter1 != cellFacesRange1.end(); ++cellFaceIter1) {
cellFaces1.push_back(*cellFaceIter1);
}
auto cellFacesRange2 = cell_faces[actCellIdx2];
for (auto cellFaceIter2 = cellFacesRange2.begin(); cellFaceIter2 != cellFacesRange2.end(); ++cellFaceIter2) { for (auto cellFaceIter2 = cellFacesRange2.begin(); cellFaceIter2 != cellFacesRange2.end(); ++cellFaceIter2) {
cellFaces2.push_back(*cellFaceIter2); if (*cellFaceIter1 == *cellFaceIter2) {
} commonFace = *cellFaceIter1;
for (auto& f1 : cellFaces1) {
for (auto& f2 : cellFaces2) {
if (f1 == f2) {
commonFace = f1;
break; break;
} }
} }