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

#2527 Mohr Circle: Use cohersion and friction angle from case

Browse Source
This commit is contained in:
Rebecca Cox 2018-02-26 13:39:13 +01:00
parent f7ba9133fe
commit bed95a105e
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@ -383,6 +383,22 @@ void RimGeoMechCase::addElementPropertyFiles(const std::vector<caf::FilePath>& f
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimGeoMechCase::cohesion() const
{
return m_cohesion;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimGeoMechCase::frictionAngleDeg() const
{
return m_frictionAngleDeg;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@ -71,6 +71,9 @@ public:
void addElementPropertyFiles(const std::vector<caf::FilePath>& filenames); void addElementPropertyFiles(const std::vector<caf::FilePath>& filenames);
double cohesion() const;
double frictionAngleDeg() const;
// Fields: // Fields:
caf::PdmChildArrayField<RimGeoMechView*> geoMechViews; caf::PdmChildArrayField<RimGeoMechView*> geoMechViews;

3
ApplicationCode/UserInterface/RiuMohrsCirclePlot.cpp
View File

@ -311,6 +311,9 @@ void RiuMohrsCirclePlot::queryDataAndUpdatePlot(RimGeoMechView* geoMechView, siz
CVF_ASSERT(geoMechView); CVF_ASSERT(geoMechView);
RigFemPartResultsCollection* resultCollection = geoMechView->geoMechCase()->geoMechData()->femPartResults(); RigFemPartResultsCollection* resultCollection = geoMechView->geoMechCase()->geoMechData()->femPartResults();
setCohesion(geoMechView->geoMechCase()->cohesion());
setFrictionAngle(geoMechView->geoMechCase()->frictionAngleDeg());
int frameIdx = geoMechView->currentTimeStep(); int frameIdx = geoMechView->currentTimeStep();