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

#2369 Elm props: Only delete results from the closed files

Browse Source
This commit is contained in:
Rebecca Cox
2018-01-15 16:09:52 +01:00
parent b092565a61
commit 58123f4a49
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ void RigFemPartResultsCollection::addElementPropertyFiles(const std::vector<QStr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFemPartResultsCollection::removeElementPropertyFiles(const std::vector<QString>& filenames)
std::vector<RigFemResultAddress> RigFemPartResultsCollection::removeElementPropertyFiles(const std::vector<QString>& filenames)
{
std::vector<RigFemResultAddress> addressesToRemove;
@@ -155,6 +155,8 @@ void RigFemPartResultsCollection::removeElementPropertyFiles(const std::vector<Q
{
this->deleteResult(address);
}
return addressesToRemove;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h
View File

@@ -53,7 +53,7 @@ public:
RigFormationNames* activeFormationNames();
void addElementPropertyFiles(const std::vector<QString>& filenames);
void removeElementPropertyFiles(const std::vector<QString>& filenames);
std::vector<RigFemResultAddress> removeElementPropertyFiles(const std::vector<QString>& filenames);
void setCalculationParameters(double cohesion, double frictionAngleRad);
double parameterCohesion() const { return m_cohesion;}

13
ApplicationCode/GeoMech/GeoMechDataModel/RigFemResultAddress.h
View File

@@ -99,6 +99,19 @@ public:
return (componentName < other.componentName);
}
bool operator== (const RigFemResultAddress& other) const
{
if ( resultPosType != other.resultPosType
|| fieldName != other.fieldName
|| componentName != other.componentName
|| timeLapseBaseFrameIdx != other.timeLapseBaseFrameIdx)
{
return false;
}
return true;
}
};

16
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -557,17 +557,29 @@ void RimGeoMechCase::closeSelectedElementPropertyFiles()
m_elementPropertyFileNameIndexUiSelection.v().clear();
std::vector<RigFemResultAddress> addressesToDelete;
if (m_geoMechCaseData.notNull())
{
geoMechData()->femPartResults()->removeElementPropertyFiles(filesToClose);
addressesToDelete = geoMechData()->femPartResults()->removeElementPropertyFiles(filesToClose);
}
for (RimGeoMechView* view : geoMechViews())
{
for (RigFemResultAddress address : addressesToDelete)
{
if (address == view->cellResultResultDefinition()->resultAddress())
{
view->cellResult()->setResultAddress(RigFemResultAddress());
}
for (RimGeoMechPropertyFilter* propertyFilter : view->geoMechPropertyFilterCollection()->propertyFilters())
{
propertyFilter->resultDefinition().p()->setResultAddress(RigFemResultAddress());
if (address == propertyFilter->resultDefinition->resultAddress())
{
propertyFilter->resultDefinition->setResultAddress(RigFemResultAddress());
}
}
}
view->loadDataAndUpdate();