OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-15 18:02:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

#3058 Implement a memory cleanup dialog for GeoMech data.

Browse Source
This commit is contained in:
Gaute Lindkvist committed 2018-06-19 12:20:21 +02:00
1 parent e3bffafb46
commit d13a52a8b4
22 files changed
+622 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
+33 -1
View File
@@ -509,7 +509,7 @@ void RimGeoMechResultDefinition::setAddWellPathDerivedResults(bool addWellPathDe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFemResultAddress RimGeoMechResultDefinition::resultAddress()
RigFemResultAddress RimGeoMechResultDefinition::resultAddress() const
{
return RigFemResultAddress(resultPositionType(),
resultFieldName().toStdString(),
@@ -518,6 +518,38 @@ RigFemResultAddress RimGeoMechResultDefinition::resultAddress()
resultFieldName().toStdString() == RigFemPartResultsCollection::FIELD_NAME_COMPACTION ? m_compactionRefLayer() : RigFemResultAddress::NO_COMPACTION);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RigFemResultAddress> RimGeoMechResultDefinition::observedResults() const
{
return std::vector<RigFemResultAddress>(1, resultAddress());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFemResultPosEnum RimGeoMechResultDefinition::resultPositionType() const
{
return m_resultPositionType();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimGeoMechResultDefinition::resultFieldName() const
{
return m_resultFieldName();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimGeoMechResultDefinition::resultComponentName() const
{
return m_resultComponentName();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
+7 -5
View File
@@ -25,6 +25,7 @@
#include "cafAppEnum.h"
#include "RigFemResultPosEnum.h"
#include "RigFemResultAddress.h"
#include "RimFemResultObserver.h"
class RimGeoMechView;
class RimGeoMechPropertyFilter;
@@ -36,7 +37,7 @@ class RimGeoMechCase;
///
///
//==================================================================================================
class RimGeoMechResultDefinition : public caf::PdmObject
class RimGeoMechResultDefinition : public RimFemResultObserver
{
CAF_PDM_HEADER_INIT;
public:
@@ -50,11 +51,12 @@ public:
void loadResult();
void setAddWellPathDerivedResults(bool addWellPathDerivedResults);
RigFemResultAddress resultAddress();
RigFemResultAddress resultAddress() const;
virtual std::vector<RigFemResultAddress> observedResults() const override;
RigFemResultPosEnum resultPositionType() { return m_resultPositionType();}
QString resultFieldName() { return m_resultFieldName();}
QString resultComponentName() { return m_resultComponentName();}
RigFemResultPosEnum resultPositionType() const;
QString resultFieldName() const;
QString resultComponentName() const;
void setResultAddress(const RigFemResultAddress& resultAddress);
QString resultFieldUiName();
ApplicationCode/ProjectDataModel/RimTensorResults.cpp
+12
View File
@@ -214,6 +214,18 @@ void RimTensorResults::mappingRange(double* min, double* max) const
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RigFemResultAddress> RimTensorResults::observedResults() const
{
RigFemResultAddress mainResult = selectedTensorResult();
std::vector<RigFemResultAddress> tensorComponents = RigFemPartResultsCollection::tensorComponentAddresses(mainResult);
std::vector<RigFemResultAddress> principleComponents = RigFemPartResultsCollection::tensorPrincipalComponentAdresses(mainResult);
tensorComponents.insert(tensorComponents.end(), principleComponents.begin(), principleComponents.end());
return tensorComponents;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModel/RimTensorResults.h
+6 -4
View File
@@ -22,6 +22,7 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "RimFemResultObserver.h"
#include "RigFemResultPosEnum.h"
#include "RimRegularLegendConfig.h"
@@ -36,7 +37,7 @@ class RimRegularLegendConfig;
///
///
//==================================================================================================
class RimTensorResults : public caf::PdmObject
class RimTensorResults : public RimFemResultObserver
{
CAF_PDM_HEADER_INIT;
@@ -72,9 +73,10 @@ public:
void mappingRange(double *min, double* max) const;
static RigFemResultPosEnum resultPositionType();
QString resultFieldName() const;
static QString uiFieldName(const QString& fieldName);
std::vector<RigFemResultAddress> observedResults() const;
static RigFemResultPosEnum resultPositionType();
QString resultFieldName() const;
static QString uiFieldName(const QString& fieldName);
caf::PdmChildField<RimRegularLegendConfig*> arrowColorLegendConfig;