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

#1299 - pre-proto - Update to handle space in property name for stimplan fractures

Browse Source
This commit is contained in:
astridkbjorke 2017-03-15 15:02:20 +01:00
parent 3d67946976
commit 63eca2dc54
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
View File

@ -282,7 +282,7 @@ bool RimStimPlanFractureTemplate::setPropertyForPolygonDefault()
{ {
if (property.first == "WIDTH") if (property.first == "WIDTH")
{ {
parameterForPolygon = property.first + " " + property.second; parameterForPolygon = property.first;
return true; return true;
} }
} }
@ -291,7 +291,7 @@ bool RimStimPlanFractureTemplate::setPropertyForPolygonDefault()
{ {
if (property.first == "CONDUCTIVITY") if (property.first == "CONDUCTIVITY")
{ {
parameterForPolygon = property.first + " " + property.second; parameterForPolygon = property.first;
return true; return true;
} }
} }
@ -330,7 +330,8 @@ QList<caf::PdmOptionItemInfo> RimStimPlanFractureTemplate::calculateValueOptions
{ {
for (std::pair<QString, QString> nameUnit : getStimPlanPropertyNamesUnits()) for (std::pair<QString, QString> nameUnit : getStimPlanPropertyNamesUnits())
{ {
options.push_back(caf::PdmOptionItemInfo(nameUnit.first + " [" + nameUnit.second +"]", nameUnit.first + " " + nameUnit.second)); //options.push_back(caf::PdmOptionItemInfo(nameUnit.first + " [" + nameUnit.second + "]", nameUnit.first + " " + nameUnit.second));
options.push_back(caf::PdmOptionItemInfo(nameUnit.first, nameUnit.first));
} }
} }
@ -475,6 +476,31 @@ void RimStimPlanFractureTemplate::setDepthOfWellPathAtFracture()
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimStimPlanFractureTemplate::getUnitForStimPlanParameter(QString parameterName)
{
QString unit;
bool found = false;
bool foundMultiple = false;
for (std::pair<QString, QString> nameUnit : getStimPlanPropertyNamesUnits())
{
if (nameUnit.first == parameterName)
{
unit = nameUnit.second;
if (found) foundMultiple = true;
found = true;
}
}
if (foundMultiple) RiaLogging::error(QString("Multiple units found for same parameter"));
if (!found) RiaLogging::error(QString("Unit for parameter not found"));
return unit;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -688,16 +714,10 @@ void RimStimPlanFractureTemplate::computeMinMax(const QString& resultName, const
std::vector<cvf::Vec3f> RimStimPlanFractureTemplate::fracturePolygon(caf::AppEnum< RimDefines::UnitSystem > fractureUnit) std::vector<cvf::Vec3f> RimStimPlanFractureTemplate::fracturePolygon(caf::AppEnum< RimDefines::UnitSystem > fractureUnit)
{ {
std::vector<cvf::Vec3f> polygon; std::vector<cvf::Vec3f> polygon;
QString parameterName;
QString parameterUnit;
if (parameterForPolygon().split(" ").size() > 1)
{
parameterName = parameterForPolygon().split(" ")[0];
parameterUnit = parameterForPolygon().split(" ")[1];
}
else return polygon;
QString parameterName = parameterForPolygon;
QString parameterUnit = getUnitForStimPlanParameter(parameterName);
std::vector<std::vector<double>> dataAtTimeStep = m_stimPlanFractureDefinitionData->getDataAtTimeIndex(parameterName, parameterUnit, timestepForPolygon); std::vector<std::vector<double>> dataAtTimeStep = m_stimPlanFractureDefinitionData->getDataAtTimeIndex(parameterName, parameterUnit, timestepForPolygon);
for (int k = 0; k < dataAtTimeStep.size(); k++) for (int k = 0; k < dataAtTimeStep.size(); k++)
@ -778,9 +798,6 @@ std::vector<cvf::Vec3f> RimStimPlanFractureTemplate::fracturePolygon(caf::AppEnu
} }
return polygon; return polygon;
} }
@ -789,6 +806,8 @@ std::vector<cvf::Vec3f> RimStimPlanFractureTemplate::fracturePolygon(caf::AppEnu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimStimPlanFractureTemplate::sortPolygon(std::vector<cvf::Vec3f> &polygon) void RimStimPlanFractureTemplate::sortPolygon(std::vector<cvf::Vec3f> &polygon)
{ {
if (polygon.size() == 0) return;
for (int i = 1; i < polygon.size() - 1; i++) for (int i = 1; i < polygon.size() - 1; i++)
{ {
cvf::Vec3f lastNode = polygon[i - 1]; cvf::Vec3f lastNode = polygon[i - 1];

2
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h
View File

@ -102,4 +102,6 @@ private:
bool numberOfParameterValuesOK(std::vector<std::vector<double>> propertyValuesAtTimestep); bool numberOfParameterValuesOK(std::vector<std::vector<double>> propertyValuesAtTimestep);
bool setPropertyForPolygonDefault(); bool setPropertyForPolygonDefault();
void setDepthOfWellPathAtFracture(); void setDepthOfWellPathAtFracture();
QString getUnitForStimPlanParameter(QString parameterName);
}; };