From 49eebd0c28760c98fce113ed730d00fa0eb0f0b1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 10 Jan 2018 07:34:45 +0100 Subject: [PATCH] #2359 Fracture : Adjust default parameters for ellipse fracture --- .../RicNewEllipseFractureTemplateFeature.cpp | 12 +++---- .../RimEllipseFractureTemplate.cpp | 32 ++++++++++++++++--- .../Completions/RimEllipseFractureTemplate.h | 1 + 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/ApplicationCode/Commands/RicNewEllipseFractureTemplateFeature.cpp b/ApplicationCode/Commands/RicNewEllipseFractureTemplateFeature.cpp index 094c4c1039..2d521f37c0 100644 --- a/ApplicationCode/Commands/RicNewEllipseFractureTemplateFeature.cpp +++ b/ApplicationCode/Commands/RicNewEllipseFractureTemplateFeature.cpp @@ -51,14 +51,14 @@ void RicNewEllipseFractureTemplateFeature::onActionTriggered(bool isChecked) if (fracDefColl) { - RimEllipseFractureTemplate* fractureDef = new RimEllipseFractureTemplate(); - fracDefColl->fractureDefinitions.push_back(fractureDef); - fractureDef->name = "Ellipse Fracture Template"; - fractureDef->fractureTemplateUnit = fracDefColl->defaultUnitsForFracTemplates(); - fractureDef->setDefaultWellDiameterFromUnit(); + RimEllipseFractureTemplate* ellipseFractureTemplate = new RimEllipseFractureTemplate(); + fracDefColl->fractureDefinitions.push_back(ellipseFractureTemplate); + ellipseFractureTemplate->name = "Ellipse Fracture Template"; + ellipseFractureTemplate->fractureTemplateUnit = fracDefColl->defaultUnitsForFracTemplates(); + ellipseFractureTemplate->setDefaultValuesFromUnit(); fracDefColl->updateConnectedEditors(); - RiuMainWindow::instance()->selectAsCurrentItem(fractureDef); + RiuMainWindow::instance()->selectAsCurrentItem(ellipseFractureTemplate); } } diff --git a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp index 27c3c23c1d..b5c1b09fd3 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp @@ -47,15 +47,14 @@ RimEllipseFractureTemplate::RimEllipseFractureTemplate(void) { CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", ""); - CAF_PDM_InitField(&halfLength, "HalfLength", 650.0f, "Halflength Xf", "", "", ""); - CAF_PDM_InitField(&height, "Height", 75.0f, "Height", "", "", ""); - CAF_PDM_InitField(&width, "Width", 1.0f, "Width", "", "", ""); + CAF_PDM_InitField(&halfLength, "HalfLength", 0.0f, "Halflength Xf", "", "", ""); + CAF_PDM_InitField(&height, "Height", 0.0f, "Height", "", "", ""); + CAF_PDM_InitField(&width, "Width", 0.0f, "Width", "", "", ""); - CAF_PDM_InitField(&permeability,"Permeability", 22000.f, "Permeability [mD]", "", "", ""); + CAF_PDM_InitField(&permeability,"Permeability", 0.0f, "Permeability [mD]", "", "", ""); m_fractureGrid = new RigFractureGrid(); setupFractureGridCells(); - } //-------------------------------------------------------------------------------------------------- @@ -276,6 +275,29 @@ const RigFractureGrid* RimEllipseFractureTemplate::fractureGrid() const return m_fractureGrid.p(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimEllipseFractureTemplate::setDefaultValuesFromUnit() +{ + if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD) + { + width = 0.5f; + permeability = 800000.0f; + halfLength = 300.0f; + height = 225.0f; + } + else + { + width = 0.01f; + permeability = 1000000.0f; + halfLength = 100.0f; + height = 75.0f; + } + + this->setDefaultWellDiameterFromUnit(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h index 48b0b4feae..f65f5ee1d6 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h @@ -64,6 +64,7 @@ public: const RigFractureGrid* fractureGrid() const; + void setDefaultValuesFromUnit(); protected: virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);