OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-01 16:43:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite to make code compile (#8061)

Browse Source 
It should now be possible to build on centos 7, too
This commit is contained in:
jonjenssen authored and GitHub committed 2021-09-28 11:31:13 +02:00
1 parent 6a978b57f1
commit de1d02e7bc
2 files changed
+11 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/GeoMech/OdbReader/RifOdbReader.cpp
+10 -13
View File
@@ -627,20 +627,17 @@ size_t RifOdbReader::resultItemCount( const std::string& fieldName,
odb_Instance* partInstance = instance( partIndex );
CVF_ASSERT( partInstance != NULL );
const odb_Frame& frame = stepFrame( stepIndex, frameIndex );
odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset( *partInstance );
const odb_Frame& frame = stepFrame( stepIndex, frameIndex );
const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset( *partInstance );
if ( resultPosition != NONE )
{
odb_Enum::odb_ResultPositionEnum odbResultPos = odb_Enum::NODAL;
if ( resultPosition == ELEMENT_NODAL )
odbResultPos = odb_Enum::ELEMENT_NODAL;
else if ( resultPosition == INTEGRATION_POINT )
odbResultPos = odb_Enum::INTEGRATION_POINT;
instanceFieldOutput = instanceFieldOutput.getSubset( odbResultPos );
}
odb_Enum::odb_ResultPositionEnum odbResultPos = odb_Enum::NODAL;
if ( resultPosition == ELEMENT_NODAL )
odbResultPos = odb_Enum::ELEMENT_NODAL;
else if ( resultPosition == INTEGRATION_POINT )
odbResultPos = odb_Enum::INTEGRATION_POINT;
const odb_SequenceFieldBulkData& seqFieldBulkData = instanceFieldOutput.bulkDataBlocks();
const odb_FieldOutput& subsetOutput = instanceFieldOutput.getSubset( odbResultPos );
const odb_SequenceFieldBulkData& seqFieldBulkData = subsetOutput.bulkDataBlocks();
size_t resultItemCount = 0;
int numBlocks = seqFieldBulkData.size();
@@ -739,7 +736,7 @@ void RifOdbReader::readDisplacements( int partIndex, int stepIndex, int frameInd
odb_Instance* partInstance = instance( partIndex );
CVF_ASSERT( partInstance != NULL );
size_t dataSize = resultItemCount( "U", partIndex, stepIndex, frameIndex, NONE );
size_t dataSize = resultItemCount( "U", partIndex, stepIndex, frameIndex, NODAL );
if ( dataSize > 0 )
{
displacements->resize( dataSize );
ApplicationLibCode/GeoMech/OdbReader/RifOdbReader.h
+1 -2
View File
@@ -78,8 +78,7 @@ private:
{
NODAL,
ELEMENT_NODAL,
INTEGRATION_POINT,
NONE
INTEGRATION_POINT
};
class RifOdbResultKey