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

Roff: add roff namespace.

Browse Source
This commit is contained in:
Kristian Bendiksen 2023-01-10 21:17:39 +01:00 committed by Magne Sjaastad
parent 8d82558904
commit 7a79930ea6
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationLibCode/FileInterface/RifRoffFileTools.cpp
View File

@ -91,13 +91,13 @@ bool RifRoffFileTools::openGridFile( const QString& fileName, RigEclipseCaseData
{
const auto totalStart = high_resolution_clock::now();
Reader reader( stream );
roff::Reader reader( stream );
reader.parse();
const auto tokenizeDone = high_resolution_clock::now();
std::vector<std::pair<std::string, RoffScalar>> values = reader.scalarNamedValues();
std::vector<std::pair<std::string, Token::Kind>> arrayTypes = reader.getNamedArrayTypes();
std::vector<std::pair<std::string, roff::RoffScalar>> values = reader.scalarNamedValues();
std::vector<std::pair<std::string, roff::Token::Kind>> arrayTypes = reader.getNamedArrayTypes();
int nx = getInt( values, "dimensions.nX" );
int ny = getInt( values, "dimensions.nY" );
@ -611,17 +611,17 @@ std::pair<bool, std::map<QString, QString>>
try
{
Reader reader( stream );
roff::Reader reader( stream );
reader.parse();
std::vector<std::pair<std::string, Token::Kind>> arrayTypes = reader.getNamedArrayTypes();
std::vector<std::pair<std::string, roff::Token::Kind>> arrayTypes = reader.getNamedArrayTypes();
for ( auto [keyword, kind] : arrayTypes )
{
size_t keywordLength = reader.getArrayLength( keyword );
RiaLogging::info( QString( "Array found: %1 . Type: %2 Size: %3" )
.arg( QString::fromStdString( keyword ) )
.arg( QString::fromStdString( Token::kindToString( kind ) ) )
.arg( QString::fromStdString( roff::Token::kindToString( kind ) ) )
.arg( keywordLength ) );
if ( eclipseCaseData->mainGrid()->cellCount() == keywordLength )
{
@ -657,22 +657,26 @@ std::pair<bool, std::map<QString, QString>>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double>
RifRoffFileTools::readAndConvertToDouble( int nx, int ny, int nz, const std::string& keyword, Token::Kind kind, Reader& reader )
std::vector<double> RifRoffFileTools::readAndConvertToDouble( int nx,
int ny,
int nz,
const std::string& keyword,
roff::Token::Kind kind,
roff::Reader& reader )
{
std::vector<double> doubleVals;
if ( kind == Token::Kind::FLOAT )
if ( kind == roff::Token::Kind::FLOAT )
{
std::vector<float> values = reader.getFloatArray( keyword );
convertToReservoirIndexOrder( nx, ny, nz, values, doubleVals );
}
else if ( kind == Token::Kind::BOOL )
else if ( kind == roff::Token::Kind::BOOL )
{
std::vector<char> values = reader.getByteArray( keyword );
convertToReservoirIndexOrder( nx, ny, nz, values, doubleVals );
}
else if ( kind == Token::Kind::INT )
else if ( kind == roff::Token::Kind::INT )
{
std::vector<int> values = reader.getIntArray( keyword );
convertToReservoirIndexOrder( nx, ny, nz, values, doubleVals );
@ -680,7 +684,7 @@ std::vector<double>
else
{
RiaLogging::error( QString( "Unsupported property type '%1' for keyword '%2'." )
.arg( QString::fromStdString( Token::kindToString( kind ) ) )
.arg( QString::fromStdString( roff::Token::kindToString( kind ) ) )
.arg( QString::fromStdString( keyword ) ) );
}
@ -693,8 +697,8 @@ std::vector<double>
bool RifRoffFileTools::appendNewInputPropertyResult( RigEclipseCaseData* caseData,
const QString& resultName,
const std::string& keyword,
Token::Kind kind,
Reader& reader )
roff::Token::Kind kind,
roff::Reader& reader )
{
CVF_ASSERT( caseData );

10
ApplicationLibCode/FileInterface/RifRoffFileTools.h
View File

@ -30,7 +30,11 @@
class RigEclipseCaseData;
class RigMainGrid;
namespace roff
{
class Reader;
}
//==================================================================================================
//
@ -80,11 +84,11 @@ private:
static double interpolate( const cvf::Vec3d& top, const cvf::Vec3d& bottom, double z, int idx );
static std::vector<double>
readAndConvertToDouble( int nx, int ny, int nz, const std::string& keyword, Token::Kind kind, Reader& reader );
readAndConvertToDouble( int nx, int ny, int nz, const std::string& keyword, roff::Token::Kind kind, roff::Reader& reader );
static bool appendNewInputPropertyResult( RigEclipseCaseData* caseData,
const QString& resultName,
const std::string& keyword,
Token::Kind token,
Reader& reader );
roff::Token::Kind token,
roff::Reader& reader );
};

2
ThirdParty/roffcpp vendored

@ -1 +1 @@
Subproject commit fffa414c1bfcf21cc234ce07c9b194b80c051b5e
Subproject commit 17613c7b57788d8708af8fe585194654531be3a3