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

#3062 Ditch temporary GeoMech results as soon as they are used.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-06-19 15:27:57 +02:00
parent ed0bcb05a1
commit a9aad1cf69
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
View File

@@ -501,7 +501,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateBarConvertedResu
frameCountProgress.setProgressDescription("Calculating " + QString::fromStdString(convertedResultAddr.fieldName + ": " + convertedResultAddr.componentName)); frameCountProgress.setProgressDescription("Calculating " + QString::fromStdString(convertedResultAddr.fieldName + ": " + convertedResultAddr.componentName));
frameCountProgress.setNextProgressIncrement(this->frameCount()); frameCountProgress.setNextProgressIncrement(this->frameCount());
RigFemScalarResultFrames * srcDataFrames = this->findOrLoadScalarResult(partIndex, RigFemResultAddress(convertedResultAddr.resultPosType, fieldNameToConvert, convertedResultAddr.componentName)); RigFemResultAddress unconvertedResultAddr(convertedResultAddr.resultPosType, fieldNameToConvert, convertedResultAddr.componentName);
RigFemScalarResultFrames * srcDataFrames = this->findOrLoadScalarResult(partIndex, unconvertedResultAddr);
RigFemScalarResultFrames * dstDataFrames = m_femPartResults[partIndex]->createScalarResult(convertedResultAddr); RigFemScalarResultFrames * dstDataFrames = m_femPartResults[partIndex]->createScalarResult(convertedResultAddr);
frameCountProgress.incrementProgress(); frameCountProgress.incrementProgress();
@@ -522,7 +523,7 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateBarConvertedResu
frameCountProgress.incrementProgress(); frameCountProgress.incrementProgress();
} }
this->deleteResult(unconvertedResultAddr);
return dstDataFrames; return dstDataFrames;
} }
@@ -535,7 +536,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateEnIpPorBarResult
frameCountProgress.setProgressDescription("Calculating " + QString::fromStdString(convertedResultAddr.fieldName + ": " + convertedResultAddr.componentName)); frameCountProgress.setProgressDescription("Calculating " + QString::fromStdString(convertedResultAddr.fieldName + ": " + convertedResultAddr.componentName));
frameCountProgress.setNextProgressIncrement(this->frameCount()); frameCountProgress.setNextProgressIncrement(this->frameCount());
RigFemScalarResultFrames * srcDataFrames = this->findOrLoadScalarResult(partIndex, RigFemResultAddress(RIG_NODAL, "POR", "")); RigFemResultAddress unconvertedResultAddr(RIG_NODAL, "POR", "");
RigFemScalarResultFrames * srcDataFrames = this->findOrLoadScalarResult(partIndex, unconvertedResultAddr);
RigFemScalarResultFrames * dstDataFrames = m_femPartResults[partIndex]->createScalarResult(convertedResultAddr); RigFemScalarResultFrames * dstDataFrames = m_femPartResults[partIndex]->createScalarResult(convertedResultAddr);
frameCountProgress.incrementProgress(); frameCountProgress.incrementProgress();
@@ -576,6 +578,7 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateEnIpPorBarResult
frameCountProgress.incrementProgress(); frameCountProgress.incrementProgress();
} }
this->deleteResult(unconvertedResultAddr);
return dstDataFrames; return dstDataFrames;
} }