From f25701ba98401f2b72784a0a729ec777f2eb2998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rnar=20Grip=20Fj=C3=A6r?= Date: Tue, 30 May 2017 09:57:22 +0200 Subject: [PATCH] #1530 Fishbones : Default values --- .../RicExportFishbonesWellSegmentsFeature.cpp | 2 +- .../Fishbones/RimFishbonesMultipleSubs.cpp | 17 ++++++++++++----- .../Fishbones/RimFishbonesPipeProperties.cpp | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ApplicationCode/Commands/FishbonesCommands/RicExportFishbonesWellSegmentsFeature.cpp b/ApplicationCode/Commands/FishbonesCommands/RicExportFishbonesWellSegmentsFeature.cpp index 80693c08af..567f649b0e 100644 --- a/ApplicationCode/Commands/FishbonesCommands/RicExportFishbonesWellSegmentsFeature.cpp +++ b/ApplicationCode/Commands/FishbonesCommands/RicExportFishbonesWellSegmentsFeature.cpp @@ -283,7 +283,7 @@ void RicExportFishbonesWellSegmentsFeature::generateWelsegsTable(RifEclipseOutpu formatter.add(intersection.attachedSegmentNumber); formatter.add(length); formatter.add(depth); - formatter.add(location.fishbonesSubs->tubingRadius()); + formatter.add(location.fishbonesSubs->tubingDiameter()); formatter.add(location.fishbonesSubs->openHoleRoughnessFactor()); formatter.rowCompleted(); } diff --git a/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.cpp b/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.cpp index 6fe7093c9b..adc207a6ef 100644 --- a/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.cpp +++ b/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.cpp @@ -62,10 +62,10 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs() CAF_PDM_InitField(&fishbonesColor, "FishbonesColor", cvf::Color3f(0.999f, 0.333f, 0.999f), "Fishbones Color", "", "", ""); CAF_PDM_InitField(&m_lateralCountPerSub, "LateralCountPerSub", size_t(3), "Laterals Per Sub", "", "", ""); - CAF_PDM_InitField(&m_lateralLength, "LateralLength", QString("12.0"), "Length(s) [m]", "", "Specify multiple length values if the sub lengths differ", ""); + CAF_PDM_InitField(&m_lateralLength, "LateralLength", QString("11.0"), "Length(s) [m]", "", "Specify multiple length values if the sub lengths differ", ""); CAF_PDM_InitField(&m_lateralExitAngle, "LateralExitAngle", 35.0, "Exit Angle [deg]", "", "", ""); - CAF_PDM_InitField(&m_lateralBuildAngle, "LateralBuildAngle", 5.0, "Build Angle [deg/m]", "", "", ""); + CAF_PDM_InitField(&m_lateralBuildAngle, "LateralBuildAngle", 6.0, "Build Angle [deg/m]", "", "", ""); CAF_PDM_InitField(&m_lateralTubingDiameter, "LateralTubingDiameter", 8.0, "Tubing Diameter [mm]", "", "", ""); @@ -75,8 +75,8 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs() CAF_PDM_InitField(&m_lateralLengthFraction, "LateralLengthFraction", 0.8, "Length Fraction [0..1]", "", "", ""); CAF_PDM_InitField(&m_lateralInstallFraction, "LateralInstallFraction", 0.7, "Install Fraction [0..1]", "", "", ""); - CAF_PDM_InitField(&m_icdCount, "IcdCount", size_t(2), "ICD Count", "", "", ""); - CAF_PDM_InitField(&m_icdOrificeDiameter, "IcdOrificeDiameter", 8.0, "ICD Orifice Diameter [mm]", "", "", ""); + CAF_PDM_InitField(&m_icdCount, "IcdCount", size_t(7), "ICD Count", "", "", ""); + CAF_PDM_InitField(&m_icdOrificeDiameter, "IcdOrificeDiameter", 7.0, "ICD Orifice Diameter [mm]", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_locationOfSubs, "LocationOfSubs", "Measured Depths [m]", "", "", ""); m_locationOfSubs.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName()); @@ -84,7 +84,7 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs() CAF_PDM_InitField(&m_subsLocationMode, "SubsLocationMode", caf::AppEnum(FB_SUB_COUNT_END), "Location Defined By", "", "", ""); CAF_PDM_InitField(&m_rangeStart, "RangeStart", 100.0, "Start MD [m]", "", "", ""); CAF_PDM_InitField(&m_rangeEnd, "RangeEnd", 250.0, "End MD [m]", "", "", ""); - CAF_PDM_InitField(&m_rangeSubSpacing, "RangeSubSpacing", 40.0, "Spacing [m]", "", "", ""); + CAF_PDM_InitField(&m_rangeSubSpacing, "RangeSubSpacing", 13.0, "Spacing [m]", "", "", ""); CAF_PDM_InitField(&m_rangeSubCount, "RangeSubCount", size_t(25), "Number of Subs", "", "", ""); CAF_PDM_InitField(&m_subsOrientationMode, "SubsOrientationMode", caf::AppEnum(FB_LATERAL_ORIENTATION_RANDOM), "Orientation", "", "", ""); @@ -258,6 +258,13 @@ void RimFishbonesMultipleSubs::fieldChangedByUi(const caf::PdmFieldHandle* chang recomputeLocations = true; } + if (changedField == &m_rangeSubSpacing && + m_rangeSubSpacing() < 13.0) + { + // Minimum distance between fishbones is 13m + m_rangeSubSpacing = 13.0; + } + if (recomputeLocations) { computeRangesAndLocations(); diff --git a/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesPipeProperties.cpp b/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesPipeProperties.cpp index 91786457ea..f9b1c8fde8 100644 --- a/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesPipeProperties.cpp +++ b/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesPipeProperties.cpp @@ -30,7 +30,7 @@ RimFishbonesPipeProperties::RimFishbonesPipeProperties() { CAF_PDM_InitObject("FishbonesPipeProperties", "", "", ""); - CAF_PDM_InitField(&m_lateralHoleDiameter, "LateralHoleDiameter", 12.0, "Hole Diameter [mm]", "", "", ""); + CAF_PDM_InitField(&m_lateralHoleDiameter, "LateralHoleDiameter", 12.5, "Hole Diameter [mm]", "", "", ""); CAF_PDM_InitField(&m_skinFactor, "SkinFactor", 1.0, "Skin Factor [0..1]", "", "", ""); }