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

Fix data access crash when no temp is available

Browse Source 
Change element node order
This commit is contained in:
Jon Jenssen
2024-02-15 17:36:38 +01:00
committed by jonjenssen
parent 5cfabbb8b8
commit 5162ae467c
8 changed files with 16 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.cpp
View File

@@ -264,12 +264,3 @@ void RigFaultReactivationModel::postProcessElementSets( const RimEclipseCase* eC
m_3dparts[part]->postProcessElementSets( eCase->mainGrid(), cellInfo );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFaultReactivationModel::flipNodeOrder( bool flipFW, bool flipHW )
{
if ( flipFW ) m_3dparts[GridPart::FW]->flipNodeOrder();
if ( flipHW ) m_3dparts[GridPart::HW]->flipNodeOrder();
}

1
ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.h
View File

@@ -87,7 +87,6 @@ public:
RimFaultReactivation::GridPart normalPointsAt() const;
void postProcessElementSets( const RimEclipseCase* eCase );
void flipNodeOrder( bool flipFW, bool flipHW );
private:
std::shared_ptr<RigFaultReactivationModelGenerator> m_generator;

2
ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModelGenerator.cpp
View File

@@ -590,7 +590,7 @@ void RigFaultReactivationModelGenerator::generateGeometry( size_t sta
m_horizontalPartition,
m_modelThickness,
m_topReservoirBack.z(),
m_modelNormal,
-1.0 * m_modelNormal,
m_faultZoneCells );
frontPart->generateLocalNodes( m_localCoordTransform );

26
ApplicationLibCode/ReservoirDataModel/RigGriddedPart3d.cpp
View File

@@ -400,15 +400,15 @@ void RigGriddedPart3d::generateGeometry( const std::array<cvf::Vec3d, 12>& input
{
for ( int t = 0; t < nThicknessCells; t++, elementIdx++ )
{
m_elementIndices[elementIdx].push_back( t + nextLayerIdxOff + i );
m_elementIndices[elementIdx].push_back( t + nextLayerIdxOff + i + nThicknessOff );
m_elementIndices[elementIdx].push_back( t + nextLayerIdxOff + i + nThicknessOff + 1 );
m_elementIndices[elementIdx].push_back( t + nextLayerIdxOff + i + 1 );
m_elementIndices[elementIdx].push_back( t + i );
m_elementIndices[elementIdx].push_back( t + i + nThicknessOff );
m_elementIndices[elementIdx].push_back( t + i + nThicknessOff + 1 );
m_elementIndices[elementIdx].push_back( t + i + 1 );
m_elementIndices[elementIdx].push_back( t + i + nThicknessOff + 1 );
m_elementIndices[elementIdx].push_back( t + i + nThicknessOff );
m_elementIndices[elementIdx].push_back( t + nextLayerIdxOff + i );
m_elementIndices[elementIdx].push_back( t + nextLayerIdxOff + i + 1 );
m_elementIndices[elementIdx].push_back( t + nextLayerIdxOff + i + nThicknessOff + 1 );
m_elementIndices[elementIdx].push_back( t + nextLayerIdxOff + i + nThicknessOff );
if ( v == 0 )
{
@@ -767,15 +767,3 @@ void RigGriddedPart3d::updateElementSet( ElementSets elSet,
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigGriddedPart3d::flipNodeOrder()
{
for ( auto& nodes : m_elementIndices )
{
std::swap( nodes[1], nodes[3] );
std::swap( nodes[5], nodes[7] );
}
}

1
ApplicationLibCode/ReservoirDataModel/RigGriddedPart3d.h
View File

@@ -61,7 +61,6 @@ public:
void setUseLocalCoordinates( bool useLocalCoordinates );
void postProcessElementSets( const RigMainGrid* mainGrid, const RigActiveCellInfo* cellInfo );
void flipNodeOrder();
bool useLocalCoordinates() const;
double topHeight() const;