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

Convert to enum class

Browse Source
This commit is contained in:
Magne Sjaastad
2020-04-24 08:10:48 +02:00
parent e85c36b4a4
commit 95fc63fe7c
76 changed files with 363 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
View File

@@ -141,13 +141,13 @@ std::vector<cvf::Vec3f> RimEllipseFractureTemplate::fractureBorderPolygon() cons
//--------------------------------------------------------------------------------------------------
void RimEllipseFractureTemplate::changeUnits()
{
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_METRIC )
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
convertToUnitSystem( RiaEclipseUnitTools::UNITS_FIELD );
convertToUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD );
}
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
convertToUnitSystem( RiaEclipseUnitTools::UNITS_METRIC );
convertToUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC );
}
this->updateConnectedEditors();
@@ -284,7 +284,7 @@ const RigFractureGrid* RimEllipseFractureTemplate::fractureGrid() const
//--------------------------------------------------------------------------------------------------
void RimEllipseFractureTemplate::setDefaultValuesFromUnit()
{
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD )
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_width = 0.5;
m_permeability = 80000.0;
@@ -308,12 +308,12 @@ void RimEllipseFractureTemplate::setDefaultValuesFromUnit()
double RimEllipseFractureTemplate::conductivity() const
{
double cond = cvf::UNDEFINED_DOUBLE;
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_METRIC )
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
// Conductivity should be md-m, width is in m
cond = m_permeability * m_width;
}
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
// Conductivity should be md-ft, but width is in inches
cond = m_permeability * RiaEclipseUnitTools::inchToFeet( m_width );
@@ -403,13 +403,13 @@ void RimEllipseFractureTemplate::convertToUnitSystem( RiaEclipseUnitTools::UnitS
setUnitSystem( neededUnit );
RimFractureTemplate::convertToUnitSystem( neededUnit );
if ( neededUnit == RiaEclipseUnitTools::UNITS_FIELD )
if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_halfLength = RiaEclipseUnitTools::meterToFeet( m_halfLength );
m_height = RiaEclipseUnitTools::meterToFeet( m_height );
m_width = RiaEclipseUnitTools::meterToInch( m_width );
}
else if ( neededUnit == RiaEclipseUnitTools::UNITS_METRIC )
else if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_halfLength = RiaEclipseUnitTools::feetToMeter( m_halfLength );
m_height = RiaEclipseUnitTools::feetToMeter( m_height );
@@ -422,13 +422,13 @@ void RimEllipseFractureTemplate::convertToUnitSystem( RiaEclipseUnitTools::UnitS
//--------------------------------------------------------------------------------------------------
void RimEllipseFractureTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_METRIC )
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_halfLength.uiCapability()->setUiName( "Halflenght X<sub>f</sub> [m]" );
m_height.uiCapability()->setUiName( "Height [m]" );
m_width.uiCapability()->setUiName( "Width [m]" );
}
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_halfLength.uiCapability()->setUiName( "Halflenght X<sub>f</sub> [ft]" );
m_height.uiCapability()->setUiName( "Height [ft]" );

12
ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
View File

@@ -116,12 +116,12 @@ void RimFishbonesCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiO
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_startMD.uiCapability()->setUiName( "Start MD [m]" );
m_mainBoreDiameter.uiCapability()->setUiName( "Main Bore Diameter [m]" );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_startMD.uiCapability()->setUiName( "Start MD [ft]" );
m_mainBoreDiameter.uiCapability()->setUiName( "Main Bore Diameter [ft]" );
@@ -287,11 +287,13 @@ double RimFishbonesCollection::mainBoreDiameter( RiaEclipseUnitTools::UnitSystem
{
RimWellPath* wellPath;
firstAncestorOrThisOfTypeAsserted( wellPath );
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD && unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::feetToMeter( m_mainBoreDiameter() );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC && unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC &&
unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( m_mainBoreDiameter() );
}
@@ -307,7 +309,7 @@ void RimFishbonesCollection::setUnitSystemSpecificDefaults()
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_mainBoreDiameter = 0.216;
}

22
ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp
View File

@@ -245,9 +245,9 @@ double RimFishbonesMultipleSubs::tubingDiameter( RiaEclipseUnitTools::UnitSystem
{
RimWellPath* wellPath;
firstAncestorOrThisOfTypeAsserted( wellPath );
if ( unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::inchToMeter( m_lateralTubingDiameter() );
}
@@ -256,9 +256,9 @@ double RimFishbonesMultipleSubs::tubingDiameter( RiaEclipseUnitTools::UnitSystem
return m_lateralTubingDiameter() / 1000;
}
}
else if ( unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::meterToFeet( m_lateralTubingDiameter() / 1000 );
}
@@ -295,11 +295,13 @@ double RimFishbonesMultipleSubs::openHoleRoughnessFactor( RiaEclipseUnitTools::U
{
RimWellPath* wellPath;
firstAncestorOrThisOfTypeAsserted( wellPath );
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD && unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::feetToMeter( m_lateralOpenHoleRoghnessFactor() );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC && unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC &&
unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( m_lateralOpenHoleRoghnessFactor() );
}
@@ -420,7 +422,7 @@ void RimFishbonesMultipleSubs::setUnitSystemSpecificDefaults()
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_lateralLength = "11";
m_lateralBuildAngle = 6.0;
@@ -429,7 +431,7 @@ void RimFishbonesMultipleSubs::setUnitSystemSpecificDefaults()
m_lateralTubingRoghnessFactor = 1e-05;
m_icdOrificeDiameter = 7;
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_lateralLength = "36";
m_lateralBuildAngle = 1.83;
@@ -557,7 +559,7 @@ void RimFishbonesMultipleSubs::defineUiOrdering( QString uiConfigName, caf::PdmU
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_lateralLength.uiCapability()->setUiName( "Length(s) [m]" );
m_lateralBuildAngle.uiCapability()->setUiName( "Build Angle [deg/m]" );
@@ -567,7 +569,7 @@ void RimFishbonesMultipleSubs::defineUiOrdering( QString uiConfigName, caf::PdmU
m_icdOrificeDiameter.uiCapability()->setUiName( "ICD Orifice Diameter [mm]" );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_lateralLength.uiCapability()->setUiName( "Length(s) [ft]" );
m_lateralBuildAngle.uiCapability()->setUiName( "Build Angle [deg/ft]" );

16
ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp
View File

@@ -49,9 +49,9 @@ double RimFishbonesPipeProperties::holeDiameter( RiaEclipseUnitTools::UnitSystem
{
RimWellPath* wellPath;
firstAncestorOrThisOfTypeAsserted( wellPath );
if ( unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::inchToMeter( m_lateralHoleDiameter() );
}
@@ -60,9 +60,9 @@ double RimFishbonesPipeProperties::holeDiameter( RiaEclipseUnitTools::UnitSystem
return m_lateralHoleDiameter() / 1000;
}
}
else if ( unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::meterToFeet( m_lateralHoleDiameter() / 1000 );
}
@@ -84,11 +84,11 @@ void RimFishbonesPipeProperties::setUnitSystemSpecificDefaults()
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_lateralHoleDiameter = 12.5;
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_lateralHoleDiameter = 0.5;
}
@@ -105,11 +105,11 @@ void RimFishbonesPipeProperties::defineUiOrdering( QString uiConfigName, caf::Pd
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_lateralHoleDiameter.uiCapability()->setUiName( "Hole Diameter [mm]" );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_lateralHoleDiameter.uiCapability()->setUiName( "Hole Diameter [in]" );
}

10
ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@@ -133,7 +133,7 @@ RimFracture::RimFracture()
CAF_PDM_InitField(&m_dip, "Dip", 0.0, "Dip", "", "", "");
CAF_PDM_InitField(&m_tilt, "Tilt", 0.0, "Tilt", "", "", "");
CAF_PDM_InitField(&m_fractureUnit, "FractureUnit", caf::AppEnum<RiaEclipseUnitTools::UnitSystem>(RiaEclipseUnitTools::UNITS_METRIC), "Fracture Unit System", "", "", "");
CAF_PDM_InitField(&m_fractureUnit, "FractureUnit", caf::AppEnum<RiaEclipseUnitTools::UnitSystem>(RiaEclipseUnitTools::UnitSystem::UNITS_METRIC), "Fracture Unit System", "", "", "");
m_fractureUnit.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitField(&m_stimPlanTimeIndexToPlot, "TimeIndexToPlot", 0, "StimPlan Time Step", "", "", "");
@@ -427,11 +427,11 @@ cvf::BoundingBox RimFracture::boundingBoxInDomainCoords() const
//--------------------------------------------------------------------------------------------------
double RimFracture::wellRadius() const
{
if ( m_fractureUnit == RiaEclipseUnitTools::UNITS_METRIC )
if ( m_fractureUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return m_wellDiameter / 2.0;
}
else if ( m_fractureUnit == RiaEclipseUnitTools::UNITS_FIELD )
else if ( m_fractureUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::inchToFeet( m_wellDiameter / 2.0 );
}
@@ -603,12 +603,12 @@ QList<caf::PdmOptionItemInfo> RimFracture::calculateValueOptions( const caf::Pdm
//--------------------------------------------------------------------------------------------------
void RimFracture::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
if ( m_fractureUnit() == RiaEclipseUnitTools::UNITS_METRIC )
if ( m_fractureUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_wellDiameter.uiCapability()->setUiName( "Well Diameter [m]" );
m_perforationLength.uiCapability()->setUiName( "Perforation Length [m]" );
}
else if ( m_fractureUnit() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( m_fractureUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_wellDiameter.uiCapability()->setUiName( "Well Diameter [inches]" );
m_perforationLength.uiCapability()->setUiName( "Perforation Length [ft]" );

18
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
View File

@@ -120,7 +120,7 @@ RimFractureTemplate::RimFractureTemplate()
m_nameAndUnit.uiCapability()->setUiHidden(true);
m_nameAndUnit.xmlCapability()->disableIO();
CAF_PDM_InitField(&m_fractureTemplateUnit, "UnitSystem", caf::AppEnum<RiaEclipseUnitTools::UnitSystem>(RiaEclipseUnitTools::UNITS_UNKNOWN), "Units System", "", "", "");
CAF_PDM_InitField(&m_fractureTemplateUnit, "UnitSystem", caf::AppEnum<RiaEclipseUnitTools::UnitSystem>(RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN), "Units System", "", "", "");
m_fractureTemplateUnit.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitField(&m_orientationType, "Orientation", caf::AppEnum<FracOrientationEnum>(TRANSVERSE_WELL_PATH), "Fracture Orientation", "", "", "");
@@ -433,13 +433,13 @@ void RimFractureTemplate::defineEditorAttribute( const caf::PdmFieldHandle* fiel
//--------------------------------------------------------------------------------------------------
void RimFractureTemplate::prepareFieldsForUiDisplay()
{
if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC )
if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_wellDiameter.uiCapability()->setUiName( "Well Diameter [m]" );
m_perforationLength.uiCapability()->setUiName( "Perforation Length [m]" );
m_fractureWidth.uiCapability()->setUiName( "Fracture Width [m]" );
}
else if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD )
else if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_wellDiameter.uiCapability()->setUiName( "Well Diameter [inches]" );
m_perforationLength.uiCapability()->setUiName( "Perforation Length [ft]" );
@@ -712,13 +712,13 @@ double RimFractureTemplate::computeKh( const RimFracture* fractureInstance ) con
//--------------------------------------------------------------------------------------------------
void RimFractureTemplate::convertToUnitSystem( RiaEclipseUnitTools::UnitSystem neededUnit )
{
if ( neededUnit == RiaEclipseUnitTools::UNITS_METRIC )
if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_perforationLength = RiaEclipseUnitTools::feetToMeter( m_perforationLength );
m_wellDiameter = RiaEclipseUnitTools::inchToMeter( m_wellDiameter );
m_fractureWidth = RiaEclipseUnitTools::feetToMeter( m_fractureWidth );
}
else if ( neededUnit == RiaEclipseUnitTools::UNITS_FIELD )
else if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_perforationLength = RiaEclipseUnitTools::meterToFeet( m_perforationLength );
m_wellDiameter = RiaEclipseUnitTools::meterToInch( m_wellDiameter );
@@ -870,11 +870,11 @@ QString RimFractureTemplate::nameAndUnit() const
{
QString decoratedName;
if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC )
if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
decoratedName += "[M] - ";
}
else if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD )
else if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
decoratedName += "[F] - ";
}
@@ -937,11 +937,11 @@ float RimFractureTemplate::skinFactor() const
//--------------------------------------------------------------------------------------------------
void RimFractureTemplate::setDefaultWellDiameterFromUnit()
{
if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD )
if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_wellDiameter = 8.5;
}
else if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC )
else if ( m_fractureTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_wellDiameter = 0.216;
}

14
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
View File

@@ -55,7 +55,7 @@ RimFractureTemplateCollection::RimFractureTemplateCollection()
CAF_PDM_InitField( &m_defaultUnitsForFracTemplates,
"DefaultUnitForTemplates",
caf::AppEnum<RiaEclipseUnitTools::UnitSystem>( RiaEclipseUnitTools::UNITS_METRIC ),
caf::AppEnum<RiaEclipseUnitTools::UnitSystem>( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ),
"Default unit system for fracture templates",
"",
"",
@@ -142,7 +142,7 @@ void RimFractureTemplateCollection::setDefaultUnitSystemBasedOnLoadedCases()
RimProject* proj = RiaApplication::instance()->project();
auto commonUnitSystem = proj->commonUnitSystemForAllCases();
if ( commonUnitSystem != RiaEclipseUnitTools::UNITS_UNKNOWN )
if ( commonUnitSystem != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
{
m_defaultUnitsForFracTemplates = commonUnitSystem;
}
@@ -242,14 +242,14 @@ void RimFractureTemplateCollection::createAndAssignTemplateCopyForNonMatchingUni
caf::PdmDefaultObjectFactory::instance() ) );
auto currentUnit = fractureTemplate->fractureTemplateUnit();
auto neededUnit = RiaEclipseUnitTools::UNITS_UNKNOWN;
if ( currentUnit == RiaEclipseUnitTools::UNITS_METRIC )
auto neededUnit = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
if ( currentUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
neededUnit = RiaEclipseUnitTools::UNITS_FIELD;
neededUnit = RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
}
else if ( currentUnit == RiaEclipseUnitTools::UNITS_FIELD )
else if ( currentUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
neededUnit = RiaEclipseUnitTools::UNITS_METRIC;
neededUnit = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
}
templateWithMatchingUnit->convertToUnitSystem( neededUnit );

20
ApplicationCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp
View File

@@ -127,11 +127,13 @@ double RimMswCompletionParameters::linerDiameter( RiaEclipseUnitTools::UnitSyste
{
RimWellPath* wellPath;
firstAncestorOrThisOfTypeAsserted( wellPath );
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD && unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::feetToMeter( m_linerDiameter() );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC && unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC &&
unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( m_linerDiameter() );
}
@@ -143,7 +145,7 @@ double RimMswCompletionParameters::linerDiameter( RiaEclipseUnitTools::UnitSyste
//--------------------------------------------------------------------------------------------------
double RimMswCompletionParameters::defaultLinerDiameter( RiaEclipseUnitTools::UnitSystem unitSystem )
{
if ( unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return 0.152;
}
@@ -160,11 +162,13 @@ double RimMswCompletionParameters::roughnessFactor( RiaEclipseUnitTools::UnitSys
{
RimWellPath* wellPath;
firstAncestorOrThisOfTypeAsserted( wellPath );
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD && unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::feetToMeter( m_roughnessFactor() );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC && unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC &&
unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( m_roughnessFactor() );
}
@@ -176,7 +180,7 @@ double RimMswCompletionParameters::roughnessFactor( RiaEclipseUnitTools::UnitSys
//--------------------------------------------------------------------------------------------------
double RimMswCompletionParameters::defaultRoughnessFactor( RiaEclipseUnitTools::UnitSystem unitSystem )
{
if ( unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return 1.0e-5;
}
@@ -288,12 +292,12 @@ void RimMswCompletionParameters::defineUiOrdering( QString uiConfigName, caf::Pd
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_linerDiameter.uiCapability()->setUiName( "Liner Inner Diameter [m]" );
m_roughnessFactor.uiCapability()->setUiName( "Roughness Factor [m]" );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_linerDiameter.uiCapability()->setUiName( "Liner Inner Diameter [ft]" );
m_roughnessFactor.uiCapability()->setUiName( "Roughness Factor [ft]" );

6
ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp
View File

@@ -230,14 +230,14 @@ void RimMultipleValveLocations::defineUiOrdering( QString uiConfigName, caf::Pdm
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_locationOfValves.uiCapability()->setUiName( "Measured Depths [m]" );
m_rangeStart.uiCapability()->setUiName( "Start MD [m]" );
m_rangeEnd.uiCapability()->setUiName( "End MD [m]" );
m_rangeValveSpacing.uiCapability()->setUiName( "Spacing [m]" );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_locationOfValves.uiCapability()->setUiName( "Measured Depths [ft]" );
m_rangeStart.uiCapability()->setUiName( "Start MD [ft]" );
@@ -331,7 +331,7 @@ void RimMultipleValveLocations::fieldChangedByUi( const caf::PdmFieldHandle* cha
RimWellPath* wellPath = nullptr;
this->firstAncestorOrThisOfTypeAsserted( wellPath );
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
double minimumDistanceFeet = RiaEclipseUnitTools::meterToFeet( minimumDistanceMeter );
m_rangeValveSpacing = cvf::Math::clamp( m_rangeValveSpacing(),

14
ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
View File

@@ -135,11 +135,13 @@ double RimPerforationInterval::diameter( RiaEclipseUnitTools::UnitSystem unitSys
{
RimWellPath* wellPath;
firstAncestorOrThisOfTypeAsserted( wellPath );
if ( unitSystem == RiaEclipseUnitTools::UNITS_METRIC && wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC &&
wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::feetToMeter( m_diameter() );
}
else if ( unitSystem == RiaEclipseUnitTools::UNITS_FIELD && wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::meterToFeet( m_diameter() );
}
@@ -196,11 +198,11 @@ void RimPerforationInterval::setUnitSystemSpecificDefaults()
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_diameter = 0.216;
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_diameter = 0.709;
}
@@ -341,13 +343,13 @@ void RimPerforationInterval::defineUiOrdering( QString uiConfigName, caf::PdmUiO
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_startMD.uiCapability()->setUiName( "Start MD [m]" );
m_endMD.uiCapability()->setUiName( "End MD [m]" );
m_diameter.uiCapability()->setUiName( "Diameter [m]" );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_startMD.uiCapability()->setUiName( "Start MD [ft]" );
m_endMD.uiCapability()->setUiName( "End MD [ft]" );

16
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@@ -270,7 +270,7 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate()
{
setDefaultConductivityResultIfEmpty();
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_UNKNOWN )
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
{
setUnitSystem( m_stimPlanFractureDefinitionData->unitSet() );
}
@@ -279,7 +279,7 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate()
}
else
{
setUnitSystem( RiaEclipseUnitTools::UNITS_UNKNOWN );
setUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN );
m_readError = true;
}
@@ -405,11 +405,11 @@ void RimStimPlanFractureTemplate::computePerforationLength()
}
}
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_METRIC && m_perforationLength < 10 )
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC && m_perforationLength < 10 )
{
m_perforationLength = 10;
}
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD &&
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
m_perforationLength < RiaEclipseUnitTools::meterToFeet( 10 ) )
{
m_perforationLength = std::round( RiaEclipseUnitTools::meterToFeet( 10 ) );
@@ -428,14 +428,14 @@ std::vector<double>
auto resultValues =
m_stimPlanFractureDefinitionData->fractureGridResults( resultName, unitName, m_activeTimeStepIndex );
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_METRIC )
if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
for ( auto& v : resultValues )
{
v = RiaEclipseUnitTools::convertToMeter( v, unitName );
}
}
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
for ( auto& v : resultValues )
{
@@ -782,11 +782,11 @@ void RimStimPlanFractureTemplate::convertToUnitSystem( RiaEclipseUnitTools::Unit
if ( m_stimPlanFractureDefinitionData.isNull() ) return;
if ( neededUnit == RiaEclipseUnitTools::UNITS_FIELD )
if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_wellPathDepthAtFracture = RiaEclipseUnitTools::meterToFeet( m_wellPathDepthAtFracture );
}
else if ( neededUnit == RiaEclipseUnitTools::UNITS_METRIC )
else if ( neededUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_wellPathDepthAtFracture = RiaEclipseUnitTools::feetToMeter( m_wellPathDepthAtFracture );
}

10
ApplicationCode/ProjectDataModel/Completions/RimValveTemplate.cpp
View File

@@ -34,7 +34,7 @@ RimValveTemplate::RimValveTemplate()
CAF_PDM_InitField( &m_valveTemplateUnit,
"UnitSystem",
caf::AppEnum<RiaEclipseUnitTools::UnitSystem>( RiaEclipseUnitTools::UNITS_UNKNOWN ),
caf::AppEnum<RiaEclipseUnitTools::UnitSystem>( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ),
"Units System",
"",
"",
@@ -83,11 +83,11 @@ void RimValveTemplate::setUnitSystem( RiaEclipseUnitTools::UnitSystemType unitSy
//--------------------------------------------------------------------------------------------------
void RimValveTemplate::setDefaultValuesFromUnits()
{
if ( m_valveTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC )
if ( m_valveTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_orificeDiameter = 8;
}
else if ( m_valveTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD )
else if ( m_valveTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_orificeDiameter = 0.315;
}
@@ -200,11 +200,11 @@ void RimValveTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
uiOrdering.add( &m_valveTemplateUnit );
if ( m_type() == RiaDefines::WellPathComponentType::ICV || m_type() == RiaDefines::WellPathComponentType::ICD )
{
if ( m_valveTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC )
if ( m_valveTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_orificeDiameter.uiCapability()->setUiName( "Orifice Diameter [mm]" );
}
else if ( m_valveTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD )
else if ( m_valveTemplateUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_orificeDiameter.uiCapability()->setUiName( "Orifice Diameter [in]" );
}

4
ApplicationCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp
View File

@@ -38,7 +38,7 @@ RimValveTemplateCollection::RimValveTemplateCollection()
"",
"",
"" );
m_defaultUnitsForValveTemplates = RiaEclipseUnitTools::UNITS_METRIC;
m_defaultUnitsForValveTemplates = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
m_valveDefinitions.uiCapability()->setUiHidden( true );
addDefaultValveTemplates();
}
@@ -96,7 +96,7 @@ void RimValveTemplateCollection::setDefaultUnitSystemBasedOnLoadedCases()
RimProject* proj = RiaApplication::instance()->project();
auto commonUnitSystem = proj->commonUnitSystemForAllCases();
if ( commonUnitSystem != RiaEclipseUnitTools::UNITS_UNKNOWN )
if ( commonUnitSystem != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
{
m_defaultUnitsForValveTemplates = commonUnitSystem;
}

2
ApplicationCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp
View File

@@ -215,7 +215,7 @@ bool RimWellPathAicdParameters::isMetric() const
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
metric = true;
}

12
ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.cpp
View File

@@ -232,9 +232,9 @@ double RimWellPathValve::convertOrificeDiameter( double
RiaEclipseUnitTools::UnitSystem wellPathUnits,
RiaEclipseUnitTools::UnitSystem unitSystem )
{
if ( unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
if ( wellPathUnits == RiaEclipseUnitTools::UNITS_FIELD )
if ( wellPathUnits == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::inchToMeter( orificeDiameterWellPathUnits );
}
@@ -243,9 +243,9 @@ double RimWellPathValve::convertOrificeDiameter( double
return RiaEclipseUnitTools::mmToMeter( orificeDiameterWellPathUnits );
}
}
else if ( unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
if ( wellPathUnits == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPathUnits == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::meterToFeet( RiaEclipseUnitTools::mmToMeter( orificeDiameterWellPathUnits ) );
}
@@ -504,11 +504,11 @@ void RimWellPathValve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_measuredDepth.uiCapability()->setUiName( "Measured Depth [m]" );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_measuredDepth.uiCapability()->setUiName( "Measured Depth [ft]" );
}