Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsColumns.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsColumns.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsColumns.cs	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -0,0 +1,49 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.HydraRing.Calculation.IO
+{
+    /// <summary>
+    /// The columns of the design tables settings file.
+    /// </summary>
+    public enum DesignTablesSettingsColumns
+    {
+        /// <summary>
+        /// The ring id column.
+        /// </summary>
+        RingId,
+
+        /// <summary>
+        /// The variable column.
+        /// </summary>
+        Variable,
+
+        /// <summary>
+        /// The min column.
+        /// </summary>
+        Min,
+
+        /// <summary>
+        /// The max column.
+        /// </summary>
+        Max
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs
===================================================================
diff -u -r1ffce7db57db828039b8e2d5a24715cbaa76f6a8 -rf8240e07daa9f12cccd51403958eabb55c6a78e3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs	(.../DesignTablesSettingsCsvReader.cs)	(revision 1ffce7db57db828039b8e2d5a24715cbaa76f6a8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs	(.../DesignTablesSettingsCsvReader.cs)	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -31,22 +31,6 @@
     /// </summary>
     internal class DesignTablesSettingsCsvReader : HydraRingSettingsVariableCsvReader<IDictionary<HydraRingFailureMechanismType, IDictionary<string, DesignTablesSetting>>>
     {
-        private readonly Dictionary<string, int> columns = new Dictionary<string, int>
-        {
-            {
-                ringIdKey, 0
-            },
-            {
-                variableKey, 1
-            },
-            {
-                minKey, 2
-            },
-            {
-                maxKey, 3
-            }
-        };
-
         /// <summary>
         /// Creates a new instance of <see cref="DesignTablesSettingsCsvReader"/>.
         /// </summary>
@@ -57,16 +41,14 @@
 
         protected override void CreateSetting(IList<string> line)
         {
-            // Get failure mechanism
-            var failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[columns[variableKey]]));
+            HydraRingFailureMechanismType failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[(int) DesignTablesSettingsColumns.Variable]));
 
             if (!Settings.ContainsKey(failureMechanismType))
             {
                 Settings.Add(failureMechanismType, new Dictionary<string, DesignTablesSetting>());
             }
 
-            // Get TrajectId
-            var ringId = GetRingId(line);
+            string ringId = GetRingId(line);
             if (!Settings[failureMechanismType].ContainsKey(ringId))
             {
                 Settings[failureMechanismType].Add(ringId, GetDesignTablesSetting(line));
@@ -75,22 +57,13 @@
 
         private string GetRingId(IList<string> line)
         {
-            return GetStringValueFromElement(line[columns[ringIdKey]]);
+            return GetStringValueFromElement(line[(int) DesignTablesSettingsColumns.RingId]);
         }
 
         private DesignTablesSetting GetDesignTablesSetting(IList<string> line)
         {
-            return new DesignTablesSetting(GetDoubleValueFromElement(line[columns[minKey]]),
-                                           GetDoubleValueFromElement(line[columns[maxKey]]));
+            return new DesignTablesSetting(GetDoubleValueFromElement(line[(int) DesignTablesSettingsColumns.Min]),
+                                           GetDoubleValueFromElement(line[(int) DesignTablesSettingsColumns.Max]));
         }
-
-        #region Csv column names
-
-        private const string ringIdKey = "TrajectID";
-        private const string variableKey = "Variable";
-        private const string minKey = "Min";
-        private const string maxKey = "Max";
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs
===================================================================
diff -u -r9cb407703438fcb02cc78b839496d7b05d843875 -rf8240e07daa9f12cccd51403958eabb55c6a78e3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs	(.../HydraRingSettingsCsvReader.cs)	(revision 9cb407703438fcb02cc78b839496d7b05d843875)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs	(.../HydraRingSettingsCsvReader.cs)	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -87,7 +87,7 @@
         }
 
         /// <summary>
-        // Creates a setting object from the provided line and adds it to <see cref="Settings"/>.
+        /// Creates a setting object from the provided line and adds it to <see cref="Settings"/>.
         /// </summary>
         /// <param name="line">The line to create the setting for.</param>
         protected abstract void CreateSetting(IList<string> line);
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsVariableCsvReader.cs
===================================================================
diff -u -r1ffce7db57db828039b8e2d5a24715cbaa76f6a8 -rf8240e07daa9f12cccd51403958eabb55c6a78e3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsVariableCsvReader.cs	(.../HydraRingSettingsVariableCsvReader.cs)	(revision 1ffce7db57db828039b8e2d5a24715cbaa76f6a8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsVariableCsvReader.cs	(.../HydraRingSettingsVariableCsvReader.cs)	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -66,7 +66,7 @@
         };
 
         /// <summary>
-        /// Creates a new instance of <see cref="HydraRingSettingsVariableCsvReaderSettingsVariableCsvReader{TOutput}"/>.
+        /// Creates a new instance of <see cref="HydraRingSettingsVariableCsvReader{TOutput}"/>.
         /// </summary>
         /// <param name="fileContents">The file contents to read.</param>
         /// <param name="settings">The provided settings object to add the read settings to.</param>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsColumns.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsColumns.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsColumns.cs	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -0,0 +1,44 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.HydraRing.Calculation.IO
+{
+    /// <summary>
+    /// The columns of the hydraulic models settings file.
+    /// </summary>
+    public enum HydraulicModelsSettingsColumns
+    {
+        /// <summary>
+        /// The ring id column.
+        /// </summary>
+        RingId,
+
+        /// <summary>
+        /// The variable column.
+        /// </summary>
+        Variable,
+
+        /// <summary>
+        /// The time integration scheme id column.
+        /// </summary>
+        TimeIntegrationSchemeId
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsCsvReader.cs
===================================================================
diff -u -r1ffce7db57db828039b8e2d5a24715cbaa76f6a8 -rf8240e07daa9f12cccd51403958eabb55c6a78e3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsCsvReader.cs	(.../HydraulicModelsSettingsCsvReader.cs)	(revision 1ffce7db57db828039b8e2d5a24715cbaa76f6a8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsCsvReader.cs	(.../HydraulicModelsSettingsCsvReader.cs)	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -31,19 +31,6 @@
     /// </summary>
     internal class HydraulicModelsSettingsCsvReader : HydraRingSettingsVariableCsvReader<IDictionary<HydraRingFailureMechanismType, IDictionary<string, HydraulicModelsSetting>>>
     {
-        private readonly Dictionary<string, int> columns = new Dictionary<string, int>
-        {
-            {
-                ringIdKey, 0
-            },
-            {
-                variableKey, 1
-            },
-            {
-                timeIntegrationSchemeIdKey, 2
-            }
-        };
-
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicModelsSettingsCsvReader"/>.
         /// </summary>
@@ -54,16 +41,14 @@
 
         protected override void CreateSetting(IList<string> line)
         {
-            // Get failure mechanism
-            var failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[columns[variableKey]]));
+            HydraRingFailureMechanismType failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[(int) HydraulicModelsSettingsColumns.Variable]));
 
             if (!Settings.ContainsKey(failureMechanismType))
             {
                 Settings.Add(failureMechanismType, new Dictionary<string, HydraulicModelsSetting>());
             }
 
-            // Get TrajectId
-            var ringId = GetRingId(line);
+            string ringId = GetRingId(line);
             if (!Settings[failureMechanismType].ContainsKey(ringId))
             {
                 Settings[failureMechanismType].Add(ringId, GetHydraulicModelsSetting(line));
@@ -72,20 +57,12 @@
 
         private string GetRingId(IList<string> line)
         {
-            return GetStringValueFromElement(line[columns[ringIdKey]]);
+            return GetStringValueFromElement(line[(int) HydraulicModelsSettingsColumns.RingId]);
         }
 
         private HydraulicModelsSetting GetHydraulicModelsSetting(IList<string> line)
         {
-            return new HydraulicModelsSetting(GetIntValueFromElement(line[columns[timeIntegrationSchemeIdKey]]));
+            return new HydraulicModelsSetting(GetIntValueFromElement(line[(int) HydraulicModelsSettingsColumns.TimeIntegrationSchemeId]));
         }
-
-        #region Csv column names
-
-        private const string ringIdKey = "TrajectID";
-        private const string variableKey = "Variable";
-        private const string timeIntegrationSchemeIdKey = "TimeIntegrationSchemeIdKey";
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/NumericsSettingsColumns.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/NumericsSettingsColumns.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/NumericsSettingsColumns.cs	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -0,0 +1,114 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.HydraRing.Calculation.IO
+{
+    /// <summary>
+    /// The columns of the numerics settings file.
+    /// </summary>
+    public enum NumericsSettingsColumns
+    {
+        /// <summary>
+        /// The ring id column.
+        /// </summary>
+        RingId,
+
+        /// <summary>
+        /// The mechanism id column.
+        /// </summary>
+        MechanismId,
+
+        /// <summary>
+        /// The submechanism id column.
+        /// </summary>
+        SubMechanismId,
+
+        /// <summary>
+        /// The calculation method column.
+        /// </summary>
+        CalculationMethod,
+
+        /// <summary>
+        /// The form start method column.
+        /// </summary>
+        FormStartMethod,
+
+        /// <summary>
+        /// The form iterations column.
+        /// </summary>
+        FormIterations,
+
+        /// <summary>
+        /// The form relaxation factor column.
+        /// </summary>
+        FormRelaxationFactor,
+
+        /// <summary>
+        /// The form eps beta column.
+        /// </summary>
+        FormEpsBeta,
+
+        /// <summary>
+        /// The form eps hoh column.
+        /// </summary>
+        FormEpsHoh,
+
+        /// <summary>
+        /// The form eps z func column.
+        /// </summary>
+        FormEpsZFunc,
+
+        /// <summary>
+        /// The ds start method column.
+        /// </summary>
+        DsStartMethod,
+
+        /// <summary>
+        /// The ds minimum number of iteration column.
+        /// </summary>
+        DsMinNumberOfIterations,
+
+        /// <summary>
+        /// The ds maximum number of iterations column.
+        /// </summary>
+        DsMaxNumberOfIterations,
+
+        /// <summary>
+        /// The ds var coefficient column.
+        /// </summary>
+        DsVarCoefficient,
+
+        /// <summary>
+        /// The ni u minimum column.
+        /// </summary>
+        NiUMin,
+
+        /// <summary>
+        /// The ni u maximum column.
+        /// </summary>
+        NiUMax,
+
+        /// <summary>
+        /// The ni number of steps column.
+        /// </summary>
+        NiNumberSteps
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/NumericsSettingsCsvReader.cs
===================================================================
diff -u -r4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866 -rf8240e07daa9f12cccd51403958eabb55c6a78e3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/NumericsSettingsCsvReader.cs	(.../NumericsSettingsCsvReader.cs)	(revision 4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/NumericsSettingsCsvReader.cs	(.../NumericsSettingsCsvReader.cs)	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -30,61 +30,6 @@
     /// </summary>
     internal class NumericsSettingsCsvReader : HydraRingSettingsCsvReader<IDictionary<int, IDictionary<int, IDictionary<string, NumericsSetting>>>>
     {
-        private readonly Dictionary<string, int> columns = new Dictionary<string, int>
-        {
-            {
-                ringIdKey, 0
-            },
-            {
-                mechanismIdKey, 1
-            },
-            {
-                subMechanismIdKey, 2
-            },
-            {
-                calculationMethodKey, 3
-            },
-            {
-                formStartMethodKey, 4
-            },
-            {
-                formIterationsKey, 5
-            },
-            {
-                formRelaxationFactorKey, 6
-            },
-            {
-                formEpsBetaKey, 7
-            },
-            {
-                formEpsHohKey, 8
-            },
-            {
-                formEpsZFuncKey, 9
-            },
-            {
-                dsStartMethodKey, 10
-            },
-            {
-                dsMinNumberOfIterationsKey, 11
-            },
-            {
-                dsMaxNumberOfIterationsKey, 12
-            },
-            {
-                dsVarCoefficientKey, 13
-            },
-            {
-                niUMinKey, 14
-            },
-            {
-                niUMaxKey, 15
-            },
-            {
-                niNumberStepsKey, 16
-            }
-        };
-
         /// <summary>
         /// Creates a new instance of <see cref="NumericsSettingsCsvReader"/>.
         /// </summary>
@@ -94,24 +39,21 @@
 
         protected override void CreateSetting(IList<string> line)
         {
-            // Get failure mechanism
-            var failureMechanismType = GetFailureMechanismType(line);
+            int failureMechanismType = GetFailureMechanismType(line);
 
             if (!Settings.ContainsKey(failureMechanismType))
             {
                 Settings.Add(failureMechanismType, new Dictionary<int, IDictionary<string, NumericsSetting>>());
             }
 
-            // Get sub mechanism
-            var subMechanism = GetSubMechanismType(line);
+            int subMechanism = GetSubMechanismType(line);
 
             if (!Settings[failureMechanismType].ContainsKey(subMechanism))
             {
                 Settings[failureMechanismType].Add(subMechanism, new Dictionary<string, NumericsSetting>());
             }
 
-            // Get TrajectId
-            var ringId = GetRingId(line);
+            string ringId = GetRingId(line);
 
             if (!Settings[failureMechanismType][subMechanism].ContainsKey(ringId))
             {
@@ -121,57 +63,35 @@
 
         private int GetFailureMechanismType(IList<string> line)
         {
-            return GetIntValueFromElement(line[columns[mechanismIdKey]]);
+            return GetIntValueFromElement(line[(int) NumericsSettingsColumns.MechanismId]);
         }
 
         private int GetSubMechanismType(IList<string> line)
         {
-            return GetIntValueFromElement(line[columns[subMechanismIdKey]]);
+            return GetIntValueFromElement(line[(int) NumericsSettingsColumns.SubMechanismId]);
         }
 
         private string GetRingId(IList<string> line)
         {
-            return GetStringValueFromElement(line[columns[ringIdKey]]);
+            return GetStringValueFromElement(line[(int) NumericsSettingsColumns.RingId]);
         }
 
         private NumericsSetting GetNumericsSetting(IList<string> line)
         {
-            return new NumericsSetting(GetIntValueFromElement(line[columns[calculationMethodKey]]),
-                                       GetIntValueFromElement(line[columns[formStartMethodKey]]),
-                                       GetIntValueFromElement(line[columns[formIterationsKey]]),
-                                       GetDoubleValueFromElement(line[columns[formRelaxationFactorKey]]),
-                                       GetDoubleValueFromElement(line[columns[formEpsBetaKey]]),
-                                       GetDoubleValueFromElement(line[columns[formEpsHohKey]]),
-                                       GetDoubleValueFromElement(line[columns[formEpsZFuncKey]]),
-                                       GetIntValueFromElement(line[columns[dsStartMethodKey]]),
-                                       GetIntValueFromElement(line[columns[dsMinNumberOfIterationsKey]]),
-                                       GetIntValueFromElement(line[columns[dsMaxNumberOfIterationsKey]]),
-                                       GetDoubleValueFromElement(line[columns[dsVarCoefficientKey]]),
-                                       GetDoubleValueFromElement(line[columns[niUMinKey]]),
-                                       GetDoubleValueFromElement(line[columns[niUMaxKey]]),
-                                       GetIntValueFromElement(line[columns[niNumberStepsKey]]));
+            return new NumericsSetting(GetIntValueFromElement(line[(int) NumericsSettingsColumns.CalculationMethod]),
+                                       GetIntValueFromElement(line[(int) NumericsSettingsColumns.FormStartMethod]),
+                                       GetIntValueFromElement(line[(int) NumericsSettingsColumns.FormIterations]),
+                                       GetDoubleValueFromElement(line[(int) NumericsSettingsColumns.FormRelaxationFactor]),
+                                       GetDoubleValueFromElement(line[(int) NumericsSettingsColumns.FormEpsBeta]),
+                                       GetDoubleValueFromElement(line[(int) NumericsSettingsColumns.FormEpsHoh]),
+                                       GetDoubleValueFromElement(line[(int) NumericsSettingsColumns.FormEpsZFunc]),
+                                       GetIntValueFromElement(line[(int) NumericsSettingsColumns.DsStartMethod]),
+                                       GetIntValueFromElement(line[(int) NumericsSettingsColumns.DsMinNumberOfIterations]),
+                                       GetIntValueFromElement(line[(int) NumericsSettingsColumns.DsMaxNumberOfIterations]),
+                                       GetDoubleValueFromElement(line[(int) NumericsSettingsColumns.DsVarCoefficient]),
+                                       GetDoubleValueFromElement(line[(int) NumericsSettingsColumns.NiUMin]),
+                                       GetDoubleValueFromElement(line[(int) NumericsSettingsColumns.NiUMax]),
+                                       GetIntValueFromElement(line[(int) NumericsSettingsColumns.NiNumberSteps]));
         }
-
-        #region Csv column names
-
-        private const string ringIdKey = "TrajectID";
-        private const string mechanismIdKey = "MechanismID";
-        private const string subMechanismIdKey = "SubMechanismID";
-        private const string calculationMethodKey = "Rekenmethode";
-        private const string formStartMethodKey = "FORM_StartMethod";
-        private const string formIterationsKey = "FORM_NrIterations";
-        private const string formRelaxationFactorKey = "FORM_RelaxationFactor";
-        private const string formEpsBetaKey = "FORM_EpsBeta";
-        private const string formEpsHohKey = "FORM_EpsHOH";
-        private const string formEpsZFuncKey = "FORM_EpsZFunc";
-        private const string dsStartMethodKey = "Ds_StartMethod";
-        private const string dsMinNumberOfIterationsKey = "Ds_Min";
-        private const string dsMaxNumberOfIterationsKey = "Ds_Max";
-        private const string dsVarCoefficientKey = "Ds_VarCoefficient";
-        private const string niUMinKey = "NI_UMin";
-        private const string niUMaxKey = "NI_Umax";
-        private const string niNumberStepsKey = "NI_NumberSteps";
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/HydraulicModelsSettingsProvider.cs
===================================================================
diff -u -r02fc57a6256d23ab6182f02ea4853cff619e449f -rf8240e07daa9f12cccd51403958eabb55c6a78e3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/HydraulicModelsSettingsProvider.cs	(.../HydraulicModelsSettingsProvider.cs)	(revision 02fc57a6256d23ab6182f02ea4853cff619e449f)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/HydraulicModelsSettingsProvider.cs	(.../HydraulicModelsSettingsProvider.cs)	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -33,15 +33,12 @@
     internal class HydraulicModelsSettingsProvider
     {
         private readonly IDictionary<HydraRingFailureMechanismType, IDictionary<string, HydraulicModelsSetting>> fileHydraulicModelsSettings;
-        private IDictionary<HydraRingFailureMechanismType, HydraulicModelsSetting> defaultHydraulicModelsSettings;
 
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicModelsSettingsProvider"/>.
         /// </summary>
         public HydraulicModelsSettingsProvider()
         {
-            InitializeDefaultHydraulicModelsSettings();
-
             fileHydraulicModelsSettings = new HydraulicModelsSettingsCsvReader(Resources.HydraulicModelsSettings).ReadSettings();
         }
 
@@ -60,58 +57,7 @@
                 return fileHydraulicModelsSettings[failureMechanismType][ringId];
             }
 
-            return defaultHydraulicModelsSettings[failureMechanismType];
+            return new HydraulicModelsSetting(1);
         }
-
-        private void InitializeDefaultHydraulicModelsSettings()
-        {
-            defaultHydraulicModelsSettings = new Dictionary<HydraRingFailureMechanismType, HydraulicModelsSetting>
-            {
-                {
-                    HydraRingFailureMechanismType.AssessmentLevel,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.WaveHeight,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.WavePeakPeriod,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.WaveSpectralPeriod,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.QVariant,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.DikesOvertopping,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.DikesHeight,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.DikesPiping,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.StructuresOvertopping,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.StructuresClosure,
-                    new HydraulicModelsSetting(1)
-                },
-                {
-                    HydraRingFailureMechanismType.StructuresStructuralFailure,
-                    new HydraulicModelsSetting(1)
-                }
-            };
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r02fc57a6256d23ab6182f02ea4853cff619e449f -rf8240e07daa9f12cccd51403958eabb55c6a78e3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 02fc57a6256d23ab6182f02ea4853cff619e449f)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -68,10 +68,13 @@
     <Compile Include="Data\Output\ReliabilityIndexCalculationOutput.cs" />
     <Compile Include="Data\Output\OvertoppingCalculationWaveHeightOutput.cs" />
     <Compile Include="Data\Settings\HydraulicModelsSetting.cs" />
+    <Compile Include="IO\DesignTablesSettingsColumns.cs" />
     <Compile Include="IO\DesignTablesSettingsCsvReader.cs" />
     <Compile Include="IO\HydraRingSettingsCsvReader.cs" />
     <Compile Include="IO\HydraRingSettingsVariableCsvReader.cs" />
+    <Compile Include="IO\HydraulicModelsSettingsColumns.cs" />
     <Compile Include="IO\HydraulicModelsSettingsCsvReader.cs" />
+    <Compile Include="IO\NumericsSettingsColumns.cs" />
     <Compile Include="Parsers\ExceedanceProbabilityCalculationParser.cs" />
     <Compile Include="Parsers\IHydraRingFileParser.cs" />
     <Compile Include="Parsers\HydraRingOutputFileParser.cs" />
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs
===================================================================
diff -u -r66fb38e5d68e4b1f7720d24221ef4868b55cd9b8 -rf8240e07daa9f12cccd51403958eabb55c6a78e3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs	(.../HydraRingConfigurationService.cs)	(revision 66fb38e5d68e4b1f7720d24221ef4868b55cd9b8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs	(.../HydraRingConfigurationService.cs)	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -97,7 +97,7 @@
         /// <summary>
         /// Gets the <see cref="HydraRingUncertaintiesType"/> to use while performing Hydra-Ring calculations.
         /// </summary>
-        public HydraRingUncertaintiesType? UncertaintiesType
+        public HydraRingUncertaintiesType UncertaintiesType
         {
             get
             {
@@ -118,11 +118,11 @@
                 throw new ArgumentException(@"Section id is not unique", "hydraRingCalculationInput");
             }
 
-            if (hydraRingCalculationInputs.Any(h => h.FailureMechanismType != hydraRingCalculationInput.FailureMechanismType))
+            if (hydraRingCalculationInputs.Count > 0 && hydraRingCalculationInputs.First().FailureMechanismType != hydraRingCalculationInput.FailureMechanismType)
             {
-                throw new NotSupportedException("Running calculations for multiple failure mechanism types is not supported.");
+                throw new NotSupportedException("Running calculations for multiple failure mechanism types is not supported.");                
             }
-
+            
             hydraRingCalculationInputs.Add(hydraRingCalculationInput);
         }
 
@@ -175,10 +175,10 @@
                 new OrderedDictionary
                 {
                     {
-                        "TimeIntegrationSchemeID", (int?) timeIntegrationSchemeId
+                        "TimeIntegrationSchemeID", timeIntegrationSchemeId
                     },
                     {
-                        "UncertaintiesID", (int?) UncertaintiesType
+                        "UncertaintiesID", (int) UncertaintiesType
                     },
                     {
                         "DataSetName", "WTI 2017" // Fixed: use the WTI 2017 set of station locations
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/packages.config
===================================================================
diff -u -r02fc57a6256d23ab6182f02ea4853cff619e449f -rf8240e07daa9f12cccd51403958eabb55c6a78e3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/packages.config	(.../packages.config)	(revision 02fc57a6256d23ab6182f02ea4853cff619e449f)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/packages.config	(.../packages.config)	(revision f8240e07daa9f12cccd51403958eabb55c6a78e3)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.