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

#1596 Merge dev into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-06-14 07:25:34 +02:00
parent d7ce607000 5a6c3638ee
commit a8b8e061d7
139 changed files with 1154 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -421,13 +421,13 @@ void RimWellPathCollection::sortWellsByName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimUnitSystem::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath(const RimWellPath* wellPath)
RiaEclipseUnitTools::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath(const RimWellPath* wellPath)
{
RimProject* project;
firstAncestorOrThisOfTypeAsserted(project);
if (project->activeOilField()->analysisModels->cases.empty())
{
return RimUnitSystem::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UNITS_UNKNOWN;
}
const RigEclipseCaseData* eclipseCaseData = project->activeOilField()->analysisModels->cases()[0]->eclipseCaseData();
@@ -442,12 +442,12 @@ RimUnitSystem::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath(c
{
if (eclipseCaseData->unitsType() == RigEclipseCaseData::UNITS_FIELD)
{
return RimUnitSystem::UNITS_FIELD;
return RiaEclipseUnitTools::UNITS_FIELD;
}
else if (eclipseCaseData->unitsType() == RigEclipseCaseData::UNITS_METRIC)
{
return RimUnitSystem::UNITS_METRIC;
return RiaEclipseUnitTools::UNITS_METRIC;
}
}
return RimUnitSystem::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UNITS_UNKNOWN;
}