diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp index 0ff71438994..725eab421fa 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccess.cpp @@ -138,7 +138,7 @@ std::vector RimFaultReactivationDataAccess::extractModelData( const RigF { for ( auto& node : grid->globalNodes() ) { - double value = accessor->valueAtPosition( node ); + double value = accessor->valueAtPosition( node, model, gridPart ); values.push_back( value ); } } @@ -153,7 +153,7 @@ std::vector RimFaultReactivationDataAccess::extractModelData( const RigF double bottomDepth = computeAverageDepth( corners, { 4, 5, 6, 7 } ); cvf::Vec3d position = RigCaseToCaseCellMapperTools::calculateCellCenter( corners.data() ); - double value = accessor->valueAtPosition( position, topDepth, bottomDepth ); + double value = accessor->valueAtPosition( position, model, gridPart, topDepth, bottomDepth ); values.push_back( value ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h index 2c6d20ff14e..3d3d3504fc0 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessor.h @@ -26,6 +26,7 @@ #include class RigMainGrid; +class RigFaultReactivationModel; //================================================================================================== /// @@ -41,9 +42,11 @@ class RimFaultReactivationDataAccessor virtual bool isMatching( RimFaultReactivation::Property property ) const = 0; - virtual double valueAtPosition( const cvf::Vec3d& position, - double topDepth = std::numeric_limits::infinity(), - double bottomDepth = std::numeric_limits::infinity() ) const = 0; + virtual double valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth = std::numeric_limits::infinity(), + double bottomDepth = std::numeric_limits::infinity() ) const = 0; protected: virtual void updateResultAccessor() = 0; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorGeoMech.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorGeoMech.cpp index b6e5d31e1e1..7da47f84c5b 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorGeoMech.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorGeoMech.cpp @@ -97,7 +97,11 @@ bool RimFaultReactivationDataAccessorGeoMech::isMatching( RimFaultReactivation:: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFaultReactivationDataAccessorGeoMech::valueAtPosition( const cvf::Vec3d& position, double topDepth, double bottomDepth ) const +double RimFaultReactivationDataAccessorGeoMech::valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth, + double bottomDepth ) const { if ( !m_resultFrames ) return std::numeric_limits::infinity(); diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorGeoMech.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorGeoMech.h index 0a41bb8825a..e89241d1758 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorGeoMech.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorGeoMech.h @@ -40,9 +40,11 @@ class RimFaultReactivationDataAccessorGeoMech : public RimFaultReactivationDataA bool isMatching( RimFaultReactivation::Property property ) const override; - double valueAtPosition( const cvf::Vec3d& position, - double topDepth = std::numeric_limits::infinity(), - double bottomDepth = std::numeric_limits::infinity() ) const override; + double valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth = std::numeric_limits::infinity(), + double bottomDepth = std::numeric_limits::infinity() ) const override; private: void updateResultAccessor() override; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp index 7d2f64e925e..9d32921eb21 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp @@ -86,7 +86,11 @@ bool RimFaultReactivationDataAccessorPorePressure::isMatching( RimFaultReactivat //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFaultReactivationDataAccessorPorePressure::valueAtPosition( const cvf::Vec3d& position, double topDepth, double bottomDepth ) const +double RimFaultReactivationDataAccessorPorePressure::valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth, + double bottomDepth ) const { if ( ( m_mainGrid != nullptr ) && m_resultAccessor.notNull() ) { diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.h index b5b6aef98ee..6ae024a7a01 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.h @@ -41,9 +41,11 @@ class RimFaultReactivationDataAccessorPorePressure : public RimFaultReactivation bool isMatching( RimFaultReactivation::Property property ) const override; - double valueAtPosition( const cvf::Vec3d& position, - double topDepth = std::numeric_limits::infinity(), - double bottomDepth = std::numeric_limits::infinity() ) const override; + double valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth = std::numeric_limits::infinity(), + double bottomDepth = std::numeric_limits::infinity() ) const override; private: void updateResultAccessor() override; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.cpp index 6556a2b9422..e14c1d7bee7 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.cpp @@ -97,7 +97,11 @@ bool RimFaultReactivationDataAccessorStress::isMatching( RimFaultReactivation::P //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFaultReactivationDataAccessorStress::valueAtPosition( const cvf::Vec3d& position, double topDepth, double bottomDepth ) const +double RimFaultReactivationDataAccessorStress::valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth, + double bottomDepth ) const { if ( !m_porFrames || !m_s11Frames || !m_s22Frames || !m_s33Frames || !m_femPart ) return std::numeric_limits::infinity(); diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.h index b0d6e05ef97..4fdcfa4bd22 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.h @@ -44,9 +44,11 @@ class RimFaultReactivationDataAccessorStress : public RimFaultReactivationDataAc bool isMatching( RimFaultReactivation::Property property ) const override; - double valueAtPosition( const cvf::Vec3d& position, - double topDepth = std::numeric_limits::infinity(), - double bottomDepth = std::numeric_limits::infinity() ) const override; + double valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth = std::numeric_limits::infinity(), + double bottomDepth = std::numeric_limits::infinity() ) const override; private: void updateResultAccessor() override; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp index e1f737cb781..10607338c2f 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp @@ -83,7 +83,11 @@ bool RimFaultReactivationDataAccessorTemperature::isMatching( RimFaultReactivati //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFaultReactivationDataAccessorTemperature::valueAtPosition( const cvf::Vec3d& position, double topDepth, double bottomDepth ) const +double RimFaultReactivationDataAccessorTemperature::valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth, + double bottomDepth ) const { if ( ( m_mainGrid != nullptr ) && m_resultAccessor.notNull() ) { diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.h index 52f08c39a34..8cb50c065cc 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.h @@ -41,9 +41,11 @@ class RimFaultReactivationDataAccessorTemperature : public RimFaultReactivationD bool isMatching( RimFaultReactivation::Property property ) const override; - double valueAtPosition( const cvf::Vec3d& position, - double topDepth = std::numeric_limits::infinity(), - double bottomDepth = std::numeric_limits::infinity() ) const override; + double valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth = std::numeric_limits::infinity(), + double bottomDepth = std::numeric_limits::infinity() ) const override; private: void updateResultAccessor() override; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp index e53dbccbaee..c1dc6ccfb3e 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.cpp @@ -84,7 +84,11 @@ bool RimFaultReactivationDataAccessorVoidRatio::isMatching( RimFaultReactivation //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFaultReactivationDataAccessorVoidRatio::valueAtPosition( const cvf::Vec3d& position, double topDepth, double bottomDepth ) const +double RimFaultReactivationDataAccessorVoidRatio::valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth, + double bottomDepth ) const { if ( ( m_mainGrid != nullptr ) && m_resultAccessor.notNull() ) { diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.h index ea1465b7414..069b3b344e0 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorVoidRatio.h @@ -41,9 +41,11 @@ class RimFaultReactivationDataAccessorVoidRatio : public RimFaultReactivationDat bool isMatching( RimFaultReactivation::Property property ) const override; - double valueAtPosition( const cvf::Vec3d& position, - double topDepth = std::numeric_limits::infinity(), - double bottomDepth = std::numeric_limits::infinity() ) const override; + double valueAtPosition( const cvf::Vec3d& position, + const RigFaultReactivationModel& model, + RimFaultReactivation::GridPart gridPart, + double topDepth = std::numeric_limits::infinity(), + double bottomDepth = std::numeric_limits::infinity() ) const override; private: void updateResultAccessor() override;