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

#3089 Move text parsing for unit conversion

Browse Source
This commit is contained in:
Magne Sjaastad
2018-08-14 08:01:50 +02:00
parent 45f0f6b485
commit 4c75e2514d
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp
View File

@@ -311,27 +311,17 @@ std::vector<std::vector<double>>
// The conductivity value is used in the computations of transmissibility when exporting COMPDAT, and has unit md-m or md-ft
// This unit must match the unit used to represent coordinates of the grid used for export
QString conversionUnitText;
if (conductivityUnitTextOnFile == "md-m")
{
conversionUnitText = "m";
}
else if (conductivityUnitTextOnFile == "md-ft")
{
conversionUnitText = "ft";
}
for (auto& yValues : conductivityValues)
{
for (auto& xVal : yValues)
{
if (requiredUnitSet == RiaEclipseUnitTools::UNITS_FIELD)
{
xVal = RiaEclipseUnitTools::convertToFeet(xVal, conversionUnitText);
xVal = RiaEclipseUnitTools::convertToFeet(xVal, conductivityUnitTextOnFile);
}
else if (requiredUnitSet == RiaEclipseUnitTools::UNITS_METRIC)
{
xVal = RiaEclipseUnitTools::convertToMeter(xVal, conversionUnitText);
xVal = RiaEclipseUnitTools::convertToMeter(xVal, conductivityUnitTextOnFile);
}
}
}