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

(#401) Sync Visible Cells: More refactoring

Browse Source
This commit is contained in:
Jacob Støren 2015-09-18 10:40:17 +02:00
parent 577c0c4578
commit 35c6316d9c
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapper.cpp
View File

@ -537,18 +537,28 @@ RigCaseToCaseCellMapper::RigCaseToCaseCellMapper(RigMainGrid* masterEclGrid, Rig
} }
} }
if (matchingCells.size() == 1)
storeMapping(elmIdx, matchingCells);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigCaseToCaseCellMapper::storeMapping(int depCaseCellIdx, const std::vector<int>& masterCaseMatchingCells)
{ {
m_masterCellOrIntervalIndex[elmIdx] = matchingCells[0]; if (masterCaseMatchingCells.size() == 1)
}
else if (matchingCells.size() > 1)
{ {
m_masterCellOrIntervalIndex[elmIdx] = -((int)(m_masterCellIndexSeries.size())); m_masterCellOrIntervalIndex[depCaseCellIdx] = masterCaseMatchingCells[0];
m_masterCellIndexSeries.push_back(matchingCells); }
} else if (masterCaseMatchingCells.size() > 1)
{
m_masterCellOrIntervalIndex[depCaseCellIdx] = -((int)(m_masterCellIndexSeries.size()));
m_masterCellIndexSeries.push_back(masterCaseMatchingCells);
} }
} }
#if 0 #if 0
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Follows the HEX8 type in both RigFemTypes and cvf::StructGridInterface /// Follows the HEX8 type in both RigFemTypes and cvf::StructGridInterface

2
ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapper.h
View File

@ -50,6 +50,8 @@ public:
private: private:
void storeMapping(int depCaseCellIdx, const std::vector<int>& masterCaseMatchingCells);
std::vector<int> m_masterCellOrIntervalIndex; std::vector<int> m_masterCellOrIntervalIndex;
std::vector<std::vector<int> > m_masterCellIndexSeries; std::vector<std::vector<int> > m_masterCellIndexSeries;