Set default values and add getters without unit system

OPM · Nov 6, 2023 · de1b60a · de1b60a
1 parent e8b85bb
commit de1b60a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp
@@ -67,8 +67,8 @@ 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", std::numeric_limits<double>::infinity(), "Liner Inner Diameter" );
-    CAF_PDM_InitField( &m_roughnessFactor, "RoughnessFactor", std::numeric_limits<double>::infinity(), "Roughness Factor" );
+    CAF_PDM_InitField( &m_linerDiameter, "LinerDiameter", 0.152, "Liner Inner Diameter" );
+    CAF_PDM_InitField( &m_roughnessFactor, "RoughnessFactor", 1.0e-5, "Roughness Factor" );
 
     CAF_PDM_InitFieldNoDefault( &m_pressureDrop, "PressureDrop", "Pressure Drop" );
     CAF_PDM_InitFieldNoDefault( &m_lengthAndDepth, "LengthAndDepth", "Length and Depth" );
@@ -155,6 +155,14 @@ double RimMswCompletionParameters::linerDiameter( RiaDefines::EclipseUnitSystem
     return diameter;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+double RimMswCompletionParameters::linerDiameter() const
+{
+    return m_linerDiameter();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -195,6 +203,14 @@ double RimMswCompletionParameters::roughnessFactor( RiaDefines::EclipseUnitSyste
     return rFactor;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+double RimMswCompletionParameters::roughnessFactor() const
+{
+    return m_roughnessFactor();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.h b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.h
@@ -60,7 +60,9 @@ class RimMswCompletionParameters : public caf::PdmObject
     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;