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

#6170 Shorten POROSITY-PERMEABILITY to PORO-PERM in result view.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-07-06 09:46:28 +02:00
parent 7d7840bb5f
commit 71f494d92c
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ RigFemPartResultCalculatorPorosityPermeability::~RigFemPartResultCalculatorPoros
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RigFemPartResultCalculatorPorosityPermeability::isMatching( const RigFemResultAddress& resVarAddr ) const bool RigFemPartResultCalculatorPorosityPermeability::isMatching( const RigFemResultAddress& resVarAddr ) const
{ {
return ( resVarAddr.fieldName == "POROSITY-PERMEABILITY" && return ( resVarAddr.fieldName == "PORO-PERM" &&
( resVarAddr.componentName == "PHI" || resVarAddr.componentName == "DPHI" || ( resVarAddr.componentName == "PHI" || resVarAddr.componentName == "DPHI" ||
resVarAddr.componentName == "PERM" ) ); resVarAddr.componentName == "PERM" ) );
} }

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

@ -693,9 +693,9 @@ std::map<std::string, std::vector<std::string>>
fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL" ); fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL" );
fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL-RATIO" ); fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL-RATIO" );
fieldCompNames["POROSITY-PERMEABILITY"].push_back( "PHI" ); fieldCompNames["PORO-PERM"].push_back( "PHI" );
fieldCompNames["POROSITY-PERMEABILITY"].push_back( "DPHI" ); fieldCompNames["PORO-PERM"].push_back( "DPHI" );
fieldCompNames["POROSITY-PERMEABILITY"].push_back( "PERM" ); fieldCompNames["PORO-PERM"].push_back( "PERM" );
} }
else if ( resPos == RIG_INTEGRATION_POINT ) else if ( resPos == RIG_INTEGRATION_POINT )
{ {
@ -776,9 +776,9 @@ std::map<std::string, std::vector<std::string>>
fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL" ); fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL" );
fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL-RATIO" ); fieldCompNames["COMPRESSIBILITY"].push_back( "VERTICAL-RATIO" );
fieldCompNames["POROSITY-PERMEABILITY"].push_back( "PHI" ); fieldCompNames["PORO-PERM"].push_back( "PHI" );
fieldCompNames["POROSITY-PERMEABILITY"].push_back( "DPHI" ); fieldCompNames["PORO-PERM"].push_back( "DPHI" );
fieldCompNames["POROSITY-PERMEABILITY"].push_back( "PERM" ); fieldCompNames["PORO-PERM"].push_back( "PERM" );
} }
else if ( resPos == RIG_ELEMENT_NODAL_FACE ) else if ( resPos == RIG_ELEMENT_NODAL_FACE )
{ {
@ -1306,12 +1306,9 @@ std::set<RigFemResultAddress> RigFemPartResultsCollection::referenceCaseDependen
"COMPRESSIBILITY", "COMPRESSIBILITY",
"VERTICAL-RATIO", "VERTICAL-RATIO",
RigFemResultAddress::allTimeLapsesValue() ) ); RigFemResultAddress::allTimeLapsesValue() ) );
results.insert( results.insert( RigFemResultAddress( elementType, "PORO-PERM", "PHI", RigFemResultAddress::allTimeLapsesValue() ) );
RigFemResultAddress( elementType, "POROSITY-PERMEABILITY", "PHI", RigFemResultAddress::allTimeLapsesValue() ) ); results.insert( RigFemResultAddress( elementType, "PORO-PERM", "DPHI", RigFemResultAddress::allTimeLapsesValue() ) );
results.insert( results.insert( RigFemResultAddress( elementType, "PORO-PERM", "PERM", RigFemResultAddress::allTimeLapsesValue() ) );
RigFemResultAddress( elementType, "POROSITY-PERMEABILITY", "DPHI", RigFemResultAddress::allTimeLapsesValue() ) );
results.insert(
RigFemResultAddress( elementType, "POROSITY-PERMEABILITY", "PERM", RigFemResultAddress::allTimeLapsesValue() ) );
} }
return results; return results;
@ -1325,12 +1322,9 @@ std::set<RigFemResultAddress> RigFemPartResultsCollection::initialPermeabilityDe
std::set<RigFemResultAddress> results; std::set<RigFemResultAddress> results;
for ( auto elementType : {RIG_ELEMENT_NODAL, RIG_INTEGRATION_POINT} ) for ( auto elementType : {RIG_ELEMENT_NODAL, RIG_INTEGRATION_POINT} )
{ {
results.insert( results.insert( RigFemResultAddress( elementType, "PORO-PERM", "PHI", RigFemResultAddress::allTimeLapsesValue() ) );
RigFemResultAddress( elementType, "POROSITY-PERMEABILITY", "PHI", RigFemResultAddress::allTimeLapsesValue() ) ); results.insert( RigFemResultAddress( elementType, "PORO-PERM", "DPHI", RigFemResultAddress::allTimeLapsesValue() ) );
results.insert( results.insert( RigFemResultAddress( elementType, "PORO-PERM", "PERM", RigFemResultAddress::allTimeLapsesValue() ) );
RigFemResultAddress( elementType, "POROSITY-PERMEABILITY", "DPHI", RigFemResultAddress::allTimeLapsesValue() ) );
results.insert(
RigFemResultAddress( elementType, "POROSITY-PERMEABILITY", "PERM", RigFemResultAddress::allTimeLapsesValue() ) );
} }
return results; return results;
} }

2
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@ -828,7 +828,7 @@ QString RimGeoMechResultDefinition::currentResultUnits() const
{ {
return "1/GPa"; return "1/GPa";
} }
else if ( this->resultFieldName() == "POROSITY-PERMEABILITY" && this->resultComponentName() == "PERM" ) else if ( this->resultFieldName() == "PORO-PERM" && this->resultComponentName() == "PERM" )
{ {
return "mD"; return "mD";
} }