Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.Geographic.dll
===================================================================
diff -u -rfef3460a27a37aaa34948649aae3dd9ae143041c -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.Geometry.dll
===================================================================
diff -u -rf051fc04a5d255b6f5f43bc1ef7d3b1390155f86 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.Geotechnics.dll
===================================================================
diff -u -rf051fc04a5d255b6f5f43bc1ef7d3b1390155f86 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.Mathematics.dll
===================================================================
diff -u -rd507e597b3e53d9d35a5d764bfa8aaf96c904843 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.Probabilistic.dll
===================================================================
diff -u -rf051fc04a5d255b6f5f43bc1ef7d3b1390155f86 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.Standard.dll
===================================================================
diff -u -rd507e597b3e53d9d35a5d764bfa8aaf96c904843 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.WTIPiping.dll
===================================================================
diff -u -rfef3460a27a37aaa34948649aae3dd9ae143041c -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.WTIStability.Calculation.Wrapper.dll
===================================================================
diff -u -rf051fc04a5d255b6f5f43bc1ef7d3b1390155f86 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.WTIStability.Calculation.dll
===================================================================
diff -u -rf051fc04a5d255b6f5f43bc1ef7d3b1390155f86 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.WTIStability.IO.dll
===================================================================
diff -u -rf051fc04a5d255b6f5f43bc1ef7d3b1390155f86 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.WTIStability.Levenberg.dll
===================================================================
diff -u -rf051fc04a5d255b6f5f43bc1ef7d3b1390155f86 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.WTIStability.dll
===================================================================
diff -u -rf051fc04a5d255b6f5f43bc1ef7d3b1390155f86 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/Deltares.WaternetCreator.dll
===================================================================
diff -u -rf051fc04a5d255b6f5f43bc1ef7d3b1390155f86 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/DikesOvertopping.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/DllLinearizedBetaAlpha.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/DynamicLib-DaF.dll
===================================================================
diff -u -r6319f5aef0aa2c04a92741263457c04e56b92583 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Database.Test.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Database.TestUtils.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Database.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.DuneErosionWrapper.Tests.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.DuneErosionWrapper.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.IO.Native.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.IO.TestUtils.Native.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.MacroStability.Wrapper.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Piping2017Wrapper.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.PluginShared.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/MechanismComputation.exe
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/RingComputation.exe
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/StructuresStructuralFailure2017wrapper.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/config.sqlite
===================================================================
diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/dikesOverflow.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/dllHydraulicDunes.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/duneErosion.Native.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/exeRingComputation.exe
===================================================================
diff -u
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/feedbackDLL.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/hydraring_computation.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/linearizedBetaAlpha.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/macroStability.Native.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/piping2017.Native.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/structuresClosure2017.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/structuresOvertopping2017.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/structuresStructuralFailure2017.Native.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/winapi.dll
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ConvergenceParser.cs
===================================================================
diff -u -re12e96d97ddb51740b5fcc150c14438309a30700 -rbafcd3618c36c38f37d56f8da48056313185ef3f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ConvergenceParser.cs	(.../ConvergenceParser.cs)	(revision e12e96d97ddb51740b5fcc150c14438309a30700)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ConvergenceParser.cs	(.../ConvergenceParser.cs)	(revision bafcd3618c36c38f37d56f8da48056313185ef3f)
@@ -42,7 +42,7 @@
             $"SELECT ConvOnBeta OR ConvOnValue AS {convergedColumnName} " +
             "FROM IterateToGivenBetaConvergence " +
             $"WHERE SectionId = {sectionIdParameterName} " +
-            "AND IterationNr = (SELECT MAX(IterationNr) FROM IterateToGivenBetaConvergence);";
+            "AND OuterIterationId = (SELECT MAX(OuterIterationId) FROM IterateToGivenBetaConvergence);";
 
         /// <summary>
         /// Gets the value indicating whether the calculation for a section has converged.
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision ae74507edbfc4fe632ba5f964a147aff630dfe6e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision bafcd3618c36c38f37d56f8da48056313185ef3f)
@@ -254,6 +254,9 @@
     <Content Include="HydraRing\DynamicLib-DaF.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="HydraRing\exeRingComputation.exe">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="HydraRing\feedbackDLL.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -371,9 +374,6 @@
     <Content Include="HydraRing\ProtoBufRemote.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="HydraRing\RingComputation.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="HydraRing\structuresClosure2017.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs	(.../HydraRingInitializationService.cs)	(revision ae74507edbfc4fe632ba5f964a147aff630dfe6e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs	(.../HydraRingInitializationService.cs)	(revision bafcd3618c36c38f37d56f8da48056313185ef3f)
@@ -176,7 +176,8 @@
                                                         "projectdbfilename   = " + sectionId + databaseFileExtension,
                                                         "outputfilename      = " + HydraRingFileConstants.DesignTablesFileName,
                                                         "configdbfilename    = " + ConfigurationDatabaseFilePath,
-                                                        "hydraulicdbfilename = " + HlcdFilePath);
+                                                        "hydraulicdbfilename = " + HlcdFilePath,
+                                                        "designpointOutput   = both");
 
             File.WriteAllText(IniFilePath, initializationFileContent);
         }
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs
===================================================================
diff -u -r9e7b8344cc985249f312870b9030705371c82bfe -rbafcd3618c36c38f37d56f8da48056313185ef3f
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs	(.../HydraRingInitializationServiceTest.cs)	(revision 9e7b8344cc985249f312870b9030705371c82bfe)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs	(.../HydraRingInitializationServiceTest.cs)	(revision bafcd3618c36c38f37d56f8da48056313185ef3f)
@@ -71,7 +71,8 @@
                                                "projectdbfilename   = 700001.sql" + Environment.NewLine +
                                                "outputfilename      = designTable.txt" + Environment.NewLine +
                                                "configdbfilename    = " + configurationDatabaseFilePath + Environment.NewLine +
-                                               "hydraulicdbfilename = " + filePath;
+                                               "hydraulicdbfilename = " + filePath + Environment.NewLine + 
+                                               "designpointOutput   = both";
 
             try
             {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/ConvergenceParser/ConvergenceOnAllButLastIteration/output.sqlite
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/ConvergenceParser/ConvergenceOnBetaSection1/output.sqlite
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/ConvergenceParser/ConvergenceOnBothSection1/output.sqlite
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/ConvergenceParser/ConvergenceOnValueSection1/output.sqlite
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/ConvergenceParser/EmptyDatabase/output.sqlite
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/ConvergenceParser/NoConvergenceSection1/output.sqlite
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -rbafcd3618c36c38f37d56f8da48056313185ef3f
Binary files differ