diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp index 9e92dcedb4..1b3baa8fdc 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp @@ -141,7 +141,7 @@ bool RimFileSurface::updateSurfaceData() for ( const auto& name : propertyNames ) { auto values = m_triangleMeshData->propertyValues( name ); - surface->addVerticeResult( name, values ); + surface->addVertexResult( name, values ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFractureSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFractureSurface.cpp index 318690e53b..0001c08b29 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFractureSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFractureSurface.cpp @@ -112,7 +112,7 @@ void RimFractureSurface::loadSurfaceDataForTimeStep( int timeStep ) for ( const auto& name : propertyNames ) { auto values = triangleMeshData->propertyValues( name ); - surface->addVerticeResult( name, values ); + surface->addVertexResult( name, values ); } setSurfaceData( surface ); } diff --git a/ApplicationLibCode/ReservoirDataModel/RigSurface.cpp b/ApplicationLibCode/ReservoirDataModel/RigSurface.cpp index 1ca3c64758..579fd8a390 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigSurface.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigSurface.cpp @@ -60,9 +60,9 @@ void RigSurface::setTriangleData( const std::vector& tringleIndices, c //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigSurface::addVerticeResult( const QString resultName, const std::vector& resultValues ) +void RigSurface::addVertexResult( const QString resultName, const std::vector& resultValues ) { - m_verticeResults[resultName] = resultValues; + m_vertexResults[resultName] = resultValues; } //-------------------------------------------------------------------------------------------------- @@ -70,8 +70,8 @@ void RigSurface::addVerticeResult( const QString resultName, const std::vector RigSurface::propertyValues( const QString& propertyName ) const { - auto it = m_verticeResults.find( propertyName ); - if ( it != m_verticeResults.end() ) + auto it = m_vertexResults.find( propertyName ); + if ( it != m_vertexResults.end() ) { return it->second; } @@ -86,7 +86,7 @@ std::vector RigSurface::propertyNames() const { std::vector names; - for ( const auto& propertyResult : m_verticeResults ) + for ( const auto& propertyResult : m_vertexResults ) { names.push_back( propertyResult.first ); } diff --git a/ApplicationLibCode/ReservoirDataModel/RigSurface.h b/ApplicationLibCode/ReservoirDataModel/RigSurface.h index 3d53081dcd..3694467514 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigSurface.h +++ b/ApplicationLibCode/ReservoirDataModel/RigSurface.h @@ -41,7 +41,7 @@ public: const std::vector& vertices() const; void setTriangleData( const std::vector& tringleIndices, const std::vector& vertices ); - void addVerticeResult( const QString resultName, const std::vector& resultValues ); + void addVertexResult( const QString resultName, const std::vector& resultValues ); std::vector propertyValues( const QString& propertyName ) const; std::vector propertyNames() const; @@ -58,7 +58,7 @@ private: private: std::vector m_triangleIndices; std::vector m_vertices; - std::map> m_verticeResults; + std::map> m_vertexResults; cvf::ref m_surfaceBoundingBoxTree; diff --git a/ApplicationLibCode/ReservoirDataModel/RigSurfaceStatisticsCalculator.cpp b/ApplicationLibCode/ReservoirDataModel/RigSurfaceStatisticsCalculator.cpp index d895597635..e445a098a1 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigSurfaceStatisticsCalculator.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigSurfaceStatisticsCalculator.cpp @@ -104,12 +104,12 @@ cvf::ref RigSurfaceStatisticsCalculator::computeStatistics( const st auto enumToText = []( auto statisticsType ) { return caf::AppEnum::text( statisticsType ); }; - statSurface->addVerticeResult( enumToText( StatisticsType::MEAN ), meanValues ); - statSurface->addVerticeResult( enumToText( StatisticsType::MIN ), minValues ); - statSurface->addVerticeResult( enumToText( StatisticsType::MAX ), maxValues ); - statSurface->addVerticeResult( enumToText( StatisticsType::P10 ), p10Values ); - statSurface->addVerticeResult( enumToText( StatisticsType::P50 ), p50Values ); - statSurface->addVerticeResult( enumToText( StatisticsType::P90 ), p90Values ); + statSurface->addVertexResult( enumToText( StatisticsType::MEAN ), meanValues ); + statSurface->addVertexResult( enumToText( StatisticsType::MIN ), minValues ); + statSurface->addVertexResult( enumToText( StatisticsType::MAX ), maxValues ); + statSurface->addVertexResult( enumToText( StatisticsType::P10 ), p10Values ); + statSurface->addVertexResult( enumToText( StatisticsType::P50 ), p50Values ); + statSurface->addVertexResult( enumToText( StatisticsType::P90 ), p90Values ); return statSurface; }