cellEdgeAccessor : Use FixedArray instead of collection

This commit is contained in:
Jacob Støren 2014-08-08 08:38:12 +02:00
parent a5e926ce1b
commit d10de8cddf
2 changed files with 4 additions and 4 deletions

View File

@ -26,7 +26,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigCellEdgeResultAccessor::RigCellEdgeResultAccessor() RigCellEdgeResultAccessor::RigCellEdgeResultAccessor()
{ {
m_resultAccessObjects.resize(6);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -54,7 +54,7 @@ double RigCellEdgeResultAccessor::cellScalar(size_t localCellIndex) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RigCellEdgeResultAccessor::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const double RigCellEdgeResultAccessor::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const
{ {
const RigResultAccessor* resultAccessObj = m_resultAccessObjects.at(faceId); const RigResultAccessor* resultAccessObj = m_resultAccessObjects[faceId].p();
if (resultAccessObj != NULL) if (resultAccessObj != NULL)
{ {
return resultAccessObj->cellFaceScalar(localCellIndex, faceId); return resultAccessObj->cellFaceScalar(localCellIndex, faceId);

View File

@ -20,7 +20,7 @@
#include "RigResultAccessor.h" #include "RigResultAccessor.h"
#include "cvfCollection.h" #include "cafFixedArray.h"
//================================================================================================== //==================================================================================================
@ -37,5 +37,5 @@ public:
virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const; virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const;
private: private:
cvf::Collection<RigResultAccessor> m_resultAccessObjects; caf::FixedArray<cvf::ref<RigResultAccessor>, 6> m_resultAccessObjects;
}; };