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

(#567) Made sure that WLP auto curve name works for geo mech models too

Browse Source
This commit is contained in:
Pål Hagen 2015-10-13 16:16:14 +02:00
parent 67a62f4f02
commit 1253247481
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@ -414,35 +414,42 @@ QString RimWellLogExtractionCurve::createCurveName()
generatedCurveName += m_wellPath->name();
}
if (eclipseCase)
if (m_addCaseNameToCurveName && m_case())
{
if (m_addCaseNameToCurveName)
if (!generatedCurveName.isEmpty())
{
if (!generatedCurveName.isEmpty())
{
generatedCurveName += ",";
}
generatedCurveName += m_case->caseUserDescription();
generatedCurveName += ",";
}
if (m_addPropertyToCurveName)
{
if (!generatedCurveName.isEmpty())
{
generatedCurveName += ",";
}
generatedCurveName += m_eclipseResultDefinition->resultVariable();
}
generatedCurveName += m_case->caseUserDescription();
}
if (geomCase)
if (m_addPropertyToCurveName && eclipseCase)
{
if (!generatedCurveName.isEmpty())
{
generatedCurveName += ",";
}
generatedCurveName += m_eclipseResultDefinition->resultVariable();
}
if (m_addPropertyToCurveName && geomCase)
{
QString geoMechResultName;
QString resCompName = m_geomResultDefinition->resultComponentUiName();
if (resCompName.isEmpty())
generatedCurveName = m_geomResultDefinition->resultFieldUiName();
geoMechResultName = m_geomResultDefinition->resultFieldUiName();
else
generatedCurveName = m_geomResultDefinition->resultFieldUiName() + "." + resCompName;
geoMechResultName += m_geomResultDefinition->resultFieldUiName() + "." + resCompName;
if (!generatedCurveName.isEmpty())
{
generatedCurveName += ",";
}
generatedCurveName += geoMechResultName;
}
if (m_addTimestepToCurveName || m_addDateToCurveName)
@ -459,7 +466,6 @@ QString RimWellLogExtractionCurve::createCurveName()
maxTimeStep = eclipseCase->reservoirData()->results(porosityModel)->maxTimeStepCount();
timeStepNames = eclipseCase->timeStepStrings();
}
}
else if (geomCase)
{
@ -468,7 +474,6 @@ QString RimWellLogExtractionCurve::createCurveName()
maxTimeStep = geomCase->geoMechData()->femPartResults()->frameCount();
timeStepNames = geomCase->timeStepStrings();
}
}
if (m_addDateToCurveName && m_timeStep < timeStepNames.size())