Merge remote-tracking branch 'origin/pre-proto' into pre-proto

ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.cpp

@@ -56,6 +56,9 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateFractur
 
     for (RimFracture* fracture : fracturesAlongWellPath)
     {
+
+        bool fractureFiniteCond = (fracture->attachedFractureDefinition()->fractureConductivity() == RimFractureTemplate::FINITE_CONDUCTIVITY);
+
         using CellIdxSpace = RigTransmissibilityCondenser::CellAddress;
 
         RimFractureTemplate* fracTemplate = fracture->attachedFractureDefinition();
@@ -84,16 +87,28 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateFractur
             size_t stimPlanCellIndex = fractureGrid->getGlobalIndexFromIJ(fractureCell.getI(), fractureCell.getJ());
 
             for (size_t i = 0; i < fractureCellContributingEclipseCells.size(); i++)
+            {
+                if (fractureFiniteCond)
                 {
                     transCondenser.addNeighborTransmissibility({ true,  CellIdxSpace::ECLIPSE, fractureCellContributingEclipseCells[i] },
                                                                { false, CellIdxSpace::STIMPLAN, stimPlanCellIndex },
                                                                fractureCellContributingEclipseCellTransmissibilities[i]);
+
+                }
+                else
+                {
+                    transCondenser.addNeighborTransmissibility({ true, CellIdxSpace::ECLIPSE, fractureCellContributingEclipseCells[i] },
+                                                               { true, CellIdxSpace::WELL, 1 },
+                                                               fractureCellContributingEclipseCellTransmissibilities[i]);
+                }
             }
         }
 
         //////
         // Calculate Transmissibility in the fracture: From one StimPlan Cell to the other
 
+        if (fractureFiniteCond)
+        {
             for (size_t i = 0; i < fractureGrid->iCellCount(); i++)
             {
                 for (size_t j = 0; j < fractureGrid->jCellCount();  j++)
@@ -144,10 +159,13 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateFractur
                     }
                 }
             } 
+        }
 
         /////
         // Calculate transmissibility into the well
         
+        if (fractureFiniteCond)
+        {
             ////
             //If fracture has orientation Azimuth or Transverse, assume only radial inflow
             if (fracture->attachedFractureDefinition()->orientation() == RimFractureTemplate::AZIMUTH
@@ -216,7 +234,7 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateFractur
                                                                totalWellTrans);
                 }
             }
-
+        }
 
         /////
         // Insert total transmissibility from eclipse-cell to well for this fracture into the map 

ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake

@@ -19,6 +19,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.h
 # Fracture files goes here
 ${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.h
 ${CEE_CURRENT_LIST_DIR}RimFracture.h
+${CEE_CURRENT_LIST_DIR}RimFractureContainment.h
 ${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.h
 ${CEE_CURRENT_LIST_DIR}RimFractureTemplate.h
 ${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.h
@@ -45,6 +46,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.cpp
 # Fracture files goes here
 ${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.cpp
 ${CEE_CURRENT_LIST_DIR}RimFracture.cpp
+${CEE_CURRENT_LIST_DIR}RimFractureContainment.cpp
 ${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.cpp
 ${CEE_CURRENT_LIST_DIR}RimFractureTemplate.cpp
 ${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.cpp

ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp

@@ -27,6 +27,7 @@
 
 #include "RimUnitSystem.h"
 #include "RimFracture.h"
+#include "RimFractureContainment.h"
 #include "RimFractureTemplate.h"
 #include "RimProject.h"
 
@@ -318,6 +319,9 @@ void RimEllipseFractureTemplate::defineUiOrdering(QString uiConfigName, caf::Pdm
     geometryGroup->add(&orientation);
     geometryGroup->add(&azimuthAngle);
 
+    caf::PdmUiGroup* trGr = uiOrdering.addNewGroup("Fracture Truncation");
+    m_fractureContainmentField()->defineUiOrdering(uiConfigName, *trGr);
+
     caf::PdmUiGroup* propertyGroup = uiOrdering.addNewGroup("Properties");
     propertyGroup->add(&fractureConductivity);
     if (fractureConductivity == RimFractureTemplate::FINITE_CONDUCTIVITY)

ApplicationCode/ProjectDataModel/Completions/RimFractureContainment.cpp

@@ -0,0 +1,82 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017 -     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+#include "RimFractureContainment.h"
+#include "cafPdmUiSliderEditor.h"
+
+
+CAF_PDM_SOURCE_INIT(RimFractureContainment, "FractureContainment");
+
+namespace caf
+{
+template<>
+void caf::AppEnum< RimFractureContainment::FaultTruncType>::setUp()
+{
+    addItem(RimFractureContainment::DISABLED, "DISABLED", "Disable");
+    addItem(RimFractureContainment::TRUNCATE_AT_FAULT, "TRUNCATE_AT_FAULT", "Truncate At Faults");
+    addItem(RimFractureContainment::CONTINUE_IN_CONTAINMENT_ZONE, "CONTINUE_IN_CONTAINMENT_ZONE", "Continue in Containment Zone");
+
+    setDefault(RimFractureContainment::DISABLED);
+}
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimFractureContainment::RimFractureContainment()
+{
+    CAF_PDM_InitObject("Fracture Containment", "", "", "");
+
+    CAF_PDM_InitField(&m_isUsingFractureContainment,  "IsUsingFractureContainment",  false, "Fracture Containment", "", "", "");
+    CAF_PDM_InitField(&m_topKLayer, "topKLayer", 0, "Top Layer", "", "", "");
+    //m_topKLayer.uiCapability()->setUiEditorTypeName(caf::PdmUiSliderEditor::uiEditorTypeName());
+    CAF_PDM_InitField(&m_bottomKLayer, "bottomKLayer", 0, "Bottom Layer", "", "", "");
+    //m_topKLayer.uiCapability()->setUiEditorTypeName(caf::PdmUiSliderEditor::uiEditorTypeName());
+
+    CAF_PDM_InitFieldNoDefault(&m_faultTruncation, "m_faultTruncation", "Fault Truncation", "", "", ""); 
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QList<caf::PdmOptionItemInfo> RimFractureContainment::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, 
+                                                                            bool* useOptionsOnly)
+{
+    QList<caf::PdmOptionItemInfo> options;
+    if (fieldNeedingOptions == &m_faultTruncation)
+    {
+        options.push_back(caf::PdmOptionItemInfo(caf::AppEnum< FaultTruncType >::uiText(DISABLED), DISABLED));
+        options.push_back(caf::PdmOptionItemInfo(caf::AppEnum< FaultTruncType >::uiText(TRUNCATE_AT_FAULT), TRUNCATE_AT_FAULT));
+        if (m_isUsingFractureContainment())
+        {
+            options.push_back(caf::PdmOptionItemInfo(caf::AppEnum< FaultTruncType >::uiText(CONTINUE_IN_CONTAINMENT_ZONE), CONTINUE_IN_CONTAINMENT_ZONE));
+        }
+    }
+    return options;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimFractureContainment::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+{
+    uiOrdering.add(&m_isUsingFractureContainment);
+    uiOrdering.add(&m_topKLayer);
+    uiOrdering.add(&m_bottomKLayer);
+    uiOrdering.add(&m_faultTruncation);
+}
+

ApplicationCode/ProjectDataModel/Completions/RimFractureContainment.h

@@ -0,0 +1,57 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017 -     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+#pragma once
+#include "cafPdmObject.h"
+#include "cafPdmField.h"
+#include "cafAppEnum.h"
+
+class RimFractureContainment : public caf::PdmObject 
+{
+    CAF_PDM_HEADER_INIT;
+
+public:
+    RimFractureContainment();
+
+    caf::PdmField<bool> m_isUsingFractureContainment;
+    caf::PdmField<int>  m_topKLayer;
+    caf::PdmField<int>  m_bottomKLayer;
+
+    enum FaultTruncType
+    {
+        DISABLED,
+        TRUNCATE_AT_FAULT,
+        CONTINUE_IN_CONTAINMENT_ZONE
+    };
+
+    friend caf::AppEnum< FaultTruncType >;
+    caf::PdmField< caf::AppEnum< FaultTruncType > >  m_faultTruncation;
+
+
+    virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
+protected:
+
+    virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
+
+
+
+private:
+
+};
+
+
+

ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp

@@ -27,6 +27,7 @@
 #include "cafPdmUiDoubleSliderEditor.h"
 
 #include "cvfVector3.h"
+#include "RimFractureContainment.h"
 
 
 
@@ -77,8 +78,12 @@ RimFractureTemplate::RimFractureTemplate(void)
     perforationEfficiency.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
     CAF_PDM_InitField(&wellDiameter, "wellDiameter", 0.216, "Well Diameter at Fracture", "", "", "");
 
-    CAF_PDM_InitField(&fractureConductivity, "FractureCondictivity", caf::AppEnum<FracConductivityEnum>(INFINITE_CONDUCTIVITY), "Conductivity in Fracture", "", "", "");
+    CAF_PDM_InitField(&fractureConductivity, "FractureCondictivity", caf::AppEnum<FracConductivityEnum>(FINITE_CONDUCTIVITY), "Conductivity in Fracture", "", "", "");
 
+    CAF_PDM_InitFieldNoDefault(&m_fractureContainmentField, "fractureContainmentField", "Fracture Containment", "", "", "");
+    m_fractureContainmentField = new RimFractureContainment();
+    m_fractureContainmentField.uiCapability()->setUiTreeHidden(true);
+    m_fractureContainmentField.uiCapability()->setUiTreeChildrenHidden(true);
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h

@@ -24,6 +24,7 @@
 #include "cafPdmField.h"
 #include "cafPdmFieldHandle.h"
 #include "cafPdmObject.h"
+#include "cafPdmChildField.h"
 #include "cafPdmFieldCvfVec3d.h"
 
 #include "cvfBase.h"
@@ -33,6 +34,7 @@
 
 class RigEclipseCaseData;
 class RigFractureGrid;
+class RimFractureContainment;
 
 //==================================================================================================
 ///  
@@ -73,15 +75,16 @@ public:
 
     void                            setDefaultWellDiameterFromUnit();
     
-    virtual caf::PdmFieldHandle*    userDescriptionField() override;
-    virtual void                    fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
-    
     virtual void                    fractureGeometry(std::vector<cvf::Vec3f>* nodeCoords, std::vector<cvf::uint>* triangleIndices, RimUnitSystem::UnitSystem fractureTemplateUnit) = 0;
     virtual std::vector<cvf::Vec3f> fracturePolygon(RimUnitSystem::UnitSystem fractureTemplateUnit) = 0;
 
     virtual const RigFractureGrid*  fractureGrid() const = 0;
 
 protected:
+    caf::PdmChildField<RimFractureContainment*> m_fractureContainmentField;
+
+    virtual caf::PdmFieldHandle*    userDescriptionField() override;
+    virtual void                    fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
     virtual void                    defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
 
     virtual void                    defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;

ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp

@@ -22,6 +22,8 @@
 #include "RiaLogging.h"
 
 #include "RigStimPlanFractureDefinition.h"
+#include "RigFractureTransCalc.h"
+#include "RigFractureGrid.h"
 
 #include "RimEclipseView.h"
 #include "RimFracture.h"
@@ -29,6 +31,7 @@
 #include "RigFractureCell.h"
 #include "RimStimPlanColors.h"
 #include "RimStimPlanLegendConfig.h"
+#include "RimFractureContainment.h"
 
 #include "RivWellFracturePartMgr.h"
 
@@ -44,8 +47,6 @@
 #include <algorithm>
 #include <vector>
 #include <cmath>
-#include "RigFractureTransCalc.h"
-#include "RigFractureGrid.h"
 
 
 
@@ -1092,6 +1093,9 @@ void RimStimPlanFractureTemplate::defineUiOrdering(QString uiConfigName, caf::Pd
     geometryGroup->add(&orientation);
     geometryGroup->add(&azimuthAngle);
 
+    caf::PdmUiGroup* trGr = uiOrdering.addNewGroup("Fracture Truncation");
+    m_fractureContainmentField()->defineUiOrdering(uiConfigName, *trGr);
+
     caf::PdmUiGroup* propertyGroup = uiOrdering.addNewGroup("Properties");
     propertyGroup->add(&fractureConductivity);
     propertyGroup->add(&skinFactor);