Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7 -r8bb6e849266ec28412ebfe23beccd7235c4db9bf
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
@@ -192,92 +192,92 @@
         {
             const double targetProbability = 1.0 / 200000;
             ObservableList<HydraulicBoundaryLocation> locations = failureMechanism.HydraulicBoundaryLocations;
-            locations.ElementAt(0).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(0).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.19,
                 targetProbability, 4.79014,
                 1.0 / 1196727, 4.78959,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(1).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(1).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.19,
                 targetProbability, 4.79014,
                 1.0 / 1196727, 4.78959,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(2).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(2).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.18,
                 targetProbability, 4.79014,
                 1.0 / 1196727, 4.78959,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(3).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(3).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.18,
                 targetProbability, 4.79014,
                 1.0 / 1196787, 4.78960,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(4).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(4).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.18,
                 targetProbability, 4.79014,
                 1.0 / 1196787, 4.78960,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(5).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(5).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.39,
                 targetProbability, 4.79014,
                 1.0 / 1196489, 4.78955,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(6).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(6).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.39,
                 targetProbability, 4.79014,
                 1.0 / 1196489, 4.78955,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(7).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(7).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.39,
                 targetProbability, 4.79014,
                 1.0 / 1196489, 4.78955,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(8).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(8).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.40,
                 targetProbability, 4.79014,
                 1.0 / 1196489, 4.78955,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(9).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(9).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.40,
                 targetProbability, 4.79014,
                 1.0 / 1196429, 4.78954,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(10).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(10).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.40,
                 targetProbability, 4.79014,
                 1.0 / 1196429, 4.78954,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(11).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(11).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.40,
                 targetProbability, 4.79014,
                 1.0 / 1196429, 4.78954,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(12).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(12).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.40,
                 targetProbability, 4.79014,
                 1.0 / 1196429, 4.78954,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(13).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(13).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.41,
                 targetProbability, 4.79014,
                 1.0 / 1196429, 4.78954,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(14).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(14).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.41,
                 targetProbability, 4.79014,
                 1.0 / 1196429, 4.78954,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(15).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(15).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 6.91,
                 targetProbability, 4.79014,
                 1.0 / 1197264, 4.78968,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(16).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(16).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.53,
                 targetProbability, 4.79014,
                 1.0 / 1195476, 4.78938,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(17).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(17).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 7.80,
                 targetProbability, 4.79014,
                 1.0 / 1194761, 4.78926,
@@ -288,92 +288,92 @@
         {
             const double targetProbability = 1.0 / 200000;
             ObservableList<HydraulicBoundaryLocation> locations = failureMechanism.HydraulicBoundaryLocations;
-            locations.ElementAt(0).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(0).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.99,
                 targetProbability, 4.79014,
                 1.0 / 1199892, 4.79012,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(1).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(1).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.04,
                 targetProbability, 4.79014,
                 1.0 / 1199892, 4.79012,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(2).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(2).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.87,
                 targetProbability, 4.79014,
                 1.0 / 1199892, 4.79012,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(3).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(3).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.73,
                 targetProbability, 4.79014,
                 1.0 / 1199892, 4.79012,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(4).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(4).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.59,
                 targetProbability, 4.79014,
                 1.0 / 1199833, 4.79011,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(5).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(5).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.35,
                 targetProbability, 4.79014,
                 1.0 / 1197264, 4.78968,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(6).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(6).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.83,
                 targetProbability, 4.79014,
                 1.0 / 1196906, 4.78962,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(7).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(7).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.00,
                 targetProbability, 4.79014,
                 1.0 / 1197264, 4.78968,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(8).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(8).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.20,
                 targetProbability, 4.79014,
                 1.0 / 1197324, 4.78969,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(9).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(9).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.41,
                 targetProbability, 4.79014,
                 1.0 / 1197324, 4.78969,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(10).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(10).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.50,
                 targetProbability, 4.79014,
                 1.0 / 1197622, 4.78974,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(11).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(11).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.57,
                 targetProbability, 4.79014,
                 1.0 / 1197145, 4.78966,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(12).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(12).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.63,
                 targetProbability, 4.79014,
                 1.0 / 1196608, 4.78957,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(13).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(13).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.68,
                 targetProbability, 4.79014,
                 1.0 / 1196549, 4.78956,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(14).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(14).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.17,
                 targetProbability, 4.79014,
                 1.0 / 1199713, 4.79009,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(15).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(15).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 11.13,
                 targetProbability, 4.79014,
                 1.0 / 201269, 4.79035,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(16).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(16).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 9.24,
                 targetProbability, 4.79014,
                 1.0 / 197742, 4.78976,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(17).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(17).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.34,
                 targetProbability, 4.79014,
                 1.0 / 199056, 4.78998,
@@ -766,92 +766,92 @@
         private static void SetHydraulicBoundaryLocationDesignWaterLevelOutputValues(ICollection<HydraulicBoundaryLocation> locations)
         {
             const double targetProbability = 1.0 / 30000;
-            locations.ElementAt(0).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(0).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.78,
                 targetProbability, 3.98788,
                 1.0 / 29996, 3.98785,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(1).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(1).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.77,
                 targetProbability, 3.98787893,
                 1.0 / 29996, 3.98785,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(2).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(2).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.77,
                 targetProbability, 3.98788,
                 1.0 / 29996, 3.98785,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(3).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(3).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.77,
                 targetProbability, 3.98788,
                 1.0 / 29996, 3.98785,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(4).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(4).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.76865,
                 targetProbability, 3.98788,
                 1.0 / 29996, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(5).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(5).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(6).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(6).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(7).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(7).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(8).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(8).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(9).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(9).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(10).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(10).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(11).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(11).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(12).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(12).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(13).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(13).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(14).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(14).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.93,
                 targetProbability, 3.98788,
                 1.0 / 29995, 3.98784,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(15).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(15).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.54,
                 targetProbability, 3.98788,
                 1.0 / 29996, 3.98785,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(16).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(16).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 5.86,
                 targetProbability, 3.98788,
                 1.0 / 29994, 3.98783,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(17).DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(17).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                 6.00,
                 targetProbability, 3.98788,
                 1.0 / 29993, 3.98782,
@@ -861,92 +861,92 @@
         private static void SetHydraulicBoundaryLocationWaveHeightOutputValues(ICollection<HydraulicBoundaryLocation> locations)
         {
             const double targetProbability = 1.0 / 30000;
-            locations.ElementAt(0).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(0).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.13,
                 targetProbability, 3.98788,
                 1.0 / 29972, 3.98766,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(1).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(1).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.19,
                 targetProbability, 3.98788,
                 1.0 / 29962, 3.98770,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(2).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(2).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.02,
                 targetProbability, 3.98788,
                 1.0 / 29977, 3.98758,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(3).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(3).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.87,
                 targetProbability, 3.98788,
                 1.0 / 29963, 3.98759,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(4).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(4).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.73,
                 targetProbability, 3.98788,
                 1.0 / 29957, 3.98754,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(5).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(5).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 2.65,
                 targetProbability, 3.98788,
                 1.0 / 30022, 3.98805,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(6).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(6).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.04,
                 targetProbability, 3.98788,
                 1.0 / 30001, 3.98789,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(7).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(7).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.20,
                 targetProbability, 3.98788,
                 1.0 / 30000, 3.98788,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(8).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(8).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.35,
                 targetProbability, 3.98788,
                 1.0 / 29996, 3.98785,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(9).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(9).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.53,
                 targetProbability, 3.98788,
                 1.0 / 29999, 3.98787,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(10).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(10).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.62,
                 targetProbability, 3.98788,
                 1.0 / 29888, 3.98699,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(11).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(11).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.68,
                 targetProbability, 3.98788,
                 1.0 / 29890, 3.98701,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(12).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(12).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.73,
                 targetProbability, 3.98788,
                 1.0 / 29882, 3.98694,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(13).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(13).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.75,
                 targetProbability, 3.98788,
                 1.0 / 29902, 3.98710,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(14).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(14).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 3.30,
                 targetProbability, 3.98788,
                 1.0 / 30037, 3.98817,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(15).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(15).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 9.57,
                 targetProbability, 3.98788,
                 1.0 / 29999, 3.98787,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(16).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(16).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 8.02,
                 targetProbability, 3.98788,
                 1.0 / 30108, 3.98873,
                 CalculationConvergence.CalculatedConverged);
-            locations.ElementAt(17).WaveHeightOutput = new HydraulicBoundaryLocationOutput(
+            locations.ElementAt(17).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(
                 4.11,
                 targetProbability, 3.98788,
                 1.0 / 29929, 3.98732,