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

Code review, brush-up, and extended surface unit tests

Browse Source
This commit is contained in:
Stein Inge Dale
2020-06-03 13:34:18 +02:00
committed by Magne Sjaastad
parent e5f3a3b67d
commit 10e4c60073
5 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/FileInterface/RifSurfaceReader.cpp
View File

@@ -19,9 +19,11 @@
#include "RifSurfaceReader.h"
#include "RigGocadData.h"
#include "cvfAssert.h"
#include "cvfVector3.h"
#include "QStringList"
#include <fstream>
#include <limits>
#include <map>
@@ -37,6 +39,8 @@
//--------------------------------------------------------------------------------------------------
void RifSurfaceReader::readGocadFile( const QString& filename, RigGocadData* gocadData )
{
CVF_ASSERT( gocadData );
enum class GocadZPositive
{
Elevation,
@@ -50,7 +54,6 @@ void RifSurfaceReader::readGocadFile( const QString& filename, RigGocadData* goc
std::vector<QString> propertyNames;
std::vector<std::vector<float>> propertyValues;
size_t propertyRow = 0;
{
std::ifstream stream( filename.toLatin1().data() );
@@ -110,13 +113,14 @@ void RifSurfaceReader::readGocadFile( const QString& filename, RigGocadData* goc
vertexIdToIndex[vertexId] = static_cast<unsigned>( vertices.size() - 1 );
}
propertyValues.push_back( std::vector<float>( propertyNames.size() ) );
for ( size_t i = 0; i < propertyNames.size(); i++ )
{
lineStream >> propertyValues[propertyRow][i];
float value = std::numeric_limits<double>::infinity();
lineStream >> value;
propertyValues[i].push_back( value );
}
propertyRow++;
}
else if ( firstToken.compare( "TRGL" ) == 0 )
{
@@ -154,6 +158,8 @@ void RifSurfaceReader::readGocadFile( const QString& filename, RigGocadData* goc
{
propertyNames.push_back( w );
}
propertyValues.resize( propertyNames.size() );
}
else if ( firstToken.compare( "ZPOSITIVE" ) == 0 )
{
@@ -184,8 +190,11 @@ void RifSurfaceReader::readGocadFile( const QString& filename, RigGocadData* goc
}
}
gocadData->setGeometryData( vertices, triangleIndices );
gocadData->addPropertyData( propertyNames, propertyValues );
if ( gocadData )
{
gocadData->setGeometryData( vertices, triangleIndices );
gocadData->addPropertyData( propertyNames, propertyValues );
}
}
//--------------------------------------------------------------------------------------------------