From 88d30b74af5fc78e0a7b69952de7c8ed0545e2f0 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Fri, 23 Oct 2020 16:07:44 +0200 Subject: [PATCH] Make python fracture model export command independent of fracture model plot. --- .../create_and_export_fracture_model.py | 10 ++++---- .../CMakeLists_files.cmake | 4 ++-- ...ureModelPlot.cpp => RimcFractureModel.cpp} | 23 ++++++++----------- ...ractureModelPlot.h => RimcFractureModel.h} | 9 +++----- 4 files changed, 21 insertions(+), 25 deletions(-) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModelPlot.cpp => RimcFractureModel.cpp} (71%) rename ApplicationCode/ProjectDataModelCommands/{RimcFractureModelPlot.h => RimcFractureModel.h} (87%) diff --git a/ApplicationCode/GrpcInterface/Python/rips/PythonExamples/create_and_export_fracture_model.py b/ApplicationCode/GrpcInterface/Python/rips/PythonExamples/create_and_export_fracture_model.py index 25b7e30f2b..76a1c197dc 100644 --- a/ApplicationCode/GrpcInterface/Python/rips/PythonExamples/create_and_export_fracture_model.py +++ b/ApplicationCode/GrpcInterface/Python/rips/PythonExamples/create_and_export_fracture_model.py @@ -72,14 +72,16 @@ fracture_model = fracture_model_collection.new_fracture_model(eclipse_case=case, measured_depth=measured_depth, fracture_model_template=fracture_model_template) +export_folder = tempfile.gettempdir() + +print("Exporting fracture model to: ", export_folder) +fracture_model.export_to_file(directory_path=export_folder) + # Create a fracture mode plot fracture_model_plot_collection = project.descendants(rips.FractureModelPlotCollection)[0] fracture_model_plot = fracture_model_plot_collection.new_fracture_model_plot(fracture_model=fracture_model) -export_folder = tempfile.gettempdir() - -print("Exporting fracture model to: ", export_folder) -fracture_model_plot.export_to_file(directory_path=export_folder) +print("Exporting fracture model plot to: ", export_folder) fracture_model_plot.export_snapshot(export_folder=export_folder) print("Setting measured depth and perforation length.") diff --git a/ApplicationCode/ProjectDataModelCommands/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModelCommands/CMakeLists_files.cmake index 0f01d6717a..46507ea967 100644 --- a/ApplicationCode/ProjectDataModelCommands/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModelCommands/CMakeLists_files.cmake @@ -8,7 +8,7 @@ ${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}/RimcFractureModelPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimcFractureModel.h ${CMAKE_CURRENT_LIST_DIR}/RimcSurfaceCollection.h ${CMAKE_CURRENT_LIST_DIR}/RimcDataContainerDouble.h ${CMAKE_CURRENT_LIST_DIR}/RimcDataContainerString.h @@ -24,7 +24,7 @@ ${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}/RimcFractureModelPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimcFractureModel.cpp ${CMAKE_CURRENT_LIST_DIR}/RimcSurfaceCollection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimcDataContainerDouble.cpp ${CMAKE_CURRENT_LIST_DIR}/RimcDataContainerString.cpp diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.cpp b/ApplicationCode/ProjectDataModelCommands/RimcFractureModel.cpp similarity index 71% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.cpp rename to ApplicationCode/ProjectDataModelCommands/RimcFractureModel.cpp index 992bb8b9ae..ac8a3c6566 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcFractureModel.cpp @@ -15,22 +15,21 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// -#include "RimcFractureModelPlot.h" +#include "RimcFractureModel.h" #include "RifFractureModelExporter.h" #include "RimFractureModel.h" -#include "RimFractureModelPlot.h" #include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmFieldScriptingCapability.h" -CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureModelPlot, RimcFractureModelPlot_exportToFile, "ExportToFile" ); +CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureModel, RimcFractureModel_exportToFile, "ExportToFile" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimcFractureModelPlot_exportToFile::RimcFractureModelPlot_exportToFile( caf::PdmObjectHandle* self ) +RimcFractureModel_exportToFile::RimcFractureModel_exportToFile( caf::PdmObjectHandle* self ) : caf::PdmObjectMethod( self ) { CAF_PDM_InitObject( "Export Fracture Model Plot", "", "", "Export Fracture Model Plot to File" ); @@ -40,13 +39,11 @@ RimcFractureModelPlot_exportToFile::RimcFractureModelPlot_exportToFile( caf::Pdm //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmObjectHandle* RimcFractureModelPlot_exportToFile::execute() +caf::PdmObjectHandle* RimcFractureModel_exportToFile::execute() { - RimFractureModelPlot* fractureModelPlot = self(); + RimFractureModel* fractureModel = self(); - RifFractureModelExporter::writeToDirectory( fractureModelPlot->fractureModel(), - fractureModelPlot->fractureModel()->useDetailedFluidLoss(), - m_directoryPath() ); + RifFractureModelExporter::writeToDirectory( fractureModel, fractureModel->useDetailedFluidLoss(), m_directoryPath() ); return nullptr; } @@ -54,7 +51,7 @@ caf::PdmObjectHandle* RimcFractureModelPlot_exportToFile::execute() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimcFractureModelPlot_exportToFile::resultIsPersistent() const +bool RimcFractureModel_exportToFile::resultIsPersistent() const { return false; } @@ -62,15 +59,15 @@ bool RimcFractureModelPlot_exportToFile::resultIsPersistent() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::unique_ptr RimcFractureModelPlot_exportToFile::defaultResult() const +std::unique_ptr RimcFractureModel_exportToFile::defaultResult() const { - return std::unique_ptr( new RimFractureModelPlot ); + return std::unique_ptr( new RimFractureModel ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimcFractureModelPlot_exportToFile::isNullptrValidResult() const +bool RimcFractureModel_exportToFile::isNullptrValidResult() const { return true; } diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.h b/ApplicationCode/ProjectDataModelCommands/RimcFractureModel.h similarity index 87% rename from ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.h rename to ApplicationCode/ProjectDataModelCommands/RimcFractureModel.h index f007799345..59fae451c8 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.h +++ b/ApplicationCode/ProjectDataModelCommands/RimcFractureModel.h @@ -18,8 +18,6 @@ #pragma once -#include "RimFractureModelPlot.h" - #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" @@ -28,18 +26,17 @@ #include -class RimFractureModelPlot; -class RimWellPath; +class RimFractureModel; //================================================================================================== /// //================================================================================================== -class RimcFractureModelPlot_exportToFile : public caf::PdmObjectMethod +class RimcFractureModel_exportToFile : public caf::PdmObjectMethod { CAF_PDM_HEADER_INIT; public: - RimcFractureModelPlot_exportToFile( caf::PdmObjectHandle* self ); + RimcFractureModel_exportToFile( caf::PdmObjectHandle* self ); caf::PdmObjectHandle* execute() override; bool resultIsPersistent() const override;