OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Magne Sjaastad
2017-09-14 13:48:30 +02:00
parent db233a970f
commit 1ec9e72ce2
5 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp
View File

@@ -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 "";
}