From da2b183d0e774831e3efc0f9ae370346129b5c58 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Fri, 23 Sep 2022 15:49:09 +0200 Subject: [PATCH] Thermal Fracture: Add option to choose filter cake pressure drop adjustment. --- .../RimThermalFractureTemplate.cpp | 26 +++++++++++++++++++ .../Completions/RimThermalFractureTemplate.h | 10 +++++++ 2 files changed, 36 insertions(+) diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp index 0d3b548c3a..d3816570ed 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp @@ -54,6 +54,18 @@ #include #include +namespace caf +{ +template <> +void caf::AppEnum::setUp() +{ + addItem( RimThermalFractureTemplate::FilterCakePressureDrop::RELATIVE, "Relative", "Relative" ); + addItem( RimThermalFractureTemplate::FilterCakePressureDrop::ABSOLUTE, "Absolute", "Absolute" ); + + setDefault( RimThermalFractureTemplate::FilterCakePressureDrop::RELATIVE ); +} +}; // namespace caf + CAF_PDM_SOURCE_INIT( RimThermalFractureTemplate, "ThermalFractureTemplate", "RimThermalFractureTemplate" ); //-------------------------------------------------------------------------------------------------- @@ -63,6 +75,10 @@ RimThermalFractureTemplate::RimThermalFractureTemplate() { CAF_PDM_InitScriptableObject( "Fracture Template", ":/FractureTemplate16x16.png" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_filterCakePressureDropType, + "FilterCakePressureDrop", + "Filter Cake Pressure Drop" ); + m_readError = false; setDeletable( true ); @@ -748,3 +764,13 @@ const RigThermalFractureDefinition* RimThermalFractureTemplate::fractureDefiniti { return m_fractureDefinitionData.get(); } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimThermalFractureTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) +{ + RimMeshFractureTemplate::defineUiOrdering( uiConfigName, uiOrdering ); + + uiOrdering.add( &m_filterCakePressureDropType ); +} diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.h b/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.h index fbae208a4d..4b9cd42db2 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.h @@ -39,6 +39,12 @@ class RimThermalFractureTemplate : public RimMeshFractureTemplate CAF_PDM_HEADER_INIT; public: + enum class FilterCakePressureDrop + { + RELATIVE, + ABSOLUTE + }; + RimThermalFractureTemplate(); ~RimThermalFractureTemplate() override; @@ -106,9 +112,13 @@ public: const RigThermalFractureDefinition* fractureDefinition() const; protected: + void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; + QString getFileSelectionFilter() const override; QStringList conductivityResultNames() const override; private: + caf::PdmField> m_filterCakePressureDropType; + std::shared_ptr m_fractureDefinitionData; };