Moved loading of dependent datasets

This commit is contained in:
Magne Sjaastad
2014-08-25 13:20:58 +02:00
parent 4d1d2215c2
commit 8dc2eed3c0
2 changed files with 30 additions and 28 deletions

View File

@@ -196,32 +196,7 @@ void RimResultDefinition::loadResult()
RimReservoirCellResultsStorage* gridCellResults = this->currentGridCellResults();
if (gridCellResults)
{
if (m_resultType() == RimDefines::STATIC_NATIVE)
{
if (m_resultVariable().compare(RimDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive) == 0)
{
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANX");
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANY");
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANZ");
}
else if (m_resultVariable().compare(RimDefines::combinedMultResultName(), Qt::CaseInsensitive) == 0)
{
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTX");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTX-");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTY");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTY-");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTZ");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTZ-");
}
else
{
gridCellResults->findOrLoadScalarResult(m_resultType(), m_resultVariable);
}
}
else
{
gridCellResults->findOrLoadScalarResult(m_resultType(), m_resultVariable);
}
gridCellResults->findOrLoadScalarResult(m_resultType(), m_resultVariable);
}
updateFieldVisibility();