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

Thermal Fracture: Remove some unnecessary complications with the result names.

Browse Source
This commit is contained in:
Kristian Bendiksen
2022-09-12 14:47:20 +02:00
parent 619807b81f
commit 453fe2dcd6
1 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp
View File

@@ -112,7 +112,7 @@ bool RimThermalFractureTemplate::setBorderPolygonResultNameToDefault()
// first option: Width // first option: Width
for ( std::pair<QString, QString> property : uiResultNamesWithUnit() ) for ( std::pair<QString, QString> property : uiResultNamesWithUnit() )
{ {
if ( property.first == "WIDTH" ) if ( property.first.contains( "width", Qt::CaseInsensitive ) )
{ {
m_borderPolygonResultName = property.first; m_borderPolygonResultName = property.first;
return true; return true;
@@ -505,30 +505,7 @@ std::vector<std::pair<QString, QString>> RimThermalFractureTemplate::uiResultNam
if ( m_fractureDefinitionData ) if ( m_fractureDefinitionData )
{ {
QString conductivityUnit = "mD/s"; return m_fractureDefinitionData->getPropertyNamesUnits();
std::vector<std::pair<QString, QString>> tmp;
std::vector<std::pair<QString, QString>> propertyNamesUnitsOnFile =
m_fractureDefinitionData->getPropertyNamesUnits();
for ( const auto& nameUnitPair : propertyNamesUnitsOnFile )
{
if ( nameUnitPair.first.contains( RiaDefines::conductivityResultName(), Qt::CaseInsensitive ) )
{
conductivityUnit = nameUnitPair.second;
}
else
{
tmp.push_back( nameUnitPair );
}
}
propertyNamesAndUnits.push_back( std::make_pair( RiaDefines::conductivityResultName(), conductivityUnit ) );
for ( const auto& nameUnitPair : tmp )
{
propertyNamesAndUnits.push_back( nameUnitPair );
}
} }
return propertyNamesAndUnits; return propertyNamesAndUnits;