From 2ec4e5a6c4e1c76d7dd4de585de755bb2bac7507 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Wed, 4 Nov 2020 13:46:17 +0100 Subject: [PATCH] #6596 Rename from FractureModel to StimPlanModel. --- .../Application/CMakeLists_files.cmake | 4 +- .../Application/RiaApplication.cpp | 20 +- ...efines.cpp => RiaStimPlanModelDefines.cpp} | 2 +- ...delDefines.h => RiaStimPlanModelDefines.h} | 0 .../Commands/CMakeLists_files.cmake | 4 +- .../CompletionCommands/CMakeLists_files.cmake | 4 +- ...cpp => RicNewStimPlanModelPlotFeature.cpp} | 136 +++--- ...ure.h => RicNewStimPlanModelPlotFeature.h} | 26 +- .../FractureCommands/CMakeLists_files.cmake | 12 +- .../RicFractureNameGenerator.cpp | 12 +- .../RicFractureNameGenerator.h | 4 +- ...ure.cpp => RicNewStimPlanModelFeature.cpp} | 64 +-- ...Feature.h => RicNewStimPlanModelFeature.h} | 10 +- ...=> RicNewStimPlanModelTemplateFeature.cpp} | 28 +- ...h => RicNewStimPlanModelTemplateFeature.h} | 2 +- ...cNewWellPathStimPlanModelAtPosFeature.cpp} | 16 +- ...RicNewWellPathStimPlanModelAtPosFeature.h} | 2 +- .../RicElasticPropertiesImportTools.cpp | 10 +- .../RicElasticPropertiesImportTools.h | 4 +- ...> RicExportStimPlanModelToFileFeature.cpp} | 26 +- ... => RicExportStimPlanModelToFileFeature.h} | 2 +- .../RicFaciesPropertiesImportTools.cpp | 10 +- .../Commands/RicFaciesPropertiesImportTools.h | 4 +- .../RicImportElasticPropertiesFeature.cpp | 10 +- .../Commands/RicImportFaciesFeature.cpp | 10 +- .../RicNewWellLogPlotFeatureImpl.cpp | 4 +- .../FileInterface/CMakeLists_files.cmake | 20 +- ...RifStimPlanModelAsymmetricFrkExporter.cpp} | 22 +- ...> RifStimPlanModelAsymmetricFrkExporter.h} | 6 +- ... RifStimPlanModelDeviationFrkExporter.cpp} | 18 +- ...=> RifStimPlanModelDeviationFrkExporter.h} | 6 +- ...orter.cpp => RifStimPlanModelExporter.cpp} | 22 +- ...lExporter.h => RifStimPlanModelExporter.h} | 6 +- ...RifStimPlanModelGeologicalFrkExporter.cpp} | 50 +-- ...> RifStimPlanModelGeologicalFrkExporter.h} | 6 +- ...p => RifStimPlanModelPerfsFrkExporter.cpp} | 26 +- ...r.h => RifStimPlanModelPerfsFrkExporter.h} | 6 +- .../RimCompletionTemplateCollection.cpp | 18 +- .../RimCompletionTemplateCollection.h | 8 +- .../Completions/RimWellPathCompletions.cpp | 22 +- .../Completions/RimWellPathCompletions.h | 6 +- .../RimContextCommandBuilder.cpp | 32 +- .../RimMainPlotCollection.cpp | 22 +- .../ProjectDataModel/RimMainPlotCollection.h | 6 +- .../ProjectDataModel/RimProject.cpp | 6 +- .../ProjectDataModel/RimReloadCaseTools.cpp | 6 +- .../ProjectDataModel/RimWellPath.cpp | 10 +- .../ProjectDataModel/RimWellPath.h | 6 +- .../RimWellPathCollection.cpp | 12 +- .../StimPlanModel/CMakeLists_files.cmake | 52 +-- .../StimPlanModel/RimElasticProperties.cpp | 8 +- .../RimElasticPropertyScaling.cpp | 10 +- .../StimPlanModel/RimElasticPropertyScaling.h | 2 +- .../RimElasticPropertyScalingCollection.h | 2 +- .../StimPlanModel/RimFaciesProperties.cpp | 8 +- .../StimPlanModel/RimNonNetLayers.cpp | 10 +- ...FractureModel.cpp => RimStimPlanModel.cpp} | 388 +++++++++--------- ...{RimFractureModel.h => RimStimPlanModel.h} | 30 +- ...tor.cpp => RimStimPlanModelCalculator.cpp} | 118 +++--- ...culator.h => RimStimPlanModelCalculator.h} | 18 +- ...ion.cpp => RimStimPlanModelCollection.cpp} | 40 +- ...lection.h => RimStimPlanModelCollection.h} | 18 +- ...delCurve.cpp => RimStimPlanModelCurve.cpp} | 62 +-- ...reModelCurve.h => RimStimPlanModelCurve.h} | 14 +- ...timPlanModelElasticPropertyCalculator.cpp} | 72 ++-- ...mStimPlanModelElasticPropertyCalculator.h} | 16 +- ...pp => RimStimPlanModelLayerCalculator.cpp} | 42 +- ...or.h => RimStimPlanModelLayerCalculator.h} | 16 +- ...ModelPlot.cpp => RimStimPlanModelPlot.cpp} | 80 ++-- ...tureModelPlot.h => RimStimPlanModelPlot.h} | 16 +- ...cpp => RimStimPlanModelPlotCollection.cpp} | 34 +- ...ion.h => RimStimPlanModelPlotCollection.h} | 14 +- ...h => RimStimPlanModelPropertyCalculator.h} | 12 +- ...urve.h => RimStimPlanModelPropertyCurve.h} | 4 +- ...p => RimStimPlanModelStressCalculator.cpp} | 42 +- ...r.h => RimStimPlanModelStressCalculator.h} | 16 +- ...plate.cpp => RimStimPlanModelTemplate.cpp} | 100 ++--- ...lTemplate.h => RimStimPlanModelTemplate.h} | 8 +- ...=> RimStimPlanModelTemplateCollection.cpp} | 48 +-- ...h => RimStimPlanModelTemplateCollection.h} | 16 +- ... => RimStimPlanModelWellLogCalculator.cpp} | 110 ++--- ....h => RimStimPlanModelWellLogCalculator.h} | 20 +- .../CMakeLists_files.cmake | 16 +- .../RimcElasticProperties.h | 6 +- ...ractureModel.cpp => RimcStimPlanModel.cpp} | 26 +- ...imcFractureModel.h => RimcStimPlanModel.h} | 6 +- ...on.cpp => RimcStimPlanModelCollection.cpp} | 50 +-- ...ection.h => RimcStimPlanModelCollection.h} | 12 +- ...pp => RimcStimPlanModelPlotCollection.cpp} | 40 +- ...on.h => RimcStimPlanModelPlotCollection.h} | 10 +- ...> RimcStimPlanModelTemplateCollection.cpp} | 42 +- ... => RimcStimPlanModelTemplateCollection.h} | 8 +- .../ReservoirDataModel/RigElasticProperties.h | 2 +- .../UnitTests/CMakeLists_files.cmake | 2 +- ...timPlanModelDeviationFrkExporter-Test.cpp} | 6 +- .../UserInterface/RiuViewerCommands.cpp | 2 +- 96 files changed, 1221 insertions(+), 1221 deletions(-) rename ApplicationCode/Application/{RiaFractureModelDefines.cpp => RiaStimPlanModelDefines.cpp} (98%) rename ApplicationCode/Application/{RiaFractureModelDefines.h => RiaStimPlanModelDefines.h} (100%) rename ApplicationCode/Commands/CompletionCommands/{RicNewFractureModelPlotFeature.cpp => RicNewStimPlanModelPlotFeature.cpp} (77%) rename ApplicationCode/Commands/CompletionCommands/{RicNewFractureModelPlotFeature.h => RicNewStimPlanModelPlotFeature.h} (67%) rename ApplicationCode/Commands/FractureCommands/{RicNewFractureModelFeature.cpp => RicNewStimPlanModelFeature.cpp} (71%) rename ApplicationCode/Commands/FractureCommands/{RicNewFractureModelFeature.h => RicNewStimPlanModelFeature.h} (87%) rename ApplicationCode/Commands/FractureCommands/{RicNewFractureModelTemplateFeature.cpp => RicNewStimPlanModelTemplateFeature.cpp} (69%) rename ApplicationCode/Commands/FractureCommands/{RicNewFractureModelTemplateFeature.h => RicNewStimPlanModelTemplateFeature.h} (95%) rename ApplicationCode/Commands/FractureCommands/{RicNewWellPathFractureModelAtPosFeature.cpp => RicNewWellPathStimPlanModelAtPosFeature.cpp} (84%) rename ApplicationCode/Commands/FractureCommands/{RicNewWellPathFractureModelAtPosFeature.h => RicNewWellPathStimPlanModelAtPosFeature.h} (95%) rename ApplicationCode/Commands/{RicExportFractureModelToFileFeature.cpp => RicExportStimPlanModelToFileFeature.cpp} (70%) rename ApplicationCode/Commands/{RicExportFractureModelToFileFeature.h => RicExportStimPlanModelToFileFeature.h} (95%) rename ApplicationCode/FileInterface/{RifFractureModelAsymmetricFrkExporter.cpp => RifStimPlanModelAsymmetricFrkExporter.cpp} (83%) rename ApplicationCode/FileInterface/{RifFractureModelAsymmetricFrkExporter.h => RifStimPlanModelAsymmetricFrkExporter.h} (92%) rename ApplicationCode/FileInterface/{RifFractureModelDeviationFrkExporter.cpp => RifStimPlanModelDeviationFrkExporter.cpp} (90%) rename ApplicationCode/FileInterface/{RifFractureModelDeviationFrkExporter.h => RifStimPlanModelDeviationFrkExporter.h} (92%) rename ApplicationCode/FileInterface/{RifFractureModelExporter.cpp => RifStimPlanModelExporter.cpp} (63%) rename ApplicationCode/FileInterface/{RifFractureModelExporter.h => RifStimPlanModelExporter.h} (90%) rename ApplicationCode/FileInterface/{RifFractureModelGeologicalFrkExporter.cpp => RifStimPlanModelGeologicalFrkExporter.cpp} (73%) rename ApplicationCode/FileInterface/{RifFractureModelGeologicalFrkExporter.h => RifStimPlanModelGeologicalFrkExporter.h} (91%) rename ApplicationCode/FileInterface/{RifFractureModelPerfsFrkExporter.cpp => RifStimPlanModelPerfsFrkExporter.cpp} (87%) rename ApplicationCode/FileInterface/{RifFractureModelPerfsFrkExporter.h => RifStimPlanModelPerfsFrkExporter.h} (92%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModel.cpp => RimStimPlanModel.cpp} (84%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModel.h => RimStimPlanModel.h} (92%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelCalculator.cpp => RimStimPlanModelCalculator.cpp} (86%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelCalculator.h => RimStimPlanModelCalculator.h} (91%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelCollection.cpp => RimStimPlanModelCollection.cpp} (74%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelCollection.h => RimStimPlanModelCollection.h} (74%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelCurve.cpp => RimStimPlanModelCurve.cpp} (75%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelCurve.h => RimStimPlanModelCurve.h} (81%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelElasticPropertyCalculator.cpp => RimStimPlanModelElasticPropertyCalculator.cpp} (86%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelElasticPropertyCalculator.h => RimStimPlanModelElasticPropertyCalculator.h} (84%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelLayerCalculator.cpp => RimStimPlanModelLayerCalculator.cpp} (80%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelLayerCalculator.h => RimStimPlanModelLayerCalculator.h} (77%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelPlot.cpp => RimStimPlanModelPlot.cpp} (73%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelPlot.h => RimStimPlanModelPlot.h} (82%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelPlotCollection.cpp => RimStimPlanModelPlotCollection.cpp} (68%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelPlotCollection.h => RimStimPlanModelPlotCollection.h} (76%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelPropertyCalculator.h => RimStimPlanModelPropertyCalculator.h} (85%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelPropertyCurve.h => RimStimPlanModelPropertyCurve.h} (94%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelStressCalculator.cpp => RimStimPlanModelStressCalculator.cpp} (82%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelStressCalculator.h => RimStimPlanModelStressCalculator.h} (80%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelTemplate.cpp => RimStimPlanModelTemplate.cpp} (88%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelTemplate.h => RimStimPlanModelTemplate.h} (96%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelTemplateCollection.cpp => RimStimPlanModelTemplateCollection.cpp} (73%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelTemplateCollection.h => RimStimPlanModelTemplateCollection.h} (75%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelWellLogCalculator.cpp => RimStimPlanModelWellLogCalculator.cpp} (81%) rename ApplicationCode/ProjectDataModel/StimPlanModel/{RimFractureModelWellLogCalculator.h => RimStimPlanModelWellLogCalculator.h} (83%) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModel.cpp => RimcStimPlanModel.cpp} (71%) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModel.h => RimcStimPlanModel.h} (90%) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModelCollection.cpp => RimcStimPlanModelCollection.cpp} (63%) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModelCollection.h => RimcStimPlanModelCollection.h} (85%) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModelPlotCollection.cpp => RimcStimPlanModelPlotCollection.cpp} (56%) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModelPlotCollection.h => RimcStimPlanModelPlotCollection.h} (85%) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModelTemplateCollection.cpp => RimcStimPlanModelTemplateCollection.cpp} (67%) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModelTemplateCollection.h => RimcStimPlanModelTemplateCollection.h} (87%) rename ApplicationCode/UnitTests/{RifFractureModelDeviationFrkExporter-Test.cpp => RifStimPlanModelDeviationFrkExporter-Test.cpp} (84%) diff --git a/ApplicationCode/Application/CMakeLists_files.cmake b/ApplicationCode/Application/CMakeLists_files.cmake index 895a22a2ca..b7995a488d 100644 --- a/ApplicationCode/Application/CMakeLists_files.cmake +++ b/ApplicationCode/Application/CMakeLists_files.cmake @@ -19,7 +19,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiaEclipseFileNameTools.h ${CMAKE_CURRENT_LIST_DIR}/RiaFeatureCommandContext.h ${CMAKE_CURRENT_LIST_DIR}/RiaStringListSerializer.h ${CMAKE_CURRENT_LIST_DIR}/RiaNncDefines.h -${CMAKE_CURRENT_LIST_DIR}/RiaFractureModelDefines.h +${CMAKE_CURRENT_LIST_DIR}/RiaStimPlanModelDefines.h ) set (SOURCE_GROUP_SOURCE_FILES @@ -43,7 +43,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiaEclipseFileNameTools.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaFeatureCommandContext.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaStringListSerializer.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaNncDefines.cpp -${CMAKE_CURRENT_LIST_DIR}/RiaFractureModelDefines.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaStimPlanModelDefines.cpp ) list(APPEND CODE_HEADER_FILES diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 2066c2b950..338f2ebac2 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -53,10 +53,6 @@ #include "RimEclipseView.h" #include "RimFlowPlotCollection.h" #include "RimFormationNamesCollection.h" -#include "RimFractureModel.h" -#include "RimFractureModelCollection.h" -#include "RimFractureModelPlot.h" -#include "RimFractureModelPlotCollection.h" #include "RimFractureTemplateCollection.h" #include "RimGeoMechCase.h" #include "RimGeoMechCellColors.h" @@ -80,6 +76,10 @@ #include "RimSaturationPressurePlotCollection.h" #include "RimSimWellInViewCollection.h" #include "RimStimPlanColors.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCollection.h" +#include "RimStimPlanModelPlot.h" +#include "RimStimPlanModelPlotCollection.h" #include "RimSummaryCase.h" #include "RimSummaryCaseCollection.h" #include "RimSummaryCaseMainCollection.h" @@ -1575,7 +1575,7 @@ void RiaApplication::loadAndUpdatePlotData() RimAnalysisPlotCollection* alsColl = nullptr; RimCorrelationPlotCollection* corrColl = nullptr; RimMultiPlotCollection* gpwColl = nullptr; - RimFractureModelPlotCollection* frmColl = nullptr; + RimStimPlanModelPlotCollection* frmColl = nullptr; if ( m_project->mainPlotCollection() ) { @@ -1623,9 +1623,9 @@ void RiaApplication::loadAndUpdatePlotData() { gpwColl = m_project->mainPlotCollection()->multiPlotCollection(); } - if ( m_project->mainPlotCollection()->fractureModelPlotCollection() ) + if ( m_project->mainPlotCollection()->stimPlanModelPlotCollection() ) { - frmColl = m_project->mainPlotCollection()->fractureModelPlotCollection(); + frmColl = m_project->mainPlotCollection()->stimPlanModelPlotCollection(); } } @@ -1641,7 +1641,7 @@ void RiaApplication::loadAndUpdatePlotData() plotCount += alsColl ? alsColl->plotCount() : 0; plotCount += corrColl ? corrColl->plotCount() + corrColl->reports().size() : 0; plotCount += gpwColl ? gpwColl->multiPlots().size() : 0; - plotCount += frmColl ? frmColl->fractureModelPlots().size() : 0; + plotCount += frmColl ? frmColl->stimPlanModelPlots().size() : 0; if ( plotCount > 0 ) { @@ -1750,9 +1750,9 @@ void RiaApplication::loadAndUpdatePlotData() if ( frmColl ) { - for ( const auto& fractureModelPlot : frmColl->fractureModelPlots() ) + for ( const auto& stimPlanModelPlot : frmColl->stimPlanModelPlots() ) { - fractureModelPlot->loadDataAndUpdate(); + stimPlanModelPlot->loadDataAndUpdate(); plotProgress.incrementProgress(); } } diff --git a/ApplicationCode/Application/RiaFractureModelDefines.cpp b/ApplicationCode/Application/RiaStimPlanModelDefines.cpp similarity index 98% rename from ApplicationCode/Application/RiaFractureModelDefines.cpp rename to ApplicationCode/Application/RiaStimPlanModelDefines.cpp index caa28d53ab..804df3213d 100644 --- a/ApplicationCode/Application/RiaFractureModelDefines.cpp +++ b/ApplicationCode/Application/RiaStimPlanModelDefines.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" namespace caf { diff --git a/ApplicationCode/Application/RiaFractureModelDefines.h b/ApplicationCode/Application/RiaStimPlanModelDefines.h similarity index 100% rename from ApplicationCode/Application/RiaFractureModelDefines.h rename to ApplicationCode/Application/RiaStimPlanModelDefines.h diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake index 8a882b1c46..56db5633bc 100644 --- a/ApplicationCode/Commands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CMakeLists_files.cmake @@ -88,7 +88,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicDeleteTemporaryLgrsFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicExportContourMapToTextFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicExportContourMapToTextUi.h ${CMAKE_CURRENT_LIST_DIR}/RicNewMultiPlotFeature.h -${CMAKE_CURRENT_LIST_DIR}/RicExportFractureModelToFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExportStimPlanModelToFileFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicStackSelectedCurvesFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicUnstackSelectedCurvesFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicThemeColorEditorFeature.h @@ -184,7 +184,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicDeleteTemporaryLgrsFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicExportContourMapToTextFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicExportContourMapToTextUi.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewMultiPlotFeature.cpp -${CMAKE_CURRENT_LIST_DIR}/RicExportFractureModelToFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportStimPlanModelToFileFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicStackSelectedCurvesFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicUnstackSelectedCurvesFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicThemeColorEditorFeature.cpp diff --git a/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake index f7d62d0b29..a9b3fa7d4c 100644 --- a/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake @@ -12,7 +12,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewValveAtMeasuredDepthFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicDeleteValveTemplateFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportCompletionsFileFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportPerforationIntervalsFeature.h -${CMAKE_CURRENT_LIST_DIR}/RicNewFractureModelPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanModelPlotFeature.h ) set (SOURCE_GROUP_SOURCE_FILES @@ -28,7 +28,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewValveAtMeasuredDepthFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicDeleteValveTemplateFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportCompletionsFileFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportPerforationIntervalsFeature.cpp -${CMAKE_CURRENT_LIST_DIR}/RicNewFractureModelPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanModelPlotFeature.cpp ) diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.cpp similarity index 77% rename from ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp rename to ApplicationCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.cpp index ba0a029430..7503993074 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicNewFractureModelPlotFeature.h" +#include "RicNewStimPlanModelPlotFeature.h" #include "RiaApplication.h" #include "RiaColorTables.h" @@ -33,14 +33,14 @@ #include "RimEclipseResultDefinition.h" #include "RimEclipseView.h" #include "RimFaciesProperties.h" -#include "RimFractureModel.h" -#include "RimFractureModelCurve.h" -#include "RimFractureModelPlot.h" -#include "RimFractureModelPlotCollection.h" -#include "RimFractureModelTemplate.h" #include "RimMainPlotCollection.h" #include "RimModeledWellPath.h" #include "RimProject.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCurve.h" +#include "RimStimPlanModelPlot.h" +#include "RimStimPlanModelPlotCollection.h" +#include "RimStimPlanModelTemplate.h" #include "RimWellLogTrack.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" @@ -59,35 +59,35 @@ #include #include -CAF_CMD_SOURCE_INIT( RicNewFractureModelPlotFeature, "RicNewFractureModelPlotFeature" ); +CAF_CMD_SOURCE_INIT( RicNewStimPlanModelPlotFeature, "RicNewStimPlanModelPlotFeature" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelPlot* RicNewFractureModelPlotFeature::createPlot( RimFractureModel* fractureModel ) +RimStimPlanModelPlot* RicNewStimPlanModelPlotFeature::createPlot( RimStimPlanModel* stimPlanModel ) { - RimEclipseCase* eclipseCase = fractureModel->eclipseCase(); - int timeStep = fractureModel->timeStep(); + RimEclipseCase* eclipseCase = stimPlanModel->eclipseCase(); + int timeStep = stimPlanModel->timeStep(); - caf::ProgressInfo progInfo( 100, "Creating Fracture Model Plot" ); + caf::ProgressInfo progInfo( 100, "Creating StimPlan Model Plot" ); - RimFractureModelPlot* plot = createFractureModelPlot( true, "Fracture Model" ); - plot->setFractureModel( fractureModel ); + RimStimPlanModelPlot* plot = createStimPlanModelPlot( true, "StimPlan Model" ); + plot->setStimPlanModel( stimPlanModel ); { auto task = progInfo.task( "Creating formation track", 2 ); - createFormationTrack( plot, fractureModel, eclipseCase ); + createFormationTrack( plot, stimPlanModel, eclipseCase ); } { auto task = progInfo.task( "Creating facies track", 2 ); - createFaciesTrack( plot, fractureModel, eclipseCase ); + createFaciesTrack( plot, stimPlanModel, eclipseCase ); } { auto task = progInfo.task( "Creating layers track", 2 ); - createLayersTrack( plot, fractureModel, eclipseCase ); + createLayersTrack( plot, stimPlanModel, eclipseCase ); } { @@ -105,20 +105,20 @@ RimFractureModelPlot* RicNewFractureModelPlotFeature::createPlot( RimFractureMod for ( auto result : plots ) { bool logarithmicPlot = logarithmicPlots.count( result.first ) > 0; - createParametersTrack( plot, fractureModel, eclipseCase, timeStep, result.first, result.second, logarithmicPlot ); + createParametersTrack( plot, stimPlanModel, eclipseCase, timeStep, result.first, result.second, logarithmicPlot ); } } { auto task = progInfo.task( "Creating stress track", 2 ); createParametersTrack( plot, - fractureModel, + stimPlanModel, eclipseCase, timeStep, "Stress", {RiaDefines::CurveProperty::STRESS, RiaDefines::CurveProperty::INITIAL_STRESS} ); createParametersTrack( plot, - fractureModel, + stimPlanModel, eclipseCase, timeStep, "Stress Gradient", @@ -144,13 +144,13 @@ RimFractureModelPlot* RicNewFractureModelPlotFeature::createPlot( RimFractureMod for ( auto result : results ) { QString trackName = caf::AppEnum::uiText( result ); - createParametersTrack( plot, fractureModel, eclipseCase, timeStep, trackName, {result} ); + createParametersTrack( plot, stimPlanModel, eclipseCase, timeStep, trackName, {result} ); } } { auto task = progInfo.task( "Creating temperature track", 2 ); - createParametersTrack( plot, fractureModel, eclipseCase, timeStep, "Temperature", {RiaDefines::CurveProperty::TEMPERATURE} ); + createParametersTrack( plot, stimPlanModel, eclipseCase, timeStep, "Temperature", {RiaDefines::CurveProperty::TEMPERATURE} ); } { @@ -177,7 +177,7 @@ RimFractureModelPlot* RicNewFractureModelPlotFeature::createPlot( RimFractureMod //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicNewFractureModelPlotFeature::isCommandEnabled() +bool RicNewStimPlanModelPlotFeature::isCommandEnabled() { Rim3dView* view = RiaApplication::instance()->activeReservoirView(); if ( !view ) return false; @@ -188,37 +188,37 @@ bool RicNewFractureModelPlotFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelPlotFeature::onActionTriggered( bool isChecked ) +void RicNewStimPlanModelPlotFeature::onActionTriggered( bool isChecked ) { - RimFractureModel* fractureModel = caf::SelectionManager::instance()->selectedItemAncestorOfType(); - if ( !fractureModel ) return; + RimStimPlanModel* stimPlanModel = caf::SelectionManager::instance()->selectedItemAncestorOfType(); + if ( !stimPlanModel ) return; - createPlot( fractureModel ); + createPlot( stimPlanModel ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelPlotFeature::setupActionLook( QAction* actionToSetup ) +void RicNewStimPlanModelPlotFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setText( "New Fracture Model Plot" ); + actionToSetup->setText( "New StimPlan Model Plot" ); // actionToSetup->setIcon( QIcon( ":/WellBoreStability16x16.png" ) ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelPlotFeature::createFormationTrack( RimFractureModelPlot* plot, - RimFractureModel* fractureModel, +void RicNewStimPlanModelPlotFeature::createFormationTrack( RimStimPlanModelPlot* plot, + RimStimPlanModel* stimPlanModel, RimEclipseCase* eclipseCase ) { RimWellLogTrack* formationTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, "Formations", plot ); - formationTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() ); + formationTrack->setFormationWellPath( stimPlanModel->thicknessDirectionWellPath() ); formationTrack->setFormationCase( eclipseCase ); formationTrack->setAnnotationType( RiuPlotAnnotationTool::RegionAnnotationType::FORMATION_ANNOTATIONS ); formationTrack->setVisibleXRange( 0.0, 0.0 ); - formationTrack->setOverburdenHeight( fractureModel->overburdenHeight() ); - formationTrack->setUnderburdenHeight( fractureModel->underburdenHeight() ); + formationTrack->setOverburdenHeight( stimPlanModel->overburdenHeight() ); + formationTrack->setUnderburdenHeight( stimPlanModel->underburdenHeight() ); formationTrack->setColSpan( RimPlot::ONE ); formationTrack->setLegendsVisible( true ); } @@ -226,26 +226,26 @@ void RicNewFractureModelPlotFeature::createFormationTrack( RimFractureModelPlot* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelPlotFeature::createFaciesTrack( RimFractureModelPlot* plot, - RimFractureModel* fractureModel, +void RicNewStimPlanModelPlotFeature::createFaciesTrack( RimStimPlanModelPlot* plot, + RimStimPlanModel* stimPlanModel, RimEclipseCase* eclipseCase ) { - RimFractureModelTemplate* fractureModelTemplate = fractureModel->fractureModelTemplate(); - if ( !fractureModelTemplate ) return; + RimStimPlanModelTemplate* stimPlanModelTemplate = stimPlanModel->stimPlanModelTemplate(); + if ( !stimPlanModelTemplate ) return; - RimFaciesProperties* faciesProperties = fractureModelTemplate->faciesProperties(); + RimFaciesProperties* faciesProperties = stimPlanModelTemplate->faciesProperties(); if ( !faciesProperties ) return; const RimEclipseResultDefinition* faciesDefinition = faciesProperties->faciesDefinition(); if ( !faciesDefinition ) return; RimWellLogTrack* faciesTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, "Facies", plot ); - faciesTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() ); + faciesTrack->setFormationWellPath( stimPlanModel->thicknessDirectionWellPath() ); faciesTrack->setFormationCase( eclipseCase ); faciesTrack->setAnnotationType( RiuPlotAnnotationTool::RegionAnnotationType::RESULT_PROPERTY_ANNOTATIONS ); faciesTrack->setRegionPropertyResultType( faciesDefinition->resultType(), faciesDefinition->resultVariable() ); - faciesTrack->setOverburdenHeight( fractureModel->overburdenHeight() ); - faciesTrack->setUnderburdenHeight( fractureModel->underburdenHeight() ); + faciesTrack->setOverburdenHeight( stimPlanModel->overburdenHeight() ); + faciesTrack->setUnderburdenHeight( stimPlanModel->underburdenHeight() ); faciesTrack->setLegendsVisible( true ); faciesTrack->setPlotTitleVisible( true ); @@ -257,8 +257,8 @@ void RicNewFractureModelPlotFeature::createFaciesTrack( RimFractureModelPlot* pl caf::ColorTable colors = RiaColorTables::wellLogPlotPaletteColors(); - RimFractureModelCurve* curve = new RimFractureModelCurve; - curve->setFractureModel( fractureModel ); + RimStimPlanModelCurve* curve = new RimStimPlanModelCurve; + curve->setStimPlanModel( stimPlanModel ); curve->setCurveProperty( RiaDefines::CurveProperty::FACIES ); curve->setCase( eclipseCase ); curve->setEclipseResultCategory( faciesDefinition->resultType() ); @@ -286,20 +286,20 @@ void RicNewFractureModelPlotFeature::createFaciesTrack( RimFractureModelPlot* pl //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelPlotFeature::createLayersTrack( RimFractureModelPlot* plot, - RimFractureModel* fractureModel, +void RicNewStimPlanModelPlotFeature::createLayersTrack( RimStimPlanModelPlot* plot, + RimStimPlanModel* stimPlanModel, RimEclipseCase* eclipseCase ) { RimWellLogTrack* faciesTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, "Layers", plot ); - faciesTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() ); + faciesTrack->setFormationWellPath( stimPlanModel->thicknessDirectionWellPath() ); faciesTrack->setFormationCase( eclipseCase ); faciesTrack->setLegendsVisible( true ); faciesTrack->setPlotTitleVisible( true ); - RimFractureModelTemplate* fractureModelTemplate = fractureModel->fractureModelTemplate(); - if ( !fractureModelTemplate ) return; + RimStimPlanModelTemplate* stimPlanModelTemplate = stimPlanModel->stimPlanModelTemplate(); + if ( !stimPlanModelTemplate ) return; - RimFaciesProperties* faciesProperties = fractureModelTemplate->faciesProperties(); + RimFaciesProperties* faciesProperties = stimPlanModelTemplate->faciesProperties(); if ( !faciesProperties ) return; RimColorLegend* faciesColors = faciesProperties->colorLegend(); @@ -310,9 +310,9 @@ void RicNewFractureModelPlotFeature::createLayersTrack( RimFractureModelPlot* pl caf::ColorTable colors = RiaColorTables::wellLogPlotPaletteColors(); - RimFractureModelCurve* curve = new RimFractureModelCurve; + RimStimPlanModelCurve* curve = new RimStimPlanModelCurve; curve->setCurveProperty( RiaDefines::CurveProperty::LAYERS ); - curve->setFractureModel( fractureModel ); + curve->setStimPlanModel( stimPlanModel ); curve->setCase( eclipseCase ); curve->setColor( colors.cycledColor3f( 0 ) ); curve->setLineStyle( RiuQwtPlotCurve::STYLE_SOLID ); @@ -337,8 +337,8 @@ void RicNewFractureModelPlotFeature::createLayersTrack( RimFractureModelPlot* pl //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelPlotFeature::createParametersTrack( RimFractureModelPlot* plot, - RimFractureModel* fractureModel, +void RicNewStimPlanModelPlotFeature::createParametersTrack( RimStimPlanModelPlot* plot, + RimStimPlanModel* stimPlanModel, RimEclipseCase* eclipseCase, int timeStep, const QString& trackTitle, @@ -347,7 +347,7 @@ void RicNewFractureModelPlotFeature::createParametersTrack( RimFractureModelPlot { RimWellLogTrack* plotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, trackTitle, plot ); plotTrack->setFormationCase( eclipseCase ); - plotTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() ); + plotTrack->setFormationWellPath( stimPlanModel->thicknessDirectionWellPath() ); plotTrack->setColSpan( RimPlot::TWO ); plotTrack->setLegendsVisible( true ); plotTrack->setPlotTitleVisible( true ); @@ -357,14 +357,14 @@ void RicNewFractureModelPlotFeature::createParametersTrack( RimFractureModelPlot int colorIndex = 0; for ( const RiaDefines::CurveProperty& propertyType : propertyTypes ) { - QString resultVariable = fractureModel->eclipseResultVariable( propertyType ); - RiaDefines::ResultCatType resultCategoryType = fractureModel->eclipseResultCategory( propertyType ); + QString resultVariable = stimPlanModel->eclipseResultVariable( propertyType ); + RiaDefines::ResultCatType resultCategoryType = stimPlanModel->eclipseResultCategory( propertyType ); // TODO: maybe improve? bool fixedInitialTimeStep = ( propertyType == RiaDefines::CurveProperty::INITIAL_PRESSURE ); - RimFractureModelCurve* curve = new RimFractureModelCurve; + RimStimPlanModelCurve* curve = new RimStimPlanModelCurve; curve->setCurveProperty( propertyType ); - curve->setFractureModel( fractureModel ); + curve->setStimPlanModel( stimPlanModel ); curve->setCase( eclipseCase ); curve->setEclipseResultVariable( resultVariable ); curve->setEclipseResultCategory( resultCategoryType ); @@ -413,20 +413,20 @@ void RicNewFractureModelPlotFeature::createParametersTrack( RimFractureModelPlot //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelPlot* RicNewFractureModelPlotFeature::createFractureModelPlot( bool showAfterCreation, +RimStimPlanModelPlot* RicNewStimPlanModelPlotFeature::createStimPlanModelPlot( bool showAfterCreation, const QString& plotDescription ) { - RimFractureModelPlotCollection* fractureModelPlotColl = fractureModelPlotCollection(); - CVF_ASSERT( fractureModelPlotColl ); + RimStimPlanModelPlotCollection* stimPlanModelPlotColl = stimPlanModelPlotCollection(); + CVF_ASSERT( stimPlanModelPlotColl ); // Make sure the summary plot window is created RiaGuiApplication::instance()->getOrCreateMainPlotWindow(); - RimFractureModelPlot* plot = new RimFractureModelPlot(); + RimStimPlanModelPlot* plot = new RimStimPlanModelPlot(); plot->setAsPlotMdiWindow(); - fractureModelPlotColl->addFractureModelPlot( plot ); + stimPlanModelPlotColl->addStimPlanModelPlot( plot ); if ( !plotDescription.isEmpty() ) { @@ -435,7 +435,7 @@ RimFractureModelPlot* RicNewFractureModelPlotFeature::createFractureModelPlot( b else { plot->nameConfig()->setCustomName( - QString( "Fracture Model Plot %1" ).arg( fractureModelPlotCollection()->fractureModelPlots().size() ) ); + QString( "StimPlan Model Plot %1" ).arg( stimPlanModelPlotCollection()->stimPlanModelPlots().size() ) ); } if ( showAfterCreation ) @@ -449,7 +449,7 @@ RimFractureModelPlot* RicNewFractureModelPlotFeature::createFractureModelPlot( b //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelPlotCollection* RicNewFractureModelPlotFeature::fractureModelPlotCollection() +RimStimPlanModelPlotCollection* RicNewStimPlanModelPlotFeature::stimPlanModelPlotCollection() { RimProject* project = RiaApplication::instance()->project(); CVF_ASSERT( project ); @@ -457,8 +457,8 @@ RimFractureModelPlotCollection* RicNewFractureModelPlotFeature::fractureModelPlo RimMainPlotCollection* mainPlotColl = project->mainPlotCollection(); CVF_ASSERT( mainPlotColl ); - RimFractureModelPlotCollection* fractureModelPlotColl = mainPlotColl->fractureModelPlotCollection(); - CVF_ASSERT( fractureModelPlotColl ); + RimStimPlanModelPlotCollection* stimPlanModelPlotColl = mainPlotColl->stimPlanModelPlotCollection(); + CVF_ASSERT( stimPlanModelPlotColl ); - return mainPlotColl->fractureModelPlotCollection(); + return mainPlotColl->stimPlanModelPlotCollection(); } diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.h b/ApplicationCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.h similarity index 67% rename from ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.h rename to ApplicationCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.h index c686690f3c..7efd091983 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.h +++ b/ApplicationCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.h @@ -21,22 +21,22 @@ #include "cafCmdFeature.h" #include "RiaDefines.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" class RimEclipseCase; -class RimFractureModelPlot; -class RimFractureModelPlotCollection; -class RimFractureModel; +class RimStimPlanModelPlot; +class RimStimPlanModelPlotCollection; +class RimStimPlanModel; //================================================================================================== /// //================================================================================================== -class RicNewFractureModelPlotFeature : public caf::CmdFeature +class RicNewStimPlanModelPlotFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; public: - static RimFractureModelPlot* createPlot( RimFractureModel* fractureModel ); + static RimStimPlanModelPlot* createPlot( RimStimPlanModel* stimPlanModel ); protected: // Overrides @@ -46,21 +46,21 @@ protected: private: static void - createFormationTrack( RimFractureModelPlot* plot, RimFractureModel* fractureModel, RimEclipseCase* eclipseCase ); + createFormationTrack( RimStimPlanModelPlot* plot, RimStimPlanModel* stimPlanModel, RimEclipseCase* eclipseCase ); static void - createFaciesTrack( RimFractureModelPlot* plot, RimFractureModel* fractureModel, RimEclipseCase* eclipseCase ); + createFaciesTrack( RimStimPlanModelPlot* plot, RimStimPlanModel* stimPlanModel, RimEclipseCase* eclipseCase ); static void - createLayersTrack( RimFractureModelPlot* plot, RimFractureModel* fractureModel, RimEclipseCase* eclipseCase ); + createLayersTrack( RimStimPlanModelPlot* plot, RimStimPlanModel* stimPlanModel, RimEclipseCase* eclipseCase ); - static void createParametersTrack( RimFractureModelPlot* plot, - RimFractureModel* fractureModel, + static void createParametersTrack( RimStimPlanModelPlot* plot, + RimStimPlanModel* stimPlanModel, RimEclipseCase* eclipseCase, int timeStep, const QString& trackTitle, const std::vector& propertyTypes, bool isPlotLogarithmic = false ); - static RimFractureModelPlot* createFractureModelPlot( bool showAfterCreation, const QString& plotDescription ); + static RimStimPlanModelPlot* createStimPlanModelPlot( bool showAfterCreation, const QString& plotDescription ); - static RimFractureModelPlotCollection* fractureModelPlotCollection(); + static RimStimPlanModelPlotCollection* stimPlanModelPlotCollection(); }; diff --git a/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake index f96087f00b..31b150c205 100644 --- a/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake @@ -12,9 +12,9 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewSimWellFractureFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanFractureTemplateFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureAtPosFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureFeature.h -${CMAKE_CURRENT_LIST_DIR}/RicNewFractureModelFeature.h -${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureModelAtPosFeature.h -${CMAKE_CURRENT_LIST_DIR}/RicNewFractureModelTemplateFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanModelFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathStimPlanModelAtPosFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanModelTemplateFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicNewElasticPropertyScalingFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleFracturesFeature.h @@ -37,9 +37,9 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewSimWellFractureFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanFractureTemplateFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureAtPosFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureFeature.cpp -${CMAKE_CURRENT_LIST_DIR}/RicNewFractureModelFeature.cpp -${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureModelAtPosFeature.cpp -${CMAKE_CURRENT_LIST_DIR}/RicNewFractureModelTemplateFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanModelFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathStimPlanModelAtPosFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanModelTemplateFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewElasticPropertyScalingFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleFracturesFeature.cpp diff --git a/ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.cpp b/ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.cpp index 341944978a..f0beee37fa 100644 --- a/ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.cpp +++ b/ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.cpp @@ -19,8 +19,8 @@ #include "RicFractureNameGenerator.h" #include "RimFracture.h" -#include "RimFractureModel.h" -#include "RimFractureModelTemplate.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelTemplate.h" //-------------------------------------------------------------------------------------------------- /// @@ -33,15 +33,15 @@ QString RicFractureNameGenerator::nameForNewFracture() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RicFractureNameGenerator::nameForNewFractureModel() +QString RicFractureNameGenerator::nameForNewStimPlanModel() { - return RicFractureNameGenerator::nameForNewObject( "Fracture Model_%1" ); + return RicFractureNameGenerator::nameForNewObject( "StimPlan Model_%1" ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RicFractureNameGenerator::nameForNewFractureModelTemplate() +QString RicFractureNameGenerator::nameForNewStimPlanModelTemplate() { - return RicFractureNameGenerator::nameForNewObject( "Fracture Model Template_%1" ); + return RicFractureNameGenerator::nameForNewObject( "StimPlan Model Template_%1" ); } diff --git a/ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.h b/ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.h index 513321bfb4..da042fec50 100644 --- a/ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.h +++ b/ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.h @@ -30,8 +30,8 @@ class RicFractureNameGenerator { public: static QString nameForNewFracture(); - static QString nameForNewFractureModel(); - static QString nameForNewFractureModelTemplate(); + static QString nameForNewStimPlanModel(); + static QString nameForNewStimPlanModelTemplate(); private: template diff --git a/ApplicationCode/Commands/FractureCommands/RicNewFractureModelFeature.cpp b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelFeature.cpp similarity index 71% rename from ApplicationCode/Commands/FractureCommands/RicNewFractureModelFeature.cpp rename to ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelFeature.cpp index a3acf5bc10..7684a0f300 100644 --- a/ApplicationCode/Commands/FractureCommands/RicNewFractureModelFeature.cpp +++ b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelFeature.cpp @@ -16,18 +16,18 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicNewFractureModelFeature.h" +#include "RicNewStimPlanModelFeature.h" #include "RiaApplication.h" #include "RicFractureNameGenerator.h" #include "RimEclipseView.h" -#include "RimFractureModel.h" -#include "RimFractureModelCollection.h" #include "RimModeledWellPath.h" #include "RimOilField.h" #include "RimProject.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCollection.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" #include "RimWellPathCompletions.h" @@ -42,12 +42,12 @@ #include -CAF_CMD_SOURCE_INIT( RicNewFractureModelFeature, "RicNewFractureModelFeature" ); +CAF_CMD_SOURCE_INIT( RicNewStimPlanModelFeature, "RicNewStimPlanModelFeature" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModel* RicNewFractureModelFeature::addFractureModel( RimWellPath* wellPath, +RimStimPlanModel* RicNewStimPlanModelFeature::addStimPlanModel( RimWellPath* wellPath, RimWellPathCollection* wellPathCollection, RimEclipseCase* eclipseCase, int timeStep, @@ -57,28 +57,28 @@ RimFractureModel* RicNewFractureModelFeature::addFractureModel( RimWellPath* if ( !RicWellPathsUnitSystemSettingsImpl::ensureHasUnitSystem( wellPath ) ) return nullptr; - RimFractureModelCollection* fractureModelCollection = wellPath->fractureModelCollection(); - CVF_ASSERT( fractureModelCollection ); + RimStimPlanModelCollection* stimPlanModelCollection = wellPath->stimPlanModelCollection(); + CVF_ASSERT( stimPlanModelCollection ); RimOilField* oilfield = nullptr; - fractureModelCollection->firstAncestorOrThisOfType( oilfield ); + stimPlanModelCollection->firstAncestorOrThisOfType( oilfield ); if ( !oilfield ) return nullptr; - RimFractureModel* fractureModel = new RimFractureModel(); - fractureModelCollection->addFractureModel( fractureModel ); + RimStimPlanModel* stimPlanModel = new RimStimPlanModel(); + stimPlanModelCollection->addStimPlanModel( stimPlanModel ); - fractureModel->setEclipseCase( eclipseCase ); - fractureModel->setTimeStep( timeStep ); + stimPlanModel->setEclipseCase( eclipseCase ); + stimPlanModel->setTimeStep( timeStep ); - QString fractureModelName = RicFractureNameGenerator::nameForNewFractureModel(); - fractureModel->setName( fractureModelName ); + QString stimPlanModelName = RicFractureNameGenerator::nameForNewStimPlanModel(); + stimPlanModel->setName( stimPlanModelName ); RimProject* project = nullptr; - fractureModelCollection->firstAncestorOrThisOfType( project ); + stimPlanModelCollection->firstAncestorOrThisOfType( project ); // Add a "fake" well path for thickess direction RimModeledWellPath* thicknessDirectionWellPath = new RimModeledWellPath; - fractureModel->setThicknessDirectionWellPath( thicknessDirectionWellPath ); + stimPlanModel->setThicknessDirectionWellPath( thicknessDirectionWellPath ); std::vector wellPaths = {thicknessDirectionWellPath}; wellPathCollection->addWellPaths( wellPaths, false ); @@ -91,19 +91,19 @@ RimFractureModel* RicNewFractureModelFeature::addFractureModel( RimWellPath* if ( measuredDepth > 0.0 ) { - fractureModel->setMD( measuredDepth ); + stimPlanModel->setMD( measuredDepth ); } - Riu3DMainWindowTools::selectAsCurrentItem( fractureModel ); - return fractureModel; + Riu3DMainWindowTools::selectAsCurrentItem( stimPlanModel ); + return stimPlanModel; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelFeature::onActionTriggered( bool isChecked ) +void RicNewStimPlanModelFeature::onActionTriggered( bool isChecked ) { - RimFractureModelCollection* fractureColl = RicNewFractureModelFeature::selectedFractureModelCollection(); + RimStimPlanModelCollection* fractureColl = RicNewStimPlanModelFeature::selectedStimPlanModelCollection(); if ( !fractureColl ) return; RimWellPath* wellPath = nullptr; @@ -121,30 +121,30 @@ void RicNewFractureModelFeature::onActionTriggered( bool isChecked ) timeStep = activeView->currentTimeStep(); } - RicNewFractureModelFeature::addFractureModel( wellPath, wellPathCollection, eclipseCase, timeStep ); + RicNewStimPlanModelFeature::addStimPlanModel( wellPath, wellPathCollection, eclipseCase, timeStep ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelFeature::setupActionLook( QAction* actionToSetup ) +void RicNewStimPlanModelFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setIcon( QIcon( ":/FractureSymbol16x16.png" ) ); - actionToSetup->setText( "Create Fracture Model" ); + actionToSetup->setText( "Create StimPlan Model" ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicNewFractureModelFeature::isCommandEnabled() +bool RicNewStimPlanModelFeature::isCommandEnabled() { - return selectedFractureModelCollection() != nullptr; + return selectedStimPlanModelCollection() != nullptr; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelCollection* RicNewFractureModelFeature::selectedFractureModelCollection() +RimStimPlanModelCollection* RicNewStimPlanModelFeature::selectedStimPlanModelCollection() { std::vector selectedItems; caf::SelectionManager::instance()->selectedItems( selectedItems ); @@ -152,20 +152,20 @@ RimFractureModelCollection* RicNewFractureModelFeature::selectedFractureModelCol caf::PdmUiItem* pdmUiItem = selectedItems.front(); - RimFractureModelCollection* fractureModelCollection = nullptr; + RimStimPlanModelCollection* stimPlanModelCollection = nullptr; caf::PdmObjectHandle* objHandle = dynamic_cast( pdmUiItem ); if ( objHandle ) { - objHandle->firstAncestorOrThisOfType( fractureModelCollection ); + objHandle->firstAncestorOrThisOfType( stimPlanModelCollection ); - if ( fractureModelCollection ) return fractureModelCollection; + if ( stimPlanModelCollection ) return stimPlanModelCollection; RimWellPath* wellPath = dynamic_cast( objHandle ); - if ( wellPath ) return wellPath->fractureModelCollection(); + if ( wellPath ) return wellPath->stimPlanModelCollection(); RimWellPathCompletions* completions = caf::SelectionManager::instance()->selectedItemOfType(); - if ( completions ) return completions->fractureModelCollection(); + if ( completions ) return completions->stimPlanModelCollection(); } return nullptr; } diff --git a/ApplicationCode/Commands/FractureCommands/RicNewFractureModelFeature.h b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelFeature.h similarity index 87% rename from ApplicationCode/Commands/FractureCommands/RicNewFractureModelFeature.h rename to ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelFeature.h index 5493b67589..989847b896 100644 --- a/ApplicationCode/Commands/FractureCommands/RicNewFractureModelFeature.h +++ b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelFeature.h @@ -20,8 +20,8 @@ #include "cafCmdFeature.h" -class RimFractureModel; -class RimFractureModelCollection; +class RimStimPlanModel; +class RimStimPlanModelCollection; class RimWellPath; class RimWellPathCollection; class RimEclipseCase; @@ -29,12 +29,12 @@ class RimEclipseCase; //================================================================================================== /// //================================================================================================== -class RicNewFractureModelFeature : public caf::CmdFeature +class RicNewStimPlanModelFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; public: - static RimFractureModel* addFractureModel( RimWellPath* wellPath, + static RimStimPlanModel* addStimPlanModel( RimWellPath* wellPath, RimWellPathCollection* wellPathCollection, RimEclipseCase* eclipseCase = nullptr, int timeStep = 0, @@ -46,5 +46,5 @@ protected: bool isCommandEnabled() override; private: - static RimFractureModelCollection* selectedFractureModelCollection(); + static RimStimPlanModelCollection* selectedStimPlanModelCollection(); }; diff --git a/ApplicationCode/Commands/FractureCommands/RicNewFractureModelTemplateFeature.cpp b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelTemplateFeature.cpp similarity index 69% rename from ApplicationCode/Commands/FractureCommands/RicNewFractureModelTemplateFeature.cpp rename to ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelTemplateFeature.cpp index 096d6be2f5..42715c5f46 100644 --- a/ApplicationCode/Commands/FractureCommands/RicNewFractureModelTemplateFeature.cpp +++ b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelTemplateFeature.cpp @@ -16,13 +16,13 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicNewFractureModelTemplateFeature.h" +#include "RicNewStimPlanModelTemplateFeature.h" #include "RimCompletionTemplateCollection.h" -#include "RimFractureModelTemplate.h" -#include "RimFractureModelTemplateCollection.h" #include "RimOilField.h" #include "RimProject.h" +#include "RimStimPlanModelTemplate.h" +#include "RimStimPlanModelTemplateCollection.h" #include "RicFractureNameGenerator.h" @@ -34,12 +34,12 @@ #include -CAF_CMD_SOURCE_INIT( RicNewFractureModelTemplateFeature, "RicNewFractureModelTemplateFeature" ); +CAF_CMD_SOURCE_INIT( RicNewStimPlanModelTemplateFeature, "RicNewStimPlanModelTemplateFeature" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelTemplateFeature::onActionTriggered( bool isChecked ) +void RicNewStimPlanModelTemplateFeature::onActionTriggered( bool isChecked ) { RimProject* project = RimProject::current(); CVF_ASSERT( project ); @@ -47,31 +47,31 @@ void RicNewFractureModelTemplateFeature::onActionTriggered( bool isChecked ) RimOilField* oilfield = project->activeOilField(); if ( !oilfield ) return; - RimFractureModelTemplateCollection* fracModColl = - oilfield->completionTemplateCollection->fractureModelTemplateCollection(); + RimStimPlanModelTemplateCollection* fracModColl = + oilfield->completionTemplateCollection->stimPlanModelTemplateCollection(); if ( !fracModColl ) return; - RimFractureModelTemplate* fractureModelTemplate = new RimFractureModelTemplate; - fractureModelTemplate->setName( RicFractureNameGenerator::nameForNewFractureModelTemplate() ); + RimStimPlanModelTemplate* stimPlanModelTemplate = new RimStimPlanModelTemplate; + stimPlanModelTemplate->setName( RicFractureNameGenerator::nameForNewStimPlanModelTemplate() ); - fracModColl->addFractureModelTemplate( fractureModelTemplate ); + fracModColl->addStimPlanModelTemplate( stimPlanModelTemplate ); fracModColl->updateConnectedEditors(); - Riu3DMainWindowTools::selectAsCurrentItem( fractureModelTemplate ); + Riu3DMainWindowTools::selectAsCurrentItem( stimPlanModelTemplate ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewFractureModelTemplateFeature::setupActionLook( QAction* actionToSetup ) +void RicNewStimPlanModelTemplateFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setIcon( QIcon( ":/FractureTemplate16x16.png" ) ); - actionToSetup->setText( "New Fracture Model Template" ); + actionToSetup->setText( "New StimPlan Model Template" ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicNewFractureModelTemplateFeature::isCommandEnabled() +bool RicNewStimPlanModelTemplateFeature::isCommandEnabled() { return true; } diff --git a/ApplicationCode/Commands/FractureCommands/RicNewFractureModelTemplateFeature.h b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelTemplateFeature.h similarity index 95% rename from ApplicationCode/Commands/FractureCommands/RicNewFractureModelTemplateFeature.h rename to ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelTemplateFeature.h index 643a17072e..024175c6a2 100644 --- a/ApplicationCode/Commands/FractureCommands/RicNewFractureModelTemplateFeature.h +++ b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanModelTemplateFeature.h @@ -25,7 +25,7 @@ //================================================================================================== /// //================================================================================================== -class RicNewFractureModelTemplateFeature : public caf::CmdFeature +class RicNewStimPlanModelTemplateFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureModelAtPosFeature.cpp b/ApplicationCode/Commands/FractureCommands/RicNewWellPathStimPlanModelAtPosFeature.cpp similarity index 84% rename from ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureModelAtPosFeature.cpp rename to ApplicationCode/Commands/FractureCommands/RicNewWellPathStimPlanModelAtPosFeature.cpp index 32b8e2ad7d..d4ba94e411 100644 --- a/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureModelAtPosFeature.cpp +++ b/ApplicationCode/Commands/FractureCommands/RicNewWellPathStimPlanModelAtPosFeature.cpp @@ -16,11 +16,11 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicNewWellPathFractureModelAtPosFeature.h" +#include "RicNewWellPathStimPlanModelAtPosFeature.h" #include "RiaApplication.h" -#include "RicNewFractureModelFeature.h" +#include "RicNewStimPlanModelFeature.h" #include "RimEclipseView.h" #include "RimTools.h" @@ -31,12 +31,12 @@ #include -CAF_CMD_SOURCE_INIT( RicNewWellPathFractureModelAtPosFeature, "RicNewWellPathFractureModelAtPosFeature" ); +CAF_CMD_SOURCE_INIT( RicNewWellPathStimPlanModelAtPosFeature, "RicNewWellPathStimPlanModelAtPosFeature" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathFractureModelAtPosFeature::onActionTriggered( bool isChecked ) +void RicNewWellPathStimPlanModelAtPosFeature::onActionTriggered( bool isChecked ) { Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance(); RiuSelectionItem* selItem = riuSelManager->selectedItem( Riu3dSelectionManager::RUI_TEMPORARY ); @@ -59,7 +59,7 @@ void RicNewWellPathFractureModelAtPosFeature::onActionTriggered( bool isChecked timeStep = activeView->currentTimeStep(); } - RicNewFractureModelFeature::addFractureModel( wellPath, + RicNewStimPlanModelFeature::addStimPlanModel( wellPath, wellPathCollection, eclipseCase, timeStep, @@ -69,16 +69,16 @@ void RicNewWellPathFractureModelAtPosFeature::onActionTriggered( bool isChecked //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathFractureModelAtPosFeature::setupActionLook( QAction* actionToSetup ) +void RicNewWellPathStimPlanModelAtPosFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setIcon( QIcon( ":/FractureSymbol16x16.png" ) ); - actionToSetup->setText( "Create Fracture Model at this Depth" ); + actionToSetup->setText( "Create StimPlan Model at this Depth" ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicNewWellPathFractureModelAtPosFeature::isCommandEnabled() +bool RicNewWellPathStimPlanModelAtPosFeature::isCommandEnabled() { return true; } diff --git a/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureModelAtPosFeature.h b/ApplicationCode/Commands/FractureCommands/RicNewWellPathStimPlanModelAtPosFeature.h similarity index 95% rename from ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureModelAtPosFeature.h rename to ApplicationCode/Commands/FractureCommands/RicNewWellPathStimPlanModelAtPosFeature.h index d5af026d68..2a57254811 100644 --- a/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureModelAtPosFeature.h +++ b/ApplicationCode/Commands/FractureCommands/RicNewWellPathStimPlanModelAtPosFeature.h @@ -25,7 +25,7 @@ //================================================================================================== /// //================================================================================================== -class RicNewWellPathFractureModelAtPosFeature : public caf::CmdFeature +class RicNewWellPathStimPlanModelAtPosFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/Commands/RicElasticPropertiesImportTools.cpp b/ApplicationCode/Commands/RicElasticPropertiesImportTools.cpp index 6a5d512ad5..a8b71fad14 100644 --- a/ApplicationCode/Commands/RicElasticPropertiesImportTools.cpp +++ b/ApplicationCode/Commands/RicElasticPropertiesImportTools.cpp @@ -30,9 +30,9 @@ #include "RimElasticProperties.h" #include "RimFormationNames.h" #include "RimFormationNamesCollection.h" -#include "RimFractureModelTemplate.h" #include "RimOilField.h" #include "RimProject.h" +#include "RimStimPlanModelTemplate.h" #include #include @@ -41,7 +41,7 @@ /// //-------------------------------------------------------------------------------------------------- void RicElasticPropertiesImportTools::importElasticPropertiesFromFile( const QString& filePath, - RimFractureModelTemplate* fractureModelTemplate, + RimStimPlanModelTemplate* stimPlanModelTemplate, const QString& formationWildCard ) { RifCsvUserDataFileParser csvParser( filePath ); @@ -85,7 +85,7 @@ void RicElasticPropertiesImportTools::importElasticPropertiesFromFile( const QSt } } - RimElasticProperties* rimElasticProperties = fractureModelTemplate->elasticProperties(); + RimElasticProperties* rimElasticProperties = stimPlanModelTemplate->elasticProperties(); if ( !rimElasticProperties ) rimElasticProperties = new RimElasticProperties; for ( FaciesKey key : faciesKeys ) { @@ -147,8 +147,8 @@ void RicElasticPropertiesImportTools::importElasticPropertiesFromFile( const QSt } rimElasticProperties->setFilePath( filePath ); - fractureModelTemplate->setElasticProperties( rimElasticProperties ); - fractureModelTemplate->updateConnectedEditors(); + stimPlanModelTemplate->setElasticProperties( rimElasticProperties ); + stimPlanModelTemplate->updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicElasticPropertiesImportTools.h b/ApplicationCode/Commands/RicElasticPropertiesImportTools.h index 811a00a49f..908d97c9b4 100644 --- a/ApplicationCode/Commands/RicElasticPropertiesImportTools.h +++ b/ApplicationCode/Commands/RicElasticPropertiesImportTools.h @@ -21,7 +21,7 @@ #include #include -class RimFractureModelTemplate; +class RimStimPlanModelTemplate; //-------------------------------------------------------------------------------------------------- /// @@ -30,7 +30,7 @@ class RicElasticPropertiesImportTools { public: static void importElasticPropertiesFromFile( const QString& filePath, - RimFractureModelTemplate* fractureModelTemplate, + RimStimPlanModelTemplate* stimPlanModelTemplate, const QString& formationWildCard = "1*" ); private: diff --git a/ApplicationCode/Commands/RicExportFractureModelToFileFeature.cpp b/ApplicationCode/Commands/RicExportStimPlanModelToFileFeature.cpp similarity index 70% rename from ApplicationCode/Commands/RicExportFractureModelToFileFeature.cpp rename to ApplicationCode/Commands/RicExportStimPlanModelToFileFeature.cpp index 20d6dbb488..999c3456b2 100644 --- a/ApplicationCode/Commands/RicExportFractureModelToFileFeature.cpp +++ b/ApplicationCode/Commands/RicExportStimPlanModelToFileFeature.cpp @@ -16,27 +16,27 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicExportFractureModelToFileFeature.h" +#include "RicExportStimPlanModelToFileFeature.h" #include "RiaApplication.h" -#include "RimFractureModel.h" +#include "RimStimPlanModel.h" #include "RiuFileDialogTools.h" -#include "RifFractureModelExporter.h" +#include "RifStimPlanModelExporter.h" #include "cafSelectionManager.h" #include "cafUtils.h" #include -CAF_CMD_SOURCE_INIT( RicExportFractureModelToFileFeature, "RicExportFractureModelToFileFeature" ); +CAF_CMD_SOURCE_INIT( RicExportStimPlanModelToFileFeature, "RicExportStimPlanModelToFileFeature" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicExportFractureModelToFileFeature::isCommandEnabled() +bool RicExportStimPlanModelToFileFeature::isCommandEnabled() { return true; } @@ -44,21 +44,21 @@ bool RicExportFractureModelToFileFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicExportFractureModelToFileFeature::onActionTriggered( bool isChecked ) +void RicExportStimPlanModelToFileFeature::onActionTriggered( bool isChecked ) { - RimFractureModel* fractureModel = caf::SelectionManager::instance()->selectedItemOfType(); - if ( !fractureModel ) return; - if ( !fractureModel->fractureModelTemplate() ) return; + RimStimPlanModel* stimPlanModel = caf::SelectionManager::instance()->selectedItemOfType(); + if ( !stimPlanModel ) return; + if ( !stimPlanModel->stimPlanModelTemplate() ) return; RiaApplication* app = RiaApplication::instance(); QString defaultDir = app->lastUsedDialogDirectory( "FRACTURE_MODEL_EXPORT" ); QString directoryPath = - RiuFileDialogTools::getExistingDirectory( nullptr, "Select Directory for Fracture Model Export", defaultDir ); + RiuFileDialogTools::getExistingDirectory( nullptr, "Select Directory for StimPlan Model Export", defaultDir ); if ( directoryPath.isEmpty() ) return; - RifFractureModelExporter::writeToDirectory( fractureModel, fractureModel->useDetailedFluidLoss(), directoryPath ); + RifStimPlanModelExporter::writeToDirectory( stimPlanModel, stimPlanModel->useDetailedFluidLoss(), directoryPath ); // Remember the path to next time app->setLastUsedDialogDirectory( "FRACTURE_MODEL_EXPORT", directoryPath ); @@ -67,8 +67,8 @@ void RicExportFractureModelToFileFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicExportFractureModelToFileFeature::setupActionLook( QAction* actionToSetup ) +void RicExportStimPlanModelToFileFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setText( "Export Fracture Model to File" ); + actionToSetup->setText( "Export StimPlan Model to File" ); actionToSetup->setIcon( QIcon( ":/Save.svg" ) ); } diff --git a/ApplicationCode/Commands/RicExportFractureModelToFileFeature.h b/ApplicationCode/Commands/RicExportStimPlanModelToFileFeature.h similarity index 95% rename from ApplicationCode/Commands/RicExportFractureModelToFileFeature.h rename to ApplicationCode/Commands/RicExportStimPlanModelToFileFeature.h index 6b2087c50e..f7b0bc0db9 100644 --- a/ApplicationCode/Commands/RicExportFractureModelToFileFeature.h +++ b/ApplicationCode/Commands/RicExportStimPlanModelToFileFeature.h @@ -23,7 +23,7 @@ //================================================================================================== /// //================================================================================================== -class RicExportFractureModelToFileFeature : public caf::CmdFeature +class RicExportStimPlanModelToFileFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/Commands/RicFaciesPropertiesImportTools.cpp b/ApplicationCode/Commands/RicFaciesPropertiesImportTools.cpp index d1f4c446e6..c7d26ac329 100644 --- a/ApplicationCode/Commands/RicFaciesPropertiesImportTools.cpp +++ b/ApplicationCode/Commands/RicFaciesPropertiesImportTools.cpp @@ -28,8 +28,8 @@ #include "RimColorLegendCollection.h" #include "RimColorLegendItem.h" #include "RimFaciesProperties.h" -#include "RimFractureModelTemplate.h" #include "RimProject.h" +#include "RimStimPlanModelTemplate.h" #include "RifColorLegendData.h" #include "RifRoffReader.h" @@ -40,7 +40,7 @@ /// //-------------------------------------------------------------------------------------------------- void RicFaciesPropertiesImportTools::importFaciesPropertiesFromFile( const QString& filePath, - RimFractureModelTemplate* fractureModelTemplate, + RimStimPlanModelTemplate* stimPlanModelTemplate, bool createColorLegend ) { if ( filePath.isEmpty() ) return; @@ -56,7 +56,7 @@ void RicFaciesPropertiesImportTools::importFaciesPropertiesFromFile( const QStri return; } - RimFaciesProperties* faciesProperties = fractureModelTemplate->faciesProperties(); + RimFaciesProperties* faciesProperties = stimPlanModelTemplate->faciesProperties(); if ( !faciesProperties ) { faciesProperties = new RimFaciesProperties; @@ -101,8 +101,8 @@ void RicFaciesPropertiesImportTools::importFaciesPropertiesFromFile( const QStri faciesProperties->setFilePath( filePath ); - fractureModelTemplate->setFaciesProperties( faciesProperties ); - fractureModelTemplate->updateConnectedEditors(); + stimPlanModelTemplate->setFaciesProperties( faciesProperties ); + stimPlanModelTemplate->updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicFaciesPropertiesImportTools.h b/ApplicationCode/Commands/RicFaciesPropertiesImportTools.h index 826825b984..c22cb80d9d 100644 --- a/ApplicationCode/Commands/RicFaciesPropertiesImportTools.h +++ b/ApplicationCode/Commands/RicFaciesPropertiesImportTools.h @@ -19,7 +19,7 @@ #pragma once class RimColorLegend; -class RimFractureModelTemplate; +class RimStimPlanModelTemplate; namespace cvf { @@ -35,7 +35,7 @@ class RicFaciesPropertiesImportTools { public: static void importFaciesPropertiesFromFile( const QString& filePath, - RimFractureModelTemplate* fractureModelTemplate, + RimStimPlanModelTemplate* stimPlanModelTemplate, bool createColorLegend = false ); private: diff --git a/ApplicationCode/Commands/RicImportElasticPropertiesFeature.cpp b/ApplicationCode/Commands/RicImportElasticPropertiesFeature.cpp index 972256e267..b4ed593220 100644 --- a/ApplicationCode/Commands/RicImportElasticPropertiesFeature.cpp +++ b/ApplicationCode/Commands/RicImportElasticPropertiesFeature.cpp @@ -22,7 +22,7 @@ #include "RicElasticPropertiesImportTools.h" -#include "RimFractureModelTemplate.h" +#include "RimStimPlanModelTemplate.h" #include "Riu3DMainWindowTools.h" #include "RiuFileDialogTools.h" @@ -47,9 +47,9 @@ bool RicImportElasticPropertiesFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- void RicImportElasticPropertiesFeature::onActionTriggered( bool isChecked ) { - RimFractureModelTemplate* fractureModelTemplate = - caf::SelectionManager::instance()->selectedItemAncestorOfType(); - if ( !fractureModelTemplate ) return; + RimStimPlanModelTemplate* stimPlanModelTemplate = + caf::SelectionManager::instance()->selectedItemAncestorOfType(); + if ( !stimPlanModelTemplate ) return; // Open dialog box to select files RiaApplication* app = RiaApplication::instance(); @@ -64,7 +64,7 @@ void RicImportElasticPropertiesFeature::onActionTriggered( bool isChecked ) // Remember the path to next time app->setLastUsedDialogDirectory( "STIMPLAN_DIR", QFileInfo( filePath ).absolutePath() ); - RicElasticPropertiesImportTools::importElasticPropertiesFromFile( filePath, fractureModelTemplate ); + RicElasticPropertiesImportTools::importElasticPropertiesFromFile( filePath, stimPlanModelTemplate ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicImportFaciesFeature.cpp b/ApplicationCode/Commands/RicImportFaciesFeature.cpp index 079d25f6f4..99b74b05dc 100644 --- a/ApplicationCode/Commands/RicImportFaciesFeature.cpp +++ b/ApplicationCode/Commands/RicImportFaciesFeature.cpp @@ -25,7 +25,7 @@ #include "RicFaciesPropertiesImportTools.h" -#include "RimFractureModelTemplate.h" +#include "RimStimPlanModelTemplate.h" #include "cafSelectionManager.h" @@ -47,9 +47,9 @@ bool RicImportFaciesFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- void RicImportFaciesFeature::onActionTriggered( bool isChecked ) { - RimFractureModelTemplate* fractureModelTemplate = - caf::SelectionManager::instance()->selectedItemAncestorOfType(); - if ( !fractureModelTemplate ) return; + RimStimPlanModelTemplate* stimPlanModelTemplate = + caf::SelectionManager::instance()->selectedItemAncestorOfType(); + if ( !stimPlanModelTemplate ) return; RiaApplication* app = RiaApplication::instance(); QString defaultDir = app->lastUsedDialogDirectoryWithFallbackToProjectFolder( "STIMPLAN_DIR" ); @@ -67,7 +67,7 @@ void RicImportFaciesFeature::onActionTriggered( bool isChecked ) app->setLastUsedDialogDirectory( "STIMPLAN_DIR", QFileInfo( fileName ).absolutePath() ); bool createColorLegend = true; - RicFaciesPropertiesImportTools::importFaciesPropertiesFromFile( fileName, fractureModelTemplate, createColorLegend ); + RicFaciesPropertiesImportTools::importFaciesPropertiesFromFile( fileName, stimPlanModelTemplate, createColorLegend ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp index 12af12277f..c67ee0fd10 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp @@ -21,10 +21,10 @@ #include "RimCase.h" #include "RimEclipseCase.h" -#include "RimFractureModelPlot.h" -#include "RimFractureModelPlotCollection.h" #include "RimMainPlotCollection.h" #include "RimProject.h" +#include "RimStimPlanModelPlot.h" +#include "RimStimPlanModelPlotCollection.h" #include "RimWellBoreStabilityPlot.h" #include "RimWellLogCurveCommonDataSource.h" #include "RimWellLogPlot.h" diff --git a/ApplicationCode/FileInterface/CMakeLists_files.cmake b/ApplicationCode/FileInterface/CMakeLists_files.cmake index 9eb3ecc12c..01460b55ef 100644 --- a/ApplicationCode/FileInterface/CMakeLists_files.cmake +++ b/ApplicationCode/FileInterface/CMakeLists_files.cmake @@ -54,11 +54,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RifSurfaceImporter.h ${CMAKE_CURRENT_LIST_DIR}/RifRoffReader.h ${CMAKE_CURRENT_LIST_DIR}/RifColorLegendData.h ${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader.h -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelExporter.h -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelGeologicalFrkExporter.h -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelDeviationFrkExporter.h -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelPerfsFrkExporter.h -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelAsymmetricFrkExporter.h +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelExporter.h +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelGeologicalFrkExporter.h +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelDeviationFrkExporter.h +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelPerfsFrkExporter.h +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelAsymmetricFrkExporter.h ${CMAKE_CURRENT_LIST_DIR}/RifSurfaceExporter.h @@ -119,11 +119,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RifSurfaceImporter.cpp ${CMAKE_CURRENT_LIST_DIR}/RifRoffReader.cpp ${CMAKE_CURRENT_LIST_DIR}/RifColorLegendData.cpp ${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader.cpp -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelExporter.cpp -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelGeologicalFrkExporter.cpp -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelDeviationFrkExporter.cpp -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelPerfsFrkExporter.cpp -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelAsymmetricFrkExporter.cpp +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelExporter.cpp +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelGeologicalFrkExporter.cpp +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelDeviationFrkExporter.cpp +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelPerfsFrkExporter.cpp +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelAsymmetricFrkExporter.cpp ${CMAKE_CURRENT_LIST_DIR}/RifSurfaceExporter.cpp # HDF5 file reader is directly included in ResInsight main CmakeList.txt diff --git a/ApplicationCode/FileInterface/RifFractureModelAsymmetricFrkExporter.cpp b/ApplicationCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.cpp similarity index 83% rename from ApplicationCode/FileInterface/RifFractureModelAsymmetricFrkExporter.cpp rename to ApplicationCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.cpp index 60465fe970..979392f8d8 100644 --- a/ApplicationCode/FileInterface/RifFractureModelAsymmetricFrkExporter.cpp +++ b/ApplicationCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.cpp @@ -16,9 +16,9 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RifFractureModelAsymmetricFrkExporter.h" +#include "RifStimPlanModelAsymmetricFrkExporter.h" -#include "RimFractureModel.h" +#include "RimStimPlanModel.h" #include #include @@ -26,7 +26,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifFractureModelAsymmetricFrkExporter::writeToFile( RimFractureModel* fractureModel, const QString& filepath ) +bool RifStimPlanModelAsymmetricFrkExporter::writeToFile( RimStimPlanModel* stimPlanModel, const QString& filepath ) { QFile data( filepath ); if ( !data.open( QFile::WriteOnly | QFile::Truncate ) ) @@ -37,11 +37,11 @@ bool RifFractureModelAsymmetricFrkExporter::writeToFile( RimFractureModel* fract QTextStream stream( &data ); appendHeaderToStream( stream ); - double bedDipDeg = fractureModel->formationDip(); - bool hasBarrier = fractureModel->hasBarrier(); - double distanceToBarrier = fractureModel->distanceToBarrier(); - double barrierDip = fractureModel->barrierDip(); - int wellPenetrationLayer = fractureModel->wellPenetrationLayer(); + double bedDipDeg = stimPlanModel->formationDip(); + bool hasBarrier = stimPlanModel->hasBarrier(); + double distanceToBarrier = stimPlanModel->distanceToBarrier(); + double barrierDip = stimPlanModel->barrierDip(); + int wellPenetrationLayer = stimPlanModel->wellPenetrationLayer(); appendBarrierDataToStream( stream, bedDipDeg, @@ -58,7 +58,7 @@ bool RifFractureModelAsymmetricFrkExporter::writeToFile( RimFractureModel* fract //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelAsymmetricFrkExporter::appendHeaderToStream( QTextStream& stream ) +void RifStimPlanModelAsymmetricFrkExporter::appendHeaderToStream( QTextStream& stream ) { stream << "" << endl << "" << endl; } @@ -66,7 +66,7 @@ void RifFractureModelAsymmetricFrkExporter::appendHeaderToStream( QTextStream& s //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelAsymmetricFrkExporter::appendBarrierDataToStream( QTextStream& stream, +void RifStimPlanModelAsymmetricFrkExporter::appendBarrierDataToStream( QTextStream& stream, double bedDipDeg, bool hasBarrier, double distanceToBarrier, @@ -93,7 +93,7 @@ void RifFractureModelAsymmetricFrkExporter::appendBarrierDataToStream( QTextStre //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelAsymmetricFrkExporter::appendFooterToStream( QTextStream& stream ) +void RifStimPlanModelAsymmetricFrkExporter::appendFooterToStream( QTextStream& stream ) { stream << "" << endl; } diff --git a/ApplicationCode/FileInterface/RifFractureModelAsymmetricFrkExporter.h b/ApplicationCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.h similarity index 92% rename from ApplicationCode/FileInterface/RifFractureModelAsymmetricFrkExporter.h rename to ApplicationCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.h index 75ad194ad6..57a3b3553d 100644 --- a/ApplicationCode/FileInterface/RifFractureModelAsymmetricFrkExporter.h +++ b/ApplicationCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.h @@ -18,7 +18,7 @@ #pragma once -class RimFractureModel; +class RimStimPlanModel; class QString; class QTextStream; @@ -26,10 +26,10 @@ class QTextStream; //================================================================================================== // //================================================================================================== -class RifFractureModelAsymmetricFrkExporter +class RifStimPlanModelAsymmetricFrkExporter { public: - static bool writeToFile( RimFractureModel* fractureModel, const QString& filepath ); + static bool writeToFile( RimStimPlanModel* stimPlanModel, const QString& filepath ); private: static void appendHeaderToStream( QTextStream& stream ); diff --git a/ApplicationCode/FileInterface/RifFractureModelDeviationFrkExporter.cpp b/ApplicationCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp similarity index 90% rename from ApplicationCode/FileInterface/RifFractureModelDeviationFrkExporter.cpp rename to ApplicationCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp index a4083399cf..a16ed4bfc3 100644 --- a/ApplicationCode/FileInterface/RifFractureModelDeviationFrkExporter.cpp +++ b/ApplicationCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp @@ -16,9 +16,9 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RifFractureModelDeviationFrkExporter.h" +#include "RifStimPlanModelDeviationFrkExporter.h" -#include "RimFractureModel.h" +#include "RimStimPlanModel.h" #include "RimWellPath.h" #include "RigWellPathGeometryExporter.h" @@ -29,9 +29,9 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifFractureModelDeviationFrkExporter::writeToFile( RimFractureModel* fractureModel, const QString& filepath ) +bool RifStimPlanModelDeviationFrkExporter::writeToFile( RimStimPlanModel* stimPlanModel, const QString& filepath ) { - RimWellPath* wellPath = fractureModel->wellPath(); + RimWellPath* wellPath = stimPlanModel->wellPath(); if ( !wellPath ) { return false; @@ -71,7 +71,7 @@ bool RifFractureModelDeviationFrkExporter::writeToFile( RimFractureModel* fractu //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelDeviationFrkExporter::appendHeaderToStream( QTextStream& stream ) +void RifStimPlanModelDeviationFrkExporter::appendHeaderToStream( QTextStream& stream ) { stream << "" << endl << "" << endl; } @@ -79,7 +79,7 @@ void RifFractureModelDeviationFrkExporter::appendHeaderToStream( QTextStream& st //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelDeviationFrkExporter::appendToStream( QTextStream& stream, +void RifStimPlanModelDeviationFrkExporter::appendToStream( QTextStream& stream, const QString& label, const std::vector& values ) { @@ -106,7 +106,7 @@ void RifFractureModelDeviationFrkExporter::appendToStream( QTextStream& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelDeviationFrkExporter::appendFooterToStream( QTextStream& stream ) +void RifStimPlanModelDeviationFrkExporter::appendFooterToStream( QTextStream& stream ) { stream << "" << endl; } @@ -114,7 +114,7 @@ void RifFractureModelDeviationFrkExporter::appendFooterToStream( QTextStream& st //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelDeviationFrkExporter::convertFromMeterToFeet( std::vector& data ) +void RifStimPlanModelDeviationFrkExporter::convertFromMeterToFeet( std::vector& data ) { for ( size_t i = 0; i < data.size(); i++ ) { @@ -125,7 +125,7 @@ void RifFractureModelDeviationFrkExporter::convertFromMeterToFeet( std::vector& tvdValues, +void RifStimPlanModelDeviationFrkExporter::fixupDepthValuesForExport( const std::vector& tvdValues, const std::vector& mdValues, std::vector& exportTvdValues, std::vector& exportMdValues ) diff --git a/ApplicationCode/FileInterface/RifFractureModelDeviationFrkExporter.h b/ApplicationCode/FileInterface/RifStimPlanModelDeviationFrkExporter.h similarity index 92% rename from ApplicationCode/FileInterface/RifFractureModelDeviationFrkExporter.h rename to ApplicationCode/FileInterface/RifStimPlanModelDeviationFrkExporter.h index ceca7d233b..b673b51d0a 100644 --- a/ApplicationCode/FileInterface/RifFractureModelDeviationFrkExporter.h +++ b/ApplicationCode/FileInterface/RifStimPlanModelDeviationFrkExporter.h @@ -20,17 +20,17 @@ #include -class RimFractureModel; +class RimStimPlanModel; class QString; class QTextStream; //================================================================================================== // //================================================================================================== -class RifFractureModelDeviationFrkExporter +class RifStimPlanModelDeviationFrkExporter { public: - static bool writeToFile( RimFractureModel* fractureModel, const QString& filepath ); + static bool writeToFile( RimStimPlanModel* stimPlanModel, const QString& filepath ); static void fixupDepthValuesForExport( const std::vector& tvdValues, const std::vector& mdValues, diff --git a/ApplicationCode/FileInterface/RifFractureModelExporter.cpp b/ApplicationCode/FileInterface/RifStimPlanModelExporter.cpp similarity index 63% rename from ApplicationCode/FileInterface/RifFractureModelExporter.cpp rename to ApplicationCode/FileInterface/RifStimPlanModelExporter.cpp index df9220b3df..e974958692 100644 --- a/ApplicationCode/FileInterface/RifFractureModelExporter.cpp +++ b/ApplicationCode/FileInterface/RifStimPlanModelExporter.cpp @@ -16,26 +16,26 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RifFractureModelExporter.h" +#include "RifStimPlanModelExporter.h" -#include "RifFractureModelAsymmetricFrkExporter.h" -#include "RifFractureModelDeviationFrkExporter.h" -#include "RifFractureModelGeologicalFrkExporter.h" -#include "RifFractureModelPerfsFrkExporter.h" +#include "RifStimPlanModelAsymmetricFrkExporter.h" +#include "RifStimPlanModelDeviationFrkExporter.h" +#include "RifStimPlanModelGeologicalFrkExporter.h" +#include "RifStimPlanModelPerfsFrkExporter.h" -#include "RimFractureModel.h" +#include "RimStimPlanModel.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifFractureModelExporter::writeToDirectory( RimFractureModel* fractureModel, +bool RifStimPlanModelExporter::writeToDirectory( RimStimPlanModel* stimPlanModel, bool useDetailedFluidLoss, const QString& directoryPath ) { - return RifFractureModelGeologicalFrkExporter::writeToFile( fractureModel, + return RifStimPlanModelGeologicalFrkExporter::writeToFile( stimPlanModel, useDetailedFluidLoss, directoryPath + "/Geological.frk" ) && - RifFractureModelDeviationFrkExporter::writeToFile( fractureModel, directoryPath + "/Deviation.frk" ) && - RifFractureModelPerfsFrkExporter::writeToFile( fractureModel, directoryPath + "/Perfs.frk" ) && - RifFractureModelAsymmetricFrkExporter::writeToFile( fractureModel, directoryPath + "/Asymmetric.frk" ); + RifStimPlanModelDeviationFrkExporter::writeToFile( stimPlanModel, directoryPath + "/Deviation.frk" ) && + RifStimPlanModelPerfsFrkExporter::writeToFile( stimPlanModel, directoryPath + "/Perfs.frk" ) && + RifStimPlanModelAsymmetricFrkExporter::writeToFile( stimPlanModel, directoryPath + "/Asymmetric.frk" ); } diff --git a/ApplicationCode/FileInterface/RifFractureModelExporter.h b/ApplicationCode/FileInterface/RifStimPlanModelExporter.h similarity index 90% rename from ApplicationCode/FileInterface/RifFractureModelExporter.h rename to ApplicationCode/FileInterface/RifStimPlanModelExporter.h index 829be5f6a6..1cf4421278 100644 --- a/ApplicationCode/FileInterface/RifFractureModelExporter.h +++ b/ApplicationCode/FileInterface/RifStimPlanModelExporter.h @@ -20,15 +20,15 @@ #include -class RimFractureModel; +class RimStimPlanModel; class QString; class QTextStream; //================================================================================================== // //================================================================================================== -class RifFractureModelExporter +class RifStimPlanModelExporter { public: - static bool writeToDirectory( RimFractureModel* fractureModel, bool useDetailedFluidLoss, const QString& directoryPath ); + static bool writeToDirectory( RimStimPlanModel* stimPlanModel, bool useDetailedFluidLoss, const QString& directoryPath ); }; diff --git a/ApplicationCode/FileInterface/RifFractureModelGeologicalFrkExporter.cpp b/ApplicationCode/FileInterface/RifStimPlanModelGeologicalFrkExporter.cpp similarity index 73% rename from ApplicationCode/FileInterface/RifFractureModelGeologicalFrkExporter.cpp rename to ApplicationCode/FileInterface/RifStimPlanModelGeologicalFrkExporter.cpp index e83eb931db..9d8b75e37b 100644 --- a/ApplicationCode/FileInterface/RifFractureModelGeologicalFrkExporter.cpp +++ b/ApplicationCode/FileInterface/RifStimPlanModelGeologicalFrkExporter.cpp @@ -16,10 +16,10 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RifFractureModelGeologicalFrkExporter.h" +#include "RifStimPlanModelGeologicalFrkExporter.h" -#include "RimFractureModel.h" -#include "RimFractureModelCalculator.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCalculator.h" #include #include @@ -27,7 +27,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifFractureModelGeologicalFrkExporter::writeToFile( RimFractureModel* fractureModel, +bool RifStimPlanModelGeologicalFrkExporter::writeToFile( RimStimPlanModel* stimPlanModel, bool useDetailedLoss, const QString& filepath ) { @@ -91,24 +91,24 @@ bool RifFractureModelGeologicalFrkExporter::writeToFile( RimFractureModel* fract } std::map> values; - values["dpthlyr"] = fractureModel->calculator()->calculateTrueVerticalDepth(); - values["strs"] = fractureModel->calculator()->calculateStress(); - values["strsg"] = fractureModel->calculator()->calculateStressGradient(); - values["elyr"] = fractureModel->calculator()->calculateYoungsModulus(); - values["poissonr"] = fractureModel->calculator()->calculatePoissonsRatio(); - values["tuflyr"] = fractureModel->calculator()->calculateKIc(); - values["clyrc"] = fractureModel->calculator()->calculateFluidLossCoefficient(); - values["clyrs"] = fractureModel->calculator()->calculateSpurtLoss(); - values["pembed"] = fractureModel->calculator()->calculateProppandEmbedment(); - values["zoneResPres"] = fractureModel->calculator()->calculateReservoirPressure(); - values["zoneWaterSat"] = fractureModel->calculator()->calculateImmobileFluidSaturation(); - values["zonePorosity"] = fractureModel->calculator()->calculatePorosity(); - values["zoneHorizPerm"] = fractureModel->calculator()->calculateHorizontalPermeability(); - values["zoneVertPerm"] = fractureModel->calculator()->calculateVerticalPermeability(); - values["zoneTemp"] = fractureModel->calculator()->calculateTemperature(); - values["zoneRelPerm"] = fractureModel->calculator()->calculateRelativePermeabilityFactor(); - values["zonePoroElas"] = fractureModel->calculator()->calculatePoroElasticConstant(); - values["zoneThermalExp"] = fractureModel->calculator()->calculateThermalExpansionCoefficient(); + values["dpthlyr"] = stimPlanModel->calculator()->calculateTrueVerticalDepth(); + values["strs"] = stimPlanModel->calculator()->calculateStress(); + values["strsg"] = stimPlanModel->calculator()->calculateStressGradient(); + values["elyr"] = stimPlanModel->calculator()->calculateYoungsModulus(); + values["poissonr"] = stimPlanModel->calculator()->calculatePoissonsRatio(); + values["tuflyr"] = stimPlanModel->calculator()->calculateKIc(); + values["clyrc"] = stimPlanModel->calculator()->calculateFluidLossCoefficient(); + values["clyrs"] = stimPlanModel->calculator()->calculateSpurtLoss(); + values["pembed"] = stimPlanModel->calculator()->calculateProppandEmbedment(); + values["zoneResPres"] = stimPlanModel->calculator()->calculateReservoirPressure(); + values["zoneWaterSat"] = stimPlanModel->calculator()->calculateImmobileFluidSaturation(); + values["zonePorosity"] = stimPlanModel->calculator()->calculatePorosity(); + values["zoneHorizPerm"] = stimPlanModel->calculator()->calculateHorizontalPermeability(); + values["zoneVertPerm"] = stimPlanModel->calculator()->calculateVerticalPermeability(); + values["zoneTemp"] = stimPlanModel->calculator()->calculateTemperature(); + values["zoneRelPerm"] = stimPlanModel->calculator()->calculateRelativePermeabilityFactor(); + values["zonePoroElas"] = stimPlanModel->calculator()->calculatePoroElasticConstant(); + values["zoneThermalExp"] = stimPlanModel->calculator()->calculateThermalExpansionCoefficient(); QFile data( filepath ); if ( !data.open( QFile::WriteOnly | QFile::Truncate ) ) @@ -129,12 +129,12 @@ bool RifFractureModelGeologicalFrkExporter::writeToFile( RimFractureModel* fract return true; } -void RifFractureModelGeologicalFrkExporter::appendHeaderToStream( QTextStream& stream ) +void RifStimPlanModelGeologicalFrkExporter::appendHeaderToStream( QTextStream& stream ) { stream << "" << endl << "" << endl; } -void RifFractureModelGeologicalFrkExporter::appendToStream( QTextStream& stream, +void RifStimPlanModelGeologicalFrkExporter::appendToStream( QTextStream& stream, const QString& label, const std::vector& values ) { @@ -157,7 +157,7 @@ void RifFractureModelGeologicalFrkExporter::appendToStream( QTextStream& stream << "" << endl << "" << endl; } -void RifFractureModelGeologicalFrkExporter::appendFooterToStream( QTextStream& stream ) +void RifStimPlanModelGeologicalFrkExporter::appendFooterToStream( QTextStream& stream ) { stream << "" << endl; } diff --git a/ApplicationCode/FileInterface/RifFractureModelGeologicalFrkExporter.h b/ApplicationCode/FileInterface/RifStimPlanModelGeologicalFrkExporter.h similarity index 91% rename from ApplicationCode/FileInterface/RifFractureModelGeologicalFrkExporter.h rename to ApplicationCode/FileInterface/RifStimPlanModelGeologicalFrkExporter.h index b0159fd133..a486830c91 100644 --- a/ApplicationCode/FileInterface/RifFractureModelGeologicalFrkExporter.h +++ b/ApplicationCode/FileInterface/RifStimPlanModelGeologicalFrkExporter.h @@ -20,17 +20,17 @@ #include -class RimFractureModel; +class RimStimPlanModel; class QString; class QTextStream; //================================================================================================== // //================================================================================================== -class RifFractureModelGeologicalFrkExporter +class RifStimPlanModelGeologicalFrkExporter { public: - static bool writeToFile( RimFractureModel* plot, bool useDetailedFluidLoss, const QString& filepath ); + static bool writeToFile( RimStimPlanModel* plot, bool useDetailedFluidLoss, const QString& filepath ); private: static void appendHeaderToStream( QTextStream& stream ); diff --git a/ApplicationCode/FileInterface/RifFractureModelPerfsFrkExporter.cpp b/ApplicationCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp similarity index 87% rename from ApplicationCode/FileInterface/RifFractureModelPerfsFrkExporter.cpp rename to ApplicationCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp index e0668f2341..480202e156 100644 --- a/ApplicationCode/FileInterface/RifFractureModelPerfsFrkExporter.cpp +++ b/ApplicationCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp @@ -16,11 +16,11 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RifFractureModelPerfsFrkExporter.h" +#include "RifStimPlanModelPerfsFrkExporter.h" #include "RiaLogging.h" -#include "RimFractureModel.h" +#include "RimStimPlanModel.h" #include "RimWellPath.h" #include "RigWellPath.h" @@ -34,9 +34,9 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifFractureModelPerfsFrkExporter::writeToFile( RimFractureModel* fractureModel, const QString& filepath ) +bool RifStimPlanModelPerfsFrkExporter::writeToFile( RimStimPlanModel* stimPlanModel, const QString& filepath ) { - RimWellPath* wellPath = fractureModel->wellPath(); + RimWellPath* wellPath = stimPlanModel->wellPath(); if ( !wellPath ) { return false; @@ -52,15 +52,15 @@ bool RifFractureModelPerfsFrkExporter::writeToFile( RimFractureModel* fractureMo appendHeaderToStream( stream ); bool isTransverse = - ( fractureModel->fractureOrientation() == RimFractureModel::FractureOrientation::TRANSVERSE_WELL_PATH || - fractureModel->fractureOrientation() == RimFractureModel::FractureOrientation::AZIMUTH ); + ( stimPlanModel->fractureOrientation() == RimStimPlanModel::FractureOrientation::TRANSVERSE_WELL_PATH || + stimPlanModel->fractureOrientation() == RimStimPlanModel::FractureOrientation::AZIMUTH ); appendFractureOrientationToStream( stream, isTransverse ); // Unit: meter - double perforationLength = fractureModel->perforationLength(); + double perforationLength = stimPlanModel->perforationLength(); - double anchorPositionMD = computeMeasuredDepthForPosition( wellPath, fractureModel->anchorPosition() ); + double anchorPositionMD = computeMeasuredDepthForPosition( wellPath, stimPlanModel->anchorPosition() ); double topMD = anchorPositionMD - ( perforationLength / 2.0 ); double bottomMD = anchorPositionMD + ( perforationLength / 2.0 ); @@ -77,7 +77,7 @@ bool RifFractureModelPerfsFrkExporter::writeToFile( RimFractureModel* fractureMo //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelPerfsFrkExporter::appendHeaderToStream( QTextStream& stream ) +void RifStimPlanModelPerfsFrkExporter::appendHeaderToStream( QTextStream& stream ) { stream << "" << endl << "" << endl; } @@ -85,7 +85,7 @@ void RifFractureModelPerfsFrkExporter::appendHeaderToStream( QTextStream& stream //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelPerfsFrkExporter::appendFractureOrientationToStream( QTextStream& stream, bool isTransverse ) +void RifStimPlanModelPerfsFrkExporter::appendFractureOrientationToStream( QTextStream& stream, bool isTransverse ) { stream << "" << endl << static_cast( isTransverse ) << endl << "" << endl; } @@ -93,7 +93,7 @@ void RifFractureModelPerfsFrkExporter::appendFractureOrientationToStream( QTextS //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelPerfsFrkExporter::appendPerforationToStream( QTextStream& stream, int index, double topMD, double bottomMD ) +void RifStimPlanModelPerfsFrkExporter::appendPerforationToStream( QTextStream& stream, int index, double topMD, double bottomMD ) { stream << "" << endl << "" << endl @@ -108,7 +108,7 @@ void RifFractureModelPerfsFrkExporter::appendPerforationToStream( QTextStream& s //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifFractureModelPerfsFrkExporter::appendFooterToStream( QTextStream& stream ) +void RifStimPlanModelPerfsFrkExporter::appendFooterToStream( QTextStream& stream ) { stream << "" << endl; } @@ -116,7 +116,7 @@ void RifFractureModelPerfsFrkExporter::appendFooterToStream( QTextStream& stream //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RifFractureModelPerfsFrkExporter::computeMeasuredDepthForPosition( const RimWellPath* wellPath, +double RifStimPlanModelPerfsFrkExporter::computeMeasuredDepthForPosition( const RimWellPath* wellPath, const cvf::Vec3d& position ) { const RigWellPath* wellPathGeometry = wellPath->wellPathGeometry(); diff --git a/ApplicationCode/FileInterface/RifFractureModelPerfsFrkExporter.h b/ApplicationCode/FileInterface/RifStimPlanModelPerfsFrkExporter.h similarity index 92% rename from ApplicationCode/FileInterface/RifFractureModelPerfsFrkExporter.h rename to ApplicationCode/FileInterface/RifStimPlanModelPerfsFrkExporter.h index d04c5f5604..fc5000c4b1 100644 --- a/ApplicationCode/FileInterface/RifFractureModelPerfsFrkExporter.h +++ b/ApplicationCode/FileInterface/RifStimPlanModelPerfsFrkExporter.h @@ -20,7 +20,7 @@ #include "cvfVector3.h" -class RimFractureModel; +class RimStimPlanModel; class RimWellPath; class QString; @@ -29,10 +29,10 @@ class QTextStream; //================================================================================================== // //================================================================================================== -class RifFractureModelPerfsFrkExporter +class RifStimPlanModelPerfsFrkExporter { public: - static bool writeToFile( RimFractureModel* fractureModel, const QString& filepath ); + static bool writeToFile( RimStimPlanModel* stimPlanModel, const QString& filepath ); private: static void appendHeaderToStream( QTextStream& stream ); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp index 6f5f9e6757..93dad55afd 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp @@ -18,8 +18,8 @@ #include "RimCompletionTemplateCollection.h" -#include "RimFractureModelTemplateCollection.h" #include "RimFractureTemplateCollection.h" +#include "RimStimPlanModelTemplateCollection.h" #include "RimValveTemplateCollection.h" #include "cafPdmUiTreeOrdering.h" @@ -39,8 +39,8 @@ RimCompletionTemplateCollection::RimCompletionTemplateCollection() m_fractureTemplates = new RimFractureTemplateCollection; m_fractureTemplates->addDefaultEllipseTemplate(); - CAF_PDM_InitFieldNoDefault( &m_fractureModelTemplates, "FractureModelTemplates", "", "", "", "" ); - m_fractureModelTemplates = new RimFractureModelTemplateCollection; + CAF_PDM_InitFieldNoDefault( &m_stimPlanModelTemplates, "StimPlanModelTemplates", "", "", "", "" ); + m_stimPlanModelTemplates = new RimStimPlanModelTemplateCollection; CAF_PDM_InitFieldNoDefault( &m_valveTemplates, "ValveTemplates", "", "", "", "" ); m_valveTemplates = new RimValveTemplateCollection; @@ -106,17 +106,17 @@ void RimCompletionTemplateCollection::setFractureTemplateCollection( RimFracture //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelTemplateCollection* RimCompletionTemplateCollection::fractureModelTemplateCollection() +RimStimPlanModelTemplateCollection* RimCompletionTemplateCollection::stimPlanModelTemplateCollection() { - return m_fractureModelTemplates; + return m_stimPlanModelTemplates; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RimFractureModelTemplateCollection* RimCompletionTemplateCollection::fractureModelTemplateCollection() const +const RimStimPlanModelTemplateCollection* RimCompletionTemplateCollection::stimPlanModelTemplateCollection() const { - return m_fractureModelTemplates; + return m_stimPlanModelTemplates; } //-------------------------------------------------------------------------------------------------- @@ -126,7 +126,7 @@ void RimCompletionTemplateCollection::defineUiTreeOrdering( caf::PdmUiTreeOrderi QString uiConfigName /*= ""*/ ) { uiTreeOrdering.add( m_fractureTemplates ); - uiTreeOrdering.add( m_fractureModelTemplates ); + uiTreeOrdering.add( m_stimPlanModelTemplates ); uiTreeOrdering.add( m_valveTemplates ); uiTreeOrdering.skipRemainingChildren( true ); } @@ -137,5 +137,5 @@ void RimCompletionTemplateCollection::defineUiTreeOrdering( caf::PdmUiTreeOrderi void RimCompletionTemplateCollection::loadAndUpdateData() { m_fractureTemplates->loadAndUpdateData(); - m_fractureModelTemplates->loadAndUpdateData(); + m_stimPlanModelTemplates->loadAndUpdateData(); } diff --git a/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.h b/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.h index e6e5d9ecbf..706b45cd2e 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.h @@ -24,7 +24,7 @@ class RimOilField; class RimValveTemplateCollection; class RimFractureTemplateCollection; -class RimFractureModelTemplateCollection; +class RimStimPlanModelTemplateCollection; class RimCompletionTemplateCollection : public caf::PdmObject { @@ -36,8 +36,8 @@ public: RimFractureTemplateCollection* fractureTemplateCollection(); const RimFractureTemplateCollection* fractureTemplateCollection() const; - RimFractureModelTemplateCollection* fractureModelTemplateCollection(); - const RimFractureModelTemplateCollection* fractureModelTemplateCollection() const; + RimStimPlanModelTemplateCollection* stimPlanModelTemplateCollection(); + const RimStimPlanModelTemplateCollection* stimPlanModelTemplateCollection() const; RimValveTemplateCollection* valveTemplateCollection(); const RimValveTemplateCollection* valveTemplateCollection() const; void setDefaultUnitSystemBasedOnLoadedCases(); @@ -50,7 +50,7 @@ private: caf::PdmChildField m_fractureTemplates; caf::PdmChildField m_valveTemplates; - caf::PdmChildField m_fractureModelTemplates; + caf::PdmChildField m_stimPlanModelTemplates; protected: void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; diff --git a/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp b/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp index 9608e3f7e5..22596ef1be 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp @@ -23,10 +23,10 @@ #include "RimFishboneWellPathCollection.h" #include "RimFishbonesCollection.h" #include "RimFishbonesMultipleSubs.h" -#include "RimFractureModel.h" -#include "RimFractureModelCollection.h" #include "RimPerforationCollection.h" #include "RimPerforationInterval.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCollection.h" #include "RimWellPathComponentInterface.h" #include "RimWellPathFracture.h" #include "RimWellPathFractureCollection.h" @@ -112,9 +112,9 @@ RimWellPathCompletions::RimWellPathCompletions() m_fractureCollection = new RimWellPathFractureCollection; m_fractureCollection.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_fractureModelCollection, "FractureModels", "Fracture Models", "", "", "" ); - m_fractureModelCollection = new RimFractureModelCollection; - m_fractureModelCollection.uiCapability()->setUiHidden( true ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanModelCollection, "StimPlanModels", "StimPlan Models", "", "", "" ); + m_stimPlanModelCollection = new RimStimPlanModelCollection; + m_stimPlanModelCollection.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_wellNameForExport, "WellNameForExport", QString(), "Well Name", "", "", "" ); m_wellNameForExport.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); @@ -233,11 +233,11 @@ RimWellPathFractureCollection* RimWellPathCompletions::fractureCollection() cons //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelCollection* RimWellPathCompletions::fractureModelCollection() const +RimStimPlanModelCollection* RimWellPathCompletions::stimPlanModelCollection() const { - CVF_ASSERT( m_fractureModelCollection ); + CVF_ASSERT( m_stimPlanModelCollection ); - return m_fractureModelCollection; + return m_stimPlanModelCollection; } //-------------------------------------------------------------------------------------------------- @@ -284,7 +284,7 @@ std::vector RimWellPathCompletions::allCom //-------------------------------------------------------------------------------------------------- bool RimWellPathCompletions::hasCompletions() const { - if ( !fractureCollection()->allFractures().empty() || !fractureModelCollection()->allFractureModels().empty() ) + if ( !fractureCollection()->allFractures().empty() || !stimPlanModelCollection()->allStimPlanModels().empty() ) { return true; } @@ -411,9 +411,9 @@ void RimWellPathCompletions::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTre uiTreeOrdering.add( &m_fractureCollection ); } - if ( !fractureModelCollection()->allFractureModels().empty() ) + if ( !stimPlanModelCollection()->allStimPlanModels().empty() ) { - uiTreeOrdering.add( &m_fractureModelCollection ); + uiTreeOrdering.add( &m_stimPlanModelCollection ); } } diff --git a/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h b/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h index 501e2314f6..c6bb6ecf08 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h @@ -27,7 +27,7 @@ class RimPerforationCollection; class RimWellPathFractureCollection; class RimWellPathComponentInterface; class RimWellPathValve; -class RimFractureModelCollection; +class RimStimPlanModelCollection; //================================================================================================== /// @@ -75,7 +75,7 @@ public: RimFishbonesCollection* fishbonesCollection() const; RimPerforationCollection* perforationCollection() const; RimWellPathFractureCollection* fractureCollection() const; - RimFractureModelCollection* fractureModelCollection() const; + RimStimPlanModelCollection* stimPlanModelCollection() const; std::vector valves() const; std::vector allCompletions() const; @@ -114,7 +114,7 @@ private: caf::PdmChildField m_fishbonesCollection; caf::PdmChildField m_perforationCollection; caf::PdmChildField m_fractureCollection; - caf::PdmChildField m_fractureModelCollection; + caf::PdmChildField m_stimPlanModelCollection; caf::PdmField m_wellNameForExport; caf::PdmField m_wellGroupName; diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index 9703d7ca77..6562de5d42 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -71,11 +71,6 @@ #include "RimFlowPlotCollection.h" #include "RimFormationNames.h" #include "RimFormationNamesCollection.h" -#include "RimFractureModel.h" -#include "RimFractureModelCollection.h" -#include "RimFractureModelPlot.h" -#include "RimFractureModelTemplate.h" -#include "RimFractureModelTemplateCollection.h" #include "RimFractureTemplate.h" #include "RimFractureTemplateCollection.h" #include "RimGeoMechCase.h" @@ -112,6 +107,11 @@ #include "RimSimWellInView.h" #include "RimSimWellInViewCollection.h" #include "RimStimPlanFractureTemplate.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCollection.h" +#include "RimStimPlanModelPlot.h" +#include "RimStimPlanModelTemplate.h" +#include "RimStimPlanModelTemplateCollection.h" #include "RimSummaryCase.h" #include "RimSummaryCaseCollection.h" #include "RimSummaryCaseMainCollection.h" @@ -404,7 +404,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() menuBuilder << "RicNewPerforationIntervalFeature"; menuBuilder << "RicNewFishbonesSubsFeature"; menuBuilder << "RicNewWellPathFractureFeature"; - menuBuilder << "RicNewFractureModelFeature"; + menuBuilder << "RicNewStimPlanModelFeature"; menuBuilder.subMenuEnd(); menuBuilder << "RicCreateTemporaryLgrFeature"; menuBuilder.addSeparator(); @@ -437,15 +437,15 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() { menuBuilder << "RicDeleteWellPathAttributeFeature"; } - else if ( dynamic_cast( firstUiItem ) ) + else if ( dynamic_cast( firstUiItem ) ) { - menuBuilder << "RicNewFractureModelFeature"; - menuBuilder << "RicNewFractureModelPlotFeature"; - menuBuilder << "RicExportFractureModelToFileFeature"; + menuBuilder << "RicNewStimPlanModelFeature"; + menuBuilder << "RicNewStimPlanModelPlotFeature"; + menuBuilder << "RicExportStimPlanModelToFileFeature"; } - else if ( dynamic_cast( firstUiItem ) ) + else if ( dynamic_cast( firstUiItem ) ) { - menuBuilder << "RicNewFractureModelFeature"; + menuBuilder << "RicNewStimPlanModelFeature"; } else if ( dynamic_cast( firstUiItem ) || dynamic_cast( firstUiItem ) || @@ -874,14 +874,14 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() { menuBuilder << "RicDeleteValveTemplateFeature"; } - else if ( dynamic_cast( firstUiItem ) ) + else if ( dynamic_cast( firstUiItem ) ) { menuBuilder << "RicImportFaciesFeature"; menuBuilder << "RicImportElasticPropertiesFeature"; } - else if ( dynamic_cast( firstUiItem ) ) + else if ( dynamic_cast( firstUiItem ) ) { - menuBuilder << "RicNewFractureModelTemplateFeature"; + menuBuilder << "RicNewStimPlanModelTemplateFeature"; } else if ( dynamic_cast( firstUiItem ) ) { @@ -1313,7 +1313,7 @@ int RimContextCommandBuilder::appendCreateCompletions( caf::CmdFeatureMenuBuilde candidates << "RicNewValveFeature"; candidates << "RicNewFishbonesSubsFeature"; candidates << "RicNewWellPathFractureFeature"; - candidates << "RicNewFractureModelFeature"; + candidates << "RicNewStimPlanModelFeature"; candidates << "Separator"; candidates << "RicCreateMultipleFracturesFeature"; candidates << "RicNewWellPathAttributeFeature"; diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp index 2d7bfff5c7..65bada910b 100644 --- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp @@ -22,8 +22,6 @@ #include "RimCorrelationPlotCollection.h" #include "RimFlowCharacteristicsPlot.h" #include "RimFlowPlotCollection.h" -#include "RimFractureModelPlot.h" -#include "RimFractureModelPlotCollection.h" #include "RimGridCrossPlot.h" #include "RimGridCrossPlotCollection.h" #include "RimMultiPlot.h" @@ -32,6 +30,8 @@ #include "RimProject.h" #include "RimRftPlotCollection.h" #include "RimSaturationPressurePlotCollection.h" +#include "RimStimPlanModelPlot.h" +#include "RimStimPlanModelPlotCollection.h" #include "RimSummaryAddress.h" #include "RimSummaryCrossPlotCollection.h" #include "RimSummaryPlotCollection.h" @@ -95,8 +95,8 @@ RimMainPlotCollection::RimMainPlotCollection() CAF_PDM_InitFieldNoDefault( &m_multiPlotCollection, "RimMultiPlotCollection", "Multi Plots", "", "", "" ); m_multiPlotCollection.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_fractureModelPlotCollection, "FractureModelPlotCollection", "", "", "", "" ); - m_fractureModelPlotCollection.uiCapability()->setUiHidden( true ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanModelPlotCollection, "StimPlanModelPlotCollection", "", "", "", "" ); + m_stimPlanModelPlotCollection.uiCapability()->setUiHidden( true ); m_wellLogPlotCollection = new RimWellLogPlotCollection(); m_rftPlotCollection = new RimRftPlotCollection(); @@ -109,7 +109,7 @@ RimMainPlotCollection::RimMainPlotCollection() m_multiPlotCollection = new RimMultiPlotCollection; m_analysisPlotCollection = new RimAnalysisPlotCollection; m_correlationPlotCollection = new RimCorrelationPlotCollection; - m_fractureModelPlotCollection = new RimFractureModelPlotCollection; + m_stimPlanModelPlotCollection = new RimStimPlanModelPlotCollection; } //-------------------------------------------------------------------------------------------------- @@ -227,9 +227,9 @@ RimCorrelationPlotCollection* RimMainPlotCollection::correlationPlotCollection() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelPlotCollection* RimMainPlotCollection::fractureModelPlotCollection() +RimStimPlanModelPlotCollection* RimMainPlotCollection::stimPlanModelPlotCollection() { - return m_fractureModelPlotCollection(); + return m_stimPlanModelPlotCollection(); } //-------------------------------------------------------------------------------------------------- @@ -248,7 +248,7 @@ void RimMainPlotCollection::deleteAllContainedObjects() m_multiPlotCollection()->deleteAllChildObjects(); m_analysisPlotCollection()->deleteAllPlots(); m_correlationPlotCollection()->deleteAllPlots(); - m_fractureModelPlotCollection()->deleteAllPlots(); + m_stimPlanModelPlotCollection()->deleteAllPlots(); } //-------------------------------------------------------------------------------------------------- @@ -309,11 +309,11 @@ void RimMainPlotCollection::updatePlotsWithFormations() } } - if ( m_fractureModelPlotCollection ) + if ( m_stimPlanModelPlotCollection ) { - for ( RimFractureModelPlot* fractureModelPlot : m_fractureModelPlotCollection->fractureModelPlots() ) + for ( RimStimPlanModelPlot* stimPlanModelPlot : m_stimPlanModelPlotCollection->stimPlanModelPlots() ) { - fractureModelPlot->loadDataAndUpdate(); + stimPlanModelPlot->loadDataAndUpdate(); } } } diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h index ff51b988a7..32db568641 100644 --- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h @@ -40,7 +40,7 @@ class RifReaderEclipseSummary; class RimEclipseResultCase; class RimFlowPlotCollection; class RimSaturationPressurePlotCollection; -class RimFractureModelPlotCollection; +class RimStimPlanModelPlotCollection; //================================================================================================== /// @@ -65,7 +65,7 @@ public: RimGridCrossPlotCollection* gridCrossPlotCollection(); RimSaturationPressurePlotCollection* saturationPressurePlotCollection(); RimMultiPlotCollection* multiPlotCollection(); - RimFractureModelPlotCollection* fractureModelPlotCollection(); + RimStimPlanModelPlotCollection* stimPlanModelPlotCollection(); void deleteAllContainedObjects(); void updateCurrentTimeStepInPlots(); @@ -92,7 +92,7 @@ private: caf::PdmChildField m_gridCrossPlotCollection; caf::PdmChildField m_saturationPressurePlotCollection; caf::PdmChildField m_multiPlotCollection; - caf::PdmChildField m_fractureModelPlotCollection; + caf::PdmChildField m_stimPlanModelPlotCollection; caf::PdmField m_show; }; diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 1117b36c3f..b7ad18ec24 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -49,7 +49,6 @@ #include "RimEclipseCaseCollection.h" #include "RimFlowPlotCollection.h" #include "RimFormationNamesCollection.h" -#include "RimFractureModelPlotCollection.h" #include "RimFractureTemplate.h" #include "RimFractureTemplateCollection.h" #include "RimGeoMechCase.h" @@ -70,6 +69,7 @@ #include "RimRftPlotCollection.h" #include "RimSaturationPressurePlotCollection.h" #include "RimScriptCollection.h" +#include "RimStimPlanModelPlotCollection.h" #include "RimSummaryCalculation.h" #include "RimSummaryCalculationCollection.h" #include "RimSummaryCaseCollection.h" @@ -1449,9 +1449,9 @@ void RimProject::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, Q itemCollection->add( mainPlotCollection->multiPlotCollection() ); } - if ( mainPlotCollection->fractureModelPlotCollection() ) + if ( mainPlotCollection->stimPlanModelPlotCollection() ) { - itemCollection->add( mainPlotCollection->fractureModelPlotCollection() ); + itemCollection->add( mainPlotCollection->stimPlanModelPlotCollection() ); } } diff --git a/ApplicationCode/ProjectDataModel/RimReloadCaseTools.cpp b/ApplicationCode/ProjectDataModel/RimReloadCaseTools.cpp index 0d15c52b34..8365e5c9af 100644 --- a/ApplicationCode/ProjectDataModel/RimReloadCaseTools.cpp +++ b/ApplicationCode/ProjectDataModel/RimReloadCaseTools.cpp @@ -100,11 +100,11 @@ void RimReloadCaseTools::clearAllGridData( RigEclipseCaseData* eclipseCaseData ) matrixModelResults->clearAllResults(); } - RigCaseCellResultsData* fractureModelResults = + RigCaseCellResultsData* stimPlanModelResults = eclipseCaseData->results( RiaDefines::PorosityModelType::FRACTURE_MODEL ); - if ( fractureModelResults ) + if ( stimPlanModelResults ) { - fractureModelResults->clearAllResults(); + stimPlanModelResults->clearAllResults(); } } diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp index ad98605187..937abeec68 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp @@ -35,9 +35,9 @@ #include "Rim3dWellLogCurve.h" #include "Rim3dWellLogCurveCollection.h" #include "RimFishbonesMultipleSubs.h" -#include "RimFractureModelCollection.h" #include "RimMainPlotCollection.h" #include "RimProject.h" +#include "RimStimPlanModelCollection.h" #include "RimTools.h" #include "RimWellLogFile.h" #include "RimWellLogFileChannel.h" @@ -305,21 +305,21 @@ const RimWellPathFractureCollection* RimWellPath::fractureCollection() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelCollection* RimWellPath::fractureModelCollection() +RimStimPlanModelCollection* RimWellPath::stimPlanModelCollection() { CVF_ASSERT( m_completions ); - return m_completions->fractureModelCollection(); + return m_completions->stimPlanModelCollection(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RimFractureModelCollection* RimWellPath::fractureModelCollection() const +const RimStimPlanModelCollection* RimWellPath::stimPlanModelCollection() const { CVF_ASSERT( m_completions ); - return m_completions->fractureModelCollection(); + return m_completions->stimPlanModelCollection(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.h b/ApplicationCode/ProjectDataModel/RimWellPath.h index 6e1bd29889..5e9c7cb86d 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.h +++ b/ApplicationCode/ProjectDataModel/RimWellPath.h @@ -49,7 +49,7 @@ class RimProject; class RimWellLogFile; class RimFractureTemplateCollection; class RimFishboneWellPathCollection; -class RimFractureModelCollection; +class RimStimPlanModelCollection; class RimFishbonesCollection; class RimPerforationCollection; class RimWellPathAttributeCollection; @@ -122,8 +122,8 @@ public: const RimPerforationCollection* perforationIntervalCollection() const; RimWellPathFractureCollection* fractureCollection(); const RimWellPathFractureCollection* fractureCollection() const; - RimFractureModelCollection* fractureModelCollection(); - const RimFractureModelCollection* fractureModelCollection() const; + RimStimPlanModelCollection* stimPlanModelCollection(); + const RimStimPlanModelCollection* stimPlanModelCollection() const; RimWellPathAttributeCollection* attributeCollection(); const RimWellPathAttributeCollection* attributeCollection() const; diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp index 9edcef1358..e344f1a14c 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp @@ -35,11 +35,11 @@ #include "RimEclipseCase.h" #include "RimEclipseCaseCollection.h" #include "RimEclipseView.h" -#include "RimFractureModel.h" -#include "RimFractureModelCollection.h" #include "RimOilField.h" #include "RimPerforationCollection.h" #include "RimProject.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCollection.h" #include "RimWellLogFile.h" #include "RimWellMeasurementCollection.h" #include "RimWellPath.h" @@ -254,12 +254,12 @@ void RimWellPathCollection::loadDataAndUpdate() } } - RimFractureModelCollection* fractureModelCollection = wellPath->fractureModelCollection(); - if ( fractureModelCollection ) + RimStimPlanModelCollection* stimPlanModelCollection = wellPath->stimPlanModelCollection(); + if ( stimPlanModelCollection ) { - for ( RimFractureModel* fractureModel : fractureModelCollection->allFractureModels() ) + for ( RimStimPlanModel* stimPlanModel : stimPlanModelCollection->allStimPlanModels() ) { - fractureModel->loadDataAndUpdate(); + stimPlanModel->loadDataAndUpdate(); } } } diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/StimPlanModel/CMakeLists_files.cmake index 4acad0a0b6..6b8ca6eb70 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/CMakeLists_files.cmake @@ -1,19 +1,19 @@ set (SOURCE_GROUP_HEADER_FILES -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelCollection.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelTemplate.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModel.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelTemplateCollection.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelCalculator.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelCurve.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelElasticPropertyCalculator.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelLayerCalculator.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelPlotCollection.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelPlot.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelPropertyCalculator.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelPropertyCurve.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelStressCalculator.h -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelWellLogCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelTemplate.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModel.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelTemplateCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelElasticPropertyCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelLayerCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelPlotCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelPropertyCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelPropertyCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelStressCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelWellLogCalculator.h ${CMAKE_CURRENT_LIST_DIR}/RimElasticProperties.h ${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertyScaling.h ${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertyScalingCollection.h @@ -22,18 +22,18 @@ ${CMAKE_CURRENT_LIST_DIR}/RimNonNetLayers.h ) set (SOURCE_GROUP_SOURCE_FILES -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelCollection.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelTemplate.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModel.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelTemplateCollection.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelCalculator.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelCurve.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelElasticPropertyCalculator.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelLayerCalculator.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelPlotCollection.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelPlot.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelStressCalculator.cpp -${CMAKE_CURRENT_LIST_DIR}/RimFractureModelWellLogCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelTemplate.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModel.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelTemplateCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelElasticPropertyCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelLayerCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelPlotCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelStressCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelWellLogCalculator.cpp ${CMAKE_CURRENT_LIST_DIR}/RimElasticProperties.cpp ${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertyScaling.cpp ${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertyScalingCollection.cpp diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticProperties.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticProperties.cpp index 52f2ab5c0e..4fb5010481 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticProperties.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticProperties.cpp @@ -19,7 +19,7 @@ #include "RimElasticProperties.h" #include "RimElasticPropertyScalingCollection.h" -#include "RimFractureModelTemplate.h" +#include "RimStimPlanModelTemplate.h" #include "RicElasticPropertiesImportTools.h" @@ -228,9 +228,9 @@ void RimElasticProperties::loadDataAndUpdate() { if ( !m_filePath().path().isEmpty() ) { - RimFractureModelTemplate* fractureModelTemplate; - firstAncestorOrThisOfType( fractureModelTemplate ); - RicElasticPropertiesImportTools::importElasticPropertiesFromFile( m_filePath().path(), fractureModelTemplate ); + RimStimPlanModelTemplate* stimPlanModelTemplate; + firstAncestorOrThisOfType( stimPlanModelTemplate ); + RicElasticPropertiesImportTools::importElasticPropertiesFromFile( m_filePath().path(), stimPlanModelTemplate ); } } diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.cpp index f32fe90295..ffcca93033 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.cpp @@ -24,8 +24,8 @@ #include "RimEclipseCase.h" #include "RimElasticProperties.h" #include "RimFaciesProperties.h" -#include "RimFractureModelTemplate.h" #include "RimProject.h" +#include "RimStimPlanModelTemplate.h" #include "cafPdmFieldScriptingCapability.h" #include "cafPdmObjectScriptingCapability.h" @@ -154,11 +154,11 @@ void RimElasticPropertyScaling::updateAutoName() //-------------------------------------------------------------------------------------------------- RimColorLegend* RimElasticPropertyScaling::getFaciesColorLegend() { - RimFractureModelTemplate* fractureModelTemplate; - firstAncestorOrThisOfType( fractureModelTemplate ); - if ( !fractureModelTemplate ) return nullptr; + RimStimPlanModelTemplate* stimPlanModelTemplate; + firstAncestorOrThisOfType( stimPlanModelTemplate ); + if ( !stimPlanModelTemplate ) return nullptr; - RimFaciesProperties* faciesProperties = fractureModelTemplate->faciesProperties(); + RimFaciesProperties* faciesProperties = stimPlanModelTemplate->faciesProperties(); if ( !faciesProperties ) return nullptr; return faciesProperties->colorLegend(); diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.h index 534f1ae7bb..2d6c5a4a1f 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.h @@ -21,7 +21,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include "RimCheckableNamedObject.h" diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.h index cd02aa7af7..e17fe1b62b 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.h @@ -22,7 +22,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" class RimElasticPropertyScaling; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.cpp index 577fcb523c..40ddefbcd4 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.cpp @@ -20,9 +20,9 @@ #include "RimColorLegend.h" #include "RimEclipseResultDefinition.h" -#include "RimFractureModelTemplate.h" #include "RimProject.h" #include "RimRegularLegendConfig.h" +#include "RimStimPlanModelTemplate.h" #include "RimTools.h" #include "RicFaciesPropertiesImportTools.h" @@ -193,9 +193,9 @@ void RimFaciesProperties::loadDataAndUpdate() { if ( !m_filePath().path().isEmpty() ) { - RimFractureModelTemplate* fractureModelTemplate; - firstAncestorOrThisOfType( fractureModelTemplate ); - RicFaciesPropertiesImportTools::importFaciesPropertiesFromFile( m_filePath().path(), fractureModelTemplate ); + RimStimPlanModelTemplate* stimPlanModelTemplate; + firstAncestorOrThisOfType( stimPlanModelTemplate ); + RicFaciesPropertiesImportTools::importFaciesPropertiesFromFile( m_filePath().path(), stimPlanModelTemplate ); } } diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimNonNetLayers.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimNonNetLayers.cpp index 3d68e79357..b17e63eee1 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimNonNetLayers.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimNonNetLayers.cpp @@ -23,8 +23,8 @@ #include "RimEclipseCase.h" #include "RimEclipseResultDefinition.h" #include "RimFaciesProperties.h" -#include "RimFractureModelTemplate.h" #include "RimProject.h" +#include "RimStimPlanModelTemplate.h" #include "cafPdmFieldScriptingCapability.h" #include "cafPdmObjectScriptingCapability.h" @@ -159,11 +159,11 @@ const QString& RimNonNetLayers::facies() const //-------------------------------------------------------------------------------------------------- RimColorLegend* RimNonNetLayers::getFaciesColorLegend() { - RimFractureModelTemplate* fractureModelTemplate; - firstAncestorOrThisOfType( fractureModelTemplate ); - if ( !fractureModelTemplate ) return nullptr; + RimStimPlanModelTemplate* stimPlanModelTemplate; + firstAncestorOrThisOfType( stimPlanModelTemplate ); + if ( !stimPlanModelTemplate ) return nullptr; - RimFaciesProperties* faciesProperties = fractureModelTemplate->faciesProperties(); + RimFaciesProperties* faciesProperties = stimPlanModelTemplate->faciesProperties(); if ( !faciesProperties ) return nullptr; return faciesProperties->colorLegend(); diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModel.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp similarity index 84% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModel.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp index a303ee98ff..b73de11ed2 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModel.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp @@ -16,14 +16,14 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModel.h" +#include "RimStimPlanModel.h" #include "RiaApplication.h" #include "RiaCompletionTypeCalculationScheduler.h" #include "RiaEclipseUnitTools.h" #include "RiaFractureDefines.h" -#include "RiaFractureModelDefines.h" #include "RiaLogging.h" +#include "RiaStimPlanModelDefines.h" #include "RigEclipseCaseData.h" #include "RigMainGrid.h" @@ -45,15 +45,15 @@ #include "RimFaultInView.h" #include "RimFaultInViewCollection.h" #include "RimFracture.h" -#include "RimFractureModelCalculator.h" -#include "RimFractureModelPlot.h" -#include "RimFractureModelTemplate.h" -#include "RimFractureModelTemplateCollection.h" #include "RimModeledWellPath.h" #include "RimNonNetLayers.h" #include "RimOilField.h" #include "RimPolylineTarget.h" #include "RimProject.h" +#include "RimStimPlanModelCalculator.h" +#include "RimStimPlanModelPlot.h" +#include "RimStimPlanModelTemplate.h" +#include "RimStimPlanModelTemplateCollection.h" #include "RimTextAnnotation.h" #include "RimTools.h" #include "RimUserDefinedPolylinesAnnotation.h" @@ -80,62 +80,62 @@ #include -CAF_PDM_SOURCE_INIT( RimFractureModel, "FractureModel" ); +CAF_PDM_SOURCE_INIT( RimStimPlanModel, "StimPlanModel" ); namespace caf { template <> -void caf::AppEnum::setUp() +void caf::AppEnum::setUp() { - addItem( RimFractureModel::ExtractionType::TRUE_VERTICAL_THICKNESS, "TVT", "True Vertical Thickness" ); - addItem( RimFractureModel::ExtractionType::TRUE_STRATIGRAPHIC_THICKNESS, "TST", "True Stratigraphic Thickness" ); + addItem( RimStimPlanModel::ExtractionType::TRUE_VERTICAL_THICKNESS, "TVT", "True Vertical Thickness" ); + addItem( RimStimPlanModel::ExtractionType::TRUE_STRATIGRAPHIC_THICKNESS, "TST", "True Stratigraphic Thickness" ); - setDefault( RimFractureModel::ExtractionType::TRUE_VERTICAL_THICKNESS ); + setDefault( RimStimPlanModel::ExtractionType::TRUE_VERTICAL_THICKNESS ); } template <> -void caf::AppEnum::setUp() +void caf::AppEnum::setUp() { - addItem( RimFractureModel::FractureOrientation::ALONG_WELL_PATH, "ALONG_WELL_PATH", "Along Well Path" ); - addItem( RimFractureModel::FractureOrientation::TRANSVERSE_WELL_PATH, + addItem( RimStimPlanModel::FractureOrientation::ALONG_WELL_PATH, "ALONG_WELL_PATH", "Along Well Path" ); + addItem( RimStimPlanModel::FractureOrientation::TRANSVERSE_WELL_PATH, "TRANSVERSE_WELL_PATH", "Transverse (normal) to Well Path" ); - addItem( RimFractureModel::FractureOrientation::AZIMUTH, "AZIMUTH", "Azimuth" ); + addItem( RimStimPlanModel::FractureOrientation::AZIMUTH, "AZIMUTH", "Azimuth" ); - setDefault( RimFractureModel::FractureOrientation::TRANSVERSE_WELL_PATH ); + setDefault( RimStimPlanModel::FractureOrientation::TRANSVERSE_WELL_PATH ); } template <> -void caf::AppEnum::setUp() +void caf::AppEnum::setUp() { - addItem( RimFractureModel::MissingValueStrategy::DEFAULT_VALUE, "DEFAULT_VALUE", "Default value" ); - addItem( RimFractureModel::MissingValueStrategy::LINEAR_INTERPOLATION, "LINEAR_INTERPOLATION", "Linear interpolation" ); - addItem( RimFractureModel::MissingValueStrategy::OTHER_CURVE_PROPERTY, "OTHER_CURVE_PROPERTY", "Other Curve Property" ); + addItem( RimStimPlanModel::MissingValueStrategy::DEFAULT_VALUE, "DEFAULT_VALUE", "Default value" ); + addItem( RimStimPlanModel::MissingValueStrategy::LINEAR_INTERPOLATION, "LINEAR_INTERPOLATION", "Linear interpolation" ); + addItem( RimStimPlanModel::MissingValueStrategy::OTHER_CURVE_PROPERTY, "OTHER_CURVE_PROPERTY", "Other Curve Property" ); - setDefault( RimFractureModel::MissingValueStrategy::DEFAULT_VALUE ); + setDefault( RimStimPlanModel::MissingValueStrategy::DEFAULT_VALUE ); } template <> -void caf::AppEnum::setUp() +void caf::AppEnum::setUp() { - addItem( RimFractureModel::BurdenStrategy::DEFAULT_VALUE, "DEFAULT_VALUE", "Default value" ); - addItem( RimFractureModel::BurdenStrategy::GRADIENT, "GRADIENT", "Gradient" ); + addItem( RimStimPlanModel::BurdenStrategy::DEFAULT_VALUE, "DEFAULT_VALUE", "Default value" ); + addItem( RimStimPlanModel::BurdenStrategy::GRADIENT, "GRADIENT", "Gradient" ); - setDefault( RimFractureModel::BurdenStrategy::DEFAULT_VALUE ); + setDefault( RimStimPlanModel::BurdenStrategy::DEFAULT_VALUE ); } }; // namespace caf //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModel::RimFractureModel() +RimStimPlanModel::RimStimPlanModel() { - CAF_PDM_InitScriptableObject( "FractureModel", "", "", "" ); + CAF_PDM_InitScriptableObject( "StimPlanModel", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fractureModelTemplate, "FractureModelTemplate", "Fracture Model Template", "", "", "" ); - CAF_PDM_InitField( &m_editFractureModelTemplate, "EditModelTemplate", false, "Edit", "", "", "" ); - m_editFractureModelTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); - m_editFractureModelTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanModelTemplate, "StimPlanModelTemplate", "StimPlan Model Template", "", "", "" ); + CAF_PDM_InitField( &m_editStimPlanModelTemplate, "EditModelTemplate", false, "Edit", "", "", "" ); + m_editStimPlanModelTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); + m_editStimPlanModelTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "Case", "", "", "" ); CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" ); @@ -226,8 +226,8 @@ RimFractureModel::RimFractureModel() "", "" ); - m_calculator = std::shared_ptr( new RimFractureModelCalculator ); - m_calculator->setFractureModel( this ); + m_calculator = std::shared_ptr( new RimStimPlanModelCalculator ); + m_calculator->setStimPlanModel( this ); setDeletable( true ); } @@ -235,7 +235,7 @@ RimFractureModel::RimFractureModel() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModel::~RimFractureModel() +RimStimPlanModel::~RimStimPlanModel() { RimWellPath* wellPath = m_thicknessDirectionWellPath.value(); RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection(); @@ -251,7 +251,7 @@ RimFractureModel::~RimFractureModel() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModel::isEnabled() const +bool RimStimPlanModel::isEnabled() const { return isChecked(); } @@ -259,7 +259,7 @@ bool RimFractureModel::isEnabled() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModel::useDetailedFluidLoss() const +bool RimStimPlanModel::useDetailedFluidLoss() const { return m_useDetailedFluidLoss(); } @@ -267,18 +267,18 @@ bool RimFractureModel::useDetailedFluidLoss() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::initAfterRead() +void RimStimPlanModel::initAfterRead() { - if ( m_fractureModelTemplate ) + if ( m_stimPlanModelTemplate ) { - m_fractureModelTemplate->changed.connect( this, &RimFractureModel::fractureModelTemplateChanged ); + m_stimPlanModelTemplate->changed.connect( this, &RimStimPlanModel::stimPlanModelTemplateChanged ); } } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::fieldChangedByUi( const caf::PdmFieldHandle* changedField, +void RimStimPlanModel::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { @@ -333,17 +333,17 @@ void RimFractureModel::fieldChangedByUi( const caf::PdmFieldHandle* changedField m_thermalExpansionCoeffientDefault.uiCapability()->setUiReadOnly( !m_useDetailedFluidLoss ); } - if ( changedField == &m_fractureModelTemplate ) + if ( changedField == &m_stimPlanModelTemplate ) { - setFractureModelTemplate( m_fractureModelTemplate() ); + setStimPlanModelTemplate( m_stimPlanModelTemplate() ); } - if ( changedField == &m_editFractureModelTemplate ) + if ( changedField == &m_editStimPlanModelTemplate ) { - m_editFractureModelTemplate = false; - if ( m_fractureModelTemplate != nullptr ) + m_editStimPlanModelTemplate = false; + if ( m_stimPlanModelTemplate != nullptr ) { - Riu3DMainWindowTools::selectAsCurrentItem( m_fractureModelTemplate() ); + Riu3DMainWindowTools::selectAsCurrentItem( m_stimPlanModelTemplate() ); } } else @@ -355,20 +355,20 @@ void RimFractureModel::fieldChangedByUi( const caf::PdmFieldHandle* changedField //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QList RimFractureModel::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, +QList RimStimPlanModel::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) { QList options; - if ( fieldNeedingOptions == &m_fractureModelTemplate ) + if ( fieldNeedingOptions == &m_stimPlanModelTemplate ) { RimOilField* oilField = RimProject::current()->activeOilField(); if ( oilField && oilField->completionTemplateCollection() ) { - RimFractureModelTemplateCollection* fracDefColl = - oilField->completionTemplateCollection()->fractureModelTemplateCollection(); + RimStimPlanModelTemplateCollection* fracDefColl = + oilField->completionTemplateCollection()->stimPlanModelTemplateCollection(); - for ( RimFractureModelTemplate* fracDef : fracDefColl->fractureModelTemplates() ) + for ( RimStimPlanModelTemplate* fracDef : fracDefColl->stimPlanModelTemplates() ) { QString displayText = fracDef->name(); options.push_back( caf::PdmOptionItemInfo( displayText, fracDef ) ); @@ -390,7 +390,7 @@ QList RimFractureModel::calculateValueOptions( const caf //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::Vec3d RimFractureModel::fracturePosition() const +cvf::Vec3d RimStimPlanModel::fracturePosition() const { return m_anchorPosition; } @@ -398,7 +398,7 @@ cvf::Vec3d RimFractureModel::fracturePosition() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaDefines::WellPathComponentType RimFractureModel::componentType() const +RiaDefines::WellPathComponentType RimStimPlanModel::componentType() const { return RiaDefines::WellPathComponentType::FRACTURE; } @@ -406,7 +406,7 @@ RiaDefines::WellPathComponentType RimFractureModel::componentType() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModel::componentLabel() const +QString RimStimPlanModel::componentLabel() const { return name(); } @@ -414,15 +414,15 @@ QString RimFractureModel::componentLabel() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModel::componentTypeLabel() const +QString RimStimPlanModel::componentTypeLabel() const { - return "Fracture Model"; + return "StimPlan Model"; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::Color3f RimFractureModel::defaultComponentColor() const +cvf::Color3f RimStimPlanModel::defaultComponentColor() const { return cvf::Color3f::RED; // RiaColorTables::wellPathComponentColors()[componentType()]; } @@ -430,7 +430,7 @@ cvf::Color3f RimFractureModel::defaultComponentColor() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::startMD() const +double RimStimPlanModel::startMD() const { return m_MD(); } @@ -438,7 +438,7 @@ double RimFractureModel::startMD() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::endMD() const +double RimStimPlanModel::endMD() const { return m_MD(); } @@ -446,7 +446,7 @@ double RimFractureModel::endMD() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::Vec3d RimFractureModel::anchorPosition() const +cvf::Vec3d RimStimPlanModel::anchorPosition() const { return m_anchorPosition(); } @@ -454,7 +454,7 @@ cvf::Vec3d RimFractureModel::anchorPosition() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::Vec3d RimFractureModel::thicknessDirection() const +cvf::Vec3d RimStimPlanModel::thicknessDirection() const { return m_thicknessDirection(); } @@ -462,7 +462,7 @@ cvf::Vec3d RimFractureModel::thicknessDirection() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::updatePositionFromMeasuredDepth() +void RimStimPlanModel::updatePositionFromMeasuredDepth() { cvf::Vec3d positionAlongWellpath = cvf::Vec3d::ZERO; @@ -485,7 +485,7 @@ void RimFractureModel::updatePositionFromMeasuredDepth() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::updateThicknessDirection() +void RimStimPlanModel::updateThicknessDirection() { // True vertical thickness: just point straight up cvf::Vec3d direction( 0.0, 0.0, -1.0 ); @@ -532,7 +532,7 @@ void RimFractureModel::updateThicknessDirection() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::Vec3d RimFractureModel::calculateTSTDirection() const +cvf::Vec3d RimStimPlanModel::calculateTSTDirection() const { cvf::Vec3d defaultDirection = cvf::Vec3d( 0.0, 0.0, -1.0 ); @@ -577,7 +577,7 @@ cvf::Vec3d RimFractureModel::calculateTSTDirection() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::updateBarrierProperties() +void RimStimPlanModel::updateBarrierProperties() { if ( m_autoComputeBarrier ) { @@ -597,7 +597,7 @@ void RimFractureModel::updateBarrierProperties() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::updateDistanceToBarrierAndDip() +void RimStimPlanModel::updateDistanceToBarrierAndDip() { caf::PdmObjectHandle* objHandle = dynamic_cast( this ); if ( !objHandle ) return; @@ -612,7 +612,7 @@ void RimFractureModel::updateDistanceToBarrierAndDip() const cvf::Vec3d& position = anchorPosition(); RiaLogging::info( "Computing distance to barrier." ); - RiaLogging::info( QString( "Anchor position: %1" ).arg( RimFractureModel::vecToString( position ) ) ); + RiaLogging::info( QString( "Anchor position: %1" ).arg( RimStimPlanModel::vecToString( position ) ) ); RigWellPath* wellPathGeometry = wellPath->wellPathGeometry(); @@ -621,12 +621,12 @@ void RimFractureModel::updateDistanceToBarrierAndDip() cvf::Vec3d p2; wellPathGeometry->twoClosestPoints( position, &p1, &p2 ); RiaLogging::info( QString( "Closest points on well path: %1 %2" ) - .arg( RimFractureModel::vecToString( p1 ) ) - .arg( RimFractureModel::vecToString( p2 ) ) ); + .arg( RimStimPlanModel::vecToString( p1 ) ) + .arg( RimStimPlanModel::vecToString( p2 ) ) ); // Create a well direction based on the two points cvf::Vec3d wellDirection = ( p2 - p1 ).getNormalized(); - RiaLogging::info( QString( "Well direction: %1" ).arg( RimFractureModel::vecToString( wellDirection ) ) ); + RiaLogging::info( QString( "Well direction: %1" ).arg( RimStimPlanModel::vecToString( wellDirection ) ) ); cvf::Vec3d fractureDirection = wellDirection; if ( m_fractureOrientation == FractureOrientation::ALONG_WELL_PATH ) @@ -645,7 +645,7 @@ void RimFractureModel::updateDistanceToBarrierAndDip() // The direction to the barrier is normal to the TST cvf::Vec3d directionToBarrier = ( thicknessDirection() ^ fractureDirection ).getNormalized(); - RiaLogging::info( QString( "Direction to barrier: %1" ).arg( RimFractureModel::vecToString( directionToBarrier ) ) ); + RiaLogging::info( QString( "Direction to barrier: %1" ).arg( RimStimPlanModel::vecToString( directionToBarrier ) ) ); std::vector intersections = generateBarrierIntersections( eclipseCaseData, position, directionToBarrier ); @@ -708,7 +708,7 @@ void RimFractureModel::updateDistanceToBarrierAndDip() /// //-------------------------------------------------------------------------------------------------- std::vector - RimFractureModel::generateBarrierIntersections( RigEclipseCaseData* eclipseCaseData, + RimStimPlanModel::generateBarrierIntersections( RigEclipseCaseData* eclipseCaseData, const cvf::Vec3d& position, const cvf::Vec3d& directionToBarrier ) { @@ -729,7 +729,7 @@ std::vector /// //-------------------------------------------------------------------------------------------------- std::vector - RimFractureModel::generateBarrierIntersectionsBetweenPoints( RigEclipseCaseData* eclipseCaseData, + RimStimPlanModel::generateBarrierIntersectionsBetweenPoints( RigEclipseCaseData* eclipseCaseData, const cvf::Vec3d& startPosition, const cvf::Vec3d& endPosition ) { @@ -749,7 +749,7 @@ std::vector //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::clearBarrierAnnotation() +void RimStimPlanModel::clearBarrierAnnotation() { auto existingAnnotation = m_barrierAnnotation.value(); if ( existingAnnotation ) @@ -775,7 +775,7 @@ void RimFractureModel::clearBarrierAnnotation() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::addBarrierAnnotation( const cvf::Vec3d& startPosition, +void RimStimPlanModel::addBarrierAnnotation( const cvf::Vec3d& startPosition, const cvf::Vec3d& endPosition, const QString& text ) { @@ -814,7 +814,7 @@ void RimFractureModel::addBarrierAnnotation( const cvf::Vec3d& startPosition, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimAnnotationCollectionBase* RimFractureModel::annotationCollection() +RimAnnotationCollectionBase* RimStimPlanModel::annotationCollection() { const auto project = RimProject::current(); auto oilField = project->activeOilField(); @@ -824,16 +824,16 @@ RimAnnotationCollectionBase* RimFractureModel::annotationCollection() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) +void RimStimPlanModel::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { m_thicknessDirectionWellPath.uiCapability()->setUiHidden( true ); m_barrierAnnotation.uiCapability()->setUiHidden( true ); m_barrierTextAnnotation.uiCapability()->setUiHidden( true ); - m_azimuthAngle.uiCapability()->setUiHidden( m_fractureOrientation() != RimFractureModel::FractureOrientation::AZIMUTH ); + m_azimuthAngle.uiCapability()->setUiHidden( m_fractureOrientation() != RimStimPlanModel::FractureOrientation::AZIMUTH ); uiOrdering.add( nameField(), caf::PdmUiOrdering::LayoutOptions( true, 3, 1 ) ); - uiOrdering.add( &m_fractureModelTemplate, {true, 2, 1} ); - uiOrdering.add( &m_editFractureModelTemplate, {false, 1, 0} ); + uiOrdering.add( &m_stimPlanModelTemplate, {true, 2, 1} ); + uiOrdering.add( &m_editStimPlanModelTemplate, {false, 1, 0} ); uiOrdering.add( &m_eclipseCase ); uiOrdering.add( &m_timeStep ); @@ -874,7 +874,7 @@ void RimFractureModel::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::defineEditorAttribute( const caf::PdmFieldHandle* field, +void RimStimPlanModel::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) { @@ -907,7 +907,7 @@ void RimFractureModel::defineEditorAttribute( const caf::PdmFieldHandle* field, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimWellPath* RimFractureModel::wellPath() const +RimWellPath* RimStimPlanModel::wellPath() const { const caf::PdmObjectHandle* objHandle = dynamic_cast( this ); if ( !objHandle ) return nullptr; @@ -920,7 +920,7 @@ RimWellPath* RimFractureModel::wellPath() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimModeledWellPath* RimFractureModel::thicknessDirectionWellPath() const +RimModeledWellPath* RimStimPlanModel::thicknessDirectionWellPath() const { return m_thicknessDirectionWellPath; } @@ -928,7 +928,7 @@ RimModeledWellPath* RimFractureModel::thicknessDirectionWellPath() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::setThicknessDirectionWellPath( RimModeledWellPath* thicknessDirectionWellPath ) +void RimStimPlanModel::setThicknessDirectionWellPath( RimModeledWellPath* thicknessDirectionWellPath ) { m_thicknessDirectionWellPath = thicknessDirectionWellPath; updateThicknessDirectionWellPathName(); @@ -937,7 +937,7 @@ void RimFractureModel::setThicknessDirectionWellPath( RimModeledWellPath* thickn //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::updateThicknessDirectionWellPathName() +void RimStimPlanModel::updateThicknessDirectionWellPathName() { QString wellNameFormat( "%1 for %2" ); m_thicknessDirectionWellPath()->setName( wellNameFormat.arg( m_extractionType().text() ).arg( name() ) ); @@ -946,7 +946,7 @@ void RimFractureModel::updateThicknessDirectionWellPathName() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModel::vecToString( const cvf::Vec3d& vec ) +QString RimStimPlanModel::vecToString( const cvf::Vec3d& vec ) { return QString( "[%1, %2, %3]" ).arg( vec.x() ).arg( vec.y() ).arg( vec.z() ); } @@ -954,7 +954,7 @@ QString RimFractureModel::vecToString( const cvf::Vec3d& vec ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModel::findThicknessTargetPoints( cvf::Vec3d& topPosition, cvf::Vec3d& bottomPosition ) +bool RimStimPlanModel::findThicknessTargetPoints( cvf::Vec3d& topPosition, cvf::Vec3d& bottomPosition ) { RigEclipseCaseData* eclipseCaseData = getEclipseCaseData(); if ( !eclipseCaseData ) return false; @@ -968,10 +968,10 @@ bool RimFractureModel::findThicknessTargetPoints( cvf::Vec3d& topPosition, cvf:: const cvf::BoundingBox& geometryBoundingBox = eclipseCaseData->mainGrid()->boundingBox(); RiaLogging::info( QString( "All cells bounding box: %1 %2" ) - .arg( RimFractureModel::vecToString( geometryBoundingBox.min() ) ) - .arg( RimFractureModel::vecToString( geometryBoundingBox.max() ) ) ); - RiaLogging::info( QString( "Position: %1" ).arg( RimFractureModel::vecToString( position ) ) ); - RiaLogging::info( QString( "Direction: %1" ).arg( RimFractureModel::vecToString( direction ) ) ); + .arg( RimStimPlanModel::vecToString( geometryBoundingBox.min() ) ) + .arg( RimStimPlanModel::vecToString( geometryBoundingBox.max() ) ) ); + RiaLogging::info( QString( "Position: %1" ).arg( RimStimPlanModel::vecToString( position ) ) ); + RiaLogging::info( QString( "Direction: %1" ).arg( RimStimPlanModel::vecToString( direction ) ) ); if ( !geometryBoundingBox.contains( position ) ) { @@ -989,12 +989,12 @@ bool RimFractureModel::findThicknessTargetPoints( cvf::Vec3d& topPosition, cvf:: // Find and add point on top plane cvf::Vec3d abovePlane = position + ( direction * -10000.0 ); topPlane.intersect( position, abovePlane, &topPosition ); - RiaLogging::info( QString( "Top: %1" ).arg( RimFractureModel::vecToString( topPosition ) ) ); + RiaLogging::info( QString( "Top: %1" ).arg( RimStimPlanModel::vecToString( topPosition ) ) ); // Find and add point on bottom plane cvf::Vec3d belowPlane = position + ( direction * 10000.0 ); bottomPlane.intersect( position, belowPlane, &bottomPosition ); - RiaLogging::info( QString( "Bottom: %1" ).arg( RimFractureModel::vecToString( bottomPosition ) ) ); + RiaLogging::info( QString( "Bottom: %1" ).arg( RimStimPlanModel::vecToString( bottomPosition ) ) ); return true; } @@ -1002,7 +1002,7 @@ bool RimFractureModel::findThicknessTargetPoints( cvf::Vec3d& topPosition, cvf:: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::calculateFormationDip( const cvf::Vec3d& direction ) +double RimStimPlanModel::calculateFormationDip( const cvf::Vec3d& direction ) { // Formation dip is inclination of a plane from horizontal. return cvf::Math::toDegrees( cvf::GeometryTools::getAngle( direction, -cvf::Vec3d::Z_AXIS ) ); @@ -1011,30 +1011,30 @@ double RimFractureModel::calculateFormationDip( const cvf::Vec3d& direction ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::loadDataAndUpdate() +void RimStimPlanModel::loadDataAndUpdate() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::defaultPorosity() const +double RimStimPlanModel::defaultPorosity() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultPorosity() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->defaultPorosity() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::defaultPermeability() const +double RimStimPlanModel::defaultPermeability() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultPermeability() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->defaultPermeability() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::getDefaultForMissingValue( RiaDefines::CurveProperty curveProperty ) const +double RimStimPlanModel::getDefaultForMissingValue( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::POROSITY ) { @@ -1060,7 +1060,7 @@ double RimFractureModel::getDefaultForMissingValue( RiaDefines::CurveProperty cu //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaDefines::CurveProperty RimFractureModel::getDefaultPropertyForMissingValues( RiaDefines::CurveProperty curveProperty ) const +RiaDefines::CurveProperty RimStimPlanModel::getDefaultPropertyForMissingValues( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::PRESSURE ) { @@ -1073,7 +1073,7 @@ RiaDefines::CurveProperty RimFractureModel::getDefaultPropertyForMissingValues( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::getDefaultForMissingOverburdenValue( RiaDefines::CurveProperty curveProperty ) const +double RimStimPlanModel::getDefaultForMissingOverburdenValue( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::POROSITY ) { @@ -1105,7 +1105,7 @@ double RimFractureModel::getDefaultForMissingOverburdenValue( RiaDefines::CurveP //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::getDefaultForMissingUnderburdenValue( RiaDefines::CurveProperty curveProperty ) const +double RimStimPlanModel::getDefaultForMissingUnderburdenValue( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::POROSITY ) { @@ -1137,16 +1137,16 @@ double RimFractureModel::getDefaultForMissingUnderburdenValue( RiaDefines::Curve //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::getOverburdenGradient( RiaDefines::CurveProperty curveProperty ) const +double RimStimPlanModel::getOverburdenGradient( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::PRESSURE || curveProperty == RiaDefines::CurveProperty::INITIAL_PRESSURE ) { - if ( !m_fractureModelTemplate ) + if ( !m_stimPlanModelTemplate ) { return 0.0; } - return m_fractureModelTemplate()->overburdenFluidDensity() * 9.81 * 1000.0 / 1.0e5; + return m_stimPlanModelTemplate()->overburdenFluidDensity() * 9.81 * 1000.0 / 1.0e5; } else { @@ -1159,17 +1159,17 @@ double RimFractureModel::getOverburdenGradient( RiaDefines::CurveProperty curveP //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::getUnderburdenGradient( RiaDefines::CurveProperty curveProperty ) const +double RimStimPlanModel::getUnderburdenGradient( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::PRESSURE || curveProperty == RiaDefines::CurveProperty::INITIAL_PRESSURE ) { - if ( !m_fractureModelTemplate ) + if ( !m_stimPlanModelTemplate ) { return 0.0; } - return m_fractureModelTemplate()->underburdenFluidDensity() * 9.81 * 1000.0 / 1.0e5; + return m_stimPlanModelTemplate()->underburdenFluidDensity() * 9.81 * 1000.0 / 1.0e5; } else { @@ -1182,7 +1182,7 @@ double RimFractureModel::getUnderburdenGradient( RiaDefines::CurveProperty curve //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::getDefaultValueForProperty( RiaDefines::CurveProperty curveProperty ) const +double RimStimPlanModel::getDefaultValueForProperty( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR ) { @@ -1207,31 +1207,31 @@ double RimFractureModel::getDefaultValueForProperty( RiaDefines::CurveProperty c //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModel::MissingValueStrategy RimFractureModel::missingValueStrategy( RiaDefines::CurveProperty curveProperty ) const +RimStimPlanModel::MissingValueStrategy RimStimPlanModel::missingValueStrategy( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::INITIAL_PRESSURE ) - return RimFractureModel::MissingValueStrategy::LINEAR_INTERPOLATION; + return RimStimPlanModel::MissingValueStrategy::LINEAR_INTERPOLATION; else if ( curveProperty == RiaDefines::CurveProperty::PRESSURE ) - return RimFractureModel::MissingValueStrategy::OTHER_CURVE_PROPERTY; + return RimStimPlanModel::MissingValueStrategy::OTHER_CURVE_PROPERTY; else - return RimFractureModel::MissingValueStrategy::DEFAULT_VALUE; + return RimStimPlanModel::MissingValueStrategy::DEFAULT_VALUE; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModel::BurdenStrategy RimFractureModel::burdenStrategy( RiaDefines::CurveProperty curveProperty ) const +RimStimPlanModel::BurdenStrategy RimStimPlanModel::burdenStrategy( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::INITIAL_PRESSURE ) - return RimFractureModel::BurdenStrategy::GRADIENT; + return RimStimPlanModel::BurdenStrategy::GRADIENT; - return RimFractureModel::BurdenStrategy::DEFAULT_VALUE; + return RimStimPlanModel::BurdenStrategy::DEFAULT_VALUE; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModel::hasDefaultValueForProperty( RiaDefines::CurveProperty curveProperty ) const +bool RimStimPlanModel::hasDefaultValueForProperty( RiaDefines::CurveProperty curveProperty ) const { auto withDefaults = {RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR, RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT, @@ -1242,114 +1242,114 @@ bool RimFractureModel::hasDefaultValueForProperty( RiaDefines::CurveProperty cur //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::verticalStress() const +double RimStimPlanModel::verticalStress() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->verticalStress() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->verticalStress() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::verticalStressGradient() const +double RimStimPlanModel::verticalStressGradient() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->verticalStressGradient() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->verticalStressGradient() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::stressDepth() const +double RimStimPlanModel::stressDepth() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->stressDepth() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->stressDepth() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::overburdenHeight() const +double RimStimPlanModel::overburdenHeight() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->overburdenHeight() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->overburdenHeight() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::underburdenHeight() const +double RimStimPlanModel::underburdenHeight() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->underburdenHeight() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->underburdenHeight() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::defaultOverburdenPorosity() const +double RimStimPlanModel::defaultOverburdenPorosity() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultOverburdenPorosity() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->defaultOverburdenPorosity() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::defaultUnderburdenPorosity() const +double RimStimPlanModel::defaultUnderburdenPorosity() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultUnderburdenPorosity() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->defaultUnderburdenPorosity() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::defaultOverburdenPermeability() const +double RimStimPlanModel::defaultOverburdenPermeability() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultOverburdenPermeability() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->defaultOverburdenPermeability() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::defaultUnderburdenPermeability() const +double RimStimPlanModel::defaultUnderburdenPermeability() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultUnderburdenPermeability() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->defaultUnderburdenPermeability() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModel::overburdenFormation() const +QString RimStimPlanModel::overburdenFormation() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->overburdenFormation() : ""; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->overburdenFormation() : ""; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModel::overburdenFacies() const +QString RimStimPlanModel::overburdenFacies() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->overburdenFacies() : ""; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->overburdenFacies() : ""; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModel::underburdenFormation() const +QString RimStimPlanModel::underburdenFormation() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->underburdenFormation() : ""; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->underburdenFormation() : ""; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModel::underburdenFacies() const +QString RimStimPlanModel::underburdenFacies() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->underburdenFacies() : ""; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->underburdenFacies() : ""; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::updateReferringPlots() +void RimStimPlanModel::updateReferringPlots() { // Update plots referring to this fracture model - std::vector referringObjects; + std::vector referringObjects; objectsWithReferringPtrFieldsOfType( referringObjects ); for ( auto modelPlot : referringObjects ) @@ -1361,7 +1361,7 @@ void RimFractureModel::updateReferringPlots() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::setMD( double md ) +void RimStimPlanModel::setMD( double md ) { m_MD = md; updatePositionFromMeasuredDepth(); @@ -1372,7 +1372,7 @@ void RimFractureModel::setMD( double md ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::setEclipseCaseAndTimeStep( RimEclipseCase* eclipseCase, int timeStep ) +void RimStimPlanModel::setEclipseCaseAndTimeStep( RimEclipseCase* eclipseCase, int timeStep ) { setEclipseCase( eclipseCase ); setTimeStep( timeStep ); @@ -1384,7 +1384,7 @@ void RimFractureModel::setEclipseCaseAndTimeStep( RimEclipseCase* eclipseCase, i //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -int RimFractureModel::timeStep() const +int RimStimPlanModel::timeStep() const { return m_timeStep; } @@ -1392,7 +1392,7 @@ int RimFractureModel::timeStep() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::setTimeStep( int timeStep ) +void RimStimPlanModel::setTimeStep( int timeStep ) { m_timeStep = timeStep; } @@ -1400,31 +1400,31 @@ void RimFractureModel::setTimeStep( int timeStep ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::referenceTemperature() const +double RimStimPlanModel::referenceTemperature() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->referenceTemperature() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->referenceTemperature() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::referenceTemperatureGradient() const +double RimStimPlanModel::referenceTemperatureGradient() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->referenceTemperatureGradient() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->referenceTemperatureGradient() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::referenceTemperatureDepth() const +double RimStimPlanModel::referenceTemperatureDepth() const { - return m_fractureModelTemplate() ? m_fractureModelTemplate()->referenceTemperatureDepth() : 0.0; + return m_stimPlanModelTemplate() ? m_stimPlanModelTemplate()->referenceTemperatureDepth() : 0.0; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimEclipseCase* RimFractureModel::eclipseCase() const +RimEclipseCase* RimStimPlanModel::eclipseCase() const { return m_eclipseCase; } @@ -1432,7 +1432,7 @@ RimEclipseCase* RimFractureModel::eclipseCase() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::setEclipseCase( RimEclipseCase* eclipseCase ) +void RimStimPlanModel::setEclipseCase( RimEclipseCase* eclipseCase ) { m_eclipseCase = eclipseCase; } @@ -1440,7 +1440,7 @@ void RimFractureModel::setEclipseCase( RimEclipseCase* eclipseCase ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigEclipseCaseData* RimFractureModel::getEclipseCaseData() const +RigEclipseCaseData* RimStimPlanModel::getEclipseCaseData() const { // Find an eclipse case RimEclipseCase* eclCase = eclipseCase(); @@ -1452,7 +1452,7 @@ RigEclipseCaseData* RimFractureModel::getEclipseCaseData() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::perforationLength() const +double RimStimPlanModel::perforationLength() const { return m_perforationLength(); } @@ -1460,7 +1460,7 @@ double RimFractureModel::perforationLength() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModel::FractureOrientation RimFractureModel::fractureOrientation() const +RimStimPlanModel::FractureOrientation RimStimPlanModel::fractureOrientation() const { return m_fractureOrientation(); } @@ -1468,7 +1468,7 @@ RimFractureModel::FractureOrientation RimFractureModel::fractureOrientation() co //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::formationDip() const +double RimStimPlanModel::formationDip() const { return m_formationDip; } @@ -1476,7 +1476,7 @@ double RimFractureModel::formationDip() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModel::hasBarrier() const +bool RimStimPlanModel::hasBarrier() const { return m_hasBarrier; } @@ -1484,7 +1484,7 @@ bool RimFractureModel::hasBarrier() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::distanceToBarrier() const +double RimStimPlanModel::distanceToBarrier() const { return m_distanceToBarrier; } @@ -1492,7 +1492,7 @@ double RimFractureModel::distanceToBarrier() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::barrierDip() const +double RimStimPlanModel::barrierDip() const { return m_barrierDip; } @@ -1500,7 +1500,7 @@ double RimFractureModel::barrierDip() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -int RimFractureModel::wellPenetrationLayer() const +int RimStimPlanModel::wellPenetrationLayer() const { return m_wellPenetrationLayer; } @@ -1508,33 +1508,33 @@ int RimFractureModel::wellPenetrationLayer() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::setFractureModelTemplate( RimFractureModelTemplate* fractureModelTemplate ) +void RimStimPlanModel::setStimPlanModelTemplate( RimStimPlanModelTemplate* stimPlanModelTemplate ) { - if ( m_fractureModelTemplate ) + if ( m_stimPlanModelTemplate ) { - m_fractureModelTemplate->changed.disconnect( this ); + m_stimPlanModelTemplate->changed.disconnect( this ); } - m_fractureModelTemplate = fractureModelTemplate; + m_stimPlanModelTemplate = stimPlanModelTemplate; - if ( m_fractureModelTemplate ) + if ( m_stimPlanModelTemplate ) { - m_fractureModelTemplate->changed.connect( this, &RimFractureModel::fractureModelTemplateChanged ); + m_stimPlanModelTemplate->changed.connect( this, &RimStimPlanModel::stimPlanModelTemplateChanged ); } } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelTemplate* RimFractureModel::fractureModelTemplate() const +RimStimPlanModelTemplate* RimStimPlanModel::stimPlanModelTemplate() const { - return m_fractureModelTemplate; + return m_stimPlanModelTemplate; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::fractureModelTemplateChanged( const caf::SignalEmitter* emitter ) +void RimStimPlanModel::stimPlanModelTemplateChanged( const caf::SignalEmitter* emitter ) { updateViewsAndPlots(); } @@ -1542,7 +1542,7 @@ void RimFractureModel::fractureModelTemplateChanged( const caf::SignalEmitter* e //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::updateViewsAndPlots() +void RimStimPlanModel::updateViewsAndPlots() { RimEclipseCase* eclipseCase = nullptr; this->firstAncestorOrThisOfType( eclipseCase ); @@ -1563,7 +1563,7 @@ void RimFractureModel::updateViewsAndPlots() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::hideOtherFaults( const QString& targetFaultName ) +void RimStimPlanModel::hideOtherFaults( const QString& targetFaultName ) { RimEclipseView* view = dynamic_cast( RiaApplication::instance()->activeReservoirView() ); if ( !view ) return; @@ -1580,7 +1580,7 @@ void RimFractureModel::hideOtherFaults( const QString& targetFaultName ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModel::showAllFaults() +void RimStimPlanModel::showAllFaults() { RimEclipseView* view = dynamic_cast( RiaApplication::instance()->activeReservoirView() ); if ( !view ) return; @@ -1597,7 +1597,7 @@ void RimFractureModel::showAllFaults() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::shared_ptr RimFractureModel::calculator() const +std::shared_ptr RimStimPlanModel::calculator() const { return m_calculator; } @@ -1605,7 +1605,7 @@ std::shared_ptr RimFractureModel::calculator() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaDefines::ResultCatType RimFractureModel::eclipseResultCategory( RiaDefines::CurveProperty curveProperty ) const +RiaDefines::ResultCatType RimStimPlanModel::eclipseResultCategory( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::PRESSURE || curveProperty == RiaDefines::CurveProperty::INITIAL_PRESSURE ) @@ -1614,9 +1614,9 @@ RiaDefines::ResultCatType RimFractureModel::eclipseResultCategory( RiaDefines::C } else if ( curveProperty == RiaDefines::CurveProperty::FACIES ) { - if ( !m_fractureModelTemplate ) return RiaDefines::ResultCatType::STATIC_NATIVE; + if ( !m_stimPlanModelTemplate ) return RiaDefines::ResultCatType::STATIC_NATIVE; - RimFaciesProperties* faciesProperties = m_fractureModelTemplate->faciesProperties(); + RimFaciesProperties* faciesProperties = m_stimPlanModelTemplate->faciesProperties(); if ( !faciesProperties ) return RiaDefines::ResultCatType::STATIC_NATIVE; const RimEclipseResultDefinition* faciesDefinition = faciesProperties->faciesDefinition(); @@ -1626,9 +1626,9 @@ RiaDefines::ResultCatType RimFractureModel::eclipseResultCategory( RiaDefines::C } else if ( curveProperty == RiaDefines::CurveProperty::NET_TO_GROSS ) { - if ( !m_fractureModelTemplate ) return RiaDefines::ResultCatType::STATIC_NATIVE; + if ( !m_stimPlanModelTemplate ) return RiaDefines::ResultCatType::STATIC_NATIVE; - RimNonNetLayers* nonNetLayers = m_fractureModelTemplate->nonNetLayers(); + RimNonNetLayers* nonNetLayers = m_stimPlanModelTemplate->nonNetLayers(); if ( !nonNetLayers ) return RiaDefines::ResultCatType::STATIC_NATIVE; const RimEclipseResultDefinition* resultDef = nonNetLayers->resultDefinition(); @@ -1645,7 +1645,7 @@ RiaDefines::ResultCatType RimFractureModel::eclipseResultCategory( RiaDefines::C //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModel::eclipseResultVariable( RiaDefines::CurveProperty curveProperty ) const +QString RimStimPlanModel::eclipseResultVariable( RiaDefines::CurveProperty curveProperty ) const { if ( curveProperty == RiaDefines::CurveProperty::PRESSURE || curveProperty == RiaDefines::CurveProperty::INITIAL_PRESSURE ) @@ -1658,9 +1658,9 @@ QString RimFractureModel::eclipseResultVariable( RiaDefines::CurveProperty curve return "PORO"; else if ( curveProperty == RiaDefines::CurveProperty::FACIES ) { - if ( !m_fractureModelTemplate ) return ""; + if ( !m_stimPlanModelTemplate ) return ""; - RimFaciesProperties* faciesProperties = m_fractureModelTemplate->faciesProperties(); + RimFaciesProperties* faciesProperties = m_stimPlanModelTemplate->faciesProperties(); if ( !faciesProperties ) return ""; const RimEclipseResultDefinition* faciesDefinition = faciesProperties->faciesDefinition(); @@ -1670,9 +1670,9 @@ QString RimFractureModel::eclipseResultVariable( RiaDefines::CurveProperty curve } else if ( curveProperty == RiaDefines::CurveProperty::NET_TO_GROSS ) { - if ( !m_fractureModelTemplate ) return ""; + if ( !m_stimPlanModelTemplate ) return ""; - RimNonNetLayers* nonNetLayers = m_fractureModelTemplate->nonNetLayers(); + RimNonNetLayers* nonNetLayers = m_stimPlanModelTemplate->nonNetLayers(); if ( !nonNetLayers ) return ""; const RimEclipseResultDefinition* resultDef = nonNetLayers->resultDefinition(); @@ -1687,11 +1687,11 @@ QString RimFractureModel::eclipseResultVariable( RiaDefines::CurveProperty curve //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimColorLegend* RimFractureModel::getFaciesColorLegend() const +RimColorLegend* RimStimPlanModel::getFaciesColorLegend() const { - if ( !m_fractureModelTemplate ) return nullptr; + if ( !m_stimPlanModelTemplate ) return nullptr; - RimFaciesProperties* faciesProperties = m_fractureModelTemplate->faciesProperties(); + RimFaciesProperties* faciesProperties = m_stimPlanModelTemplate->faciesProperties(); if ( !faciesProperties ) return nullptr; return faciesProperties->colorLegend(); @@ -1700,7 +1700,7 @@ RimColorLegend* RimFractureModel::getFaciesColorLegend() const //------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModel::findFaciesValue( const RimColorLegend& colorLegend, const QString& name ) +double RimStimPlanModel::findFaciesValue( const RimColorLegend& colorLegend, const QString& name ) { for ( auto item : colorLegend.colorLegendItems() ) { @@ -1713,7 +1713,7 @@ double RimFractureModel::findFaciesValue( const RimColorLegend& colorLegend, con //------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModel::isScaledByNetToGross( RiaDefines::CurveProperty curveProperty ) const +bool RimStimPlanModel::isScaledByNetToGross( RiaDefines::CurveProperty curveProperty ) const { std::vector matching = {RiaDefines::CurveProperty::POROSITY, RiaDefines::CurveProperty::PERMEABILITY_X, diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModel.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.h similarity index 92% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModel.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.h index 6a2ba2ae65..0dead640eb 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModel.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include "RimCheckableNamedObject.h" #include "RimWellPathComponentInterface.h" @@ -38,16 +38,16 @@ class RigEclipseCaseData; class RimAnnotationCollectionBase; class RimUserDefinedPolylinesAnnotation; class RimFaciesProperties; -class RimFractureModelTemplate; +class RimStimPlanModelTemplate; class RimTextAnnotation; -class RimFractureModelCalculator; +class RimStimPlanModelCalculator; class RimColorLegend; //================================================================================================== /// /// //================================================================================================== -class RimFractureModel : public RimCheckableNamedObject, public RimWellPathComponentInterface +class RimStimPlanModel : public RimCheckableNamedObject, public RimWellPathComponentInterface { CAF_PDM_HEADER_INIT; @@ -78,8 +78,8 @@ public: GRADIENT }; - RimFractureModel( void ); - ~RimFractureModel( void ) override; + RimStimPlanModel( void ); + ~RimStimPlanModel( void ) override; void setMD( double md ); @@ -160,15 +160,15 @@ public: double getOverburdenGradient( RiaDefines::CurveProperty curveProperty ) const; double getUnderburdenGradient( RiaDefines::CurveProperty curveProperty ) const; - void setFractureModelTemplate( RimFractureModelTemplate* fractureModelTemplate ); - RimFractureModelTemplate* fractureModelTemplate() const; + void setStimPlanModelTemplate( RimStimPlanModelTemplate* stimPlanModelTemplate ); + RimStimPlanModelTemplate* stimPlanModelTemplate() const; void updateReferringPlots(); - std::shared_ptr calculator() const; + std::shared_ptr calculator() const; - RimFractureModel::MissingValueStrategy missingValueStrategy( RiaDefines::CurveProperty curveProperty ) const; - RimFractureModel::BurdenStrategy burdenStrategy( RiaDefines::CurveProperty curveProperty ) const; + RimStimPlanModel::MissingValueStrategy missingValueStrategy( RiaDefines::CurveProperty curveProperty ) const; + RimStimPlanModel::BurdenStrategy burdenStrategy( RiaDefines::CurveProperty curveProperty ) const; RiaDefines::ResultCatType eclipseResultCategory( RiaDefines::CurveProperty curveProperty ) const; QString eclipseResultVariable( RiaDefines::CurveProperty curveProperty ) const; @@ -213,7 +213,7 @@ private: const cvf::Vec3d& endPosition ); void updateViewsAndPlots(); - void fractureModelTemplateChanged( const caf::SignalEmitter* emitter ); + void stimPlanModelTemplateChanged( const caf::SignalEmitter* emitter ); void hideOtherFaults( const QString& targetFaultName ); void showAllFaults(); @@ -235,8 +235,8 @@ protected: caf::PdmField m_thermalExpansionCoeffientDefault; caf::PdmField m_useDetailedFluidLoss; - caf::PdmPtrField m_fractureModelTemplate; - caf::PdmField m_editFractureModelTemplate; + caf::PdmPtrField m_stimPlanModelTemplate; + caf::PdmField m_editStimPlanModelTemplate; caf::PdmField> m_fractureOrientation; caf::PdmField m_azimuthAngle; @@ -254,5 +254,5 @@ protected: caf::PdmField m_showOnlyBarrierFault; caf::PdmField m_showAllFaults; - std::shared_ptr m_calculator; + std::shared_ptr m_calculator; }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCalculator.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.cpp similarity index 86% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCalculator.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.cpp index 73d526e399..730b421363 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.cpp @@ -15,58 +15,58 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelCalculator.h" +#include "RimStimPlanModelCalculator.h" #include "RiaDefines.h" -#include "RiaFractureModelDefines.h" #include "RiaLogging.h" +#include "RiaStimPlanModelDefines.h" #include "RigEclipseCaseData.h" #include "RimEclipseResultDefinition.h" -#include "RimFractureModel.h" -#include "RimFractureModelCalculator.h" -#include "RimFractureModelElasticPropertyCalculator.h" -#include "RimFractureModelLayerCalculator.h" -#include "RimFractureModelPropertyCalculator.h" -#include "RimFractureModelStressCalculator.h" -#include "RimFractureModelWellLogCalculator.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCalculator.h" +#include "RimStimPlanModelElasticPropertyCalculator.h" +#include "RimStimPlanModelLayerCalculator.h" +#include "RimStimPlanModelPropertyCalculator.h" +#include "RimStimPlanModelStressCalculator.h" +#include "RimStimPlanModelWellLogCalculator.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelCalculator::RimFractureModelCalculator() +RimStimPlanModelCalculator::RimStimPlanModelCalculator() { m_resultCalculators.push_back( - std::unique_ptr( new RimFractureModelWellLogCalculator( this ) ) ); + std::unique_ptr( new RimStimPlanModelWellLogCalculator( this ) ) ); m_resultCalculators.push_back( - std::unique_ptr( new RimFractureModelElasticPropertyCalculator( this ) ) ); + std::unique_ptr( new RimStimPlanModelElasticPropertyCalculator( this ) ) ); m_resultCalculators.push_back( - std::unique_ptr( new RimFractureModelLayerCalculator( this ) ) ); + std::unique_ptr( new RimStimPlanModelLayerCalculator( this ) ) ); m_resultCalculators.push_back( - std::unique_ptr( new RimFractureModelStressCalculator( this ) ) ); + std::unique_ptr( new RimStimPlanModelStressCalculator( this ) ) ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCalculator::setFractureModel( RimFractureModel* fractureModel ) +void RimStimPlanModelCalculator::setStimPlanModel( RimStimPlanModel* stimPlanModel ) { - m_fractureModel = fractureModel; + m_stimPlanModel = stimPlanModel; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModel* RimFractureModelCalculator::fractureModel() +RimStimPlanModel* RimStimPlanModelCalculator::stimPlanModel() { - return m_fractureModel; + return m_stimPlanModel; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelCalculator::extractCurveData( RiaDefines::CurveProperty curveProperty, +bool RimStimPlanModelCalculator::extractCurveData( RiaDefines::CurveProperty curveProperty, int timeStep, std::vector& values, std::vector& measuredDepthValues, @@ -78,7 +78,7 @@ bool RimFractureModelCalculator::extractCurveData( RiaDefines::CurveProperty cur if ( calculator->isMatching( curveProperty ) ) { return calculator - ->calculate( curveProperty, m_fractureModel, timeStep, values, measuredDepthValues, tvDepthValues, rkbDiff ); + ->calculate( curveProperty, m_stimPlanModel, timeStep, values, measuredDepthValues, tvDepthValues, rkbDiff ); } } @@ -88,7 +88,7 @@ bool RimFractureModelCalculator::extractCurveData( RiaDefines::CurveProperty cur //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::extractValues( RiaDefines::CurveProperty curveProperty, int timeStep ) const +std::vector RimStimPlanModelCalculator::extractValues( RiaDefines::CurveProperty curveProperty, int timeStep ) const { std::vector values; std::vector measuredDepthValues; @@ -103,7 +103,7 @@ std::vector RimFractureModelCalculator::extractValues( RiaDefines::Curve //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCalculator::calculateLayers( std::vector>& layerBoundaryDepths, +void RimStimPlanModelCalculator::calculateLayers( std::vector>& layerBoundaryDepths, std::vector>& layerBoundaryIndexes ) const { std::vector layerValues; @@ -112,7 +112,7 @@ void RimFractureModelCalculator::calculateLayers( std::vectortimeStep(), + m_stimPlanModel->timeStep(), layerValues, measuredDepthValues, depths, @@ -135,7 +135,7 @@ void RimFractureModelCalculator::calculateLayers( std::vector& values, +double RimStimPlanModelCalculator::findValueAtTopOfLayer( const std::vector& values, const std::vector>& layerBoundaryIndexes, size_t layerNo ) { @@ -146,7 +146,7 @@ double RimFractureModelCalculator::findValueAtTopOfLayer( const std::vector& values, +double RimStimPlanModelCalculator::findValueAtBottomOfLayer( const std::vector& values, const std::vector>& layerBoundaryIndexes, size_t layerNo ) { @@ -157,7 +157,7 @@ double RimFractureModelCalculator::findValueAtBottomOfLayer( const std::vector>& layerBoundaryIndexes, +void RimStimPlanModelCalculator::computeAverageByLayer( const std::vector>& layerBoundaryIndexes, const std::vector& inputVector, std::vector& result ) { @@ -177,7 +177,7 @@ void RimFractureModelCalculator::computeAverageByLayer( const std::vector>& layerBoundaryIndexes, +void RimStimPlanModelCalculator::extractTopOfLayerValues( const std::vector>& layerBoundaryIndexes, const std::vector& inputVector, std::vector& result ) { @@ -190,7 +190,7 @@ void RimFractureModelCalculator::extractTopOfLayerValues( const std::vector RimFractureModelCalculator::calculateTrueVerticalDepth() const +std::vector RimStimPlanModelCalculator::calculateTrueVerticalDepth() const { std::vector> layerBoundaryDepths; std::vector> layerBoundaryIndexes; @@ -211,13 +211,13 @@ std::vector RimFractureModelCalculator::calculateTrueVerticalDepth() con /// //-------------------------------------------------------------------------------------------------- std::vector - RimFractureModelCalculator::findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty curveProperty ) const + RimStimPlanModelCalculator::findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty curveProperty ) const { std::vector> layerBoundaryDepths; std::vector> layerBoundaryIndexes; calculateLayers( layerBoundaryDepths, layerBoundaryIndexes ); - std::vector values = extractValues( curveProperty, m_fractureModel->timeStep() ); + std::vector values = extractValues( curveProperty, m_stimPlanModel->timeStep() ); std::vector result; computeAverageByLayer( layerBoundaryIndexes, values, result ); return result; @@ -226,13 +226,13 @@ std::vector //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::findCurveAndComputeTopOfLayer( RiaDefines::CurveProperty curveProperty ) const +std::vector RimStimPlanModelCalculator::findCurveAndComputeTopOfLayer( RiaDefines::CurveProperty curveProperty ) const { std::vector> layerBoundaryDepths; std::vector> layerBoundaryIndexes; calculateLayers( layerBoundaryDepths, layerBoundaryIndexes ); - std::vector values = extractValues( curveProperty, m_fractureModel->timeStep() ); + std::vector values = extractValues( curveProperty, m_stimPlanModel->timeStep() ); std::vector result; extractTopOfLayerValues( layerBoundaryIndexes, values, result ); return result; @@ -241,7 +241,7 @@ std::vector RimFractureModelCalculator::findCurveAndComputeTopOfLayer( R //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculatePorosity() const +std::vector RimStimPlanModelCalculator::calculatePorosity() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::POROSITY ); } @@ -249,7 +249,7 @@ std::vector RimFractureModelCalculator::calculatePorosity() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateReservoirPressure() const +std::vector RimStimPlanModelCalculator::calculateReservoirPressure() const { std::vector pressureBar = findCurveAndComputeTopOfLayer( RiaDefines::CurveProperty::PRESSURE ); @@ -265,7 +265,7 @@ std::vector RimFractureModelCalculator::calculateReservoirPressure() con //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateHorizontalPermeability() const +std::vector RimStimPlanModelCalculator::calculateHorizontalPermeability() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::PERMEABILITY_X ); } @@ -273,7 +273,7 @@ std::vector RimFractureModelCalculator::calculateHorizontalPermeability( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateVerticalPermeability() const +std::vector RimStimPlanModelCalculator::calculateVerticalPermeability() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::PERMEABILITY_Z ); } @@ -281,7 +281,7 @@ std::vector RimFractureModelCalculator::calculateVerticalPermeability() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateStress() const +std::vector RimStimPlanModelCalculator::calculateStress() const { std::vector stress; std::vector stressGradients; @@ -293,7 +293,7 @@ std::vector RimFractureModelCalculator::calculateStress() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateInitialStress() const +std::vector RimStimPlanModelCalculator::calculateInitialStress() const { std::vector stress; std::vector stressGradients; @@ -305,20 +305,20 @@ std::vector RimFractureModelCalculator::calculateInitialStress() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelCalculator::calculateStressWithGradients( std::vector& stress, +bool RimStimPlanModelCalculator::calculateStressWithGradients( std::vector& stress, std::vector& stressGradients, std::vector& initialStress ) const { // Reference stress - const double verticalStressRef = m_fractureModel->verticalStress(); - const double verticalStressGradientRef = m_fractureModel->verticalStressGradient(); - const double stressDepthRef = m_fractureModel->stressDepth(); + const double verticalStressRef = m_stimPlanModel->verticalStress(); + const double verticalStressGradientRef = m_stimPlanModel->verticalStressGradient(); + const double stressDepthRef = m_stimPlanModel->stressDepth(); std::vector> layerBoundaryDepths; std::vector> layerBoundaryIndexes; calculateLayers( layerBoundaryDepths, layerBoundaryIndexes ); - int timeStep = m_fractureModel->timeStep(); + int timeStep = m_stimPlanModel->timeStep(); // Biot coefficient std::vector biotData = extractValues( RiaDefines::CurveProperty::BIOT_COEFFICIENT, timeStep ); @@ -424,7 +424,7 @@ bool RimFractureModelCalculator::calculateStressWithGradients( std::vector RimFractureModelCalculator::calculateStressGradient() const +std::vector RimStimPlanModelCalculator::calculateStressGradient() const { std::vector stress; std::vector stressGradients; @@ -436,16 +436,16 @@ std::vector RimFractureModelCalculator::calculateStressGradient() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCalculator::calculateTemperature( std::vector& temperatures ) const +void RimStimPlanModelCalculator::calculateTemperature( std::vector& temperatures ) const { // Reference temperature. Unit: degrees celsius - const double referenceTemperature = m_fractureModel->referenceTemperature(); + const double referenceTemperature = m_stimPlanModel->referenceTemperature(); // Reference temperature gradient. Unit: degrees Celsius per meter - const double referenceTemperatureGradient = m_fractureModel->referenceTemperatureGradient(); + const double referenceTemperatureGradient = m_stimPlanModel->referenceTemperatureGradient(); // Reference depth for temperature. Unit: meter. - const double referenceTemperatureDepth = m_fractureModel->referenceTemperatureDepth(); + const double referenceTemperatureDepth = m_stimPlanModel->referenceTemperatureDepth(); std::vector> layerBoundaryDepths; std::vector> layerBoundaryIndexes; @@ -467,7 +467,7 @@ void RimFractureModelCalculator::calculateTemperature( std::vector& temp //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateYoungsModulus() const +std::vector RimStimPlanModelCalculator::calculateYoungsModulus() const { std::vector valuesGPa = findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::YOUNGS_MODULUS ); std::vector valuesMMpsi; @@ -482,7 +482,7 @@ std::vector RimFractureModelCalculator::calculateYoungsModulus() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculatePoissonsRatio() const +std::vector RimStimPlanModelCalculator::calculatePoissonsRatio() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::POISSONS_RATIO ); } @@ -490,7 +490,7 @@ std::vector RimFractureModelCalculator::calculatePoissonsRatio() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateKIc() const +std::vector RimStimPlanModelCalculator::calculateKIc() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::K_IC ); } @@ -498,7 +498,7 @@ std::vector RimFractureModelCalculator::calculateKIc() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateFluidLossCoefficient() const +std::vector RimStimPlanModelCalculator::calculateFluidLossCoefficient() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::FLUID_LOSS_COEFFICIENT ); } @@ -506,7 +506,7 @@ std::vector RimFractureModelCalculator::calculateFluidLossCoefficient() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateSpurtLoss() const +std::vector RimStimPlanModelCalculator::calculateSpurtLoss() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::SPURT_LOSS ); } @@ -514,7 +514,7 @@ std::vector RimFractureModelCalculator::calculateSpurtLoss() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateProppandEmbedment() const +std::vector RimStimPlanModelCalculator::calculateProppandEmbedment() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::PROPPANT_EMBEDMENT ); } @@ -522,7 +522,7 @@ std::vector RimFractureModelCalculator::calculateProppandEmbedment() con //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateImmobileFluidSaturation() const +std::vector RimStimPlanModelCalculator::calculateImmobileFluidSaturation() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::IMMOBILE_FLUID_SATURATION ); } @@ -530,7 +530,7 @@ std::vector RimFractureModelCalculator::calculateImmobileFluidSaturation //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateTemperature() const +std::vector RimStimPlanModelCalculator::calculateTemperature() const { std::vector temperaturesCelsius; calculateTemperature( temperaturesCelsius ); @@ -548,7 +548,7 @@ std::vector RimFractureModelCalculator::calculateTemperature() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateRelativePermeabilityFactor() const +std::vector RimStimPlanModelCalculator::calculateRelativePermeabilityFactor() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR ); } @@ -556,7 +556,7 @@ std::vector RimFractureModelCalculator::calculateRelativePermeabilityFac //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculatePoroElasticConstant() const +std::vector RimStimPlanModelCalculator::calculatePoroElasticConstant() const { return findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT ); } @@ -564,7 +564,7 @@ std::vector RimFractureModelCalculator::calculatePoroElasticConstant() c //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCalculator::calculateThermalExpansionCoefficient() const +std::vector RimStimPlanModelCalculator::calculateThermalExpansionCoefficient() const { // SI unit is 1/Celsius std::vector coefficientCelsius = diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCalculator.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.h similarity index 91% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCalculator.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.h index 2f7ad6959f..3327b19522 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCalculator.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.h @@ -17,22 +17,22 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" -#include "RimFractureModelPropertyCalculator.h" +#include "RimStimPlanModelPropertyCalculator.h" #include #include -class RimFractureModel; +class RimStimPlanModel; -class RimFractureModelCalculator +class RimStimPlanModelCalculator { public: - RimFractureModelCalculator(); + RimStimPlanModelCalculator(); - void setFractureModel( RimFractureModel* fractureModel ); - RimFractureModel* fractureModel(); + void setStimPlanModel( RimStimPlanModel* stimPlanModel ); + RimStimPlanModel* stimPlanModel(); bool extractCurveData( RiaDefines::CurveProperty curveProperty, int timeStep, @@ -91,6 +91,6 @@ protected: std::vector& result ); private: - RimFractureModel* m_fractureModel; - std::vector> m_resultCalculators; + RimStimPlanModel* m_stimPlanModel; + std::vector> m_resultCalculators; }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCollection.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp similarity index 74% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCollection.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp index fa6ab2b01d..ad2de5ea68 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCollection.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp @@ -16,72 +16,72 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelCollection.h" +#include "RimStimPlanModelCollection.h" -#include "RimFractureModel.h" #include "RimProject.h" +#include "RimStimPlanModel.h" #include "cafPdmFieldScriptingCapability.h" #include "cafPdmObject.h" #include "cafPdmObjectScriptingCapability.h" -CAF_PDM_SOURCE_INIT( RimFractureModelCollection, "FractureModelCollection" ); +CAF_PDM_SOURCE_INIT( RimStimPlanModelCollection, "StimPlanModelCollection" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelCollection::RimFractureModelCollection( void ) +RimStimPlanModelCollection::RimStimPlanModelCollection( void ) { - CAF_PDM_InitScriptableObject( "Fracture Models", "", "", "" ); + CAF_PDM_InitScriptableObject( "StimPlan Models", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_fractureModels, "FractureModels", "", "", "", "" ); - m_fractureModels.uiCapability()->setUiHidden( true ); + CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModels, "StimPlanModels", "", "", "", "" ); + m_stimPlanModels.uiCapability()->setUiHidden( true ); - setName( "Fracture Models" ); + setName( "StimPlan Models" ); nameField()->uiCapability()->setUiHidden( true ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelCollection::~RimFractureModelCollection() +RimStimPlanModelCollection::~RimStimPlanModelCollection() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCollection::addFractureModel( RimFractureModel* fracture ) +void RimStimPlanModelCollection::addStimPlanModel( RimStimPlanModel* fracture ) { - m_fractureModels.push_back( fracture ); + m_stimPlanModels.push_back( fracture ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCollection::deleteFractureModels() +void RimStimPlanModelCollection::deleteStimPlanModels() { - m_fractureModels.deleteAllChildObjects(); + m_stimPlanModels.deleteAllChildObjects(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCollection::allFractureModels() const +std::vector RimStimPlanModelCollection::allStimPlanModels() const { - return m_fractureModels.childObjects(); + return m_stimPlanModels.childObjects(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelCollection::activeFractureModels() const +std::vector RimStimPlanModelCollection::activeStimPlanModels() const { - std::vector active; + std::vector active; if ( isChecked() ) { - for ( const auto& f : allFractureModels() ) + for ( const auto& f : allStimPlanModels() ) { if ( f->isChecked() ) { @@ -96,7 +96,7 @@ std::vector RimFractureModelCollection::activeFractureModels( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) +void RimStimPlanModelCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { uiOrdering.skipRemainingFields( true ); } @@ -104,7 +104,7 @@ void RimFractureModelCollection::defineUiOrdering( QString uiConfigName, caf::Pd //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, +void RimStimPlanModelCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCollection.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.h similarity index 74% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCollection.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.h index 1b3b0f2496..78c8351236 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCollection.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.h @@ -24,30 +24,30 @@ #include -class RimFractureModel; +class RimStimPlanModel; //================================================================================================== /// /// //================================================================================================== -class RimFractureModelCollection : public RimCheckableNamedObject +class RimStimPlanModelCollection : public RimCheckableNamedObject { CAF_PDM_HEADER_INIT; public: - RimFractureModelCollection( void ); - ~RimFractureModelCollection( void ) override; + RimStimPlanModelCollection( void ); + ~RimStimPlanModelCollection( void ) override; - void addFractureModel( RimFractureModel* fracture ); - void deleteFractureModels(); + void addStimPlanModel( RimStimPlanModel* fracture ); + void deleteStimPlanModels(); - std::vector allFractureModels() const; - std::vector activeFractureModels() const; + std::vector allStimPlanModels() const; + std::vector activeStimPlanModels() const; private: void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; private: - caf::PdmChildArrayField m_fractureModels; + caf::PdmChildArrayField m_stimPlanModels; }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCurve.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp similarity index 75% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCurve.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp index fad8c6d333..dcd367c23c 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCurve.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp @@ -16,40 +16,40 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelCurve.h" +#include "RimStimPlanModelCurve.h" #include "RiaApplication.h" -#include "RiaFractureModelDefines.h" #include "RiaInterpolationTools.h" #include "RiaLogging.h" #include "RiaPreferences.h" +#include "RiaStimPlanModelDefines.h" #include "RigEclipseCaseData.h" #include "RimEclipseCase.h" #include "RimEclipseResultDefinition.h" -#include "RimFractureModel.h" -#include "RimFractureModelCalculator.h" -#include "RimFractureModelPlot.h" #include "RimModeledWellPath.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCalculator.h" +#include "RimStimPlanModelPlot.h" #include "RiuQwtPlotCurve.h" #include "RiuQwtPlotWidget.h" #include "cafPdmUiTreeOrdering.h" -CAF_PDM_SOURCE_INIT( RimFractureModelCurve, "FractureModelCurve" ); +CAF_PDM_SOURCE_INIT( RimStimPlanModelCurve, "StimPlanModelCurve" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelCurve::RimFractureModelCurve() +RimStimPlanModelCurve::RimStimPlanModelCurve() { - CAF_PDM_InitObject( "Fracture Model Curve", "", "", "" ); + CAF_PDM_InitObject( "StimPlan Model Curve", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fractureModel, "FractureModel", "Fracture Model", "", "", "" ); - m_fractureModel.uiCapability()->setUiTreeChildrenHidden( true ); - m_fractureModel.uiCapability()->setUiHidden( true ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanModel, "StimPlanModel", "StimPlan Model", "", "", "" ); + m_stimPlanModel.uiCapability()->setUiTreeChildrenHidden( true ); + m_stimPlanModel.uiCapability()->setUiHidden( true ); CAF_PDM_InitFieldNoDefault( &m_curveProperty, "CurveProperty", "Curve Property", "", "", "" ); m_curveProperty.uiCapability()->setUiHidden( true ); @@ -60,25 +60,25 @@ RimFractureModelCurve::RimFractureModelCurve() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelCurve::~RimFractureModelCurve() +RimStimPlanModelCurve::~RimStimPlanModelCurve() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCurve::setFractureModel( RimFractureModel* fractureModel ) +void RimStimPlanModelCurve::setStimPlanModel( RimStimPlanModel* stimPlanModel ) { - m_fractureModel = fractureModel; - m_case = fractureModel->eclipseCase(); - m_timeStep = fractureModel->timeStep(); - m_wellPath = fractureModel->thicknessDirectionWellPath(); + m_stimPlanModel = stimPlanModel; + m_case = stimPlanModel->eclipseCase(); + m_timeStep = stimPlanModel->timeStep(); + m_wellPath = stimPlanModel->thicknessDirectionWellPath(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCurve::setEclipseResultCategory( RiaDefines::ResultCatType catType ) +void RimStimPlanModelCurve::setEclipseResultCategory( RiaDefines::ResultCatType catType ) { m_eclipseResultDefinition->setResultType( catType ); } @@ -86,7 +86,7 @@ void RimFractureModelCurve::setEclipseResultCategory( RiaDefines::ResultCatType //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCurve::setCurveProperty( RiaDefines::CurveProperty curveProperty ) +void RimStimPlanModelCurve::setCurveProperty( RiaDefines::CurveProperty curveProperty ) { m_curveProperty = curveProperty; } @@ -94,7 +94,7 @@ void RimFractureModelCurve::setCurveProperty( RiaDefines::CurveProperty curvePro //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaDefines::CurveProperty RimFractureModelCurve::curveProperty() const +RiaDefines::CurveProperty RimStimPlanModelCurve::curveProperty() const { return m_curveProperty(); } @@ -102,24 +102,24 @@ RiaDefines::CurveProperty RimFractureModelCurve::curveProperty() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, +void RimStimPlanModelCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { RimWellLogExtractionCurve::fieldChangedByUi( changedField, oldValue, newValue ); - RimFractureModelPlot* fractureModelPlot; - firstAncestorOrThisOfTypeAsserted( fractureModelPlot ); + RimStimPlanModelPlot* stimPlanModelPlot; + firstAncestorOrThisOfTypeAsserted( stimPlanModelPlot ); - if ( fractureModelPlot ) + if ( stimPlanModelPlot ) { - fractureModelPlot->loadDataAndUpdate(); + stimPlanModelPlot->loadDataAndUpdate(); } } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelCurve::performDataExtraction( bool* isUsingPseudoLength ) +void RimStimPlanModelCurve::performDataExtraction( bool* isUsingPseudoLength ) { std::vector values; std::vector measuredDepthValues; @@ -131,12 +131,12 @@ void RimFractureModelCurve::performDataExtraction( bool* isUsingPseudoLength ) *isUsingPseudoLength = false; - if ( m_fractureModel && m_fractureModel->eclipseCase() ) + if ( m_stimPlanModel && m_stimPlanModel->eclipseCase() ) { - RimEclipseCase* eclipseCase = m_fractureModel->eclipseCase(); + RimEclipseCase* eclipseCase = m_stimPlanModel->eclipseCase(); - bool isOk = m_fractureModel->calculator()->extractCurveData( curveProperty(), - m_fractureModel->timeStep(), + bool isOk = m_stimPlanModel->calculator()->extractCurveData( curveProperty(), + m_stimPlanModel->timeStep(), values, measuredDepthValues, tvDepthValues, @@ -165,7 +165,7 @@ void RimFractureModelCurve::performDataExtraction( bool* isUsingPseudoLength ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModelCurve::createCurveAutoName() +QString RimStimPlanModelCurve::createCurveAutoName() { return caf::AppEnum::uiText( m_curveProperty() ); } diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCurve.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.h similarity index 81% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCurve.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.h index 5d4d9882c5..94f5b17689 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelCurve.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.h @@ -18,7 +18,7 @@ #pragma once -#include "RimFractureModelPropertyCurve.h" +#include "RimStimPlanModelPropertyCurve.h" #include "RimWellLogExtractionCurve.h" #include "cafPdmField.h" @@ -26,20 +26,20 @@ #include -class RimFractureModel; +class RimStimPlanModel; //================================================================================================== /// //================================================================================================== -class RimFractureModelCurve : public RimWellLogExtractionCurve, public RimFractureModelPropertyCurve +class RimStimPlanModelCurve : public RimWellLogExtractionCurve, public RimStimPlanModelPropertyCurve { CAF_PDM_HEADER_INIT; public: - RimFractureModelCurve(); - ~RimFractureModelCurve() override; + RimStimPlanModelCurve(); + ~RimStimPlanModelCurve() override; - void setFractureModel( RimFractureModel* fractureModel ); + void setStimPlanModel( RimStimPlanModel* stimPlanModel ); void setEclipseResultCategory( RiaDefines::ResultCatType catType ); @@ -53,6 +53,6 @@ protected: QString createCurveAutoName(); - caf::PdmPtrField m_fractureModel; + caf::PdmPtrField m_stimPlanModel; caf::PdmField> m_curveProperty; }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelElasticPropertyCalculator.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.cpp similarity index 86% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelElasticPropertyCalculator.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.cpp index 09c045d22a..c4694b47a4 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelElasticPropertyCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.cpp @@ -15,12 +15,12 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelElasticPropertyCalculator.h" +#include "RimStimPlanModelElasticPropertyCalculator.h" #include "RiaDefines.h" -#include "RiaFractureModelDefines.h" #include "RiaInterpolationTools.h" #include "RiaLogging.h" +#include "RiaStimPlanModelDefines.h" #include "RigEclipseCaseData.h" #include "RigEclipseWellLogExtractor.h" @@ -39,12 +39,12 @@ #include "RimEclipseResultDefinition.h" #include "RimElasticProperties.h" #include "RimFaciesProperties.h" -#include "RimFractureModel.h" -#include "RimFractureModelCalculator.h" -#include "RimFractureModelElasticPropertyCalculator.h" -#include "RimFractureModelTemplate.h" #include "RimModeledWellPath.h" #include "RimNonNetLayers.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCalculator.h" +#include "RimStimPlanModelElasticPropertyCalculator.h" +#include "RimStimPlanModelTemplate.h" #include "RimTools.h" #include "RimWellLogFile.h" #include "RimWellLogPlot.h" @@ -56,16 +56,16 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelElasticPropertyCalculator::RimFractureModelElasticPropertyCalculator( - RimFractureModelCalculator* fractureModelCalculator ) - : m_fractureModelCalculator( fractureModelCalculator ) +RimStimPlanModelElasticPropertyCalculator::RimStimPlanModelElasticPropertyCalculator( + RimStimPlanModelCalculator* stimPlanModelCalculator ) + : m_stimPlanModelCalculator( stimPlanModelCalculator ) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelElasticPropertyCalculator::isMatching( RiaDefines::CurveProperty curveProperty ) const +bool RimStimPlanModelElasticPropertyCalculator::isMatching( RiaDefines::CurveProperty curveProperty ) const { std::vector matching = {RiaDefines::CurveProperty::YOUNGS_MODULUS, RiaDefines::CurveProperty::POISSONS_RATIO, @@ -86,26 +86,26 @@ bool RimFractureModelElasticPropertyCalculator::isMatching( RiaDefines::CurvePro //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, +bool RimStimPlanModelElasticPropertyCalculator::calculate( RiaDefines::CurveProperty curveProperty, + const RimStimPlanModel* stimPlanModel, int timeStep, std::vector& values, std::vector& measuredDepthValues, std::vector& tvDepthValues, double& rkbDiff ) const { - RimEclipseCase* eclipseCase = fractureModel->eclipseCase(); + RimEclipseCase* eclipseCase = stimPlanModel->eclipseCase(); if ( !eclipseCase ) { return false; } - if ( !fractureModel->thicknessDirectionWellPath() ) + if ( !stimPlanModel->thicknessDirectionWellPath() ) { return false; } - RigWellPath* wellPathGeometry = fractureModel->thicknessDirectionWellPath()->wellPathGeometry(); + RigWellPath* wellPathGeometry = stimPlanModel->thicknessDirectionWellPath()->wellPathGeometry(); if ( !wellPathGeometry ) { RiaLogging::error( "No well path geometry found for layer data exctration." ); @@ -139,14 +139,14 @@ bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp std::vector formationNamesVector = RimWellLogTrack::formationNamesVector( eclipseCase ); - RimFractureModelTemplate* fractureModelTemplate = fractureModel->fractureModelTemplate(); - if ( !fractureModelTemplate ) + RimStimPlanModelTemplate* stimPlanModelTemplate = stimPlanModel->stimPlanModelTemplate(); + if ( !stimPlanModelTemplate ) { RiaLogging::error( QString( "No fracture model template found" ) ); return false; } - RimFaciesProperties* faciesProperties = fractureModelTemplate->faciesProperties(); + RimFaciesProperties* faciesProperties = stimPlanModelTemplate->faciesProperties(); if ( !faciesProperties ) { RiaLogging::error( QString( "No facies properties found when extracting elastic properties." ) ); @@ -160,7 +160,7 @@ bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp return false; } - RimElasticProperties* elasticProperties = fractureModelTemplate->elasticProperties(); + RimElasticProperties* elasticProperties = stimPlanModelTemplate->elasticProperties(); if ( !elasticProperties ) { RiaLogging::error( QString( "No elastic properties found" ) ); @@ -168,7 +168,7 @@ bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp } std::vector faciesValues = - m_fractureModelCalculator->extractValues( RiaDefines::CurveProperty::FACIES, timeStep ); + m_stimPlanModelCalculator->extractValues( RiaDefines::CurveProperty::FACIES, timeStep ); if ( faciesValues.empty() ) { @@ -177,12 +177,12 @@ bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp } std::vector poroValues = - m_fractureModelCalculator->extractValues( RiaDefines::CurveProperty::POROSITY, timeStep ); + m_stimPlanModelCalculator->extractValues( RiaDefines::CurveProperty::POROSITY, timeStep ); - double overburdenHeight = fractureModel->overburdenHeight(); + double overburdenHeight = stimPlanModel->overburdenHeight(); if ( overburdenHeight > 0.0 ) { - QString overburdenFormation = fractureModel->overburdenFormation(); + QString overburdenFormation = stimPlanModel->overburdenFormation(); addOverburden( formationNamesVector, formationValues, tvDepthValues, @@ -191,10 +191,10 @@ bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp overburdenFormation ); } - double underburdenHeight = fractureModel->underburdenHeight(); + double underburdenHeight = stimPlanModel->underburdenHeight(); if ( underburdenHeight > 0.0 ) { - QString underburdenFormation = fractureModel->underburdenFormation(); + QString underburdenFormation = stimPlanModel->underburdenFormation(); addUnderburden( formationNamesVector, formationValues, tvDepthValues, @@ -204,7 +204,7 @@ bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp } std::vector netToGrossValues = - m_fractureModelCalculator->extractValues( RiaDefines::CurveProperty::NET_TO_GROSS, timeStep ); + m_stimPlanModelCalculator->extractValues( RiaDefines::CurveProperty::NET_TO_GROSS, timeStep ); CAF_ASSERT( tvDepthValues.size() == faciesValues.size() ); CAF_ASSERT( tvDepthValues.size() == poroValues.size() ); @@ -214,12 +214,12 @@ bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp double netToGrossCutoff = 1.0; QString netToGrossFaciesName = ""; QString netToGrossFormationName = ""; - if ( fractureModel->fractureModelTemplate() && fractureModel->fractureModelTemplate()->nonNetLayers() ) + if ( stimPlanModel->stimPlanModelTemplate() && stimPlanModel->stimPlanModelTemplate()->nonNetLayers() ) { - isScaledByNetToGross = fractureModel->isScaledByNetToGross( curveProperty ) && !netToGrossValues.empty() && - fractureModel->fractureModelTemplate()->nonNetLayers()->isChecked(); - netToGrossCutoff = fractureModel->fractureModelTemplate()->nonNetLayers()->cutOff(); - netToGrossFaciesName = fractureModel->fractureModelTemplate()->nonNetLayers()->facies(); + isScaledByNetToGross = stimPlanModel->isScaledByNetToGross( curveProperty ) && !netToGrossValues.empty() && + stimPlanModel->stimPlanModelTemplate()->nonNetLayers()->isChecked(); + netToGrossCutoff = stimPlanModel->stimPlanModelTemplate()->nonNetLayers()->cutOff(); + netToGrossFaciesName = stimPlanModel->stimPlanModelTemplate()->nonNetLayers()->facies(); } for ( size_t i = 0; i < tvDepthValues.size(); i++ ) @@ -258,9 +258,9 @@ bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp values.push_back( val ); } - else if ( fractureModel->hasDefaultValueForProperty( curveProperty ) ) + else if ( stimPlanModel->hasDefaultValueForProperty( curveProperty ) ) { - double val = fractureModel->getDefaultValueForProperty( curveProperty ); + double val = stimPlanModel->getDefaultValueForProperty( curveProperty ); values.push_back( val ); } } @@ -281,7 +281,7 @@ bool RimFractureModelElasticPropertyCalculator::calculate( RiaDefines::CurveProp //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModelElasticPropertyCalculator::findFaciesName( const RimColorLegend& colorLegend, double value ) +QString RimStimPlanModelElasticPropertyCalculator::findFaciesName( const RimColorLegend& colorLegend, double value ) { for ( auto item : colorLegend.colorLegendItems() ) { @@ -294,7 +294,7 @@ QString RimFractureModelElasticPropertyCalculator::findFaciesName( const RimColo //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelElasticPropertyCalculator::addOverburden( std::vector& formationNames, +void RimStimPlanModelElasticPropertyCalculator::addOverburden( std::vector& formationNames, std::vector& formationValues, std::vector& tvDepthValues, std::vector& measuredDepthValues, @@ -323,7 +323,7 @@ void RimFractureModelElasticPropertyCalculator::addOverburden( std::vector& formationNames, +void RimStimPlanModelElasticPropertyCalculator::addUnderburden( std::vector& formationNames, std::vector& formationValues, std::vector& tvDepthValues, std::vector& measuredDepthValues, diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelElasticPropertyCalculator.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.h similarity index 84% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelElasticPropertyCalculator.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.h index 84fd3353fa..91b0ccbb4c 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelElasticPropertyCalculator.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelElasticPropertyCalculator.h @@ -17,25 +17,25 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RimFractureModelPropertyCalculator.h" +#include "RimStimPlanModelPropertyCalculator.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include -class RimFractureModelCalculator; -class RimFractureModel; +class RimStimPlanModelCalculator; +class RimStimPlanModel; class RimColorLegend; class QString; -class RimFractureModelElasticPropertyCalculator : public RimFractureModelPropertyCalculator +class RimStimPlanModelElasticPropertyCalculator : public RimStimPlanModelPropertyCalculator { public: - RimFractureModelElasticPropertyCalculator( RimFractureModelCalculator* calculator ); + RimStimPlanModelElasticPropertyCalculator( RimStimPlanModelCalculator* calculator ); bool calculate( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, + const RimStimPlanModel* stimPlanModel, int timeStep, std::vector& values, std::vector& measuredDepthValues, @@ -62,5 +62,5 @@ protected: static QString findFaciesName( const RimColorLegend& colorLegend, double value ); private: - RimFractureModelCalculator* m_fractureModelCalculator; + RimStimPlanModelCalculator* m_stimPlanModelCalculator; }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelLayerCalculator.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.cpp similarity index 80% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelLayerCalculator.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.cpp index 5a148bde97..07c18fc8b9 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelLayerCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.cpp @@ -15,11 +15,11 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelLayerCalculator.h" +#include "RimStimPlanModelLayerCalculator.h" #include "RiaDefines.h" -#include "RiaFractureModelDefines.h" #include "RiaLogging.h" +#include "RiaStimPlanModelDefines.h" #include "RigEclipseCaseData.h" #include "RigEclipseWellLogExtractor.h" @@ -30,12 +30,12 @@ #include "RimCase.h" #include "RimEclipseCase.h" #include "RimEclipseResultDefinition.h" -#include "RimFractureModel.h" -#include "RimFractureModelCalculator.h" -#include "RimFractureModelLayerCalculator.h" -#include "RimFractureModelTemplate.h" #include "RimModeledWellPath.h" #include "RimNonNetLayers.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCalculator.h" +#include "RimStimPlanModelLayerCalculator.h" +#include "RimStimPlanModelTemplate.h" #include "RimWellLogTrack.h" #include "RimWellPath.h" @@ -44,15 +44,15 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelLayerCalculator::RimFractureModelLayerCalculator( RimFractureModelCalculator* fractureModelCalculator ) - : m_fractureModelCalculator( fractureModelCalculator ) +RimStimPlanModelLayerCalculator::RimStimPlanModelLayerCalculator( RimStimPlanModelCalculator* stimPlanModelCalculator ) + : m_stimPlanModelCalculator( stimPlanModelCalculator ) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelLayerCalculator::isMatching( RiaDefines::CurveProperty curveProperty ) const +bool RimStimPlanModelLayerCalculator::isMatching( RiaDefines::CurveProperty curveProperty ) const { return curveProperty == RiaDefines::CurveProperty::LAYERS; } @@ -60,26 +60,26 @@ bool RimFractureModelLayerCalculator::isMatching( RiaDefines::CurveProperty curv //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelLayerCalculator::calculate( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, +bool RimStimPlanModelLayerCalculator::calculate( RiaDefines::CurveProperty curveProperty, + const RimStimPlanModel* stimPlanModel, int timeStep, std::vector& values, std::vector& measuredDepthValues, std::vector& tvDepthValues, double& rkbDiff ) const { - RimEclipseCase* eclipseCase = fractureModel->eclipseCase(); + RimEclipseCase* eclipseCase = stimPlanModel->eclipseCase(); if ( !eclipseCase ) { return false; } - if ( !fractureModel->thicknessDirectionWellPath() ) + if ( !stimPlanModel->thicknessDirectionWellPath() ) { return false; } - RigWellPath* wellPathGeometry = fractureModel->thicknessDirectionWellPath()->wellPathGeometry(); + RigWellPath* wellPathGeometry = stimPlanModel->thicknessDirectionWellPath()->wellPathGeometry(); if ( !wellPathGeometry ) { RiaLogging::error( "No well path geometry found for layer data exctration." ); @@ -109,13 +109,13 @@ bool RimFractureModelLayerCalculator::calculate( RiaDefines::CurveProperty curve std::vector formationNamesVector = RimWellLogTrack::formationNamesVector( eclipseCase ); - double overburdenHeight = fractureModel->overburdenHeight(); + double overburdenHeight = stimPlanModel->overburdenHeight(); if ( overburdenHeight > 0.0 ) { RimWellLogTrack::addOverburden( formationNamesVector, curveData, overburdenHeight ); } - double underburdenHeight = fractureModel->underburdenHeight(); + double underburdenHeight = stimPlanModel->underburdenHeight(); if ( underburdenHeight > 0.0 ) { RimWellLogTrack::addUnderburden( formationNamesVector, curveData, underburdenHeight ); @@ -123,7 +123,7 @@ bool RimFractureModelLayerCalculator::calculate( RiaDefines::CurveProperty curve // Extract facies data std::vector faciesValues = - m_fractureModelCalculator->extractValues( RiaDefines::CurveProperty::FACIES, timeStep ); + m_stimPlanModelCalculator->extractValues( RiaDefines::CurveProperty::FACIES, timeStep ); if ( faciesValues.empty() ) { RiaLogging::error( QString( "Empty facies data found for layer curve." ) ); @@ -131,7 +131,7 @@ bool RimFractureModelLayerCalculator::calculate( RiaDefines::CurveProperty curve } std::vector netToGrossValues = - m_fractureModelCalculator->extractValues( RiaDefines::CurveProperty::NET_TO_GROSS, timeStep ); + m_stimPlanModelCalculator->extractValues( RiaDefines::CurveProperty::NET_TO_GROSS, timeStep ); if ( netToGrossValues.empty() ) { RiaLogging::warning( QString( "Empty net-to-gross data found for layer curve." ) ); @@ -151,10 +151,10 @@ bool RimFractureModelLayerCalculator::calculate( RiaDefines::CurveProperty curve double netToGrossCutoff = 1.0; bool useNetToGross = false; - if ( fractureModel->fractureModelTemplate() && fractureModel->fractureModelTemplate()->nonNetLayers() ) + if ( stimPlanModel->stimPlanModelTemplate() && stimPlanModel->stimPlanModelTemplate()->nonNetLayers() ) { - netToGrossCutoff = fractureModel->fractureModelTemplate()->nonNetLayers()->cutOff(); - useNetToGross = !netToGrossValues.empty() && fractureModel->fractureModelTemplate()->nonNetLayers()->isChecked(); + netToGrossCutoff = stimPlanModel->stimPlanModelTemplate()->nonNetLayers()->cutOff(); + useNetToGross = !netToGrossValues.empty() && stimPlanModel->stimPlanModelTemplate()->nonNetLayers()->isChecked(); } for ( size_t i = 0; i < faciesValues.size(); i++ ) diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelLayerCalculator.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.h similarity index 77% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelLayerCalculator.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.h index 02e48bcc12..789de9b937 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelLayerCalculator.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelLayerCalculator.h @@ -17,22 +17,22 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RimFractureModelPropertyCalculator.h" +#include "RimStimPlanModelPropertyCalculator.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include -class RimFractureModelCalculator; -class RimFractureModel; +class RimStimPlanModelCalculator; +class RimStimPlanModel; -class RimFractureModelLayerCalculator : public RimFractureModelPropertyCalculator +class RimStimPlanModelLayerCalculator : public RimStimPlanModelPropertyCalculator { public: - RimFractureModelLayerCalculator( RimFractureModelCalculator* calculator ); + RimStimPlanModelLayerCalculator( RimStimPlanModelCalculator* calculator ); bool calculate( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, + const RimStimPlanModel* stimPlanModel, int timeStep, std::vector& values, std::vector& measuredDepthValues, @@ -42,5 +42,5 @@ public: bool isMatching( RiaDefines::CurveProperty curveProperty ) const override; private: - RimFractureModelCalculator* m_fractureModelCalculator; + RimStimPlanModelCalculator* m_stimPlanModelCalculator; }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlot.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp similarity index 73% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlot.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp index 8c588dfda9..e119fd7bae 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlot.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp @@ -15,17 +15,17 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelPlot.h" +#include "RimStimPlanModelPlot.h" #include "RiaDefines.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include "Riu3DMainWindowTools.h" #include "RimEclipseCase.h" -#include "RimFractureModel.h" -#include "RimFractureModelCurve.h" -#include "RimFractureModelPropertyCurve.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCurve.h" +#include "RimStimPlanModelPropertyCurve.h" #include "RimTools.h" #include "RimWellLogTrack.h" @@ -36,21 +36,21 @@ #include "cafPdmUiGroup.h" #include "cafPdmUiToolButtonEditor.h" -CAF_PDM_SOURCE_INIT( RimFractureModelPlot, "FractureModelPlot" ); +CAF_PDM_SOURCE_INIT( RimStimPlanModelPlot, "StimPlanModelPlot" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelPlot::RimFractureModelPlot() +RimStimPlanModelPlot::RimStimPlanModelPlot() { - CAF_PDM_InitScriptableObject( "Fracture Model Plot", "", "", "A fracture model plot" ); + CAF_PDM_InitScriptableObject( "StimPlan Model Plot", "", "", "A fracture model plot" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_fractureModel, "FractureModel", "Fracture Model", "", "", "" ); - m_fractureModel.uiCapability()->setUiReadOnly( true ); + CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModel, "StimPlanModel", "StimPlan Model", "", "", "" ); + m_stimPlanModel.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_editFractureModel, "EditModel", false, "Edit", "", "", "" ); - m_editFractureModel.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); - m_editFractureModel.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + CAF_PDM_InitField( &m_editStimPlanModel, "EditModel", false, "Edit", "", "", "" ); + m_editStimPlanModel.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); + m_editStimPlanModel.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "Case", "", "", "" ); CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" ); @@ -62,30 +62,30 @@ RimFractureModelPlot::RimFractureModelPlot() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelPlot::setFractureModel( RimFractureModel* fractureModel ) +void RimStimPlanModelPlot::setStimPlanModel( RimStimPlanModel* stimPlanModel ) { - m_fractureModel = fractureModel; - m_eclipseCase = fractureModel->eclipseCase(); - m_timeStep = fractureModel->timeStep(); + m_stimPlanModel = stimPlanModel; + m_eclipseCase = stimPlanModel->eclipseCase(); + m_timeStep = stimPlanModel->timeStep(); - m_nameConfig->setCustomName( fractureModel->name() ); + m_nameConfig->setCustomName( stimPlanModel->name() ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModel* RimFractureModelPlot::fractureModel() +RimStimPlanModel* RimStimPlanModelPlot::stimPlanModel() { - return m_fractureModel; + return m_stimPlanModel; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) +void RimStimPlanModelPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { - uiOrdering.add( &m_fractureModel, {true, 2, 1} ); - uiOrdering.add( &m_editFractureModel, {false, 1, 0} ); + uiOrdering.add( &m_stimPlanModel, {true, 2, 1} ); + uiOrdering.add( &m_editStimPlanModel, {false, 1, 0} ); uiOrdering.add( &m_eclipseCase ); uiOrdering.add( &m_timeStep ); @@ -105,14 +105,14 @@ void RimFractureModelPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd /// //-------------------------------------------------------------------------------------------------- QList - RimFractureModelPlot::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) + RimStimPlanModelPlot::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) { QList options; - if ( fieldNeedingOptions == &m_fractureModel ) + if ( fieldNeedingOptions == &m_stimPlanModel ) { // The user is not allowed to change this field, but option box looks good - options.push_back( caf::PdmOptionItemInfo( m_fractureModel->name(), m_fractureModel ) ); + options.push_back( caf::PdmOptionItemInfo( m_stimPlanModel->name(), m_stimPlanModel ) ); } else if ( fieldNeedingOptions == &m_eclipseCase ) { @@ -129,22 +129,22 @@ QList //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField, +void RimStimPlanModelPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - if ( m_fractureModel ) + if ( m_stimPlanModel ) { if ( changedField == &m_eclipseCase || changedField == &m_timeStep ) { - m_fractureModel->setEclipseCaseAndTimeStep( m_eclipseCase(), m_timeStep() ); + m_stimPlanModel->setEclipseCaseAndTimeStep( m_eclipseCase(), m_timeStep() ); } - else if ( changedField == &m_editFractureModel ) + else if ( changedField == &m_editStimPlanModel ) { - m_editFractureModel = false; - if ( m_fractureModel != nullptr ) + m_editStimPlanModel = false; + if ( m_stimPlanModel != nullptr ) { - Riu3DMainWindowTools::selectAsCurrentItem( m_fractureModel() ); + Riu3DMainWindowTools::selectAsCurrentItem( m_stimPlanModel() ); } } } @@ -153,17 +153,17 @@ void RimFractureModelPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedF //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelPlot::onLoadDataAndUpdate() +void RimStimPlanModelPlot::onLoadDataAndUpdate() { // Enable and disable detailed fluid loss curves - if ( fractureModel() != nullptr ) + if ( stimPlanModel() != nullptr ) { std::vector fluidLossCurves = {RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT, RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR, RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT, RiaDefines::CurveProperty::IMMOBILE_FLUID_SATURATION}; - bool detailedFluidLoss = fractureModel()->useDetailedFluidLoss(); + bool detailedFluidLoss = stimPlanModel()->useDetailedFluidLoss(); for ( auto curveProperty : fluidLossCurves ) { @@ -186,7 +186,7 @@ void RimFractureModelPlot::onLoadDataAndUpdate() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelPlot::applyDataSource() +void RimStimPlanModelPlot::applyDataSource() { this->updateConnectedEditors(); } @@ -194,12 +194,12 @@ void RimFractureModelPlot::applyDataSource() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimWellLogExtractionCurve* RimFractureModelPlot::findCurveByProperty( RiaDefines::CurveProperty curveProperty ) const +RimWellLogExtractionCurve* RimStimPlanModelPlot::findCurveByProperty( RiaDefines::CurveProperty curveProperty ) const { - std::vector curves; + std::vector curves; descendantsIncludingThisOfType( curves ); - for ( RimFractureModelPropertyCurve* curve : curves ) + for ( RimStimPlanModelPropertyCurve* curve : curves ) { if ( curve->curveProperty() == curveProperty ) { diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlot.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.h similarity index 82% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlot.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.h index ac2e004b3e..30180f013a 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlot.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.h @@ -19,23 +19,23 @@ #include "RimDepthTrackPlot.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include "cafPdmPtrField.h" -class RimFractureModel; +class RimStimPlanModel; class RimWellLogExtractionCurve; class RimEclipseCase; -class RimFractureModelPlot : public RimDepthTrackPlot +class RimStimPlanModelPlot : public RimDepthTrackPlot { CAF_PDM_HEADER_INIT; public: - RimFractureModelPlot(); + RimStimPlanModelPlot(); - void setFractureModel( RimFractureModel* fractureModel ); - RimFractureModel* fractureModel(); + void setStimPlanModel( RimStimPlanModel* stimPlanModel ); + RimStimPlanModel* stimPlanModel(); protected: RimWellLogExtractionCurve* findCurveByProperty( RiaDefines::CurveProperty curveProperty ) const; @@ -50,8 +50,8 @@ protected: private: void applyDataSource(); - caf::PdmPtrField m_fractureModel; - caf::PdmField m_editFractureModel; + caf::PdmPtrField m_stimPlanModel; + caf::PdmField m_editStimPlanModel; caf::PdmPtrField m_eclipseCase; caf::PdmField m_timeStep; }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlotCollection.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp similarity index 68% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlotCollection.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp index a0e8846b65..5986721952 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp @@ -16,40 +16,40 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelPlotCollection.h" +#include "RimStimPlanModelPlotCollection.h" -#include "RimFractureModelPlot.h" +#include "RimStimPlanModelPlot.h" #include "cafPdmFieldScriptingCapability.h" #include "cafPdmObjectScriptingCapability.h" -CAF_PDM_SOURCE_INIT( RimFractureModelPlotCollection, "FractureModelPlotCollection" ); +CAF_PDM_SOURCE_INIT( RimStimPlanModelPlotCollection, "StimPlanModelPlotCollection" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelPlotCollection::RimFractureModelPlotCollection() +RimStimPlanModelPlotCollection::RimStimPlanModelPlotCollection() { - CAF_PDM_InitScriptableObject( "Fracture Model Plots", ":/WellLogPlots16x16.png", "", "" ); + CAF_PDM_InitScriptableObject( "StimPlan Model Plots", ":/WellLogPlots16x16.png", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_fractureModelPlots, "FractureModelPlots", "", "", "", "" ); - m_fractureModelPlots.uiCapability()->setUiHidden( true ); + CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelPlots, "StimPlanModelPlots", "", "", "", "" ); + m_stimPlanModelPlots.uiCapability()->setUiHidden( true ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelPlotCollection::~RimFractureModelPlotCollection() +RimStimPlanModelPlotCollection::~RimStimPlanModelPlotCollection() { - m_fractureModelPlots.deleteAllChildObjects(); + m_stimPlanModelPlots.deleteAllChildObjects(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelPlotCollection::reloadAllPlots() +void RimStimPlanModelPlotCollection::reloadAllPlots() { - for ( const auto& w : m_fractureModelPlots() ) + for ( const auto& w : m_stimPlanModelPlots() ) { w->loadDataAndUpdate(); } @@ -58,23 +58,23 @@ void RimFractureModelPlotCollection::reloadAllPlots() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelPlotCollection::addFractureModelPlot( RimFractureModelPlot* newPlot ) +void RimStimPlanModelPlotCollection::addStimPlanModelPlot( RimStimPlanModelPlot* newPlot ) { - m_fractureModelPlots.push_back( newPlot ); + m_stimPlanModelPlots.push_back( newPlot ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelPlotCollection::fractureModelPlots() const +std::vector RimStimPlanModelPlotCollection::stimPlanModelPlots() const { - return m_fractureModelPlots.childObjects(); + return m_stimPlanModelPlots.childObjects(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelPlotCollection::deleteAllPlots() +void RimStimPlanModelPlotCollection::deleteAllPlots() { - m_fractureModelPlots.deleteAllChildObjects(); + m_stimPlanModelPlots.deleteAllChildObjects(); } diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlotCollection.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.h similarity index 76% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlotCollection.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.h index c5915a61b0..e953e587ca 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.h @@ -22,28 +22,28 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -class RimFractureModelPlot; +class RimStimPlanModelPlot; //================================================================================================== /// /// //================================================================================================== -class RimFractureModelPlotCollection : public caf::PdmObject +class RimStimPlanModelPlotCollection : public caf::PdmObject { CAF_PDM_HEADER_INIT; public: - RimFractureModelPlotCollection(); - ~RimFractureModelPlotCollection() override; + RimStimPlanModelPlotCollection(); + ~RimStimPlanModelPlotCollection() override; - void addFractureModelPlot( RimFractureModelPlot* newPlot ); + void addStimPlanModelPlot( RimStimPlanModelPlot* newPlot ); - std::vector fractureModelPlots() const; + std::vector stimPlanModelPlots() const; void reloadAllPlots(); void deleteAllPlots(); private: - caf::PdmChildArrayField m_fractureModelPlots; + caf::PdmChildArrayField m_stimPlanModelPlots; }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPropertyCalculator.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPropertyCalculator.h similarity index 85% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPropertyCalculator.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPropertyCalculator.h index b8ff34bcad..4b298767bd 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPropertyCalculator.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPropertyCalculator.h @@ -18,24 +18,24 @@ #pragma once -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include -class RimFractureModelCalculator; -class RimFractureModel; +class RimStimPlanModelCalculator; +class RimStimPlanModel; //================================================================================================== /// //================================================================================================== -class RimFractureModelPropertyCalculator +class RimStimPlanModelPropertyCalculator { public: - virtual ~RimFractureModelPropertyCalculator(){}; + virtual ~RimStimPlanModelPropertyCalculator(){}; virtual bool isMatching( RiaDefines::CurveProperty curveProperty ) const = 0; virtual bool calculate( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, + const RimStimPlanModel* stimPlanModel, int timeStep, std::vector& values, std::vector& measuredDepthValues, diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPropertyCurve.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPropertyCurve.h similarity index 94% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPropertyCurve.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPropertyCurve.h index 0e4f7a8ef2..77f5b79696 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelPropertyCurve.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPropertyCurve.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include "RimWellLogExtractionCurve.h" @@ -27,7 +27,7 @@ //================================================================================================== /// //================================================================================================== -class RimFractureModelPropertyCurve +class RimStimPlanModelPropertyCurve { public: virtual void setCurveProperty( RiaDefines::CurveProperty ) = 0; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelStressCalculator.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.cpp similarity index 82% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelStressCalculator.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.cpp index db06cbccea..07def4487d 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelStressCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.cpp @@ -15,11 +15,11 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelStressCalculator.h" +#include "RimStimPlanModelStressCalculator.h" #include "RiaDefines.h" -#include "RiaFractureModelDefines.h" #include "RiaLogging.h" +#include "RiaStimPlanModelDefines.h" #include "RigEclipseCaseData.h" #include "RigEclipseWellLogExtractor.h" @@ -28,23 +28,23 @@ #include "RigWellPathGeometryTools.h" #include "RimCase.h" #include "RimEclipseCase.h" -#include "RimFractureModel.h" -#include "RimFractureModelCalculator.h" -#include "RimFractureModelStressCalculator.h" #include "RimModeledWellPath.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCalculator.h" +#include "RimStimPlanModelStressCalculator.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelStressCalculator::RimFractureModelStressCalculator( RimFractureModelCalculator* fractureModelCalculator ) - : m_fractureModelCalculator( fractureModelCalculator ) +RimStimPlanModelStressCalculator::RimStimPlanModelStressCalculator( RimStimPlanModelCalculator* stimPlanModelCalculator ) + : m_stimPlanModelCalculator( stimPlanModelCalculator ) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelStressCalculator::isMatching( RiaDefines::CurveProperty curveProperty ) const +bool RimStimPlanModelStressCalculator::isMatching( RiaDefines::CurveProperty curveProperty ) const { std::vector matching = {RiaDefines::CurveProperty::INITIAL_STRESS, RiaDefines::CurveProperty::STRESS, @@ -57,33 +57,33 @@ bool RimFractureModelStressCalculator::isMatching( RiaDefines::CurveProperty cur //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelStressCalculator::calculate( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, +bool RimStimPlanModelStressCalculator::calculate( RiaDefines::CurveProperty curveProperty, + const RimStimPlanModel* stimPlanModel, int timeStep, std::vector& values, std::vector& measuredDepthValues, std::vector& tvDepthValues, double& rkbDiff ) const { - RimEclipseCase* eclipseCase = fractureModel->eclipseCase(); + RimEclipseCase* eclipseCase = stimPlanModel->eclipseCase(); if ( !eclipseCase ) { return false; } - if ( !fractureModel->thicknessDirectionWellPath() ) + if ( !stimPlanModel->thicknessDirectionWellPath() ) { return false; } - RigWellPath* wellPathGeometry = fractureModel->thicknessDirectionWellPath()->wellPathGeometry(); + RigWellPath* wellPathGeometry = stimPlanModel->thicknessDirectionWellPath()->wellPathGeometry(); if ( !wellPathGeometry ) { RiaLogging::error( "No well path geometry found for stress data exctration." ); return false; } - std::vector tvDepthInFeet = m_fractureModelCalculator->calculateTrueVerticalDepth(); + std::vector tvDepthInFeet = m_stimPlanModelCalculator->calculateTrueVerticalDepth(); for ( double f : tvDepthInFeet ) { tvDepthValues.push_back( RiaEclipseUnitTools::feetToMeter( f ) ); @@ -91,23 +91,23 @@ bool RimFractureModelStressCalculator::calculate( RiaDefines::CurveProperty curv if ( curveProperty == RiaDefines::CurveProperty::STRESS ) { - values = m_fractureModelCalculator->calculateStress(); - std::vector stressGradients = m_fractureModelCalculator->calculateStressGradient(); + values = m_stimPlanModelCalculator->calculateStress(); + std::vector stressGradients = m_stimPlanModelCalculator->calculateStressGradient(); addDatapointsForBottomOfLayers( tvDepthValues, values, stressGradients ); } else if ( curveProperty == RiaDefines::CurveProperty::INITIAL_STRESS ) { - values = m_fractureModelCalculator->calculateInitialStress(); - std::vector stressGradients = m_fractureModelCalculator->calculateStressGradient(); + values = m_stimPlanModelCalculator->calculateInitialStress(); + std::vector stressGradients = m_stimPlanModelCalculator->calculateStressGradient(); addDatapointsForBottomOfLayers( tvDepthValues, values, stressGradients ); } else if ( curveProperty == RiaDefines::CurveProperty::STRESS_GRADIENT ) { - values = m_fractureModelCalculator->calculateStressGradient(); + values = m_stimPlanModelCalculator->calculateStressGradient(); } else if ( curveProperty == RiaDefines::CurveProperty::TEMPERATURE ) { - m_fractureModelCalculator->calculateTemperature( values ); + m_stimPlanModelCalculator->calculateTemperature( values ); } if ( eclipseCase ) @@ -136,7 +136,7 @@ bool RimFractureModelStressCalculator::calculate( RiaDefines::CurveProperty curv //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelStressCalculator::addDatapointsForBottomOfLayers( std::vector& tvDepthValues, +void RimStimPlanModelStressCalculator::addDatapointsForBottomOfLayers( std::vector& tvDepthValues, std::vector& stress, const std::vector& stressGradients ) { diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelStressCalculator.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.h similarity index 80% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelStressCalculator.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.h index 6692a7850d..0945728b37 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelStressCalculator.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelStressCalculator.h @@ -17,24 +17,24 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RimFractureModelPropertyCalculator.h" +#include "RimStimPlanModelPropertyCalculator.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include -class RimFractureModelCalculator; -class RimFractureModel; +class RimStimPlanModelCalculator; +class RimStimPlanModel; class QString; -class RimFractureModelStressCalculator : public RimFractureModelPropertyCalculator +class RimStimPlanModelStressCalculator : public RimStimPlanModelPropertyCalculator { public: - RimFractureModelStressCalculator( RimFractureModelCalculator* calculator ); + RimStimPlanModelStressCalculator( RimStimPlanModelCalculator* calculator ); bool calculate( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, + const RimStimPlanModel* stimPlanModel, int timeStep, std::vector& values, std::vector& measuredDepthValues, @@ -48,5 +48,5 @@ private: std::vector& stress, const std::vector& stressGradients ); - RimFractureModelCalculator* m_fractureModelCalculator; + RimStimPlanModelCalculator* m_stimPlanModelCalculator; }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplate.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp similarity index 88% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplate.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp index a9ce9be598..5051e5ac08 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplate.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp @@ -16,14 +16,14 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelTemplate.h" +#include "RimStimPlanModelTemplate.h" #include "RiaColorTables.h" #include "RiaCompletionTypeCalculationScheduler.h" #include "RiaEclipseUnitTools.h" #include "RiaFractureDefines.h" -#include "RiaFractureModelDefines.h" #include "RiaLogging.h" +#include "RiaStimPlanModelDefines.h" #include "Riu3DMainWindowTools.h" @@ -41,10 +41,10 @@ #include "RimElasticProperties.h" #include "RimEllipseFractureTemplate.h" #include "RimFaciesProperties.h" -#include "RimFractureModelPlot.h" #include "RimNonNetLayers.h" #include "RimOilField.h" #include "RimProject.h" +#include "RimStimPlanModelPlot.h" #include "RimTools.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" @@ -68,15 +68,15 @@ #include -CAF_PDM_SOURCE_INIT( RimFractureModelTemplate, "FractureModelTemplate" ); +CAF_PDM_SOURCE_INIT( RimStimPlanModelTemplate, "StimPlanModelTemplate" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelTemplate::RimFractureModelTemplate() +RimStimPlanModelTemplate::RimStimPlanModelTemplate() : changed( this ) { - CAF_PDM_InitScriptableObject( "FractureModelTemplate", "", "", "" ); + CAF_PDM_InitScriptableObject( "StimPlanModelTemplate", "", "", "" ); CAF_PDM_InitScriptableField( &m_id, "Id", -1, "ID", "", "", "" ); m_id.uiCapability()->setUiReadOnly( true ); @@ -176,14 +176,14 @@ RimFractureModelTemplate::RimFractureModelTemplate() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelTemplate::~RimFractureModelTemplate() +RimStimPlanModelTemplate::~RimStimPlanModelTemplate() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::fieldChangedByUi( const caf::PdmFieldHandle* changedField, +void RimStimPlanModelTemplate::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { @@ -194,7 +194,7 @@ void RimFractureModelTemplate::fieldChangedByUi( const caf::PdmFieldHandle* chan /// //-------------------------------------------------------------------------------------------------- QList - RimFractureModelTemplate::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) + RimStimPlanModelTemplate::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) { QList options; @@ -229,7 +229,7 @@ QList //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) +void RimStimPlanModelTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { uiOrdering.add( nameField() ); uiOrdering.add( &m_id ); @@ -268,7 +268,7 @@ void RimFractureModelTemplate::defineUiOrdering( QString uiConfigName, caf::PdmU //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::defineEditorAttribute( const caf::PdmFieldHandle* field, +void RimStimPlanModelTemplate::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) { @@ -286,7 +286,7 @@ void RimFractureModelTemplate::defineEditorAttribute( const caf::PdmFieldHandle* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::setId( int id ) +void RimStimPlanModelTemplate::setId( int id ) { m_id = id; } @@ -294,7 +294,7 @@ void RimFractureModelTemplate::setId( int id ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -int RimFractureModelTemplate::id() const +int RimStimPlanModelTemplate::id() const { return m_id; } @@ -302,7 +302,7 @@ int RimFractureModelTemplate::id() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimElasticProperties* RimFractureModelTemplate::elasticProperties() const +RimElasticProperties* RimStimPlanModelTemplate::elasticProperties() const { return m_elasticProperties; } @@ -310,7 +310,7 @@ RimElasticProperties* RimFractureModelTemplate::elasticProperties() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::setElasticProperties( RimElasticProperties* elasticProperties ) +void RimStimPlanModelTemplate::setElasticProperties( RimElasticProperties* elasticProperties ) { if ( m_elasticProperties ) { @@ -321,14 +321,14 @@ void RimFractureModelTemplate::setElasticProperties( RimElasticProperties* elast if ( m_elasticProperties ) { - m_elasticProperties->changed.connect( this, &RimFractureModelTemplate::elasticPropertiesChanged ); + m_elasticProperties->changed.connect( this, &RimStimPlanModelTemplate::elasticPropertiesChanged ); } } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFaciesProperties* RimFractureModelTemplate::faciesProperties() const +RimFaciesProperties* RimStimPlanModelTemplate::faciesProperties() const { return m_faciesProperties; } @@ -336,7 +336,7 @@ RimFaciesProperties* RimFractureModelTemplate::faciesProperties() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::setFaciesProperties( RimFaciesProperties* faciesProperties ) +void RimStimPlanModelTemplate::setFaciesProperties( RimFaciesProperties* faciesProperties ) { if ( m_faciesProperties ) { @@ -347,7 +347,7 @@ void RimFractureModelTemplate::setFaciesProperties( RimFaciesProperties* faciesP if ( m_faciesProperties ) { - m_faciesProperties->changed.connect( this, &RimFractureModelTemplate::faciesPropertiesChanged ); + m_faciesProperties->changed.connect( this, &RimStimPlanModelTemplate::faciesPropertiesChanged ); RimEclipseCase* eclipseCase = getEclipseCase(); if ( !eclipseCase ) return; @@ -358,7 +358,7 @@ void RimFractureModelTemplate::setFaciesProperties( RimFaciesProperties* faciesP //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::setNonNetLayers( RimNonNetLayers* nonNetLayers ) +void RimStimPlanModelTemplate::setNonNetLayers( RimNonNetLayers* nonNetLayers ) { if ( m_nonNetLayers ) { @@ -369,7 +369,7 @@ void RimFractureModelTemplate::setNonNetLayers( RimNonNetLayers* nonNetLayers ) if ( m_nonNetLayers ) { - m_nonNetLayers->changed.connect( this, &RimFractureModelTemplate::nonNetLayersChanged ); + m_nonNetLayers->changed.connect( this, &RimStimPlanModelTemplate::nonNetLayersChanged ); RimEclipseCase* eclipseCase = getEclipseCase(); if ( !eclipseCase ) return; @@ -380,7 +380,7 @@ void RimFractureModelTemplate::setNonNetLayers( RimNonNetLayers* nonNetLayers ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimNonNetLayers* RimFractureModelTemplate::nonNetLayers() const +RimNonNetLayers* RimStimPlanModelTemplate::nonNetLayers() const { return m_nonNetLayers; } @@ -388,7 +388,7 @@ RimNonNetLayers* RimFractureModelTemplate::nonNetLayers() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::initAfterRead() +void RimStimPlanModelTemplate::initAfterRead() { RimEclipseCase* eclipseCase = getEclipseCase(); if ( !eclipseCase ) return; @@ -407,7 +407,7 @@ void RimFractureModelTemplate::initAfterRead() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::faciesPropertiesChanged( const caf::SignalEmitter* emitter ) +void RimStimPlanModelTemplate::faciesPropertiesChanged( const caf::SignalEmitter* emitter ) { changed.send(); } @@ -415,7 +415,7 @@ void RimFractureModelTemplate::faciesPropertiesChanged( const caf::SignalEmitter //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::elasticPropertiesChanged( const caf::SignalEmitter* emitter ) +void RimStimPlanModelTemplate::elasticPropertiesChanged( const caf::SignalEmitter* emitter ) { changed.send(); } @@ -423,7 +423,7 @@ void RimFractureModelTemplate::elasticPropertiesChanged( const caf::SignalEmitte //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::nonNetLayersChanged( const caf::SignalEmitter* emitter ) +void RimStimPlanModelTemplate::nonNetLayersChanged( const caf::SignalEmitter* emitter ) { changed.send(); } @@ -431,7 +431,7 @@ void RimFractureModelTemplate::nonNetLayersChanged( const caf::SignalEmitter* em //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplate::loadDataAndUpdate() +void RimStimPlanModelTemplate::loadDataAndUpdate() { if ( m_elasticProperties ) { @@ -447,7 +447,7 @@ void RimFractureModelTemplate::loadDataAndUpdate() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::defaultPorosity() const +double RimStimPlanModelTemplate::defaultPorosity() const { return m_defaultPorosity(); } @@ -455,7 +455,7 @@ double RimFractureModelTemplate::defaultPorosity() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::defaultPermeability() const +double RimStimPlanModelTemplate::defaultPermeability() const { return m_defaultPermeability(); } @@ -463,7 +463,7 @@ double RimFractureModelTemplate::defaultPermeability() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::overburdenFluidDensity() const +double RimStimPlanModelTemplate::overburdenFluidDensity() const { return m_overburdenFluidDensity; } @@ -471,7 +471,7 @@ double RimFractureModelTemplate::overburdenFluidDensity() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::underburdenFluidDensity() const +double RimStimPlanModelTemplate::underburdenFluidDensity() const { return m_underburdenFluidDensity; } @@ -479,7 +479,7 @@ double RimFractureModelTemplate::underburdenFluidDensity() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::overburdenHeight() const +double RimStimPlanModelTemplate::overburdenHeight() const { return m_overburdenHeight; } @@ -487,7 +487,7 @@ double RimFractureModelTemplate::overburdenHeight() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::underburdenHeight() const +double RimStimPlanModelTemplate::underburdenHeight() const { return m_underburdenHeight; } @@ -495,7 +495,7 @@ double RimFractureModelTemplate::underburdenHeight() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::defaultOverburdenPorosity() const +double RimStimPlanModelTemplate::defaultOverburdenPorosity() const { return m_overburdenPorosity; } @@ -503,7 +503,7 @@ double RimFractureModelTemplate::defaultOverburdenPorosity() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::defaultUnderburdenPorosity() const +double RimStimPlanModelTemplate::defaultUnderburdenPorosity() const { return m_underburdenPorosity; } @@ -511,7 +511,7 @@ double RimFractureModelTemplate::defaultUnderburdenPorosity() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::defaultOverburdenPermeability() const +double RimStimPlanModelTemplate::defaultOverburdenPermeability() const { return m_overburdenPermeability; } @@ -519,7 +519,7 @@ double RimFractureModelTemplate::defaultOverburdenPermeability() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::defaultUnderburdenPermeability() const +double RimStimPlanModelTemplate::defaultUnderburdenPermeability() const { return m_underburdenPermeability; } @@ -527,7 +527,7 @@ double RimFractureModelTemplate::defaultUnderburdenPermeability() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModelTemplate::overburdenFormation() const +QString RimStimPlanModelTemplate::overburdenFormation() const { return m_overburdenFormation; } @@ -535,7 +535,7 @@ QString RimFractureModelTemplate::overburdenFormation() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModelTemplate::overburdenFacies() const +QString RimStimPlanModelTemplate::overburdenFacies() const { return m_overburdenFacies; } @@ -543,7 +543,7 @@ QString RimFractureModelTemplate::overburdenFacies() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModelTemplate::underburdenFormation() const +QString RimStimPlanModelTemplate::underburdenFormation() const { return m_underburdenFormation; } @@ -551,7 +551,7 @@ QString RimFractureModelTemplate::underburdenFormation() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFractureModelTemplate::underburdenFacies() const +QString RimStimPlanModelTemplate::underburdenFacies() const { return m_underburdenFacies; } @@ -559,7 +559,7 @@ QString RimFractureModelTemplate::underburdenFacies() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::verticalStress() const +double RimStimPlanModelTemplate::verticalStress() const { return m_verticalStress; } @@ -567,7 +567,7 @@ double RimFractureModelTemplate::verticalStress() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::verticalStressGradient() const +double RimStimPlanModelTemplate::verticalStressGradient() const { return m_verticalStressGradient; } @@ -575,7 +575,7 @@ double RimFractureModelTemplate::verticalStressGradient() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::stressDepth() const +double RimStimPlanModelTemplate::stressDepth() const { return m_stressDepth; } @@ -583,7 +583,7 @@ double RimFractureModelTemplate::stressDepth() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::referenceTemperature() const +double RimStimPlanModelTemplate::referenceTemperature() const { return m_referenceTemperature; } @@ -591,7 +591,7 @@ double RimFractureModelTemplate::referenceTemperature() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::referenceTemperatureGradient() const +double RimStimPlanModelTemplate::referenceTemperatureGradient() const { return m_referenceTemperatureGradient; } @@ -599,7 +599,7 @@ double RimFractureModelTemplate::referenceTemperatureGradient() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::referenceTemperatureDepth() const +double RimStimPlanModelTemplate::referenceTemperatureDepth() const { return m_referenceTemperatureDepth; } @@ -607,7 +607,7 @@ double RimFractureModelTemplate::referenceTemperatureDepth() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimFractureModelTemplate::computeDefaultStressDepth() +double RimStimPlanModelTemplate::computeDefaultStressDepth() { const double stressDepth = 1000.0; @@ -621,7 +621,7 @@ double RimFractureModelTemplate::computeDefaultStressDepth() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimEclipseCase* RimFractureModelTemplate::getEclipseCase() +RimEclipseCase* RimStimPlanModelTemplate::getEclipseCase() { // Find an eclipse case RimProject* proj = RimProject::current(); @@ -633,7 +633,7 @@ RimEclipseCase* RimFractureModelTemplate::getEclipseCase() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigEclipseCaseData* RimFractureModelTemplate::getEclipseCaseData() +RigEclipseCaseData* RimStimPlanModelTemplate::getEclipseCaseData() { // Find an eclipse case RimEclipseCase* eclipseCase = getEclipseCase(); diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplate.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h similarity index 96% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplate.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h index 2c51485cc2..64dce7b795 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplate.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h @@ -19,7 +19,7 @@ #pragma once #include "RiaEclipseUnitTools.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include "RimNamedObject.h" @@ -39,13 +39,13 @@ class RimNonNetLayers; /// /// //================================================================================================== -class RimFractureModelTemplate : public RimNamedObject +class RimStimPlanModelTemplate : public RimNamedObject { CAF_PDM_HEADER_INIT; public: - RimFractureModelTemplate( void ); - ~RimFractureModelTemplate( void ) override; + RimStimPlanModelTemplate( void ); + ~RimStimPlanModelTemplate( void ) override; caf::Signal<> changed; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplateCollection.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp similarity index 73% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplateCollection.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp index d85a50788b..7661c93f3e 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplateCollection.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp @@ -16,35 +16,35 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelTemplateCollection.h" +#include "RimStimPlanModelTemplateCollection.h" #include "RimCase.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" #include "RimFracture.h" -#include "RimFractureModelTemplate.h" #include "RimProject.h" +#include "RimStimPlanModelTemplate.h" #include "cafPdmFieldScriptingCapability.h" #include "cafPdmObject.h" #include "cafPdmObjectScriptingCapability.h" -CAF_PDM_SOURCE_INIT( RimFractureModelTemplateCollection, "FractureModelTemplateCollection" ); +CAF_PDM_SOURCE_INIT( RimStimPlanModelTemplateCollection, "StimPlanModelTemplateCollection" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelTemplateCollection::RimFractureModelTemplateCollection() +RimStimPlanModelTemplateCollection::RimStimPlanModelTemplateCollection() { - CAF_PDM_InitScriptableObject( "Fracture Model Templates", ":/FractureTemplates16x16.png", "", "" ); + CAF_PDM_InitScriptableObject( "StimPlan Model Templates", ":/FractureTemplates16x16.png", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_fractureModelTemplates, - "FractureModelTemplates", - "Fracture Model Templates", + CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelTemplates, + "StimPlanModelTemplates", + "StimPlan Model Templates", "", "", "" ); - m_fractureModelTemplates.uiCapability()->setUiHidden( true ); + m_stimPlanModelTemplates.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_nextValidId, "NextValidId", 0, "", "", "", "" ); m_nextValidId.uiCapability()->setUiHidden( true ); @@ -53,17 +53,17 @@ RimFractureModelTemplateCollection::RimFractureModelTemplateCollection() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelTemplateCollection::~RimFractureModelTemplateCollection() +RimStimPlanModelTemplateCollection::~RimStimPlanModelTemplateCollection() { - m_fractureModelTemplates.deleteAllChildObjects(); + m_stimPlanModelTemplates.deleteAllChildObjects(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelTemplate* RimFractureModelTemplateCollection::fractureModelTemplate( int id ) const +RimStimPlanModelTemplate* RimStimPlanModelTemplateCollection::stimPlanModelTemplate( int id ) const { - for ( const auto& templ : m_fractureModelTemplates ) + for ( const auto& templ : m_stimPlanModelTemplates ) { if ( templ->id() == id ) return templ; } @@ -73,10 +73,10 @@ RimFractureModelTemplate* RimFractureModelTemplateCollection::fractureModelTempl //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimFractureModelTemplateCollection::fractureModelTemplates() const +std::vector RimStimPlanModelTemplateCollection::stimPlanModelTemplates() const { - std::vector templates; - for ( auto& templ : m_fractureModelTemplates ) + std::vector templates; + for ( auto& templ : m_stimPlanModelTemplates ) { templates.push_back( templ ); } @@ -86,18 +86,18 @@ std::vector RimFractureModelTemplateCollection::fract //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplateCollection::addFractureModelTemplate( RimFractureModelTemplate* templ ) +void RimStimPlanModelTemplateCollection::addStimPlanModelTemplate( RimStimPlanModelTemplate* templ ) { templ->setId( nextFractureTemplateId() ); - m_fractureModelTemplates.push_back( templ ); + m_stimPlanModelTemplates.push_back( templ ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplateCollection::loadAndUpdateData() +void RimStimPlanModelTemplateCollection::loadAndUpdateData() { - for ( RimFractureModelTemplate* f : m_fractureModelTemplates() ) + for ( RimStimPlanModelTemplate* f : m_stimPlanModelTemplates() ) { f->loadDataAndUpdate(); } @@ -106,10 +106,10 @@ void RimFractureModelTemplateCollection::loadAndUpdateData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplateCollection::initAfterRead() +void RimStimPlanModelTemplateCollection::initAfterRead() { // Assign template id if not already assigned - for ( auto& templ : m_fractureModelTemplates ) + for ( auto& templ : m_stimPlanModelTemplates ) { if ( templ->id() < 0 ) templ->setId( nextFractureTemplateId() ); } @@ -118,7 +118,7 @@ void RimFractureModelTemplateCollection::initAfterRead() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -int RimFractureModelTemplateCollection::nextFractureTemplateId() +int RimStimPlanModelTemplateCollection::nextFractureTemplateId() { int newId = m_nextValidId; m_nextValidId = m_nextValidId + 1; @@ -129,7 +129,7 @@ int RimFractureModelTemplateCollection::nextFractureTemplateId() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelTemplateCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, +void RimStimPlanModelTemplateCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector& referringObjects ) { RimProject* proj = nullptr; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplateCollection.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.h similarity index 75% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplateCollection.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.h index 4a27b7dfb1..7e1f18bd39 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelTemplateCollection.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.h @@ -22,23 +22,23 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -class RimFractureModelTemplate; +class RimStimPlanModelTemplate; //================================================================================================== /// /// //================================================================================================== -class RimFractureModelTemplateCollection : public caf::PdmObject +class RimStimPlanModelTemplateCollection : public caf::PdmObject { CAF_PDM_HEADER_INIT; public: - RimFractureModelTemplateCollection(); - ~RimFractureModelTemplateCollection() override; + RimStimPlanModelTemplateCollection(); + ~RimStimPlanModelTemplateCollection() override; - RimFractureModelTemplate* fractureModelTemplate( int id ) const; - std::vector fractureModelTemplates() const; - void addFractureModelTemplate( RimFractureModelTemplate* templ ); + RimStimPlanModelTemplate* stimPlanModelTemplate( int id ) const; + std::vector stimPlanModelTemplates() const; + void addStimPlanModelTemplate( RimStimPlanModelTemplate* templ ); void loadAndUpdateData(); @@ -51,6 +51,6 @@ protected: private: int nextFractureTemplateId(); - caf::PdmChildArrayField m_fractureModelTemplates; + caf::PdmChildArrayField m_stimPlanModelTemplates; caf::PdmField m_nextValidId; // Unique fracture template ID within a project }; diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelWellLogCalculator.cpp b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelWellLogCalculator.cpp similarity index 81% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelWellLogCalculator.cpp rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelWellLogCalculator.cpp index cb7f549dff..201595e6e7 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelWellLogCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelWellLogCalculator.cpp @@ -15,12 +15,12 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimFractureModelWellLogCalculator.h" +#include "RimStimPlanModelWellLogCalculator.h" #include "RiaDefines.h" -#include "RiaFractureModelDefines.h" #include "RiaInterpolationTools.h" #include "RiaLogging.h" +#include "RiaStimPlanModelDefines.h" #include "RigEclipseCaseData.h" #include "RigEclipseWellLogExtractor.h" @@ -34,25 +34,25 @@ #include "RimEclipseInputProperty.h" #include "RimEclipseInputPropertyCollection.h" #include "RimEclipseResultDefinition.h" -#include "RimFractureModel.h" -#include "RimFractureModelCalculator.h" -#include "RimFractureModelTemplate.h" #include "RimModeledWellPath.h" #include "RimNonNetLayers.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCalculator.h" +#include "RimStimPlanModelTemplate.h" #include "RimWellPath.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureModelWellLogCalculator::RimFractureModelWellLogCalculator( RimFractureModelCalculator* fractureModelCalculator ) - : m_fractureModelCalculator( fractureModelCalculator ) +RimStimPlanModelWellLogCalculator::RimStimPlanModelWellLogCalculator( RimStimPlanModelCalculator* stimPlanModelCalculator ) + : m_stimPlanModelCalculator( stimPlanModelCalculator ) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelWellLogCalculator::isMatching( RiaDefines::CurveProperty curveProperty ) const +bool RimStimPlanModelWellLogCalculator::isMatching( RiaDefines::CurveProperty curveProperty ) const { std::vector matching = { RiaDefines::CurveProperty::FACIES, @@ -70,26 +70,26 @@ bool RimFractureModelWellLogCalculator::isMatching( RiaDefines::CurveProperty cu //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelWellLogCalculator::calculate( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, +bool RimStimPlanModelWellLogCalculator::calculate( RiaDefines::CurveProperty curveProperty, + const RimStimPlanModel* stimPlanModel, int timeStep, std::vector& values, std::vector& measuredDepthValues, std::vector& tvDepthValues, double& rkbDiff ) const { - RimEclipseCase* eclipseCase = fractureModel->eclipseCase(); + RimEclipseCase* eclipseCase = stimPlanModel->eclipseCase(); if ( !eclipseCase ) { return false; } - if ( !fractureModel->thicknessDirectionWellPath() ) + if ( !stimPlanModel->thicknessDirectionWellPath() ) { return false; } - RigWellPath* wellPathGeometry = fractureModel->thicknessDirectionWellPath()->wellPathGeometry(); + RigWellPath* wellPathGeometry = stimPlanModel->thicknessDirectionWellPath()->wellPathGeometry(); if ( !wellPathGeometry ) { RiaLogging::error( "No well path geometry found for well log exctration" ); @@ -104,13 +104,13 @@ bool RimFractureModelWellLogCalculator::calculate( RiaDefines::CurveProperty cur RimEclipseResultDefinition eclipseResultDefinition; eclipseResultDefinition.setEclipseCase( eclipseCase ); - eclipseResultDefinition.setResultType( fractureModel->eclipseResultCategory( curveProperty ) ); + eclipseResultDefinition.setResultType( stimPlanModel->eclipseResultCategory( curveProperty ) ); eclipseResultDefinition.setPorosityModel( RiaDefines::PorosityModelType::MATRIX_MODEL ); - eclipseResultDefinition.setResultVariable( fractureModel->eclipseResultVariable( curveProperty ) ); + eclipseResultDefinition.setResultVariable( stimPlanModel->eclipseResultVariable( curveProperty ) ); eclipseResultDefinition.loadResult(); - if ( fractureModel->eclipseResultCategory( curveProperty ) != RiaDefines::ResultCatType::DYNAMIC_NATIVE || + if ( stimPlanModel->eclipseResultCategory( curveProperty ) != RiaDefines::ResultCatType::DYNAMIC_NATIVE || curveProperty == RiaDefines::CurveProperty::INITIAL_PRESSURE ) { timeStep = 0; @@ -132,21 +132,21 @@ bool RimFractureModelWellLogCalculator::calculate( RiaDefines::CurveProperty cur return false; } - double overburdenHeight = fractureModel->overburdenHeight(); + double overburdenHeight = stimPlanModel->overburdenHeight(); if ( overburdenHeight > 0.0 ) { - addOverburden( curveProperty, fractureModel, tvDepthValues, measuredDepthValues, values ); + addOverburden( curveProperty, stimPlanModel, tvDepthValues, measuredDepthValues, values ); } - double underburdenHeight = fractureModel->underburdenHeight(); + double underburdenHeight = stimPlanModel->underburdenHeight(); if ( underburdenHeight > 0.0 ) { - addUnderburden( curveProperty, fractureModel, tvDepthValues, measuredDepthValues, values ); + addUnderburden( curveProperty, stimPlanModel, tvDepthValues, measuredDepthValues, values ); } if ( hasMissingValues( values ) ) { - if ( fractureModel->missingValueStrategy( curveProperty ) == RimFractureModel::MissingValueStrategy::DEFAULT_VALUE ) + if ( stimPlanModel->missingValueStrategy( curveProperty ) == RimStimPlanModel::MissingValueStrategy::DEFAULT_VALUE ) { // Try to locate a backup accessor (e.g. PORO_1 for PORO) cvf::ref backupResAcc = findMissingValuesAccessor( eclipseCase->eclipseCaseData(), @@ -162,26 +162,26 @@ bool RimFractureModelWellLogCalculator::calculate( RiaDefines::CurveProperty cur std::vector replacementValues; eclExtractor.curveData( backupResAcc.p(), &replacementValues ); - double overburdenHeight = fractureModel->overburdenHeight(); + double overburdenHeight = stimPlanModel->overburdenHeight(); if ( overburdenHeight > 0.0 ) { double defaultOverburdenValue = std::numeric_limits::infinity(); - if ( fractureModel->burdenStrategy( curveProperty ) == RimFractureModel::BurdenStrategy::DEFAULT_VALUE ) + if ( stimPlanModel->burdenStrategy( curveProperty ) == RimStimPlanModel::BurdenStrategy::DEFAULT_VALUE ) { - defaultOverburdenValue = fractureModel->getDefaultForMissingOverburdenValue( curveProperty ); + defaultOverburdenValue = stimPlanModel->getDefaultForMissingOverburdenValue( curveProperty ); } replacementValues.insert( replacementValues.begin(), defaultOverburdenValue ); replacementValues.insert( replacementValues.begin(), defaultOverburdenValue ); } - double underburdenHeight = fractureModel->underburdenHeight(); + double underburdenHeight = stimPlanModel->underburdenHeight(); if ( underburdenHeight > 0.0 ) { double defaultUnderburdenValue = std::numeric_limits::infinity(); - if ( fractureModel->burdenStrategy( curveProperty ) == RimFractureModel::BurdenStrategy::DEFAULT_VALUE ) + if ( stimPlanModel->burdenStrategy( curveProperty ) == RimStimPlanModel::BurdenStrategy::DEFAULT_VALUE ) { - defaultUnderburdenValue = fractureModel->getDefaultForMissingUnderburdenValue( curveProperty ); + defaultUnderburdenValue = stimPlanModel->getDefaultForMissingUnderburdenValue( curveProperty ); } replacementValues.push_back( defaultUnderburdenValue ); @@ -197,13 +197,13 @@ bool RimFractureModelWellLogCalculator::calculate( RiaDefines::CurveProperty cur { RiaLogging::info( QString( "Using default value for %1" ).arg( eclipseResultDefinition.resultVariable() ) ); - double defaultValue = fractureModel->getDefaultForMissingValue( curveProperty ); + double defaultValue = stimPlanModel->getDefaultForMissingValue( curveProperty ); replaceMissingValues( values, defaultValue ); } } - else if ( fractureModel->missingValueStrategy( curveProperty ) == - RimFractureModel::MissingValueStrategy::LINEAR_INTERPOLATION ) + else if ( stimPlanModel->missingValueStrategy( curveProperty ) == + RimStimPlanModel::MissingValueStrategy::LINEAR_INTERPOLATION ) { RiaLogging::info( QString( "Interpolating missing values for %1" ).arg( eclipseResultDefinition.resultVariable() ) ); @@ -213,13 +213,13 @@ bool RimFractureModelWellLogCalculator::calculate( RiaDefines::CurveProperty cur { // Get the missing data from other curve RiaDefines::CurveProperty replacementProperty = - fractureModel->getDefaultPropertyForMissingValues( curveProperty ); + stimPlanModel->getDefaultPropertyForMissingValues( curveProperty ); std::vector initialValues; std::vector initialMds; std::vector initialTvds; double initialRkbDiff = -1.0; - calculate( replacementProperty, fractureModel, timeStep, initialValues, initialMds, initialTvds, initialRkbDiff ); + calculate( replacementProperty, stimPlanModel, timeStep, initialValues, initialMds, initialTvds, initialRkbDiff ); if ( initialValues.empty() ) { @@ -232,12 +232,12 @@ bool RimFractureModelWellLogCalculator::calculate( RiaDefines::CurveProperty cur } } - if ( fractureModel->isScaledByNetToGross( curveProperty ) ) + if ( stimPlanModel->isScaledByNetToGross( curveProperty ) ) { std::vector netToGross = - m_fractureModelCalculator->extractValues( RiaDefines::CurveProperty::NET_TO_GROSS, timeStep ); + m_stimPlanModelCalculator->extractValues( RiaDefines::CurveProperty::NET_TO_GROSS, timeStep ); - scaleByNetToGross( fractureModel, netToGross, values ); + scaleByNetToGross( stimPlanModel, netToGross, values ); } return true; @@ -246,7 +246,7 @@ bool RimFractureModelWellLogCalculator::calculate( RiaDefines::CurveProperty cur //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimFractureModelWellLogCalculator::hasMissingValues( const std::vector& values ) +bool RimStimPlanModelWellLogCalculator::hasMissingValues( const std::vector& values ) { for ( double v : values ) { @@ -262,7 +262,7 @@ bool RimFractureModelWellLogCalculator::hasMissingValues( const std::vector& values, double defaultValue ) +void RimStimPlanModelWellLogCalculator::replaceMissingValues( std::vector& values, double defaultValue ) { for ( double& v : values ) { @@ -276,7 +276,7 @@ void RimFractureModelWellLogCalculator::replaceMissingValues( std::vector& values, +void RimStimPlanModelWellLogCalculator::replaceMissingValues( std::vector& values, const std::vector& replacementValues ) { CVF_ASSERT( values.size() == replacementValues.size() ); @@ -293,7 +293,7 @@ void RimFractureModelWellLogCalculator::replaceMissingValues( std::vector - RimFractureModelWellLogCalculator::findMissingValuesAccessor( RigEclipseCaseData* caseData, + RimStimPlanModelWellLogCalculator::findMissingValuesAccessor( RigEclipseCaseData* caseData, RimEclipseInputPropertyCollection* inputPropertyCollection, int gridIndex, int timeStepIndex, @@ -328,28 +328,28 @@ cvf::ref //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelWellLogCalculator::addOverburden( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, +void RimStimPlanModelWellLogCalculator::addOverburden( RiaDefines::CurveProperty curveProperty, + const RimStimPlanModel* stimPlanModel, std::vector& tvDepthValues, std::vector& measuredDepthValues, std::vector& values ) const { if ( !values.empty() ) { - double overburdenHeight = fractureModel->overburdenHeight(); + double overburdenHeight = stimPlanModel->overburdenHeight(); double tvdOverburdenBottom = tvDepthValues[0]; double tvdOverburdenTop = tvdOverburdenBottom - overburdenHeight; double overburdenTopValue = std::numeric_limits::infinity(); double overburdenBottomValue = std::numeric_limits::infinity(); - if ( fractureModel->burdenStrategy( curveProperty ) == RimFractureModel::BurdenStrategy::DEFAULT_VALUE ) + if ( stimPlanModel->burdenStrategy( curveProperty ) == RimStimPlanModel::BurdenStrategy::DEFAULT_VALUE ) { - overburdenTopValue = fractureModel->getDefaultForMissingOverburdenValue( curveProperty ); + overburdenTopValue = stimPlanModel->getDefaultForMissingOverburdenValue( curveProperty ); overburdenBottomValue = overburdenTopValue; } else { - double gradient = fractureModel->getOverburdenGradient( curveProperty ); + double gradient = stimPlanModel->getOverburdenGradient( curveProperty ); overburdenBottomValue = values[0]; overburdenTopValue = overburdenBottomValue + gradient * -overburdenHeight; } @@ -371,8 +371,8 @@ void RimFractureModelWellLogCalculator::addOverburden( RiaDefines::CurveProperty //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelWellLogCalculator::addUnderburden( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, +void RimStimPlanModelWellLogCalculator::addUnderburden( RiaDefines::CurveProperty curveProperty, + const RimStimPlanModel* stimPlanModel, std::vector& tvDepthValues, std::vector& measuredDepthValues, std::vector& values ) const @@ -381,20 +381,20 @@ void RimFractureModelWellLogCalculator::addUnderburden( RiaDefines::CurvePropert { size_t lastIndex = tvDepthValues.size() - 1; - double underburdenHeight = fractureModel->underburdenHeight(); + double underburdenHeight = stimPlanModel->underburdenHeight(); double tvdUnderburdenTop = tvDepthValues[lastIndex]; double tvdUnderburdenBottom = tvdUnderburdenTop + underburdenHeight; double underburdenTopValue = std::numeric_limits::infinity(); double underburdenBottomValue = std::numeric_limits::infinity(); - if ( fractureModel->burdenStrategy( curveProperty ) == RimFractureModel::BurdenStrategy::DEFAULT_VALUE ) + if ( stimPlanModel->burdenStrategy( curveProperty ) == RimStimPlanModel::BurdenStrategy::DEFAULT_VALUE ) { - underburdenTopValue = fractureModel->getDefaultForMissingUnderburdenValue( curveProperty ); + underburdenTopValue = stimPlanModel->getDefaultForMissingUnderburdenValue( curveProperty ); underburdenBottomValue = underburdenTopValue; } else { - double gradient = fractureModel->getUnderburdenGradient( curveProperty ); + double gradient = stimPlanModel->getUnderburdenGradient( curveProperty ); underburdenTopValue = values[lastIndex]; underburdenBottomValue = underburdenTopValue + gradient * underburdenHeight; } @@ -417,7 +417,7 @@ void RimFractureModelWellLogCalculator::addUnderburden( RiaDefines::CurvePropert //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFractureModelWellLogCalculator::scaleByNetToGross( const RimFractureModel* fractureModel, +void RimStimPlanModelWellLogCalculator::scaleByNetToGross( const RimStimPlanModel* stimPlanModel, const std::vector& netToGross, std::vector& values ) { @@ -428,10 +428,10 @@ void RimFractureModelWellLogCalculator::scaleByNetToGross( const RimFractureMode } double cutoff = 1.0; - if ( fractureModel->fractureModelTemplate() && fractureModel->fractureModelTemplate()->nonNetLayers() && - fractureModel->fractureModelTemplate()->nonNetLayers()->isChecked() ) + if ( stimPlanModel->stimPlanModelTemplate() && stimPlanModel->stimPlanModelTemplate()->nonNetLayers() && + stimPlanModel->stimPlanModelTemplate()->nonNetLayers()->isChecked() ) { - cutoff = fractureModel->fractureModelTemplate()->nonNetLayers()->cutOff(); + cutoff = stimPlanModel->stimPlanModelTemplate()->nonNetLayers()->cutOff(); } for ( size_t i = 0; i < values.size(); i++ ) diff --git a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelWellLogCalculator.h b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelWellLogCalculator.h similarity index 83% rename from ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelWellLogCalculator.h rename to ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelWellLogCalculator.h index a9aa2db7e1..e76c06a15b 100644 --- a/ApplicationCode/ProjectDataModel/StimPlanModel/RimFractureModelWellLogCalculator.h +++ b/ApplicationCode/ProjectDataModel/StimPlanModel/RimStimPlanModelWellLogCalculator.h @@ -17,10 +17,10 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RimFractureModelCalculator.h" -#include "RimFractureModelPropertyCalculator.h" +#include "RimStimPlanModelCalculator.h" +#include "RimStimPlanModelPropertyCalculator.h" -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include "cvfObject.h" @@ -31,13 +31,13 @@ class RimEclipseInputPropertyCollection; class RimEclipseResultDefinition; class RigResultAccessor; -class RimFractureModelWellLogCalculator : public RimFractureModelPropertyCalculator +class RimStimPlanModelWellLogCalculator : public RimStimPlanModelPropertyCalculator { public: - RimFractureModelWellLogCalculator( RimFractureModelCalculator* fractureModelCalculator ); + RimStimPlanModelWellLogCalculator( RimStimPlanModelCalculator* stimPlanModelCalculator ); bool calculate( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, + const RimStimPlanModel* stimPlanModel, int timeStep, std::vector& values, std::vector& measuredDepthValues, @@ -57,20 +57,20 @@ protected: RimEclipseResultDefinition* eclipseResultDefinition ) const; void addOverburden( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, + const RimStimPlanModel* stimPlanModel, std::vector& tvDepthValues, std::vector& measuredDepthValues, std::vector& values ) const; void addUnderburden( RiaDefines::CurveProperty curveProperty, - const RimFractureModel* fractureModel, + const RimStimPlanModel* stimPlanModel, std::vector& tvDepthValues, std::vector& measuredDepthValues, std::vector& values ) const; - static void scaleByNetToGross( const RimFractureModel* fractureModel, + static void scaleByNetToGross( const RimStimPlanModel* stimPlanModel, const std::vector& netToGross, std::vector& values ); - RimFractureModelCalculator* m_fractureModelCalculator; + RimStimPlanModelCalculator* m_stimPlanModelCalculator; }; diff --git a/ApplicationCode/ProjectDataModelCommands/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModelCommands/CMakeLists_files.cmake index 46507ea967..cebd9c8ccd 100644 --- a/ApplicationCode/ProjectDataModelCommands/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModelCommands/CMakeLists_files.cmake @@ -5,10 +5,10 @@ ${CMAKE_CURRENT_LIST_DIR}/RimcSummaryCase.h ${CMAKE_CURRENT_LIST_DIR}/RimcSummaryResampleData.h ${CMAKE_CURRENT_LIST_DIR}/RimcProject.h ${CMAKE_CURRENT_LIST_DIR}/RimcElasticProperties.h -${CMAKE_CURRENT_LIST_DIR}/RimcFractureModelCollection.h -${CMAKE_CURRENT_LIST_DIR}/RimcFractureModelTemplateCollection.h -${CMAKE_CURRENT_LIST_DIR}/RimcFractureModelPlotCollection.h -${CMAKE_CURRENT_LIST_DIR}/RimcFractureModel.h +${CMAKE_CURRENT_LIST_DIR}/RimcStimPlanModelCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimcStimPlanModelTemplateCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimcStimPlanModelPlotCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimcStimPlanModel.h ${CMAKE_CURRENT_LIST_DIR}/RimcSurfaceCollection.h ${CMAKE_CURRENT_LIST_DIR}/RimcDataContainerDouble.h ${CMAKE_CURRENT_LIST_DIR}/RimcDataContainerString.h @@ -21,10 +21,10 @@ ${CMAKE_CURRENT_LIST_DIR}/RimcSummaryCase.cpp ${CMAKE_CURRENT_LIST_DIR}/RimcSummaryResampleData.cpp ${CMAKE_CURRENT_LIST_DIR}/RimcProject.cpp ${CMAKE_CURRENT_LIST_DIR}/RimcElasticProperties.cpp -${CMAKE_CURRENT_LIST_DIR}/RimcFractureModelCollection.cpp -${CMAKE_CURRENT_LIST_DIR}/RimcFractureModelTemplateCollection.cpp -${CMAKE_CURRENT_LIST_DIR}/RimcFractureModelPlotCollection.cpp -${CMAKE_CURRENT_LIST_DIR}/RimcFractureModel.cpp +${CMAKE_CURRENT_LIST_DIR}/RimcStimPlanModelCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimcStimPlanModelTemplateCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimcStimPlanModelPlotCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimcStimPlanModel.cpp ${CMAKE_CURRENT_LIST_DIR}/RimcSurfaceCollection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimcDataContainerDouble.cpp ${CMAKE_CURRENT_LIST_DIR}/RimcDataContainerString.cpp diff --git a/ApplicationCode/ProjectDataModelCommands/RimcElasticProperties.h b/ApplicationCode/ProjectDataModelCommands/RimcElasticProperties.h index 8a3dccc69b..f1ea4b5ed0 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcElasticProperties.h +++ b/ApplicationCode/ProjectDataModelCommands/RimcElasticProperties.h @@ -18,7 +18,7 @@ #pragma once -#include "RimFractureModelCollection.h" +#include "RimStimPlanModelCollection.h" #include "cafPdmField.h" #include "cafPdmObjectHandle.h" @@ -28,8 +28,8 @@ #include -class RimFractureModelCollection; -class RimFractureModelTemplate; +class RimStimPlanModelCollection; +class RimStimPlanModelTemplate; class RimWellPath; //================================================================================================== diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModel.cpp b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModel.cpp similarity index 71% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModel.cpp rename to ApplicationCode/ProjectDataModelCommands/RimcStimPlanModel.cpp index ac8a3c6566..0678ccdf8d 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModel.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModel.cpp @@ -15,35 +15,35 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimcFractureModel.h" +#include "RimcStimPlanModel.h" -#include "RifFractureModelExporter.h" +#include "RifStimPlanModelExporter.h" -#include "RimFractureModel.h" +#include "RimStimPlanModel.h" #include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmFieldScriptingCapability.h" -CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureModel, RimcFractureModel_exportToFile, "ExportToFile" ); +CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimStimPlanModel, RimcStimPlanModel_exportToFile, "ExportToFile" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimcFractureModel_exportToFile::RimcFractureModel_exportToFile( caf::PdmObjectHandle* self ) +RimcStimPlanModel_exportToFile::RimcStimPlanModel_exportToFile( caf::PdmObjectHandle* self ) : caf::PdmObjectMethod( self ) { - CAF_PDM_InitObject( "Export Fracture Model Plot", "", "", "Export Fracture Model Plot to File" ); + CAF_PDM_InitObject( "Export StimPlan Model Plot", "", "", "Export StimPlan Model Plot to File" ); CAF_PDM_InitScriptableFieldNoDefault( &m_directoryPath, "DirectoryPath", "", "", "", "Directory Path" ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmObjectHandle* RimcFractureModel_exportToFile::execute() +caf::PdmObjectHandle* RimcStimPlanModel_exportToFile::execute() { - RimFractureModel* fractureModel = self(); + RimStimPlanModel* stimPlanModel = self(); - RifFractureModelExporter::writeToDirectory( fractureModel, fractureModel->useDetailedFluidLoss(), m_directoryPath() ); + RifStimPlanModelExporter::writeToDirectory( stimPlanModel, stimPlanModel->useDetailedFluidLoss(), m_directoryPath() ); return nullptr; } @@ -51,7 +51,7 @@ caf::PdmObjectHandle* RimcFractureModel_exportToFile::execute() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimcFractureModel_exportToFile::resultIsPersistent() const +bool RimcStimPlanModel_exportToFile::resultIsPersistent() const { return false; } @@ -59,15 +59,15 @@ bool RimcFractureModel_exportToFile::resultIsPersistent() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::unique_ptr RimcFractureModel_exportToFile::defaultResult() const +std::unique_ptr RimcStimPlanModel_exportToFile::defaultResult() const { - return std::unique_ptr( new RimFractureModel ); + return std::unique_ptr( new RimStimPlanModel ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimcFractureModel_exportToFile::isNullptrValidResult() const +bool RimcStimPlanModel_exportToFile::isNullptrValidResult() const { return true; } diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModel.h b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModel.h similarity index 90% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModel.h rename to ApplicationCode/ProjectDataModelCommands/RimcStimPlanModel.h index 59fae451c8..db8edc8a97 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModel.h +++ b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModel.h @@ -26,17 +26,17 @@ #include -class RimFractureModel; +class RimStimPlanModel; //================================================================================================== /// //================================================================================================== -class RimcFractureModel_exportToFile : public caf::PdmObjectMethod +class RimcStimPlanModel_exportToFile : public caf::PdmObjectMethod { CAF_PDM_HEADER_INIT; public: - RimcFractureModel_exportToFile( caf::PdmObjectHandle* self ); + RimcStimPlanModel_exportToFile( caf::PdmObjectHandle* self ); caf::PdmObjectHandle* execute() override; bool resultIsPersistent() const override; diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.cpp b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp similarity index 63% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.cpp rename to ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp index 5607093321..69ffc97b3f 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp @@ -15,70 +15,70 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimcFractureModelCollection.h" +#include "RimcStimPlanModelCollection.h" #include "RicElasticPropertiesImportTools.h" -#include "FractureCommands/RicNewFractureModelFeature.h" +#include "FractureCommands/RicNewStimPlanModelFeature.h" #include "RimEclipseCase.h" -#include "RimFractureModel.h" -#include "RimFractureModelCollection.h" -#include "RimFractureModelTemplate.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelCollection.h" +#include "RimStimPlanModelTemplate.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" #include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmFieldScriptingCapability.h" -CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureModelCollection, - RimcFractureModelCollection_newFractureModel, - "NewFractureModel" ); +CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimStimPlanModelCollection, + RimcStimPlanModelCollection_newStimPlanModel, + "NewStimPlanModel" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimcFractureModelCollection_newFractureModel::RimcFractureModelCollection_newFractureModel( caf::PdmObjectHandle* self ) +RimcStimPlanModelCollection_newStimPlanModel::RimcStimPlanModelCollection_newStimPlanModel( caf::PdmObjectHandle* self ) : caf::PdmObjectMethod( self ) { - CAF_PDM_InitObject( "Create Fracture Model", "", "", "Create a new Fracture Model" ); + CAF_PDM_InitObject( "Create StimPlan Model", "", "", "Create a new StimPlan Model" ); CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "", "", "", "Eclipse Case" ); CAF_PDM_InitScriptableFieldNoDefault( &m_timeStep, "TimeStep", "", "", "", "Time Step" ); CAF_PDM_InitScriptableFieldNoDefault( &m_wellPath, "WellPath", "", "", "", "Well Path" ); CAF_PDM_InitScriptableFieldNoDefault( &m_md, "MeasuredDepth", "", "", "", "Measured Depth" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_fractureModelTemplate, "FractureModelTemplate", "", "", "", "Fracture Model Template" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelTemplate, "StimPlanModelTemplate", "", "", "", "StimPlan Model Template" ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmObjectHandle* RimcFractureModelCollection_newFractureModel::execute() +caf::PdmObjectHandle* RimcStimPlanModelCollection_newStimPlanModel::execute() { - RimFractureModel* newFractureModel = nullptr; - RimFractureModelCollection* fractureModelCollection = self(); + RimStimPlanModel* newStimPlanModel = nullptr; + RimStimPlanModelCollection* stimPlanModelCollection = self(); if ( m_wellPath && m_eclipseCase ) { RimWellPathCollection* wellPathCollection = nullptr; - fractureModelCollection->firstAncestorOrThisOfTypeAsserted( wellPathCollection ); + stimPlanModelCollection->firstAncestorOrThisOfTypeAsserted( wellPathCollection ); - newFractureModel = - RicNewFractureModelFeature::addFractureModel( m_wellPath, wellPathCollection, m_eclipseCase, m_timeStep ); + newStimPlanModel = + RicNewStimPlanModelFeature::addStimPlanModel( m_wellPath, wellPathCollection, m_eclipseCase, m_timeStep ); } - if ( newFractureModel ) + if ( newStimPlanModel ) { - newFractureModel->setMD( m_md() ); - newFractureModel->setFractureModelTemplate( m_fractureModelTemplate() ); - fractureModelCollection->updateAllRequiredEditors(); + newStimPlanModel->setMD( m_md() ); + newStimPlanModel->setStimPlanModelTemplate( m_stimPlanModelTemplate() ); + stimPlanModelCollection->updateAllRequiredEditors(); } - return newFractureModel; + return newStimPlanModel; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimcFractureModelCollection_newFractureModel::resultIsPersistent() const +bool RimcStimPlanModelCollection_newStimPlanModel::resultIsPersistent() const { return true; } @@ -86,7 +86,7 @@ bool RimcFractureModelCollection_newFractureModel::resultIsPersistent() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::unique_ptr RimcFractureModelCollection_newFractureModel::defaultResult() const +std::unique_ptr RimcStimPlanModelCollection_newStimPlanModel::defaultResult() const { - return std::unique_ptr( new RimFractureModel ); + return std::unique_ptr( new RimStimPlanModel ); } diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.h b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelCollection.h similarity index 85% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.h rename to ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelCollection.h index c40f217fbb..d19898d7f0 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.h +++ b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelCollection.h @@ -18,7 +18,7 @@ #pragma once -#include "RimFractureModelCollection.h" +#include "RimStimPlanModelCollection.h" #include "cafPdmField.h" #include "cafPdmObjectHandle.h" @@ -28,20 +28,20 @@ #include -class RimFractureModelCollection; -class RimFractureModelTemplate; +class RimStimPlanModelCollection; +class RimStimPlanModelTemplate; class RimWellPath; class RimEclipseCase; //================================================================================================== /// //================================================================================================== -class RimcFractureModelCollection_newFractureModel : public caf::PdmObjectMethod +class RimcStimPlanModelCollection_newStimPlanModel : public caf::PdmObjectMethod { CAF_PDM_HEADER_INIT; public: - RimcFractureModelCollection_newFractureModel( caf::PdmObjectHandle* self ); + RimcStimPlanModelCollection_newStimPlanModel( caf::PdmObjectHandle* self ); caf::PdmObjectHandle* execute() override; bool resultIsPersistent() const override; @@ -52,5 +52,5 @@ private: caf::PdmField m_timeStep; caf::PdmPtrField m_wellPath; caf::PdmField m_md; - caf::PdmPtrField m_fractureModelTemplate; + caf::PdmPtrField m_stimPlanModelTemplate; }; diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.cpp b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.cpp similarity index 56% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.cpp rename to ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.cpp index 8e0890bc00..841f57fd13 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.cpp @@ -15,53 +15,53 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimcFractureModelPlotCollection.h" +#include "RimcStimPlanModelPlotCollection.h" -#include "CompletionCommands/RicNewFractureModelPlotFeature.h" +#include "CompletionCommands/RicNewStimPlanModelPlotFeature.h" #include "RimEclipseCase.h" -#include "RimFractureModel.h" -#include "RimFractureModelPlot.h" -#include "RimFractureModelPlotCollection.h" +#include "RimStimPlanModel.h" +#include "RimStimPlanModelPlot.h" +#include "RimStimPlanModelPlotCollection.h" #include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmFieldScriptingCapability.h" -CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureModelPlotCollection, - RimcFractureModelPlotCollection_newFractureModelPlot, - "NewFractureModelPlot" ); +CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimStimPlanModelPlotCollection, + RimcStimPlanModelPlotCollection_newStimPlanModelPlot, + "NewStimPlanModelPlot" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimcFractureModelPlotCollection_newFractureModelPlot::RimcFractureModelPlotCollection_newFractureModelPlot( +RimcStimPlanModelPlotCollection_newStimPlanModelPlot::RimcStimPlanModelPlotCollection_newStimPlanModelPlot( caf::PdmObjectHandle* self ) : caf::PdmObjectMethod( self ) { - CAF_PDM_InitObject( "Create Fracture Model", "", "", "Create a new Fracture Model" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_fractureModel, "FractureModel", "", "", "", "Fracture Model" ); + CAF_PDM_InitObject( "Create StimPlan Model", "", "", "Create a new StimPlan Model" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModel, "StimPlanModel", "", "", "", "StimPlan Model" ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmObjectHandle* RimcFractureModelPlotCollection_newFractureModelPlot::execute() +caf::PdmObjectHandle* RimcStimPlanModelPlotCollection_newStimPlanModelPlot::execute() { - RimFractureModelPlot* newFractureModelPlot = nullptr; - RimFractureModelPlotCollection* fractureModelPlotCollection = self(); + RimStimPlanModelPlot* newStimPlanModelPlot = nullptr; + RimStimPlanModelPlotCollection* stimPlanModelPlotCollection = self(); - if ( m_fractureModel && fractureModelPlotCollection ) + if ( m_stimPlanModel && stimPlanModelPlotCollection ) { - newFractureModelPlot = RicNewFractureModelPlotFeature::createPlot( m_fractureModel ); + newStimPlanModelPlot = RicNewStimPlanModelPlotFeature::createPlot( m_stimPlanModel ); } - return newFractureModelPlot; + return newStimPlanModelPlot; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimcFractureModelPlotCollection_newFractureModelPlot::resultIsPersistent() const +bool RimcStimPlanModelPlotCollection_newStimPlanModelPlot::resultIsPersistent() const { return true; } @@ -69,7 +69,7 @@ bool RimcFractureModelPlotCollection_newFractureModelPlot::resultIsPersistent() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::unique_ptr RimcFractureModelPlotCollection_newFractureModelPlot::defaultResult() const +std::unique_ptr RimcStimPlanModelPlotCollection_newStimPlanModelPlot::defaultResult() const { - return std::unique_ptr( new RimFractureModelPlot ); + return std::unique_ptr( new RimStimPlanModelPlot ); } diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.h b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.h similarity index 85% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.h rename to ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.h index ba46332b83..a9e0cdd10a 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.h +++ b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.h @@ -18,7 +18,7 @@ #pragma once -#include "RimFractureModelPlotCollection.h" +#include "RimStimPlanModelPlotCollection.h" #include "cafPdmField.h" #include "cafPdmObjectHandle.h" @@ -26,22 +26,22 @@ #include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" -class RimFractureModel; +class RimStimPlanModel; //================================================================================================== /// //================================================================================================== -class RimcFractureModelPlotCollection_newFractureModelPlot : public caf::PdmObjectMethod +class RimcStimPlanModelPlotCollection_newStimPlanModelPlot : public caf::PdmObjectMethod { CAF_PDM_HEADER_INIT; public: - RimcFractureModelPlotCollection_newFractureModelPlot( caf::PdmObjectHandle* self ); + RimcStimPlanModelPlotCollection_newStimPlanModelPlot( caf::PdmObjectHandle* self ); caf::PdmObjectHandle* execute() override; bool resultIsPersistent() const override; std::unique_ptr defaultResult() const override; private: - caf::PdmPtrField m_fractureModel; + caf::PdmPtrField m_stimPlanModel; }; diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelTemplateCollection.cpp b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.cpp similarity index 67% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModelTemplateCollection.cpp rename to ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.cpp index a699a80001..841156dc04 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelTemplateCollection.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.cpp @@ -15,32 +15,32 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimcFractureModelTemplateCollection.h" +#include "RimcStimPlanModelTemplateCollection.h" #include "RicElasticPropertiesImportTools.h" #include "RicFaciesPropertiesImportTools.h" #include "FractureCommands/RicFractureNameGenerator.h" -#include "FractureCommands/RicNewFractureModelFeature.h" +#include "FractureCommands/RicNewStimPlanModelFeature.h" -#include "RimFractureModelTemplate.h" -#include "RimFractureModelTemplateCollection.h" +#include "RimStimPlanModelTemplate.h" +#include "RimStimPlanModelTemplateCollection.h" #include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmFieldScriptingCapability.h" -CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureModelTemplateCollection, - RimcFractureModelTemplateCollection_newFractureModelTemplate, - "NewFractureModelTemplate" ); +CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimStimPlanModelTemplateCollection, + RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate, + "NewStimPlanModelTemplate" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimcFractureModelTemplateCollection_newFractureModelTemplate::RimcFractureModelTemplateCollection_newFractureModelTemplate( +RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate::RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate( caf::PdmObjectHandle* self ) : caf::PdmObjectMethod( self ) { - CAF_PDM_InitObject( "Create Fracture Model Template", "", "", "Create a new Fracture Model Template" ); + CAF_PDM_InitObject( "Create StimPlan Model Template", "", "", "Create a new StimPlan Model Template" ); CAF_PDM_InitScriptableFieldNoDefault( &m_faciesPropertiesFilePath, "FaciesPropertiesFilePath", "", @@ -58,26 +58,26 @@ RimcFractureModelTemplateCollection_newFractureModelTemplate::RimcFractureModelT //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmObjectHandle* RimcFractureModelTemplateCollection_newFractureModelTemplate::execute() +caf::PdmObjectHandle* RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate::execute() { - RimFractureModelTemplate* newFractureModelTemplate = new RimFractureModelTemplate; - RimFractureModelTemplateCollection* fractureModelTemplateCollection = self(); - newFractureModelTemplate->setName( RicFractureNameGenerator::nameForNewFractureModelTemplate() ); - fractureModelTemplateCollection->addFractureModelTemplate( newFractureModelTemplate ); + RimStimPlanModelTemplate* newStimPlanModelTemplate = new RimStimPlanModelTemplate; + RimStimPlanModelTemplateCollection* stimPlanModelTemplateCollection = self(); + newStimPlanModelTemplate->setName( RicFractureNameGenerator::nameForNewStimPlanModelTemplate() ); + stimPlanModelTemplateCollection->addStimPlanModelTemplate( newStimPlanModelTemplate ); RicElasticPropertiesImportTools::importElasticPropertiesFromFile( m_elasticPropertiesFilePath, - newFractureModelTemplate ); + newStimPlanModelTemplate ); RicFaciesPropertiesImportTools::importFaciesPropertiesFromFile( m_faciesPropertiesFilePath, - newFractureModelTemplate, + newStimPlanModelTemplate, true ); - fractureModelTemplateCollection->updateAllRequiredEditors(); - return newFractureModelTemplate; + stimPlanModelTemplateCollection->updateAllRequiredEditors(); + return newStimPlanModelTemplate; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimcFractureModelTemplateCollection_newFractureModelTemplate::resultIsPersistent() const +bool RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate::resultIsPersistent() const { return true; } @@ -85,7 +85,7 @@ bool RimcFractureModelTemplateCollection_newFractureModelTemplate::resultIsPersi //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::unique_ptr RimcFractureModelTemplateCollection_newFractureModelTemplate::defaultResult() const +std::unique_ptr RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate::defaultResult() const { - return std::unique_ptr( new RimFractureModelTemplate ); + return std::unique_ptr( new RimStimPlanModelTemplate ); } diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelTemplateCollection.h b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.h similarity index 87% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModelTemplateCollection.h rename to ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.h index 9aec1e5f82..a90f9371d9 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelTemplateCollection.h +++ b/ApplicationCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.h @@ -18,7 +18,7 @@ #pragma once -#include "RimFractureModelTemplateCollection.h" +#include "RimStimPlanModelTemplateCollection.h" #include "cafPdmField.h" #include "cafPdmObjectHandle.h" @@ -28,17 +28,17 @@ #include -class RimFractureModelTemplateCollection; +class RimStimPlanModelTemplateCollection; //================================================================================================== /// //================================================================================================== -class RimcFractureModelTemplateCollection_newFractureModelTemplate : public caf::PdmObjectMethod +class RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate : public caf::PdmObjectMethod { CAF_PDM_HEADER_INIT; public: - RimcFractureModelTemplateCollection_newFractureModelTemplate( caf::PdmObjectHandle* self ); + RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate( caf::PdmObjectHandle* self ); caf::PdmObjectHandle* execute() override; bool resultIsPersistent() const override; diff --git a/ApplicationCode/ReservoirDataModel/RigElasticProperties.h b/ApplicationCode/ReservoirDataModel/RigElasticProperties.h index d41d4b2141..8aeea54f8e 100644 --- a/ApplicationCode/ReservoirDataModel/RigElasticProperties.h +++ b/ApplicationCode/ReservoirDataModel/RigElasticProperties.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaFractureModelDefines.h" +#include "RiaStimPlanModelDefines.h" #include diff --git a/ApplicationCode/UnitTests/CMakeLists_files.cmake b/ApplicationCode/UnitTests/CMakeLists_files.cmake index bf11a497ec..e440ec4f34 100644 --- a/ApplicationCode/UnitTests/CMakeLists_files.cmake +++ b/ApplicationCode/UnitTests/CMakeLists_files.cmake @@ -73,7 +73,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader-Test.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaStatisticsTools-Test.cpp ${CMAKE_CURRENT_LIST_DIR}/RifStimPlanXmlReader-Test.cpp ${CMAKE_CURRENT_LIST_DIR}/RigWellPathGeometryExporter-Test.cpp -${CMAKE_CURRENT_LIST_DIR}/RifFractureModelDeviationFrkExporter-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanModelDeviationFrkExporter-Test.cpp ) if (RESINSIGHT_ENABLE_GRPC) diff --git a/ApplicationCode/UnitTests/RifFractureModelDeviationFrkExporter-Test.cpp b/ApplicationCode/UnitTests/RifStimPlanModelDeviationFrkExporter-Test.cpp similarity index 84% rename from ApplicationCode/UnitTests/RifFractureModelDeviationFrkExporter-Test.cpp rename to ApplicationCode/UnitTests/RifStimPlanModelDeviationFrkExporter-Test.cpp index ac401c004a..9d8527a110 100644 --- a/ApplicationCode/UnitTests/RifFractureModelDeviationFrkExporter-Test.cpp +++ b/ApplicationCode/UnitTests/RifStimPlanModelDeviationFrkExporter-Test.cpp @@ -1,11 +1,11 @@ #include "gtest/gtest.h" -#include "RifFractureModelDeviationFrkExporter.h" +#include "RifStimPlanModelDeviationFrkExporter.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -TEST( RifFractureModelDeviationFrkExporterTest, TvdFixup ) +TEST( RifStimPlanModelDeviationFrkExporterTest, TvdFixup ) { std::vector tvd = {475.722, 492.126, 508.53, 524.934, 541.338, 557.743, 574.147, 590.551, 606.955, 623.359, 639.764, 656.168, 672.572}; @@ -15,7 +15,7 @@ TEST( RifFractureModelDeviationFrkExporterTest, TvdFixup ) std::vector exportTvd; std::vector exportMd; - RifFractureModelDeviationFrkExporter::fixupDepthValuesForExport( tvd, md, exportTvd, exportMd ); + RifStimPlanModelDeviationFrkExporter::fixupDepthValuesForExport( tvd, md, exportTvd, exportMd ); EXPECT_EQ( tvd.size(), exportTvd.size() ); EXPECT_EQ( md.size(), exportMd.size() ); diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 57f3c165bb..8b9cd515d0 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -526,7 +526,7 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event ) menuBuilder << "RicNewValveAtMeasuredDepthFeature"; menuBuilder << "RicNewFishbonesSubsAtMeasuredDepthFeature"; menuBuilder << "RicNewWellPathFractureAtPosFeature"; - menuBuilder << "RicNewWellPathFractureModelAtPosFeature"; + menuBuilder << "RicNewWellPathStimPlanModelAtPosFeature"; menuBuilder.addSeparator(); menuBuilder << "RicNewWellPathAttributeFeature"; menuBuilder << "RicWellPathImportCompletionsFileFeature";