Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r2100 -r2111
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2100)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2111)
@@ -45,7 +45,6 @@
         {
             var translationTable = new Dictionary<InputDamProjectType, DamProjectType>()
             {
-                {InputDamProjectType.AssessmentRegional, DamProjectType.AssessmentRegional},
                 {InputDamProjectType.Design, DamProjectType.Design},
                 {InputDamProjectType.Operational, DamProjectType.Operational}
             };
@@ -61,7 +60,6 @@
         {
             var translationTable = new Dictionary<DamProjectType, InputDamProjectType>()
             {
-                {DamProjectType.AssessmentRegional, InputDamProjectType.AssessmentRegional},
                 {DamProjectType.Design, InputDamProjectType.Design},
                 {DamProjectType.Operational, InputDamProjectType.Operational}
             };
@@ -816,166 +814,6 @@
         }
 
         /// <summary>
-        /// The load situation dry
-        /// </summary>
-        public const int LoadSituationDry = 0;
-
-        /// <summary>
-        /// The load situation wet
-        /// </summary>
-        public const int LoadSituationWet = 1;
-
-        /// <summary>
-        /// Converts to Load Situation.
-        /// </summary>
-        /// <param name="inputLoadSituation">The input Load Situation.</param>
-        /// <returns></returns>
-        public static LoadSituation ConvertToLoadSituation(int inputLoadSituation)
-        {
-            var translationTable = new Dictionary<int, LoadSituation>()
-            {
-                {LoadSituationDry, LoadSituation.Dry},
-                {LoadSituationWet, LoadSituation.Wet}
-            };
-            return translationTable[inputLoadSituation];
-        }
-
-        /// <summary>
-        /// Converts to output LoadSituation.
-        /// </summary>
-        /// <param name="loadSituation">The Load Situation.</param>
-        /// <returns></returns>
-        public static int ConvertToOutputLoadSituation(LoadSituation loadSituation)
-        {
-            var translationTable = new Dictionary<LoadSituation, int>()
-            {
-                {LoadSituation.Dry, LoadSituationDry},
-                {LoadSituation.Wet, LoadSituationWet}
-            };
-            return translationTable[loadSituation];
-        }
-
-        /// <summary>
-        /// The dike dry sensitivity none
-        /// </summary>
-        public const int DikeDrySensitivityNone = 0;
-
-        /// <summary>
-        /// The dike dry sensitivity dry
-        /// </summary>
-        public const int DikeDrySensitivityDry = 1;
-
-        /// <summary>
-        /// Converts to Dike Dry Sensitivity.
-        /// </summary>
-        /// <param name="inputDikeDrySensitivity">The input DikeDrySensitivity.</param>
-        /// <returns></returns>
-        public static DikeDrySensitivity ConvertToDikeDrySensitivity(int inputDikeDrySensitivity)
-        {
-            var translationTable = new Dictionary<int, DikeDrySensitivity>()
-            {
-                {DikeDrySensitivityNone, DikeDrySensitivity.None},
-                {DikeDrySensitivityDry, DikeDrySensitivity.Dry}
-            };
-            return translationTable[inputDikeDrySensitivity];
-        }
-
-        /// <summary>
-        /// Converts to output Dike Dry Sensitivity.
-        /// </summary>
-        /// <param name="dikeDrySensitivity">The DikeDrySensitivity.</param>
-        /// <returns></returns>
-        public static int ConvertToOutputDikeDrySensitivity(DikeDrySensitivity dikeDrySensitivity)
-        {
-            var translationTable = new Dictionary<DikeDrySensitivity, int>()
-            {
-                {DikeDrySensitivity.None, DikeDrySensitivityNone},
-                {DikeDrySensitivity.Dry, DikeDrySensitivityDry}
-            };
-            return translationTable[dikeDrySensitivity];
-        }
-
-        /// <summary>
-        /// The hydraulic shortcut type hydraulic shortcut
-        /// </summary>
-        public const int HydraulicShortcutTypeHydraulicShortcut = 0;
-
-        /// <summary>
-        /// The hydraulic shortcut type no hydraulic shortcut
-        /// </summary>
-        public const int HydraulicShortcutTypeNoHydraulicShortcut = 1;
-
-        /// <summary>
-        /// Converts to Hydraulic Shortcut Type.
-        /// </summary>
-        /// <param name="inputHydraulicShortcutType">The input HydraulicShortcutType.</param>
-        /// <returns></returns>
-        public static HydraulicShortcutType ConvertToHydraulicShortcutType(int inputHydraulicShortcutType)
-        {
-            var translationTable = new Dictionary<int, HydraulicShortcutType>()
-            {
-                {HydraulicShortcutTypeHydraulicShortcut, HydraulicShortcutType.HydraulicShortcut},
-                {HydraulicShortcutTypeNoHydraulicShortcut, HydraulicShortcutType.NoHydraulicShortcut}
-            };
-            return translationTable[inputHydraulicShortcutType];
-        }
-
-        /// <summary>
-        /// Converts to output Hydraulic Shortcut Type.
-        /// </summary>
-        /// <param name="hydraulicShortcutType">The HydraulicShortcutType.</param>
-        /// <returns></returns>
-        public static int ConvertToOutputHydraulicShortcutType(HydraulicShortcutType hydraulicShortcutType)
-        {
-            var translationTable = new Dictionary<HydraulicShortcutType, int>()
-            {
-                {HydraulicShortcutType.HydraulicShortcut, HydraulicShortcutTypeHydraulicShortcut},
-                {HydraulicShortcutType.NoHydraulicShortcut, HydraulicShortcutTypeNoHydraulicShortcut}
-            };
-            return translationTable[hydraulicShortcutType];
-        }
-
-        /// <summary>
-        /// The uplift type uplift
-        /// </summary>
-        public const int UpliftTypeUplift = 0;
-
-        /// <summary>
-        /// The uplift type no uplift
-        /// </summary>
-        public const int UpliftTypeNoUplift = 1;
-
-        /// <summary>
-        /// Converts to Uplift Type.
-        /// </summary>
-        /// <param name="inputUpliftType">The input UpliftType.</param>
-        /// <returns></returns>
-        public static UpliftType ConvertToUpliftType(int inputUpliftType)
-        {
-            var translationTable = new Dictionary<int, UpliftType>()
-            {
-                {UpliftTypeUplift, UpliftType.Uplift},
-                {UpliftTypeNoUplift, UpliftType.NoUplift}
-            };
-            return translationTable[inputUpliftType];
-        }
-
-        /// <summary>
-        /// Converts to output Uplift Type.
-        /// </summary>
-        /// <param name="upliftType">The UpliftType.</param>
-        /// <returns></returns>
-        public static int ConvertToOutputUpliftType(UpliftType upliftType)
-        {
-            var translationTable = new Dictionary<UpliftType, int>()
-            {
-                {UpliftType.Uplift, UpliftTypeUplift},
-                {UpliftType.NoUplift, UpliftTypeNoUplift}
-            };
-            return translationTable[upliftType];
-        }
-
-        /// <summary>
         /// The m stab model type bishop
         /// </summary>
         public const int MStabModelTypeBishop = 0;
@@ -1079,109 +917,6 @@
         }
 
         /// <summary>
-        /// The scenario type scenario01
-        /// </summary>
-        public const int ScenarioTypeScenario01 = 0;
-
-        /// <summary>
-        /// The scenario type scenario02
-        /// </summary>
-        public const int ScenarioTypeScenario02 = 1;
-
-        /// <summary>
-        /// The scenario type scenario03
-        /// </summary>
-        public const int ScenarioTypeScenario03 = 2;
-
-        /// <summary>
-        /// The scenario type scenario04
-        /// </summary>
-        public const int ScenarioTypeScenario04 = 3;
-
-        /// <summary>
-        /// The scenario type scenario05
-        /// </summary>
-        public const int ScenarioTypeScenario05 = 4;
-
-        /// <summary>
-        /// The scenario type scenario06
-        /// </summary>
-        public const int ScenarioTypeScenario06 = 5;
-
-        /// <summary>
-        /// The scenario type scenario07
-        /// </summary>
-        public const int ScenarioTypeScenario07 = 6;
-
-        /// <summary>
-        /// The scenario type scenario08
-        /// </summary>
-        public const int ScenarioTypeScenario08 = 7;
-
-        /// <summary>
-        /// The scenario type scenario09
-        /// </summary>
-        public const int ScenarioTypeScenario09 = 8;
-
-        /// <summary>
-        /// The scenario type scenario10
-        /// </summary>
-        public const int ScenarioTypeScenario10 = 9;
-
-        /// <summary>
-        /// The scenario type scenario11
-        /// </summary>
-        public const int ScenarioTypeScenario11 = 10;
-
-        /// <summary>
-        /// Converts to Scenario Type.
-        /// </summary>
-        /// <param name="inputScenarioType">The input ScenarioType.</param>
-        /// <returns></returns>
-        public static ScenarioType ConvertToScenarioType(int inputScenarioType)
-        {
-            var translationTable = new Dictionary<int, ScenarioType>()
-            {
-                {ScenarioTypeScenario01, ScenarioType.Scenario01},
-                {ScenarioTypeScenario02, ScenarioType.Scenario02},
-                {ScenarioTypeScenario03, ScenarioType.Scenario03},
-                {ScenarioTypeScenario04, ScenarioType.Scenario04},
-                {ScenarioTypeScenario05, ScenarioType.Scenario05},
-                {ScenarioTypeScenario06, ScenarioType.Scenario06},
-                {ScenarioTypeScenario07, ScenarioType.Scenario07},
-                {ScenarioTypeScenario08, ScenarioType.Scenario08},
-                {ScenarioTypeScenario09, ScenarioType.Scenario09},
-                {ScenarioTypeScenario10, ScenarioType.Scenario10},
-                {ScenarioTypeScenario11, ScenarioType.Scenario11}
-            };
-            return translationTable[inputScenarioType];
-        }
-
-        /// <summary>
-        /// Converts to output Scenario Type.
-        /// </summary>
-        /// <param name="scenarioType">The ScenarioType.</param>
-        /// <returns></returns>
-        public static int ConvertToOutputScenarioType(ScenarioType scenarioType)
-        {
-            var translationTable = new Dictionary<ScenarioType, int>()
-            {
-                {ScenarioType.Scenario01, ScenarioTypeScenario01},
-                {ScenarioType.Scenario02, ScenarioTypeScenario02},
-                {ScenarioType.Scenario03, ScenarioTypeScenario03},
-                {ScenarioType.Scenario04, ScenarioTypeScenario04},
-                {ScenarioType.Scenario05, ScenarioTypeScenario05},
-                {ScenarioType.Scenario06, ScenarioTypeScenario06},
-                {ScenarioType.Scenario07, ScenarioTypeScenario07},
-                {ScenarioType.Scenario08, ScenarioTypeScenario08},
-                {ScenarioType.Scenario09, ScenarioTypeScenario09},
-                {ScenarioType.Scenario10, ScenarioTypeScenario10},
-                {ScenarioType.Scenario11, ScenarioTypeScenario11}
-            };
-            return translationTable[scenarioType];
-        }
-
-        /// <summary>
         /// The piping model type bligh
         /// </summary>
         public const int PipingModelTypeBligh = 0;
@@ -1235,46 +970,6 @@
             return translationTable[pipingModelType];
         }
 
-        /// <summary>
-        /// The rw result type probability of failure
-        /// </summary>
-        public const int RwResultTypeProbabilityOfFailure = 0;
-
-        /// <summary>
-        /// The rw result type safety factor
-        /// </summary>
-        public const int RwResultTypeSafetyFactor = 1;
-
-        /// <summary>
-        /// Converts to RegionalResult Type.
-        /// </summary>
-        /// <param name="inputRegionalResultType">The input RegionalResultType.</param>
-        /// <returns></returns>
-        public static RegionalResultType ConvertToRegionalResultType(int inputRegionalResultType)
-        {
-            var translationTable = new Dictionary<int, RegionalResultType>()
-            {
-                {RwResultTypeProbabilityOfFailure, RegionalResultType.ProbabilityOfFailure},
-                {RwResultTypeSafetyFactor, RegionalResultType.SafetyFactor}
-            };
-            return translationTable[inputRegionalResultType];
-        }
-
-        /// <summary>
-        /// Converts to output RegionalResult Type.
-        /// </summary>
-        /// <param name="regionalResultType">The RegionalResultType.</param>
-        /// <returns></returns>
-        public static int ConvertToOutputRegionalResultType(RegionalResultType regionalResultType)
-        {
-            var translationTable = new Dictionary<RegionalResultType, int>()
-            {
-                {RegionalResultType.ProbabilityOfFailure, RwResultTypeProbabilityOfFailure},
-                {RegionalResultType.SafetyFactor, RwResultTypeSafetyFactor}
-            };
-            return translationTable[regionalResultType];
-        }
-
         public const int SoilTypeClay = 0; 
         public const int SoilTypeGravel = 1; 
         public const int SoilTypeLoam = 2;