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: detect when conductivity is already in correct unit.

Browse Source
This commit is contained in:
Kristian Bendiksen
2022-09-19 12:55:00 +02:00
parent 244ba773ec
commit a84801715d
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/FileInterface/RifThermalFractureReader.cpp
View File

@@ -49,7 +49,8 @@ std::pair<std::shared_ptr<RigThermalFractureDefinition>, QString>
QString separator = ",";
auto appendPropertyValues = [definition]( int nodeIndex, int valueOffset, const QStringList& values ) {
auto appendPropertyValues =
[definition]( int nodeIndex, int valueOffset, const QStringList& values, double conductivityFactor ) {
CAF_ASSERT( valueOffset <= values.size() );
for ( int i = valueOffset; i < values.size(); i++ )
{
@@ -62,7 +63,7 @@ std::pair<std::shared_ptr<RigThermalFractureDefinition>, QString>
// Convert conductivity from Darcy to milliDarcy
if ( definition->getPropertyIndex( "Conductivity" ) == propertyIndex )
{
value *= 1.0e3;
value *= conductivityFactor;
}
definition->appendPropertyValue( propertyIndex, nodeIndex, value );
@@ -78,6 +79,7 @@ std::pair<std::shared_ptr<RigThermalFractureDefinition>, QString>
int nodeIndex = 0;
bool isFirstHeader = true;
bool isValidNode = false;
double conductivityFactor = 1.0;
while ( !in.atEnd() )
{
QString line = in.readLine();
@@ -100,6 +102,13 @@ std::pair<std::shared_ptr<RigThermalFractureDefinition>, QString>
// Special handling for Conductivity: change unit from Darcy to Milli
if ( name.contains( RiaDefines::conductivityResultName(), Qt::CaseInsensitive ) )
{
// Check if the conductivity unit needs conversion to milliDarcy
if ( !unit.contains( "mD" ) )
{
conductivityFactor = 1.0e3;
}
// Use the preferred internal unit for conductivity
unit = RiaDefines::unitStringConductivity( detectUnitSystem( definition ) );
}
@@ -140,13 +149,13 @@ std::pair<std::shared_ptr<RigThermalFractureDefinition>, QString>
definition->addTimeStep( dateTime.toSecsSinceEpoch() );
//
appendPropertyValues( nodeIndex, valueOffset, values );
appendPropertyValues( nodeIndex, valueOffset, values, conductivityFactor );
isValidNode = true;
}
else if ( isInternalNodeLine( line ) || isPerimeterNodeLine( line ) )
{
auto values = RifFileParseTools::splitLineAndTrim( line, separator );
appendPropertyValues( nodeIndex, valueOffset, values );
appendPropertyValues( nodeIndex, valueOffset, values, conductivityFactor );
isValidNode = true;
}
else