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

#2402 Fracture : Compute conductivity scaling for all conductivity variants

Browse Source
This commit is contained in:
Magne Sjaastad
2018-01-25 13:30:36 +01:00
parent 827468b764
commit 430b193437
8 changed files with 29 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp
View File

@@ -528,20 +528,8 @@ 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)
void RigStimPlanFractureDefinition::setDataAtTimeValue(QString resultName, QString unit, std::vector<std::vector<double>> data, double timeStepValue)
{
if (resultName == conductivityResultName())
{
for (std::vector<double> &dataAtDepth : data)
{
for (double &dataValue : dataAtDepth)
{
dataValue = dataValue * condScalingFactor;
}
}
}
size_t resIndex = resultIndex(resultName, unit);
if (resIndex != cvf::UNDEFINED_SIZE_T)
@@ -604,34 +592,6 @@ void RigStimPlanFractureDefinition::appendDataToResultStatistics(const QString&
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
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 "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h
View File

@@ -96,7 +96,7 @@ public:
std::vector<std::pair<QString, QString> > getStimPlanPropertyNamesUnits() const;
bool numberOfParameterValuesOK(std::vector<std::vector<double>> propertyValuesAtTimestep);
size_t totalNumberTimeSteps();
void setDataAtTimeValue(QString resultName, QString unit, std::vector<std::vector<double>> data, double timeStepValue, double condScalingFactor);
void setDataAtTimeValue(QString resultName, QString unit, std::vector<std::vector<double>> data, double timeStepValue);
const std::vector<std::vector<double>>& getDataAtTimeIndex(const QString& resultName, const QString& unit, size_t timeStepIndex) const;
std::vector<double> fractureGridResults(const QString& resultName,
const QString& unitName,
@@ -106,7 +106,6 @@ public:
MinMaxAccumulator& minMaxAccumulator,
PosNegAccumulator& posNegAccumulator) const;
QString conductivityResultName() const;
QStringList conductivityResultNames() const;
// Setup