From c2b4f836436e53c24326da090ae183e120cfe439 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Fri, 5 Jun 2026 14:35:21 +0200 Subject: [PATCH] #14101 Rename RimFaultDistanceResult/Collection classes and files to RimFaultDistance/RimFaultDistanceCollection Carries the "Fault Distance" rename through to the C++ class names, file names, PDM/scriptable keywords and the Python API (add_fault_distance, class FaultDistance). The RicNewFaultDistanceResultFeature command class keeps its name. --- .../RicNewFaultDistanceResultFeature.cpp | 12 +++---- .../Faults/CMakeLists_files.cmake | 4 +-- ...istanceResult.cpp => RimFaultDistance.cpp} | 32 +++++++++---------- ...ultDistanceResult.h => RimFaultDistance.h} | 4 +-- ...ion.cpp => RimFaultDistanceCollection.cpp} | 26 +++++++-------- ...lection.h => RimFaultDistanceCollection.h} | 10 +++--- .../ProjectDataModel/RimEclipseCase.cpp | 16 +++++----- .../ProjectDataModel/RimEclipseCase.h | 6 ++-- .../ProjectDataModel/RimEclipseView.cpp | 6 ++-- .../ProjectDataModel/RimEclipseView.h | 4 +-- .../RimcEclipseView.cpp | 18 +++++------ .../RimcEclipseView.h | 4 +-- ...tance_result.py => test_fault_distance.py} | 10 +++--- 13 files changed, 76 insertions(+), 76 deletions(-) rename ApplicationLibCode/ProjectDataModel/Faults/{RimFaultDistanceResult.cpp => RimFaultDistance.cpp} (86%) rename ApplicationLibCode/ProjectDataModel/Faults/{RimFaultDistanceResult.h => RimFaultDistance.h} (96%) rename ApplicationLibCode/ProjectDataModel/Faults/{RimFaultDistanceResultCollection.cpp => RimFaultDistanceCollection.cpp} (79%) rename ApplicationLibCode/ProjectDataModel/Faults/{RimFaultDistanceResultCollection.h => RimFaultDistanceCollection.h} (83%) rename GrpcInterface/Python/rips/tests/{test_fault_distance_result.py => test_fault_distance.py} (76%) diff --git a/ApplicationLibCode/Commands/EclipseCommands/RicNewFaultDistanceResultFeature.cpp b/ApplicationLibCode/Commands/EclipseCommands/RicNewFaultDistanceResultFeature.cpp index ca3d209155..eeb9dcb9da 100644 --- a/ApplicationLibCode/Commands/EclipseCommands/RicNewFaultDistanceResultFeature.cpp +++ b/ApplicationLibCode/Commands/EclipseCommands/RicNewFaultDistanceResultFeature.cpp @@ -20,8 +20,8 @@ #include "RimEclipseCase.h" #include "RimEclipseView.h" -#include "RimFaultDistanceResult.h" -#include "RimFaultDistanceResultCollection.h" +#include "RimFaultDistance.h" +#include "RimFaultDistanceCollection.h" #include "RimFaultInView.h" #include "RimFaultInViewCollection.h" @@ -49,10 +49,10 @@ RimEclipseView* findHostView() const auto faultCollections = caf::SelectionManager::instance()->objectsByType(); if ( !faultCollections.empty() ) return faultCollections.front()->firstAncestorOrThisOfType(); - const auto distanceCollections = caf::SelectionManager::instance()->objectsByType(); + const auto distanceCollections = caf::SelectionManager::instance()->objectsByType(); if ( !distanceCollections.empty() ) return firstViewOfCase( distanceCollections.front() ); - const auto distanceResults = caf::SelectionManager::instance()->objectsByType(); + const auto distanceResults = caf::SelectionManager::instance()->objectsByType(); if ( !distanceResults.empty() ) return firstViewOfCase( distanceResults.front() ); const auto faults = caf::SelectionManager::instance()->objectsByType(); @@ -78,13 +78,13 @@ void RicNewFaultDistanceResultFeature::onActionTriggered( bool isChecked ) RimEclipseView* eclipseView = findHostView(); if ( !eclipseView ) return; - RimFaultDistanceResultCollection* distanceCollection = eclipseView->faultDistanceResults(); + RimFaultDistanceCollection* distanceCollection = eclipseView->faultDistanceCollection(); if ( !distanceCollection ) return; const auto selectedFaultPointers = caf::SelectionManager::instance()->objectsByType(); std::vector selectedFaults( selectedFaultPointers.begin(), selectedFaultPointers.end() ); - RimFaultDistanceResult* newResult = distanceCollection->addResult(); + RimFaultDistance* newResult = distanceCollection->addResult(); if ( !newResult ) return; if ( !selectedFaults.empty() ) diff --git a/ApplicationLibCode/ProjectDataModel/Faults/CMakeLists_files.cmake b/ApplicationLibCode/ProjectDataModel/Faults/CMakeLists_files.cmake index 89ce932cff..18e08a64ee 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/CMakeLists_files.cmake +++ b/ApplicationLibCode/ProjectDataModel/Faults/CMakeLists_files.cmake @@ -1,6 +1,6 @@ set(SOURCE_GROUP_SOURCE_FILES - ${CMAKE_CURRENT_LIST_DIR}/RimFaultDistanceResult.cpp - ${CMAKE_CURRENT_LIST_DIR}/RimFaultDistanceResultCollection.cpp + ${CMAKE_CURRENT_LIST_DIR}/RimFaultDistance.cpp + ${CMAKE_CURRENT_LIST_DIR}/RimFaultDistanceCollection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimFaultInView.cpp ${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimFaultReactivationModel.cpp diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResult.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistance.cpp similarity index 86% rename from ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResult.cpp rename to ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistance.cpp index 6527de77e5..413259c592 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResult.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistance.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFaultDistanceResult.h" +#include "RimFaultDistance.h" #include "RiaDefines.h" @@ -38,18 +38,18 @@ #include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiTreeSelectionEditor.h" -CAF_PDM_SOURCE_INIT( RimFaultDistanceResult, "RimFaultDistanceResult" ); +CAF_PDM_SOURCE_INIT( RimFaultDistance, "RimFaultDistance" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFaultDistanceResult::RimFaultDistanceResult() +RimFaultDistance::RimFaultDistance() { CAF_PDM_InitScriptableObjectWithNameAndComment( "Fault Distance", ":/draw_style_faults_24x24.png", "", "", - "FaultDistanceResult", + "FaultDistance", "Per-cell distance to a selected subset of faults" ); CAF_PDM_InitScriptableFieldNoDefault( &m_resultName, "ResultName", "Name" ); @@ -64,7 +64,7 @@ RimFaultDistanceResult::RimFaultDistanceResult() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFaultDistanceResult::resultName() const +QString RimFaultDistance::resultName() const { return m_resultName(); } @@ -72,7 +72,7 @@ QString RimFaultDistanceResult::resultName() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResult::setResultName( const QString& name ) +void RimFaultDistance::setResultName( const QString& name ) { m_resultName = name; } @@ -80,7 +80,7 @@ void RimFaultDistanceResult::setResultName( const QString& name ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResult::setSelectedFaults( const std::vector& faults ) +void RimFaultDistance::setSelectedFaults( const std::vector& faults ) { m_faults.setValue( faults ); } @@ -88,7 +88,7 @@ void RimFaultDistanceResult::setSelectedFaults( const std::vector RimFaultDistanceResult::selectedRigFaults() const +std::vector RimFaultDistance::selectedRigFaults() const { std::vector rigFaults; for ( RimFaultInView* fault : m_faults ) @@ -101,7 +101,7 @@ std::vector RimFaultDistanceResult::selectedRigFaults() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResult::compute() +void RimFaultDistance::compute() { if ( m_resultName().isEmpty() ) return; @@ -134,7 +134,7 @@ void RimFaultDistanceResult::compute() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResult::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) +void RimFaultDistance::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { if ( changedField == &m_resultName ) { @@ -154,7 +154,7 @@ void RimFaultDistanceResult::fieldChangedByUi( const caf::PdmFieldHandle* change //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QList RimFaultDistanceResult::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) +QList RimFaultDistance::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) { QList options; @@ -178,7 +178,7 @@ QList RimFaultDistanceResult::calculateValueOptions( con //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmFieldHandle* RimFaultDistanceResult::userDescriptionField() +caf::PdmFieldHandle* RimFaultDistance::userDescriptionField() { return &m_resultName; } @@ -186,7 +186,7 @@ caf::PdmFieldHandle* RimFaultDistanceResult::userDescriptionField() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResult::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) +void RimFaultDistance::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { uiOrdering.add( &m_resultName ); uiOrdering.add( &m_faults ); @@ -197,7 +197,7 @@ void RimFaultDistanceResult::defineUiOrdering( QString uiConfigName, caf::PdmUiO //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResult::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) +void RimFaultDistance::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) { if ( field == &m_generateButton ) { @@ -211,7 +211,7 @@ void RimFaultDistanceResult::defineEditorAttribute( const caf::PdmFieldHandle* f //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResult::removeGeneratedResult( const QString& name ) +void RimFaultDistance::removeGeneratedResult( const QString& name ) { if ( name.isEmpty() ) return; @@ -230,7 +230,7 @@ void RimFaultDistanceResult::removeGeneratedResult( const QString& name ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResult::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const +void RimFaultDistance::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const { menuBuilder << "RicNewFaultDistanceResultFeature"; } diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResult.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistance.h similarity index 96% rename from ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResult.h rename to ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistance.h index f88c73c003..d21efa9734 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResult.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistance.h @@ -37,12 +37,12 @@ class CmdFeatureMenuBuilder; //================================================================================================== /// //================================================================================================== -class RimFaultDistanceResult : public caf::PdmObject +class RimFaultDistance : public caf::PdmObject { CAF_PDM_HEADER_INIT; public: - RimFaultDistanceResult(); + RimFaultDistance(); QString resultName() const; void setResultName( const QString& name ); diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResultCollection.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceCollection.cpp similarity index 79% rename from ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResultCollection.cpp rename to ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceCollection.cpp index a55c4ef72a..a5a45ade27 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResultCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceCollection.cpp @@ -16,9 +16,9 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFaultDistanceResultCollection.h" +#include "RimFaultDistanceCollection.h" -#include "RimFaultDistanceResult.h" +#include "RimFaultDistance.h" #include "cafCmdFeatureMenuBuilder.h" #include "cafPdmFieldScriptingCapability.h" @@ -27,29 +27,29 @@ #include -CAF_PDM_SOURCE_INIT( RimFaultDistanceResultCollection, "RimFaultDistanceResultCollection" ); +CAF_PDM_SOURCE_INIT( RimFaultDistanceCollection, "RimFaultDistanceCollection" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFaultDistanceResultCollection::RimFaultDistanceResultCollection() +RimFaultDistanceCollection::RimFaultDistanceCollection() { CAF_PDM_InitScriptableObjectWithNameAndComment( "Fault Distance", ":/draw_style_faults_24x24.png", "", "", - "FaultDistanceResultCollection", + "FaultDistanceCollection", "Collection of named, subset-based FAULTDIST results" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_items, "FaultDistanceResults", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_items, "FaultDistances", "" ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFaultDistanceResult* RimFaultDistanceResultCollection::addResult() +RimFaultDistance* RimFaultDistanceCollection::addResult() { - auto* newResult = new RimFaultDistanceResult(); + auto* newResult = new RimFaultDistance(); newResult->setResultName( nextDefaultName() ); addItem( newResult ); return newResult; @@ -58,11 +58,11 @@ RimFaultDistanceResult* RimFaultDistanceResultCollection::addResult() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFaultDistanceResultCollection::nextDefaultName() const +QString RimFaultDistanceCollection::nextDefaultName() const { QRegularExpression pattern( "^FAULTDIST(\\d+)$" ); int maxIndex = 0; - for ( RimFaultDistanceResult* result : items() ) + for ( RimFaultDistance* result : items() ) { if ( !result ) continue; const QRegularExpressionMatch match = pattern.match( result->resultName() ); @@ -77,9 +77,9 @@ QString RimFaultDistanceResultCollection::nextDefaultName() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResultCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) +void RimFaultDistanceCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) { - for ( RimFaultDistanceResult* result : items() ) + for ( RimFaultDistance* result : items() ) { uiTreeOrdering.add( result ); } @@ -89,7 +89,7 @@ void RimFaultDistanceResultCollection::defineUiTreeOrdering( caf::PdmUiTreeOrder //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultDistanceResultCollection::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const +void RimFaultDistanceCollection::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const { menuBuilder << "RicNewFaultDistanceResultFeature"; } diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResultCollection.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceCollection.h similarity index 83% rename from ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResultCollection.h rename to ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceCollection.h index ec9c15da62..1744db21a0 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceResultCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceCollection.h @@ -22,7 +22,7 @@ #include -class RimFaultDistanceResult; +class RimFaultDistance; namespace caf { @@ -32,15 +32,15 @@ class CmdFeatureMenuBuilder; //================================================================================================== /// //================================================================================================== -class RimFaultDistanceResultCollection : public caf::PdmObjectCollection +class RimFaultDistanceCollection : public caf::PdmObjectCollection { CAF_PDM_HEADER_INIT; public: - RimFaultDistanceResultCollection(); + RimFaultDistanceCollection(); - RimFaultDistanceResult* addResult(); - QString nextDefaultName() const; + RimFaultDistance* addResult(); + QString nextDefaultName() const; private: void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp index 64c6fd3c00..f65037ea09 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp @@ -61,8 +61,8 @@ #include "RimEclipseStatisticsCase.h" #include "RimEclipseView.h" #include "RimEclipseViewCollection.h" -#include "RimFaultDistanceResult.h" -#include "RimFaultDistanceResultCollection.h" +#include "RimFaultDistance.h" +#include "RimFaultDistanceCollection.h" #include "RimFaultInViewCollection.h" #include "RimGridCollection.h" #include "RimIntersectionCollection.h" @@ -134,8 +134,8 @@ RimEclipseCase::RimEclipseCase() CAF_PDM_InitFieldNoDefault( &m_wellTargetMappings, "WellTargetMappings", "Well Target Mappings" ); - CAF_PDM_InitFieldNoDefault( &m_faultDistanceResultCollection, "FaultDistanceResultCollection", "Fault Distance" ); - m_faultDistanceResultCollection = new RimFaultDistanceResultCollection; + CAF_PDM_InitFieldNoDefault( &m_faultDistanceCollection, "FaultDistanceCollection", "Fault Distance" ); + m_faultDistanceCollection = new RimFaultDistanceCollection; CAF_PDM_InitFieldNoDefault( &m_resultAliasList, "ResultAliasNames", "Result Name Aliases" ); m_resultAliasList.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); @@ -671,7 +671,7 @@ void RimEclipseCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin { if ( uiConfigName == "MainWindow.ProjectTree" ) { - const bool hasFaultDistance = m_faultDistanceResultCollection() && !m_faultDistanceResultCollection()->isEmpty(); + const bool hasFaultDistance = m_faultDistanceCollection() && !m_faultDistanceCollection()->isEmpty(); const bool hasWellTargets = !m_wellTargetMappings.empty(); if ( hasFaultDistance || hasWellTargets ) { @@ -679,7 +679,7 @@ void RimEclipseCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin if ( hasFaultDistance ) { - for ( auto* result : m_faultDistanceResultCollection()->items() ) + for ( auto* result : m_faultDistanceCollection()->items() ) { dataAnalytics->add( result ); } @@ -1459,7 +1459,7 @@ void RimEclipseCase::addWellTargetMapping( RimWellTargetMapping* generator ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFaultDistanceResultCollection* RimEclipseCase::faultDistanceResults() const +RimFaultDistanceCollection* RimEclipseCase::faultDistanceCollection() const { - return m_faultDistanceResultCollection; + return m_faultDistanceCollection; } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.h b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.h index 7180358ce7..e1d5a61e54 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.h @@ -41,7 +41,7 @@ class QString; class RimWellTargetMapping; -class RimFaultDistanceResultCollection; +class RimFaultDistanceCollection; class RigCaseCellResultsData; class RigEclipseCaseData; class RigFormationNames; @@ -143,7 +143,7 @@ public: void addWellTargetMapping( RimWellTargetMapping* wellTargetMapping ); - RimFaultDistanceResultCollection* faultDistanceResults() const; + RimFaultDistanceCollection* faultDistanceCollection() const; void updateResultAddressCollection(); @@ -206,7 +206,7 @@ private: caf::PdmChildArrayField m_wellTargetMappings; - caf::PdmChildField m_faultDistanceResultCollection; + caf::PdmChildField m_faultDistanceCollection; caf::PdmField> m_filesContainingFaults; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp index ad997360ac..402b940622 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp @@ -66,7 +66,7 @@ #include "RimEclipseResultDefinition.h" #include "RimElementVectorResult.h" #include "RimExtrudedCurveIntersection.h" -#include "RimFaultDistanceResultCollection.h" +#include "RimFaultDistanceCollection.h" #include "RimFaultInViewCollection.h" #include "RimFaultReactivationModelCollection.h" #include "RimFilterInViewCollection.h" @@ -357,10 +357,10 @@ RimFaultInViewCollection* RimEclipseView::faultCollection() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFaultDistanceResultCollection* RimEclipseView::faultDistanceResults() const +RimFaultDistanceCollection* RimEclipseView::faultDistanceCollection() const { RimEclipseCase* eclipseCase = this->eclipseCase(); - return eclipseCase ? eclipseCase->faultDistanceResults() : nullptr; + return eclipseCase ? eclipseCase->faultDistanceCollection() : nullptr; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.h b/ApplicationLibCode/ProjectDataModel/RimEclipseView.h index cd23226745..f45ec2e1bc 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.h @@ -53,7 +53,7 @@ class RimEclipseCellColors; class RimEclipseFaultColors; class RimEclipsePropertyFilter; class RimEclipsePropertyFilterCollection; -class RimFaultDistanceResultCollection; +class RimFaultDistanceCollection; class RimFaultInViewCollection; class RimFilterInViewCollection; class RimReservoirCellResultsStorage; @@ -115,7 +115,7 @@ public: RimStimPlanColors* fractureColors() const; RimSimWellInViewCollection* wellCollection() const; RimFaultInViewCollection* faultCollection() const; - RimFaultDistanceResultCollection* faultDistanceResults() const; + RimFaultDistanceCollection* faultDistanceCollection() const; RimVirtualPerforationResults* virtualPerforationResult() const; RimStreamlineInViewCollection* streamlineCollection() const; RimFaultReactivationModelCollection* faultReactivationModelCollection() const; diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcEclipseView.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcEclipseView.cpp index a311965aba..867a8b70a2 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcEclipseView.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcEclipseView.cpp @@ -19,23 +19,23 @@ #include "RimcEclipseView.h" #include "RimEclipseView.h" -#include "RimFaultDistanceResult.h" -#include "RimFaultDistanceResultCollection.h" +#include "RimFaultDistance.h" +#include "RimFaultDistanceCollection.h" #include "RimFaultInView.h" #include "RimFaultInViewCollection.h" #include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmFieldScriptingCapability.h" -CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimEclipseView, RimcEclipseView_addFaultDistanceResult, "add_fault_distance_result" ); +CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimEclipseView, RimcEclipseView_addFaultDistance, "add_fault_distance" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimcEclipseView_addFaultDistanceResult::RimcEclipseView_addFaultDistanceResult( caf::PdmObjectHandle* self ) +RimcEclipseView_addFaultDistance::RimcEclipseView_addFaultDistance( caf::PdmObjectHandle* self ) : caf::PdmObjectCreationMethod( self ) { - CAF_PDM_InitObject( "Add Fault Distance Result", "", "", "Create a FAULTDIST cell result for a chosen subset of faults" ); + CAF_PDM_InitObject( "Add Fault Distance", "", "", "Create a FAULTDIST cell result for a chosen subset of faults" ); CAF_PDM_InitScriptableFieldNoDefault( &m_resultName, "Name", "Name (default FAULTDIST if empty)" ); CAF_PDM_InitScriptableFieldNoDefault( &m_faults, "Faults", "Faults to include (empty = all)" ); @@ -44,12 +44,12 @@ RimcEclipseView_addFaultDistanceResult::RimcEclipseView_addFaultDistanceResult( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::expected RimcEclipseView_addFaultDistanceResult::execute() +std::expected RimcEclipseView_addFaultDistance::execute() { auto* eclipseView = self(); if ( !eclipseView ) return std::unexpected( QString( "No view" ) ); - auto* distanceCollection = eclipseView->faultDistanceResults(); + auto* distanceCollection = eclipseView->faultDistanceCollection(); if ( !distanceCollection ) return std::unexpected( QString( "No fault distance results collection" ) ); auto* newResult = distanceCollection->addResult(); @@ -73,7 +73,7 @@ std::expected RimcEclipseView_addFaultDistanceRe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimcEclipseView_addFaultDistanceResult::classKeywordReturnedType() const +QString RimcEclipseView_addFaultDistance::classKeywordReturnedType() const { - return RimFaultDistanceResult::classKeywordStatic(); + return RimFaultDistance::classKeywordStatic(); } diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcEclipseView.h b/ApplicationLibCode/ProjectDataModelCommands/RimcEclipseView.h index c81a0f815e..03235f9611 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcEclipseView.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcEclipseView.h @@ -30,12 +30,12 @@ class RimFaultInView; //================================================================================================== /// //================================================================================================== -class RimcEclipseView_addFaultDistanceResult : public caf::PdmObjectCreationMethod +class RimcEclipseView_addFaultDistance : public caf::PdmObjectCreationMethod { CAF_PDM_HEADER_INIT; public: - RimcEclipseView_addFaultDistanceResult( caf::PdmObjectHandle* self ); + RimcEclipseView_addFaultDistance( caf::PdmObjectHandle* self ); std::expected execute() override; QString classKeywordReturnedType() const override; diff --git a/GrpcInterface/Python/rips/tests/test_fault_distance_result.py b/GrpcInterface/Python/rips/tests/test_fault_distance.py similarity index 76% rename from GrpcInterface/Python/rips/tests/test_fault_distance_result.py rename to GrpcInterface/Python/rips/tests/test_fault_distance.py index 186e687798..1128b587b8 100644 --- a/GrpcInterface/Python/rips/tests/test_fault_distance_result.py +++ b/GrpcInterface/Python/rips/tests/test_fault_distance.py @@ -18,20 +18,20 @@ def _get_view(case): return case.create_view() -def test_add_fault_distance_result_subset(rips_instance, initialize_test): +def test_add_fault_distance_subset(rips_instance, initialize_test): case = rips_instance.project.load_case(GRID_PATH) view = _get_view(case) fault_collection = view.fault_collection() faults = fault_collection.faults() assert len(faults) > 0 - result = view.add_fault_distance_result("PY_FAULTDIST", faults[:1]) + result = view.add_fault_distance("PY_FAULTDIST", faults[:1]) assert result is not None assert result.result_name == "PY_FAULTDIST" -def test_add_fault_distance_result_all_matches_static(rips_instance, initialize_test): - """Passing every fault into add_fault_distance_result must reproduce the +def test_add_fault_distance_all_matches_static(rips_instance, initialize_test): + """Passing every fault into add_fault_distance must reproduce the static-native FAULTDIST values cell-for-cell.""" case = rips_instance.project.load_case(GRID_PATH) view = _get_view(case) @@ -43,7 +43,7 @@ def test_add_fault_distance_result_all_matches_static(rips_instance, initialize_ rips.PropertyType.STATIC_NATIVE, "FAULTDIST", 0 ) - view.add_fault_distance_result("PY_FAULTDIST_ALL", all_faults) + view.add_fault_distance("PY_FAULTDIST_ALL", all_faults) generated_values = case.active_cell_property( rips.PropertyType.GENERATED, "PY_FAULTDIST_ALL", 0