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

Fault Reactivation Model: Remove unused cell index adjustment.

Browse Source
This commit is contained in:
Kristian Bendiksen 2023-10-30 14:36:17 +01:00
parent fcf565e541
commit 9fc380dd5f
9 changed files with 7 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp
View File

@ -90,7 +90,6 @@ std::vector<double> RimFaultReactivationDataAccess::extractModelData( const RigF
if ( accessor )
{
accessor->setTimeStep( timeStep );
accessor->useCellIndexAdjustment( model.cellIndexAdjustment( gridPart ) );
auto grid = model.grid( gridPart );

28
ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.cpp
View File

@ -45,31 +45,3 @@ void RimFaultReactivationDataAccessor::setTimeStep( size_t timeStep )
m_timeStep = timeStep;
updateResultAccessor();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultReactivationDataAccessor::useCellIndexAdjustment( const std::map<size_t, size_t>& adjustments )
{
m_cellIndexAdjustment = adjustments;
}
// //--------------------------------------------------------------------------------------------------
// ///
// //--------------------------------------------------------------------------------------------------
size_t RimFaultReactivationDataAccessor::findAdjustedCellIndex( const cvf::Vec3d& position,
const RigMainGrid* grid,
const std::map<size_t, size_t>& cellIndexAdjustmentMap )
{
CAF_ASSERT( grid != nullptr );
size_t cellIdx = grid->findReservoirCellIndexFromPoint( position );
// adjust cell index if present in the map
if ( auto search = cellIndexAdjustmentMap.find( cellIdx ); search != cellIndexAdjustmentMap.end() )
{
cellIdx = search->second;
}
return cellIdx;
}

8
ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h
View File

@ -44,14 +44,8 @@ public:
virtual bool hasValidDataAtPosition( const cvf::Vec3d& position ) const = 0;
void useCellIndexAdjustment( const std::map<size_t, size_t>& adjustments );
static size_t
findAdjustedCellIndex( const cvf::Vec3d& position, const RigMainGrid* grid, const std::map<size_t, size_t>& cellIndexAdjustmentMap );
protected:
virtual void updateResultAccessor() = 0;
std::map<size_t, size_t> m_cellIndexAdjustment;
size_t m_timeStep;
size_t m_timeStep;
};

4
ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp
View File

@ -90,7 +90,7 @@ double RimFaultReactivationDataAccessorPorePressure::valueAtPosition( const cvf:
{
if ( ( m_mainGrid != nullptr ) && m_resultAccessor.notNull() )
{
auto cellIdx = findAdjustedCellIndex( position, m_mainGrid, m_cellIndexAdjustment );
auto cellIdx = m_mainGrid->findReservoirCellIndexFromPoint( position );
if ( cellIdx != cvf::UNDEFINED_SIZE_T )
{
double value = m_resultAccessor->cellScalar( cellIdx );
@ -117,7 +117,7 @@ double RimFaultReactivationDataAccessorPorePressure::calculatePorePressure( doub
//--------------------------------------------------------------------------------------------------
bool RimFaultReactivationDataAccessorPorePressure::hasValidDataAtPosition( const cvf::Vec3d& position ) const
{
auto cellIdx = findAdjustedCellIndex( position, m_mainGrid, m_cellIndexAdjustment );
auto cellIdx = m_mainGrid->findReservoirCellIndexFromPoint( position );
if ( cellIdx == cvf::UNDEFINED_SIZE_T ) return false;
double value = m_resultAccessor->cellScalar( cellIdx );

4
ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp
View File

@ -87,7 +87,7 @@ double RimFaultReactivationDataAccessorTemperature::valueAtPosition( const cvf::
{
if ( ( m_mainGrid != nullptr ) && m_resultAccessor.notNull() )
{
auto cellIdx = findAdjustedCellIndex( position, m_mainGrid, m_cellIndexAdjustment );
auto cellIdx = m_mainGrid->findReservoirCellIndexFromPoint( position );
if ( cellIdx != cvf::UNDEFINED_SIZE_T )
{
return m_resultAccessor->cellScalar( cellIdx );
@ -102,6 +102,6 @@ double RimFaultReactivationDataAccessorTemperature::valueAtPosition( const cvf::
//--------------------------------------------------------------------------------------------------
bool RimFaultReactivationDataAccessorTemperature::hasValidDataAtPosition( const cvf::Vec3d& position ) const
{
auto cellIdx = findAdjustedCellIndex( position, m_mainGrid, m_cellIndexAdjustment );
auto cellIdx = m_mainGrid->findReservoirCellIndexFromPoint( position );
return ( cellIdx != cvf::UNDEFINED_SIZE_T );
}

4
ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp
View File

@ -88,7 +88,7 @@ double RimFaultReactivationDataAccessorVoidRatio::valueAtPosition( const cvf::Ve
{
if ( ( m_mainGrid != nullptr ) && m_resultAccessor.notNull() )
{
auto cellIdx = findAdjustedCellIndex( position, m_mainGrid, m_cellIndexAdjustment );
auto cellIdx = m_mainGrid->findReservoirCellIndexFromPoint( position );
if ( cellIdx != cvf::UNDEFINED_SIZE_T )
{
double porosity = m_resultAccessor->cellScalar( cellIdx );
@ -107,7 +107,7 @@ double RimFaultReactivationDataAccessorVoidRatio::valueAtPosition( const cvf::Ve
//--------------------------------------------------------------------------------------------------
bool RimFaultReactivationDataAccessorVoidRatio::hasValidDataAtPosition( const cvf::Vec3d& position ) const
{
auto cellIdx = findAdjustedCellIndex( position, m_mainGrid, m_cellIndexAdjustment );
auto cellIdx = m_mainGrid->findReservoirCellIndexFromPoint( position );
if ( cellIdx == cvf::UNDEFINED_SIZE_T ) return false;
double value = m_resultAccessor->cellScalar( cellIdx );

3
ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationModel.cpp
View File

@ -730,9 +730,6 @@ bool RimFaultReactivationModel::extractAndExportModelData()
auto grid = eCase->mainGrid();
// generate cell index mappings for cells that ends up at the wrong side of the fault
model()->generateCellIndexMapping( grid );
// extract data for each timestep
m_dataAccess = std::make_shared<RimFaultReactivationDataAccess>( eCase, selectedTimeStepIndexes );
model()->generateElementSets( m_dataAccess.get(), grid );

22
ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.cpp
View File

@ -61,8 +61,6 @@ RigFaultReactivationModel::RigFaultReactivationModel()
for ( auto part : allGridParts() )
{
m_3dparts[part] = std::make_shared<RigGriddedPart3d>( part == GridPart::PART2 );
m_cellIndexAdjustmentMap[part] = {};
}
}
@ -365,23 +363,3 @@ void RigFaultReactivationModel::generateElementSets( const RimFaultReactivationD
m_3dparts[part]->generateElementSets( dataAccess, grid );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFaultReactivationModel::generateCellIndexMapping( const RigMainGrid* grid )
{
m_cellIndexAdjustmentMap.clear();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::map<size_t, size_t> RigFaultReactivationModel::cellIndexAdjustment( GridPart part ) const
{
auto it = m_cellIndexAdjustmentMap.find( part );
if ( it != m_cellIndexAdjustmentMap.end() )
return it->second;
else
return {};
}

5
ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.h
View File

@ -86,11 +86,8 @@ public:
std::shared_ptr<RigGriddedPart3d> grid( GridPart part ) const;
void generateCellIndexMapping( const RigMainGrid* grid );
void generateElementSets( const RimFaultReactivationDataAccess* dataAccess, const RigMainGrid* grid );
std::map<size_t, size_t> cellIndexAdjustment( GridPart part ) const;
protected:
void generateGrids( cvf::Vec3dArray points );
@ -120,7 +117,5 @@ private:
std::map<GridPart, std::shared_ptr<RigGriddedPart3d>> m_3dparts;
std::map<GridPart, std::map<size_t, size_t>> m_cellIndexAdjustmentMap;
cvf::Mat4d m_localCoordTransform;
};