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

Split fem part results collection 5785 (#5871)

Browse Source 
* #5785 Extract RigFemClosestResultIndexCalculator class to separate file.

* #5785 Move method implementation of RigFemClosestResutIndexCalculator to cpp file.

Also improve const correctness.

* #5785 Extract method for calculating normal SE, ie. SE:11/22/33.

* #5785 Extract method for calculating shear SE, ie. SE:12/13/23.

* #5785 Create a list of result calculators.

* #5785 Extract method for calculating timelapse, normalized, and gamma results.

* #5785 Extract method for calculating normal ST, ie. ST:11/22/33.

* #5785 Extract method for calculating shear ST, ie. ST:12/13/23.

* #5785 Extract method for calculating surface angles and aligned stress.

* #5785 Extract method for calculating principal strain and stress.

* #5785 Extract method for calculating FOS, SFI and DSM for SE.

* #5785 Extract method for calculating NE.EV, NE.ED, ST.Q and ST.STM.

* #5785 Extract method for calculating compaction.

* #5785 Extract method for calculating stress gradients.

* #5785 Extract method for calculating SE.SEM.

* #5785 Extract method for calculating NE.

* #5785 Extract method for calculating formation indices.

* #5785 Extract method for calculating nodal graidents, bar conversions, and EnIpPorBar.

* #5785 Use std::unique_ptr to calculators.

* Use std::vector<unique_ptr>

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
This commit is contained in:
Kristian Bendiksen
2020-05-09 08:57:07 +02:00
committed by GitHub
parent 976d343f3b
commit b84e868564
62 changed files with 5207 additions and 2582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/UserInterface/RiuMohrsCirclePlot.cpp
View File

@@ -26,6 +26,7 @@
#include "RigFemPart.h"
#include "RigFemPartCollection.h"
#include "RigFemPartGrid.h"
#include "RigFemPartResultCalculatorDSM.h"
#include "RigFemPartResultsCollection.h"
#include "RigFemResultPosEnum.h"
#include "RigGeoMechCaseData.h"
@@ -567,7 +568,7 @@ float RiuMohrsCirclePlot::calculateFOS( const cvf::Vec3f& principals, double fri
float tanFricAng = cvf::Math::tan( cvf::Math::toRadians( frictionAngle ) );
float cohPrTanFricAngle = 1.0f * cohesion / tanFricAng;
float dsm = RigFemPartResultsCollection::dsm( se1, se3, tanFricAng, cohPrTanFricAngle );
float dsm = RigFemPartResultCalculatorDSM::dsm( se1, se3, tanFricAng, cohPrTanFricAngle );
return 1.0f / dsm;
}