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

#6308 Move shear slip indicator to result to ST.DPN.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-08-24 14:49:08 +02:00
parent b86720529b
commit 5ecee650f0
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ RigFemPartResultCalculatorShearSlipIndicator::~RigFemPartResultCalculatorShearSl
//--------------------------------------------------------------------------------------------------
bool RigFemPartResultCalculatorShearSlipIndicator::isMatching( const RigFemResultAddress& resVarAddr ) const
{
return ( resVarAddr.fieldName == "DPN" );
return ( resVarAddr.fieldName == "ST" || resVarAddr.componentName == "DPN" );
}
//--------------------------------------------------------------------------------------------------
@@ -81,7 +81,7 @@ RigFemScalarResultFrames*
frameCountProgress.setNextProgressIncrement( m_resultCollection->frameCount() );
RigFemScalarResultFrames* shearSlipIndicatorFrames =
m_resultCollection->createScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "DPN", "" ) );
m_resultCollection->createScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "DPN" ) );
const RigFemPart* femPart = m_resultCollection->parts()->part( partIndex );
const RigFemPartGrid* femPartGrid = femPart->getOrCreateStructGrid();

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

@@ -619,6 +619,7 @@ std::map<std::string, std::vector<std::string>>
fieldCompNames["ST"].push_back( "SM" );
fieldCompNames["ST"].push_back( "Q" );
fieldCompNames["ST"].push_back( "DPN" );
for ( auto& s : stressComponentNames )
{
@@ -668,8 +669,6 @@ std::map<std::string, std::vector<std::string>>
fieldCompNames["MUD-WEIGHT"].push_back( "MWM" );
fieldCompNames["MUD-WEIGHT"].push_back( "UMWL" );
fieldCompNames["MUD-WEIGHT"].push_back( "LMWL" );
fieldCompNames["DPN"];
}
else if ( resPos == RIG_INTEGRATION_POINT )
{
@@ -704,6 +703,7 @@ std::map<std::string, std::vector<std::string>>
fieldCompNames["ST"].push_back( "SM" );
fieldCompNames["ST"].push_back( "Q" );
fieldCompNames["ST"].push_back( "DPN" );
fieldCompNames["ST"].push_back( "S11" );
fieldCompNames["ST"].push_back( "S22" );
@@ -758,8 +758,6 @@ std::map<std::string, std::vector<std::string>>
fieldCompNames["MUD-WEIGHT"].push_back( "MWM" );
fieldCompNames["MUD-WEIGHT"].push_back( "UMWL" );
fieldCompNames["MUD-WEIGHT"].push_back( "LMWL" );
fieldCompNames["DPN"];
}
else if ( resPos == RIG_ELEMENT_NODAL_FACE )
{
@@ -1763,6 +1761,6 @@ void RigFemPartResultsCollection::setWaterDensityShearSlipIndicator( double wate
for ( auto elementType : {RIG_ELEMENT_NODAL, RIG_INTEGRATION_POINT} )
{
deleteResult( RigFemResultAddress( elementType, "DPN", "", RigFemResultAddress::allTimeLapsesValue() ) );
deleteResult( RigFemResultAddress( elementType, "ST", "DPN", RigFemResultAddress::allTimeLapsesValue() ) );
}
}