#1891 StimPlan : Add support for "Conductivity-propped"

ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.cpp

@@ -140,18 +140,12 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
             if (dynamic_cast<RimStimPlanFractureTemplate*>(fracTemplate))
             {
                 RimStimPlanFractureTemplate* fracTemplateStimPlan = dynamic_cast<RimStimPlanFractureTemplate*>(fracTemplate);
-                bool conductivityInFile = false;
+                if (!fracTemplateStimPlan->hasConductivity())
-                for (auto parameterUnit : fracTemplateStimPlan->resultNamesWithUnit())
-                {
-                    if (parameterUnit.first == "CONDUCTIVITY") conductivityInFile = true;
-                }
-                if (!conductivityInFile)
                 {
                     RiaLogging::error("Trying to export completion data for stimPlan fracture without conductivity data for " + fracture->name());
                     RiaLogging::error("No transmissibilities will be calculated for " + fracture->name());
 
                     continue;
-
                 }
             }
         }

ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp

@@ -226,15 +226,14 @@ bool RimStimPlanFractureTemplate::setBorderPolygonResultNameToDefault()
             return true;
         }
     }
+    
     // if width not found, use conductivity
-    for (std::pair<QString, QString> property : resultNamesWithUnit())
+    if (hasConductivity())
     {
-        if (property.first == "CONDUCTIVITY")
+        m_borderPolygonResultName = m_stimPlanFractureDefinitionData->conductivityResultName();
-        {
-            m_borderPolygonResultName = property.first;
         return true;
     }
-    }
+
     // else: Set to first property
     if (resultNamesWithUnit().size() > 0)
     {
@@ -391,6 +390,20 @@ std::vector<double> RimStimPlanFractureTemplate::fractureGridResults(const QStri
    return m_stimPlanFractureDefinitionData->fractureGridResults(resultName, unitName, timeStepIndex);
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RimStimPlanFractureTemplate::hasConductivity() const
+{
+    if (m_stimPlanFractureDefinitionData.notNull() &&
+        !m_stimPlanFractureDefinitionData->conductivityResultName().isEmpty())
+    {
+        return true;
+    }
+
+    return false;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h

@@ -81,6 +81,7 @@ public:
     void                                    computeMinMax(const QString& resultName, const QString& unitName, double* minValue, double* maxValue, double* posClosestToZero, double* negClosestToZero) const;
     std::vector<std::vector<double>>        resultValues(const QString& resultName, const QString& unitName, size_t timeStepIndex) const;
     std::vector<double>                     fractureGridResults(const QString& resultName, const QString& unitName, size_t timeStepIndex) const;
+    bool                                    hasConductivity() const;
 
 protected:
     virtual void                            fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;

ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp

@@ -156,7 +156,7 @@ cvf::ref<RigFractureGrid> RigStimPlanFractureDefinition::createFractureGrid(int
     QString condUnit;
     if ( fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC ) condUnit = "md-m";
     if ( fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD )  condUnit = "md-ft";
-    std::vector<std::vector<double>> conductivityValuesAtTimeStep = this->getMirroredDataAtTimeIndex("CONDUCTIVITY", 
+    std::vector<std::vector<double>> conductivityValuesAtTimeStep = this->getMirroredDataAtTimeIndex(this->conductivityResultName(), 
                                                                                                      condUnit, 
                                                                                                      m_activeTimeStepIndex);
 
@@ -524,7 +524,7 @@ size_t RigStimPlanFractureDefinition::resultIndex(const QString& resultName, con
 //--------------------------------------------------------------------------------------------------
 void RigStimPlanFractureDefinition::setDataAtTimeValue(QString resultName, QString unit, std::vector<std::vector<double>> data, double timeStepValue, double condScalingFactor)
 {
-    if (resultName == "CONDUCTIVITY")
+    if (resultName == conductivityResultName())
     {
         for (std::vector<double> &dataAtDepth : data)
         {
@@ -619,3 +619,31 @@ void RigStimPlanFractureDefinition::computeMinMax(const QString& resultName, con
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RigStimPlanFractureDefinition::conductivityResultName() const
+{
+    static const QString conductivity_text("CONDUCTIVITY");
+    static const QString conductivity_propped_text("Conductivity-Propped");
+    
+    // By intention we have two for loops here, as "CONDUCTIVITY" has priority over "Conductivity-Propped"
+    for (auto stimPlanResult : m_stimPlanResults)
+    {
+        if (stimPlanResult.resultName.compare(conductivity_text, Qt::CaseInsensitive) == 0)
+        {
+            return stimPlanResult.resultName;
+        }
+    }
+
+    for (auto stimPlanResult : m_stimPlanResults)
+    {
+        if (stimPlanResult.resultName.compare(conductivity_propped_text, Qt::CaseInsensitive) == 0)
+        {
+            return stimPlanResult.resultName;
+        }
+    }
+
+    return "";
+}
+

ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h

@@ -104,6 +104,8 @@ public:
                                                                   size_t timeStepIndex) const;
     void                                      computeMinMax(const QString& resultName, const QString& unit, double* minValue, double* maxValue, double* posClosestToZero, double* negClosestToZero) const;
 
+    QString                                   conductivityResultName() const;
+    
     // Setup                          
     void                                      reorderYgridToDepths();
 private: