mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#10331 Roff property import: Add support for BYTE data type
Fixes #10331.
This commit is contained in:
parent
f091a6237f
commit
851cb69f8b
@ -666,7 +666,7 @@ std::vector<double>
|
|||||||
std::vector<float> values = reader.getFloatArray( keyword );
|
std::vector<float> values = reader.getFloatArray( keyword );
|
||||||
convertToReservoirIndexOrder<float, double>( nx, ny, nz, values, doubleVals );
|
convertToReservoirIndexOrder<float, double>( nx, ny, nz, values, doubleVals );
|
||||||
}
|
}
|
||||||
else if ( kind == roff::Token::Kind::BOOL )
|
else if ( kind == roff::Token::Kind::BOOL || kind == roff::Token::Kind::BYTE )
|
||||||
{
|
{
|
||||||
std::vector<char> values = reader.getByteArray( keyword );
|
std::vector<char> values = reader.getByteArray( keyword );
|
||||||
convertToReservoirIndexOrder<char, double>( nx, ny, nz, values, doubleVals );
|
convertToReservoirIndexOrder<char, double>( nx, ny, nz, values, doubleVals );
|
||||||
@ -735,6 +735,8 @@ RiaDefines::ResultDataType RifRoffFileTools::mapFromType( roff::Token::Kind kind
|
|||||||
{
|
{
|
||||||
case roff::Token::Kind::BOOL:
|
case roff::Token::Kind::BOOL:
|
||||||
return RiaDefines::ResultDataType::INTEGER;
|
return RiaDefines::ResultDataType::INTEGER;
|
||||||
|
case roff::Token::Kind::BYTE:
|
||||||
|
return RiaDefines::ResultDataType::INTEGER;
|
||||||
case roff::Token::Kind::INT:
|
case roff::Token::Kind::INT:
|
||||||
return RiaDefines::ResultDataType::INTEGER;
|
return RiaDefines::ResultDataType::INTEGER;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user