diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
index 26205d7b11..31b25c26ac 100644
--- a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
@@ -81,10 +81,10 @@ void RicExportEclipseSectorModelUi::GridBoxSelectionEnum::setUp()
 template <>
 void RicExportEclipseSectorModelUi::BoundaryConditionEnum::setUp()
 {
-    addItem( RicExportEclipseSectorModelUi::OPERNUM_OPERATER, "OPERNUM_OPERATER", "OPERNUM + OPERATER" );
-    addItem( RicExportEclipseSectorModelUi::BCCON_BCPROP, "BCCON_BCPROP", "BCCON + BCPROP" );
+    addItem( RigSimulationInputSettings::OPERNUM_OPERATER, "OPERNUM_OPERATER", "OPERNUM + OPERATER" );
+    addItem( RigSimulationInputSettings::BCCON_BCPROP, "BCCON_BCPROP", "BCCON + BCPROP" );
 
-    setDefault( RicExportEclipseSectorModelUi::OPERNUM_OPERATER );
+    setDefault( RigSimulationInputSettings::OPERNUM_OPERATER );
 }
 
 } // namespace caf
@@ -470,11 +470,11 @@ void RicExportEclipseSectorModelUi::defineUiOrdering( QString uiConfigName, caf:
         caf::PdmUiGroup* bcGroup = uiOrdering.addNewGroup( "Boundary Conditions" );
         bcGroup->add( &m_boundaryCondition );
 
-        if ( m_boundaryCondition() == OPERNUM_OPERATER )
+        if ( m_boundaryCondition() == RigSimulationInputSettings::OPERNUM_OPERATER )
         {
             bcGroup->add( &m_porvMultiplier );
         }
-        else if ( m_boundaryCondition() == BCCON_BCPROP )
+        else if ( m_boundaryCondition() == RigSimulationInputSettings::BCCON_BCPROP )
         {
             m_bcpropKeywords.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
             bcGroup->add( &m_bcpropKeywords );
diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h
index 5813ea990f..2baca90759 100644
--- a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h
+++ b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "RigSimulationInputSettings.h"
+
 #include "cafAppEnum.h"
 #include "cafPdmChildArrayField.h"
 #include "cafPdmField.h"
@@ -63,12 +65,7 @@ class RicExportEclipseSectorModelUi : public caf::PdmObject
     };
     using GridBoxSelectionEnum = caf::AppEnum<GridBoxSelection>;
 
-    enum BoundaryCondition
-    {
-        OPERNUM_OPERATER,
-        BCCON_BCPROP
-    };
-    using BoundaryConditionEnum = caf::AppEnum<BoundaryCondition>;
+    using BoundaryConditionEnum = caf::AppEnum<RigSimulationInputSettings::BoundaryCondition>;
 
 public:
     RicExportEclipseSectorModelUi();
diff --git a/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputSettings.cpp b/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputSettings.cpp
index 6d27932312..5740d29721 100644
--- a/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputSettings.cpp
+++ b/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputSettings.cpp
@@ -27,7 +27,7 @@ RigSimulationInputSettings::RigSimulationInputSettings()
     : m_min( caf::VecIjk0::ZERO )
     , m_max( caf::VecIjk0::ZERO )
     , m_refinement( 1, 1, 1 )
-    , m_boundaryCondition( 0 )
+    , m_boundaryCondition( OPERNUM_OPERATER )
 {
 }
 
@@ -98,7 +98,7 @@ void RigSimulationInputSettings::setBcpropKeywords( const std::vector<Opm::DeckR
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-int RigSimulationInputSettings::boundaryCondition() const
+RigSimulationInputSettings::BoundaryCondition RigSimulationInputSettings::boundaryCondition() const
 {
     return m_boundaryCondition;
 }
@@ -106,7 +106,7 @@ int RigSimulationInputSettings::boundaryCondition() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RigSimulationInputSettings::setBoundaryCondition( int value )
+void RigSimulationInputSettings::setBoundaryCondition( BoundaryCondition value )
 {
     m_boundaryCondition = value;
 }
diff --git a/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputSettings.h b/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputSettings.h
index e7e45752bc..d6b58d810c 100644
--- a/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputSettings.h
+++ b/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputSettings.h
@@ -37,6 +37,12 @@ class DeckRecord;
 class RigSimulationInputSettings
 {
 public:
+    enum BoundaryCondition
+    {
+        OPERNUM_OPERATER,
+        BCCON_BCPROP
+    };
+
     RigSimulationInputSettings();
 
     // Sector bounds (0-based grid coordinates)
@@ -53,8 +59,8 @@ public:
     std::vector<Opm::DeckRecord> bcpropKeywords() const;
     void                         setBcpropKeywords( const std::vector<Opm::DeckRecord>& keywords );
 
-    int  boundaryCondition() const;
-    void setBoundaryCondition( int value );
+    BoundaryCondition boundaryCondition() const;
+    void              setBoundaryCondition( BoundaryCondition value );
 
     // File paths
     QString inputDeckFileName() const;
@@ -68,7 +74,7 @@ private:
     caf::VecIjk0                 m_max;
     cvf::Vec3st                  m_refinement;
     std::vector<Opm::DeckRecord> m_bcpropKeywords;
-    int                          m_boundaryCondition;
+    BoundaryCondition            m_boundaryCondition;
     QString                      m_inputDeckFileName;
     QString                      m_outputDeckFileName;
 };