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

#4049 3D calculations : Use _dt_<time step index> to indicate time differenc

Browse Source
This commit is contained in:
Magne Sjaastad 2019-02-11 07:59:03 +01:00
parent 7ea2a907ad
commit f631321ad1
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -782,12 +782,10 @@ QString RimEclipseResultDefinition::resultVariableUiName() const
if (m_isTimeLapseResult() && resultType() == RiaDefines::DYNAMIC_NATIVE) if (m_isTimeLapseResult() && resultType() == RiaDefines::DYNAMIC_NATIVE)
{ {
return m_resultVariable() + "_D" + QString::number(m_timeLapseBaseTimestep()); return timeDiffResultName(m_resultVariable(), m_timeLapseBaseTimestep());
}
else
{
return m_resultVariable();
} }
return m_resultVariable();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -802,12 +800,10 @@ QString RimEclipseResultDefinition::resultVariableUiShortName() const
if (m_isTimeLapseResult() && resultType() == RiaDefines::DYNAMIC_NATIVE) if (m_isTimeLapseResult() && resultType() == RiaDefines::DYNAMIC_NATIVE)
{ {
return m_resultVariable() + "_D" + QString::number(m_timeLapseBaseTimestep()); return timeDiffResultName(m_resultVariable(), m_timeLapseBaseTimestep());
}
else
{
return m_resultVariable();
} }
return m_resultVariable();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -1314,19 +1310,26 @@ QString RimEclipseResultDefinition::flowDiagResUiText(bool shortLabel, int maxTr
return uiText; return uiText;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimEclipseResultDefinition::timeDiffResultName(const QString& resultName, int timeStepIndex)
{
return resultName + "_dt_" + QString::number(timeStepIndex);
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimEclipseResultDefinition::convertToTimeDiffUiVarName(const QString& resultName) QString RimEclipseResultDefinition::convertToTimeDiffUiVarName(const QString& resultName)
{ {
if (m_isTimeLapseResultUiField() && m_resultTypeUiField() == RiaDefines::DYNAMIC_NATIVE) if (m_isTimeLapseResultUiField() &&
(m_resultTypeUiField() == RiaDefines::DYNAMIC_NATIVE || m_resultTypeUiField() == RiaDefines::GENERATED))
{ {
return resultName + "_D" + QString::number(m_timeLapseBaseTimestepUiField()); return timeDiffResultName(resultName, m_timeLapseBaseTimestepUiField());
}
else
{
return resultName;
} }
return resultName;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -178,6 +178,7 @@ private:
bool hasDualPorFractureResult(); bool hasDualPorFractureResult();
QString flowDiagResUiText(bool shortLabel, int maxTracerStringLength = std::numeric_limits<int>::max()) const; QString flowDiagResUiText(bool shortLabel, int maxTracerStringLength = std::numeric_limits<int>::max()) const;
static QString timeDiffResultName(const QString& resultName, int timeStepIndex);
QString convertToTimeDiffUiVarName(const QString& resultName); QString convertToTimeDiffUiVarName(const QString& resultName);
QList<caf::PdmOptionItemInfo> calcOptionsForVariableUiFieldStandard(); QList<caf::PdmOptionItemInfo> calcOptionsForVariableUiFieldStandard();