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

#3979 #3980 Contour Maps: Fix GeoMech crash and make limit to POR-result optional.

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-01-18 16:12:02 +01:00
parent 8814ae9902
commit 810a991ba4
8 changed files with 93 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimGeoMechContourMapProjection.h
View File

@@ -63,7 +63,7 @@ protected:
void ensureOnlyValidPorBarVisible(cvf::UByteArray* visibility, int timeStep) const;
void updateGridInformation() override;
std::vector<double> retrieveParameterWeights() override;
std::vector<double> generateResults(int timeStep, int everyNCells = 1) override;
std::vector<double> generateResults(int timeStep) override;
bool resultVariableChanged() const override;
void clearResultVariable() override;
RimGridView* baseView() const override;
@@ -78,14 +78,16 @@ protected:
RimGeoMechCase* geoMechCase() const;
RimGeoMechContourMapView* view() const;
protected:
// Framework overrides
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
protected:
caf::PdmField<bool> m_limitToPorePressureRegions;
caf::PdmField<bool> m_includePaddingAroundPorePressureRegion;
cvf::ref<RigFemPart> m_femPart;
cvf::cref<RigFemPartGrid> m_femPartGrid;
RigFemResultAddress m_currentResultAddr;