From 880ab554f9cce268aee4bf771227f3475988b505 Mon Sep 17 00:00:00 2001
From: JacobStoren <jacob.storen@ceetronsolutions.com>
Date: Mon, 16 Dec 2013 13:48:51 +0100
Subject: [PATCH] Linux compile fixes. Had to pull out the unused NNC search
 map.

---
 .../ModelVisualization/RivNNCGeometryGenerator.h      |  2 +-
 ApplicationCode/ReservoirDataModel/RigNNCData.cpp     | 11 ++++++-----
 ApplicationCode/ReservoirDataModel/RigNNCData.h       |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h
index ec58e9041b..54c5ddf38a 100644
--- a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h
+++ b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h
@@ -58,7 +58,7 @@ private:
 private:
     // Input
     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<RigGridBase>              m_grid;
     cvf::Vec3d                          m_offset;
diff --git a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp
index f359e0666b..357b2a63bc 100644
--- a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp
@@ -76,8 +76,8 @@ void RigNNCData::processConnections(const RigMainGrid& mainGrid)
             if (!hasNeighbourInAnyDirection)
             {
                 // Add to search map
-                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_c1GlobIdx][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
             }
@@ -142,15 +142,15 @@ void RigNNCData::processConnections(const RigMainGrid& mainGrid)
                 }
 
                 // Add to search map, possibly not needed
-                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_c1GlobIdx][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
             }
         }
     }
 }
-
+/*
 //--------------------------------------------------------------------------------------------------
 /// TODO: Possibly not needed !
 //--------------------------------------------------------------------------------------------------
@@ -167,3 +167,4 @@ const std::vector<size_t>& RigNNCData::findConnectionIndices( size_t globalCellI
 
     return empty;
 }
+*/
diff --git a/ApplicationCode/ReservoirDataModel/RigNNCData.h b/ApplicationCode/ReservoirDataModel/RigNNCData.h
index 4457d0bb0a..ca4b9bf54d 100644
--- a/ApplicationCode/ReservoirDataModel/RigNNCData.h
+++ b/ApplicationCode/ReservoirDataModel/RigNNCData.h
@@ -63,9 +63,9 @@ public:
     const std::vector<RigConnection>&   connections() const  { return m_connections; };
 
 private: // This section is possibly not needed
-    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;
-    ConnectionSearchMap m_cellIdxToFaceToConnectionIdxMap;
+    //const std::vector<size_t>& findConnectionIndices(size_t globalCellIndex, cvf::StructGridInterface::FaceType face) const;
+    //typedef std::map<size_t, caf::FixedArray<std::vector<size_t>, 7 > > ConnectionSearchMap;
+    //ConnectionSearchMap m_cellIdxToFaceToConnectionIdxMap;
 
 private:
     std::vector<RigConnection> m_connections;