Fixed memory allocation issues when computing SOIL

This commit is contained in:
Magne Sjaastad 2014-08-25 10:31:36 +02:00
parent 1b2b0d8560
commit 4d1d2215c2

View File

@ -419,19 +419,12 @@ void RimReservoirCellResultsStorage::computeSOILForTimeStep(size_t timeStepIndex
}
}
size_t soilResultScalarIndex = m_cellResults->findScalarResultIndex(RimDefines::DYNAMIC_NATIVE, "SOIL");
if (m_cellResults->cellScalarResults(soilResultScalarIndex, timeStepIndex).size() == 0)
{
// // Set this result to be calculated
// m_cellResults->setMustBeCalculated(soilResultScalarIndex);
//
// m_cellResults->cellScalarResults(soilResultScalarIndex).resize(soilTimeStepCount);
// for (size_t timeStepIdx = 0; timeStepIdx < soilTimeStepCount; timeStepIdx++)
// {
m_cellResults->cellScalarResults(soilResultScalarIndex, timeStepIndex).resize(soilResultValueCount);
// }
}
// Make sure memory is allocated for the new SOIL results
size_t soilResultScalarIndex = m_cellResults->findScalarResultIndex(RimDefines::DYNAMIC_NATIVE, "SOIL");
m_cellResults->cellScalarResults(soilResultScalarIndex).resize(soilTimeStepCount);
m_cellResults->cellScalarResults(soilResultScalarIndex, timeStepIndex).resize(soilResultValueCount);
std::vector<double>* swatForTimeStep = NULL;