Skip to content

Commit

Permalink
Fault Reactivation Model: Remove unused cell index adjustment.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kriben
kriben committed Oct 30, 2023
1 parent fcf565e commit 9fc380d
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 72 deletions.
1 change: 0 additions & 1 deletion ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
28 changes: 0 additions & 28 deletions ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 7 deletions ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,8 @@ class RimFaultReactivationDataAccessor

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 changes: 2 additions & 2 deletions ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand All @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand All @@ -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 changes: 2 additions & 2 deletions ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand All @@ -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 );
Expand Down
3 changes: 0 additions & 3 deletions ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationModel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
22 changes: 0 additions & 22 deletions ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ RigFaultReactivationModel::RigFaultReactivationModel()
for ( auto part : allGridParts() )
{
m_3dparts[part] = std::make_shared<RigGriddedPart3d>( part == GridPart::PART2 );

m_cellIndexAdjustmentMap[part] = {};
}
}

Expand Down Expand Up @@ -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 changes: 0 additions & 5 deletions ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,8 @@ class RigFaultReactivationModel : public cvf::Object

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 );

Expand Down Expand Up @@ -120,7 +117,5 @@ class RigFaultReactivationModel : public cvf::Object

std::map<GridPart, std::shared_ptr<RigGriddedPart3d>> m_3dparts;

std::map<GridPart, std::map<size_t, size_t>> m_cellIndexAdjustmentMap;

cvf::Mat4d m_localCoordTransform;
};

0 comments on commit 9fc380d

Please sign in to comment.