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 PORE-COMPRESSIBILITY to COMPRESSIBILITY

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-06-05 10:16:03 +02:00
parent e9e32bfc3a
commit 0b908370f3
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp
View File

@ -50,7 +50,7 @@ RigFemPartResultCalculatorPoreCompressibility::~RigFemPartResultCalculatorPoreCo
//--------------------------------------------------------------------------------------------------
bool RigFemPartResultCalculatorPoreCompressibility::isMatching( const RigFemResultAddress& resVarAddr ) const
{
return ( resVarAddr.fieldName == "PORE-COMPRESSIBILITY" &&
return ( resVarAddr.fieldName == "COMPRESSIBILITY" &&
( resVarAddr.componentName == "PORE" || resVarAddr.componentName == "VERTICAL" ||
resVarAddr.componentName == "VERTICAL-RATIO" ) );
}

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

@ -355,13 +355,11 @@ void RigFemPartResultsCollection::setBiotCoefficientParameters( double biotFixed
}
deleteResult(
RigFemResultAddress( elementType, "PORE-COMPRESSIBILITY", "PORE", RigFemResultAddress::allTimeLapsesValue() ) );
RigFemResultAddress( elementType, "COMPRESSIBILITY", "PORE", RigFemResultAddress::allTimeLapsesValue() ) );
deleteResult(
RigFemResultAddress( elementType, "COMPRESSIBILITY", "VERTICAL", RigFemResultAddress::allTimeLapsesValue() ) );
deleteResult( RigFemResultAddress( elementType,
"PORE-COMPRESSIBILITY",
"VERTICAL",
RigFemResultAddress::allTimeLapsesValue() ) );
deleteResult( RigFemResultAddress( elementType,
"PORE-COMPRESSIBILITY",
"COMPRESSIBILITY",
"VERTICAL-RATIO",
RigFemResultAddress::allTimeLapsesValue() ) );
@ -615,9 +613,9 @@ std::map<std::string, std::vector<std::string>>
fieldCompNames["NE"].push_back( "E2" );
fieldCompNames["NE"].push_back( "E3" );
fieldCompNames["PORE-COMPRESSIBILITY"].push_back( "PORE" );
fieldCompNames["PORE-COMPRESSIBILITY"].push_back( "VERTICAL" );
fieldCompNames["PORE-COMPRESSIBILITY"].push_back( "VERTICAL-RATIO" );
fieldCompNames["COMPRESSIBILITY"].push_back( "PORE" );
fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL" );
fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL-RATIO" );
}
else if ( resPos == RIG_INTEGRATION_POINT )
{
@ -694,9 +692,9 @@ std::map<std::string, std::vector<std::string>>
fieldCompNames["NE"].push_back( "E2" );
fieldCompNames["NE"].push_back( "E3" );
fieldCompNames["PORE-COMPRESSIBILITY"].push_back( "PORE" );
fieldCompNames["PORE-COMPRESSIBILITY"].push_back( "VERTICAL" );
fieldCompNames["PORE-COMPRESSIBILITY"].push_back( "VERTICAL-RATIO" );
fieldCompNames["COMPRESSIBILITY"].push_back( "PORE" );
fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL" );
fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL-RATIO" );
}
else if ( resPos == RIG_ELEMENT_NODAL_FACE )
{