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

Use const access for FixedArray. Added sorting of faults

Browse Source
This commit is contained in:
Magne Sjaastad
2013-12-05 09:59:05 +01:00
parent 477792e89d
commit 19737aa99a
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ReservoirDataModel/RigFault.cpp
View File

@@ -24,7 +24,6 @@
//--------------------------------------------------------------------------------------------------
RigFault::RigFault()
{
m_cellRangesForFaces.resize(6);
}
//--------------------------------------------------------------------------------------------------
@@ -33,7 +32,7 @@ RigFault::RigFault()
void RigFault::addCellRangeForFace(cvf::StructGridInterface::FaceType face, const cvf::CellRange& cellRange)
{
size_t faceIndex = static_cast<size_t>(face);
CVF_ASSERT(faceIndex < m_cellRangesForFaces.size());
CVF_ASSERT(faceIndex < 6);
m_cellRangesForFaces[faceIndex].push_back(cellRange);
}
@@ -60,7 +59,7 @@ QString RigFault::name() const
const std::vector<cvf::CellRange>& RigFault::cellRangeForFace(cvf::StructGridInterface::FaceType face) const
{
size_t faceIndex = static_cast<size_t>(face);
CVF_ASSERT(faceIndex < m_cellRangesForFaces.size());
CVF_ASSERT(faceIndex < 6);
return m_cellRangesForFaces[faceIndex];
return m_cellRangesForFaces[face];
}

3
ApplicationCode/ReservoirDataModel/RigFault.h
View File

@@ -28,6 +28,7 @@
#include <QString>
#include "cvfStructGrid.h"
#include "cvfCellRange.h"
#include "cafFixedArray.h"
@@ -46,5 +47,5 @@ public:
private:
QString m_name;
std::vector< std::vector<cvf::CellRange> > m_cellRangesForFaces;
caf::FixedArray<std::vector<cvf::CellRange>, 6> m_cellRangesForFaces;
};