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

Linux compile fixes. Had to pull out the unused NNC search map.

Browse Source
This commit is contained in:
JacobStoren
2013-12-16 13:48:51 +01:00
parent 7e2d860bba
commit 880ab554f9
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h
View File

@@ -58,7 +58,7 @@ private:
private: private:
// Input // Input
cvf::cref<RigNNCData> m_nncData; cvf::cref<RigNNCData> m_nncData;
cvf::cref<cvf::Array<size_t>> m_nncIndexes; cvf::cref<cvf::Array<size_t> > m_nncIndexes;
cvf::cref<cvf::UByteArray> m_cellVisibility; cvf::cref<cvf::UByteArray> m_cellVisibility;
cvf::cref<RigGridBase> m_grid; cvf::cref<RigGridBase> m_grid;
cvf::Vec3d m_offset; cvf::Vec3d m_offset;

11
ApplicationCode/ReservoirDataModel/RigNNCData.cpp
View File

@@ -76,8 +76,8 @@ void RigNNCData::processConnections(const RigMainGrid& mainGrid)
if (!hasNeighbourInAnyDirection) if (!hasNeighbourInAnyDirection)
{ {
// Add to search map // Add to search map
m_cellIdxToFaceToConnectionIdxMap[m_connections[cnIdx].m_c1GlobIdx][cvf::StructGridInterface::NO_FACE].push_back(cnIdx); //m_cellIdxToFaceToConnectionIdxMap[m_connections[cnIdx].m_c1GlobIdx][cvf::StructGridInterface::NO_FACE].push_back(cnIdx);
m_cellIdxToFaceToConnectionIdxMap[m_connections[cnIdx].m_c2GlobIdx][cvf::StructGridInterface::NO_FACE].push_back(cnIdx); //m_cellIdxToFaceToConnectionIdxMap[m_connections[cnIdx].m_c2GlobIdx][cvf::StructGridInterface::NO_FACE].push_back(cnIdx);
continue; // to next connection continue; // to next connection
} }
@@ -142,15 +142,15 @@ void RigNNCData::processConnections(const RigMainGrid& mainGrid)
} }
// Add to search map, possibly not needed // Add to search map, possibly not needed
m_cellIdxToFaceToConnectionIdxMap[m_connections[cnIdx].m_c1GlobIdx][fIdx].push_back(cnIdx); //m_cellIdxToFaceToConnectionIdxMap[m_connections[cnIdx].m_c1GlobIdx][fIdx].push_back(cnIdx);
m_cellIdxToFaceToConnectionIdxMap[m_connections[cnIdx].m_c2GlobIdx][cvf::StructGridInterface::oppositeFace((cvf::StructGridInterface::FaceType)(fIdx))].push_back(cnIdx); //m_cellIdxToFaceToConnectionIdxMap[m_connections[cnIdx].m_c2GlobIdx][cvf::StructGridInterface::oppositeFace((cvf::StructGridInterface::FaceType)(fIdx))].push_back(cnIdx);
break; // The connection face is found. Stop looping over the cell faces. Jump to next connection break; // The connection face is found. Stop looping over the cell faces. Jump to next connection
} }
} }
} }
} }
/*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// TODO: Possibly not needed ! /// TODO: Possibly not needed !
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -167,3 +167,4 @@ const std::vector<size_t>& RigNNCData::findConnectionIndices( size_t globalCellI
return empty; return empty;
} }
*/

6
ApplicationCode/ReservoirDataModel/RigNNCData.h
View File

@@ -63,9 +63,9 @@ public:
const std::vector<RigConnection>& connections() const { return m_connections; }; const std::vector<RigConnection>& connections() const { return m_connections; };
private: // This section is possibly not needed private: // This section is possibly not needed
const std::vector<size_t>& findConnectionIndices(size_t globalCellIndex, cvf::StructGridInterface::FaceType face) const; //const std::vector<size_t>& findConnectionIndices(size_t globalCellIndex, cvf::StructGridInterface::FaceType face) const;
typedef std::map<size_t, typename caf::FixedArray<std::vector<size_t>, 7 > > ConnectionSearchMap; //typedef std::map<size_t, caf::FixedArray<std::vector<size_t>, 7 > > ConnectionSearchMap;
ConnectionSearchMap m_cellIdxToFaceToConnectionIdxMap; //ConnectionSearchMap m_cellIdxToFaceToConnectionIdxMap;
private: private:
std::vector<RigConnection> m_connections; std::vector<RigConnection> m_connections;