From 9fc380dd5f735aa7493961d957449fc695dffafd Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Mon, 30 Oct 2023 14:36:17 +0100 Subject: [PATCH] Fault Reactivation Model: Remove unused cell index adjustment. --- .../Faults/RimFaultReactivationDataAccess.cpp | 1 - .../RimFaultReactivationDataAccessor.cpp | 28 ------------------- .../Faults/RimFaultReactivationDataAccessor.h | 8 +----- ...ltReactivationDataAccessorPorePressure.cpp | 4 +-- ...ultReactivationDataAccessorTemperature.cpp | 4 +-- ...FaultReactivationDataAccessorVoidRatio.cpp | 4 +-- .../Faults/RimFaultReactivationModel.cpp | 3 -- .../RigFaultReactivationModel.cpp | 22 --------------- .../RigFaultReactivationModel.h | 5 ---- 9 files changed, 7 insertions(+), 72 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp index 16322e6145..2b0c186c84 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp @@ -90,7 +90,6 @@ std::vector RimFaultReactivationDataAccess::extractModelData( const RigF if ( accessor ) { accessor->setTimeStep( timeStep ); - accessor->useCellIndexAdjustment( model.cellIndexAdjustment( gridPart ) ); auto grid = model.grid( gridPart ); diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.cpp index 46321b0501..c12f04b509 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.cpp @@ -45,31 +45,3 @@ void RimFaultReactivationDataAccessor::setTimeStep( size_t timeStep ) m_timeStep = timeStep; updateResultAccessor(); } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimFaultReactivationDataAccessor::useCellIndexAdjustment( const std::map& adjustments ) -{ - m_cellIndexAdjustment = adjustments; -} - -// //-------------------------------------------------------------------------------------------------- -// /// -// //-------------------------------------------------------------------------------------------------- -size_t RimFaultReactivationDataAccessor::findAdjustedCellIndex( const cvf::Vec3d& position, - const RigMainGrid* grid, - const std::map& 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; -} diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h index 1d7d64663f..06a329b54a 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h @@ -44,14 +44,8 @@ public: virtual bool hasValidDataAtPosition( const cvf::Vec3d& position ) const = 0; - void useCellIndexAdjustment( const std::map& adjustments ); - - static size_t - findAdjustedCellIndex( const cvf::Vec3d& position, const RigMainGrid* grid, const std::map& cellIndexAdjustmentMap ); - protected: virtual void updateResultAccessor() = 0; - std::map m_cellIndexAdjustment; - size_t m_timeStep; + size_t m_timeStep; }; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp index 8fc9598982..c7b5d5e77f 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp @@ -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 ); diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp index 9a8033fbbc..625f79aa3f 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp @@ -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 ); } diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp index d6bb470534..c72960e5ea 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp @@ -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 ); diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationModel.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationModel.cpp index cb06544712..6f73fa5269 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationModel.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationModel.cpp @@ -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( eCase, selectedTimeStepIndexes ); model()->generateElementSets( m_dataAccess.get(), grid ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.cpp b/ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.cpp index 29c6d025a1..de9e3e48d7 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.cpp @@ -61,8 +61,6 @@ RigFaultReactivationModel::RigFaultReactivationModel() for ( auto part : allGridParts() ) { m_3dparts[part] = std::make_shared( 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 RigFaultReactivationModel::cellIndexAdjustment( GridPart part ) const -{ - auto it = m_cellIndexAdjustmentMap.find( part ); - if ( it != m_cellIndexAdjustmentMap.end() ) - return it->second; - else - return {}; -} diff --git a/ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.h b/ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.h index e9a631a381..cdb9d5c455 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.h +++ b/ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModel.h @@ -86,11 +86,8 @@ public: std::shared_ptr grid( GridPart part ) const; - void generateCellIndexMapping( const RigMainGrid* grid ); void generateElementSets( const RimFaultReactivationDataAccess* dataAccess, const RigMainGrid* grid ); - std::map cellIndexAdjustment( GridPart part ) const; - protected: void generateGrids( cvf::Vec3dArray points ); @@ -120,7 +117,5 @@ private: std::map> m_3dparts; - std::map> m_cellIndexAdjustmentMap; - cvf::Mat4d m_localCoordTransform; };