Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs
===================================================================
diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -rdf9261fbb60c129167c1d6a2ca9aed6dc0885f07
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision df9261fbb60c129167c1d6a2ca9aed6dc0885f07)
@@ -27,15 +27,12 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Service.Properties;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.ValidationRules;
-using Ringtoets.Common.Utils;
 using Ringtoets.HydraRing.Calculation.Calculator;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
 using Ringtoets.HydraRing.Calculation.Exceptions;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
@@ -75,12 +72,8 @@
         {
             var calculationName = calculation.Name;
 
-            FailureMechanismSection failureMechanismSection = StructuresHelper.FailureMechanismSectionForCalculation(failureMechanism.Sections,
-                                                                                                                     calculation);
-
             StructuresClosureCalculationInput input = CreateStructuresClosureCalculationInput(calculation,
                                                                                               failureMechanism,
-                                                                                              failureMechanismSection,
                                                                                               hydraulicBoundaryDatabaseFilePath);
 
             string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
@@ -148,10 +141,7 @@
         /// </summary>
         public void Cancel()
         {
-            if (calculator != null)
-            {
-                calculator.Cancel();
-            }
+            calculator?.Cancel();
 
             canceled = true;
         }
@@ -176,20 +166,19 @@
         private static StructuresClosureCalculationInput CreateStructuresClosureCalculationInput(
             StructuresCalculation<ClosingStructuresInput> calculation,
             ClosingStructuresFailureMechanism failureMechanism,
-            FailureMechanismSection failureMechanismSection,
             string hydraulicBoundaryDatabaseFilePath)
         {
             StructuresClosureCalculationInput input;
             switch (calculation.InputParameters.InflowModelType)
             {
                 case ClosingStructureInflowModelType.VerticalWall:
-                    input = CreateClosureVerticalWallCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath);
+                    input = CreateClosureVerticalWallCalculationInput(calculation, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath);
                     break;
                 case ClosingStructureInflowModelType.LowSill:
-                    input = CreateLowSillCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath);
+                    input = CreateLowSillCalculationInput(calculation, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath);
                     break;
                 case ClosingStructureInflowModelType.FloodedCulvert:
-                    input = CreateFloodedCulvertCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath);
+                    input = CreateFloodedCulvertCalculationInput(calculation, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath);
                     break;
                 default:
                     throw new InvalidEnumArgumentException("calculation",
@@ -201,13 +190,12 @@
 
         private static StructuresClosureVerticalWallCalculationInput CreateClosureVerticalWallCalculationInput(
             StructuresCalculation<ClosingStructuresInput> calculation,
-            FailureMechanismSection failureMechanismSection,
             GeneralClosingStructuresInput generalInput,
             string hydraulicBoundaryDatabaseFilePath)
         {
             var structuresClosureVerticalWallCalculationInput = new StructuresClosureVerticalWallCalculationInput(
                 calculation.InputParameters.HydraulicBoundaryLocation.Id,
-                new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation),
+                calculation.InputParameters.StructureNormalOrientation,
                 HydraRingInputParser.ParseForeshore(calculation.InputParameters),
                 HydraRingInputParser.ParseBreakWater(calculation.InputParameters),
                 generalInput.GravitationalAcceleration,
@@ -238,13 +226,12 @@
 
         private static StructuresClosureLowSillCalculationInput CreateLowSillCalculationInput(
             StructuresCalculation<ClosingStructuresInput> calculation,
-            FailureMechanismSection failureMechanismSection,
             GeneralClosingStructuresInput generalInput,
             string hydraulicBoundaryDatabaseFilePath)
         {
             var structuresClosureLowSillCalculationInput = new StructuresClosureLowSillCalculationInput(
                 calculation.InputParameters.HydraulicBoundaryLocation.Id,
-                new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation),
+                calculation.InputParameters.StructureNormalOrientation,
                 HydraRingInputParser.ParseForeshore(calculation.InputParameters),
                 HydraRingInputParser.ParseBreakWater(calculation.InputParameters),
                 generalInput.GravitationalAcceleration,
@@ -274,13 +261,12 @@
 
         private static StructuresClosureFloodedCulvertCalculationInput CreateFloodedCulvertCalculationInput(
             StructuresCalculation<ClosingStructuresInput> calculation,
-            FailureMechanismSection failureMechanismSection,
             GeneralClosingStructuresInput generalInput,
             string hydraulicBoundaryDatabaseFilePath)
         {
             var structuresClosureFloodedCulvertCalculationInput = new StructuresClosureFloodedCulvertCalculationInput(
                 calculation.InputParameters.HydraulicBoundaryLocation.Id,
-                new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation),
+                calculation.InputParameters.StructureNormalOrientation,
                 HydraRingInputParser.ParseForeshore(calculation.InputParameters),
                 HydraRingInputParser.ParseBreakWater(calculation.InputParameters),
                 generalInput.GravitationalAcceleration,