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

Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. (#7225)

Browse Source 
* Moved UnitSystem from RiaEclipseUnitTools to RiaDefines.
- Renamed UnitSystem to EclipseUnitSystem
- Replaced header includes and removed obsolete includes of RiaEclipseUnitTools.h
* Moved  result name functions into separate file.
* Minor cleanup

Co-authored-by: rubenthoms <rubenthoms@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
This commit is contained in:
rubenthoms
2021-01-21 12:58:46 +01:00
committed by GitHub
parent c4c6eb75f2
commit bc81437435
176 changed files with 1470 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp
View File

@@ -139,7 +139,7 @@ std::vector<double> RimWellPathValve::valveLocations() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimWellPathValve::orificeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const
double RimWellPathValve::orificeDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const
{
if ( m_valveTemplate() )
{
@@ -230,13 +230,13 @@ const RimWellPathAicdParameters* RimWellPathValve::aicdParameters() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimWellPathValve::convertOrificeDiameter( double orificeDiameterWellPathUnits,
RiaEclipseUnitTools::UnitSystem wellPathUnits,
RiaEclipseUnitTools::UnitSystem unitSystem )
double RimWellPathValve::convertOrificeDiameter( double orificeDiameterWellPathUnits,
RiaDefines::EclipseUnitSystem wellPathUnits,
RiaDefines::EclipseUnitSystem unitSystem )
{
if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC )
{
if ( wellPathUnits == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
if ( wellPathUnits == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::inchToMeter( orificeDiameterWellPathUnits );
}
@@ -245,9 +245,9 @@ double RimWellPathValve::convertOrificeDiameter( double
return RiaEclipseUnitTools::mmToMeter( orificeDiameterWellPathUnits );
}
}
else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
else if ( unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
{
if ( wellPathUnits == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
if ( wellPathUnits == RiaDefines::EclipseUnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::meterToFeet( RiaEclipseUnitTools::mmToMeter( orificeDiameterWellPathUnits ) );
}
@@ -518,11 +518,11 @@ void RimWellPathValve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC )
{
m_measuredDepth.uiCapability()->setUiName( "Measured Depth [m]" );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
{
m_measuredDepth.uiCapability()->setUiName( "Measured Depth [ft]" );
}