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

#6032 Rename stress anisotropy results.

Browse Source 
STA12/STA13/STA23 -> SA12/SA13/SA23
SEA12/STA13/STA23 -> SA12/SA13/SA23
This commit is contained in:
Kristian Bendiksen 2020-06-05 10:31:29 +02:00
parent 0b908370f3
commit 8ddec683b0
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressAnisotropy.cpp
View File

@ -48,11 +48,9 @@ RigFemPartResultCalculatorStressAnisotropy::~RigFemPartResultCalculatorStressAni
//--------------------------------------------------------------------------------------------------
bool RigFemPartResultCalculatorStressAnisotropy::isMatching( const RigFemResultAddress& resVarAddr ) const
{
return (
( ( resVarAddr.fieldName == "ST" ) && ( resVarAddr.componentName == "STA12" || resVarAddr.componentName == "STA13" ||
resVarAddr.componentName == "STA23" ) ) ||
( ( resVarAddr.fieldName == "SE" ) && ( resVarAddr.componentName == "SEA12" || resVarAddr.componentName == "SEA13" ||
resVarAddr.componentName == "SEA23" ) ) );
return ( ( ( resVarAddr.fieldName == "ST" || resVarAddr.fieldName == "SE" ) &&
( resVarAddr.componentName == "SA12" || resVarAddr.componentName == "SA13" ||
resVarAddr.componentName == "SA23" ) ) );
}
//--------------------------------------------------------------------------------------------------
@ -90,19 +88,13 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorStressAnisotropy::calculate(
RigFemScalarResultFrames* s12Frames =
m_resultCollection->createScalarResult( partIndex,
RigFemResultAddress( resVarAddr.resultPosType,
resVarAddr.fieldName,
resVarAddr.fieldName + "A12" ) );
RigFemResultAddress( resVarAddr.resultPosType, resVarAddr.fieldName, "SA12" ) );
RigFemScalarResultFrames* s13Frames =
m_resultCollection->createScalarResult( partIndex,
RigFemResultAddress( resVarAddr.resultPosType,
resVarAddr.fieldName,
resVarAddr.fieldName + "A13" ) );
RigFemResultAddress( resVarAddr.resultPosType, resVarAddr.fieldName, "SA13" ) );
RigFemScalarResultFrames* s23Frames =
m_resultCollection->createScalarResult( partIndex,
RigFemResultAddress( resVarAddr.resultPosType,
resVarAddr.fieldName,
resVarAddr.fieldName + "A23" ) );
RigFemResultAddress( resVarAddr.resultPosType, resVarAddr.fieldName, "SA23" ) );
frameCountProgress.incrementProgress();
frameCountProgress.setNextProgressIncrement( 1u );

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

@ -564,7 +564,7 @@ std::map<std::string, std::vector<std::string>>
for ( auto& s : stressAnisotropyComponentNames )
{
fieldCompNames["SE"].push_back( "SE" + s );
fieldCompNames["SE"].push_back( s );
}
fieldCompNames["SE"].push_back( "S1inc" );
@ -584,7 +584,7 @@ std::map<std::string, std::vector<std::string>>
for ( auto& s : stressAnisotropyComponentNames )
{
fieldCompNames["ST"].push_back( "ST" + s );
fieldCompNames["ST"].push_back( s );
}
fieldCompNames["ST"].push_back( "S1inc" );
@ -638,7 +638,7 @@ std::map<std::string, std::vector<std::string>>
for ( auto& s : stressAnisotropyComponentNames )
{
fieldCompNames["SE"].push_back( "SE" + s );
fieldCompNames["SE"].push_back( s );
}
fieldCompNames["SE"].push_back( "S1inc" );
@ -663,7 +663,7 @@ std::map<std::string, std::vector<std::string>>
for ( auto& s : stressAnisotropyComponentNames )
{
fieldCompNames["ST"].push_back( "ST" + s );
fieldCompNames["ST"].push_back( s );
}
fieldCompNames["ST"].push_back( "S1inc" );
@ -1411,7 +1411,7 @@ std::vector<std::string> RigFemPartResultsCollection::getStressComponentNames( b
//--------------------------------------------------------------------------------------------------
std::vector<std::string> RigFemPartResultsCollection::getStressAnisotropyComponentNames()
{
return {"A12", "A13", "A23"};
return {"SA12", "SA13", "SA23"};
}
//--------------------------------------------------------------------------------------------------