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

Janitor: Remove unused code an move initializers to private

Browse Source
This commit is contained in:
Magne Sjaastad
2023-11-13 08:50:28 +01:00
parent 1c0c78af99
commit 76fdac0b80
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp
View File

@@ -67,8 +67,10 @@ RimMswCompletionParameters::RimMswCompletionParameters()
CAF_PDM_InitField( &m_refMD, "RefMD", 0.0, "" );
CAF_PDM_InitField( &m_customValuesForLateral, "CustomValuesForLateral", false, "Custom Values for Lateral" );
CAF_PDM_InitField( &m_linerDiameter, "LinerDiameter", 0.152, "Liner Inner Diameter" );
CAF_PDM_InitField( &m_roughnessFactor, "RoughnessFactor", 1.0e-5, "Roughness Factor" );
const auto unitSystem = RiaDefines::EclipseUnitSystem::UNITS_METRIC;
CAF_PDM_InitField( &m_linerDiameter, "LinerDiameter", RimMswCompletionParameters::defaultLinerDiameter( unitSystem ), "Liner Inner Diameter" );
CAF_PDM_InitField( &m_roughnessFactor, "RoughnessFactor", RimMswCompletionParameters::defaultRoughnessFactor( unitSystem ), "Roughness Factor" );
CAF_PDM_InitFieldNoDefault( &m_pressureDrop, "PressureDrop", "Pressure Drop" );
CAF_PDM_InitFieldNoDefault( &m_lengthAndDepth, "LengthAndDepth", "Length and Depth" );
@@ -85,17 +87,6 @@ RimMswCompletionParameters::~RimMswCompletionParameters()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimMswCompletionParameters::isDefault() const
{
return m_refMDType() == ReferenceMDEnum() && m_refMD() == m_refMD.defaultValue() &&
m_linerDiameter() == m_linerDiameter.defaultValue() && m_roughnessFactor() == m_roughnessFactor.defaultValue() &&
m_pressureDrop == PressureDropEnum() && m_enforceMaxSegmentLength() == m_enforceMaxSegmentLength.defaultValue() &&
m_maxSegmentLength() == m_maxSegmentLength.defaultValue();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -148,7 +139,7 @@ double RimMswCompletionParameters::linerDiameter( RiaDefines::EclipseUnitSystem
{
return RiaEclipseUnitTools::feetToMeter( diameter );
}
else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC && unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC && unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( diameter );
}
@@ -172,10 +163,8 @@ double RimMswCompletionParameters::defaultLinerDiameter( RiaDefines::EclipseUnit
{
return 0.152;
}
else
{
return 0.5;
}
return 0.5;
}
//--------------------------------------------------------------------------------------------------
@@ -195,7 +184,7 @@ double RimMswCompletionParameters::roughnessFactor( RiaDefines::EclipseUnitSyste
{
return RiaEclipseUnitTools::feetToMeter( rFactor );
}
else if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC && unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
if ( wellPath->unitSystem() == RiaDefines::EclipseUnitSystem::UNITS_METRIC && unitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( rFactor );
}
@@ -220,10 +209,8 @@ double RimMswCompletionParameters::defaultRoughnessFactor( RiaDefines::EclipseUn
{
return 1.0e-5;
}
else
{
return 3.28e-5;
}
return 3.28e-5;
}
//--------------------------------------------------------------------------------------------------

7
ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.h
View File

@@ -54,17 +54,14 @@ public:
RimMswCompletionParameters();
~RimMswCompletionParameters() override;
bool isDefault() const;
RimMswCompletionParameters& operator=( const RimMswCompletionParameters& rhs );
ReferenceMDType referenceMDType() const;
double manualReferenceMD() const;
double linerDiameter( RiaDefines::EclipseUnitSystem unitSystem ) const;
double linerDiameter() const;
static double defaultLinerDiameter( RiaDefines::EclipseUnitSystem unitSystem );
double roughnessFactor() const;
double roughnessFactor( RiaDefines::EclipseUnitSystem unitSystem ) const;
static double defaultRoughnessFactor( RiaDefines::EclipseUnitSystem unitSystem );
PressureDropEnum pressureDrop() const;
LengthAndDepthEnum lengthAndDepth() const;
double maxSegmentLength() const;
@@ -86,6 +83,10 @@ protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void initAfterRead() override;
private:
static double defaultLinerDiameter( RiaDefines::EclipseUnitSystem unitSystem );
static double defaultRoughnessFactor( RiaDefines::EclipseUnitSystem unitSystem );
private:
caf::PdmField<ReferenceMDEnum> m_refMDType;
caf::PdmField<double> m_refMD;