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

(#538) Added DepthUnitType enum containing meter and feet

Browse Source
This commit is contained in:
Magne Sjaastad
2015-12-02 12:19:35 +01:00
parent 76a90b04c8
commit fe261560bd
8 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@@ -199,6 +199,8 @@ void RimWellLogExtractionCurve::updatePlotData()
std::vector<double> measuredDepthValues;
std::vector<double> tvDepthValues;
RimDefines::DepthUnitType depthUnit = RimDefines::UNIT_METER;
if (eclExtractor.notNull())
{
RimWellLogPlot* wellLogPlot;
@@ -224,6 +226,14 @@ void RimWellLogExtractionCurve::updatePlotData()
{
eclExtractor->curveData(resAcc.p(), &values);
}
RigCaseData::UnitsType eclipseUnitsType = eclipseCase->reservoirData()->unitsType();
if (eclipseUnitsType == RigCaseData::UNITS_FIELD)
{
// See https://github.com/OPM/ResInsight/issues/538
depthUnit = RimDefines::UNIT_FEET;
}
}
else if (geomExtractor.notNull()) // geomExtractor
{
@@ -247,11 +257,11 @@ void RimWellLogExtractionCurve::updatePlotData()
{
if (!tvDepthValues.size())
{
m_curveData->setValuesAndMD(values, measuredDepthValues, true);
m_curveData->setValuesAndMD(values, measuredDepthValues, depthUnit, true);
}
else
{
m_curveData->setValuesWithTVD(values, measuredDepthValues, tvDepthValues);
m_curveData->setValuesWithTVD(values, measuredDepthValues, tvDepthValues, depthUnit);
}
}