Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -r5fcfd3d73f28585c211086ad413fc5d177ecd6b2 -r2a896243ca24205f8e98db1b61e8148d1d9b9062 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 5fcfd3d73f28585c211086ad413fc5d177ecd6b2) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 2a896243ca24205f8e98db1b61e8148d1d9b9062) @@ -132,12 +132,8 @@ var calculationName = calculation.Name; - FailureMechanismSection failureMechanismSection = StructuresHelper.GetFailureMechanismSectionForCalculation(failureMechanism.Sections, - calculation); - StructuresStabilityPointCalculationInput input = CreateStructuresStabilityPointCalculationInput(calculation, failureMechanism, - failureMechanismSection, hydraulicBoundaryDatabaseFilePath); string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); @@ -232,7 +228,6 @@ private StructuresStabilityPointCalculationInput CreateStructuresStabilityPointCalculationInput( StructuresCalculation calculation, StabilityPointStructuresFailureMechanism failureMechanism, - FailureMechanismSection failureMechanismSection, string hydraulicBoundaryDatabaseFilePath) { StructuresStabilityPointCalculationInput input; @@ -244,13 +239,11 @@ case LoadSchematizationType.Linear: input = CreateLowSillLinearCalculationInput( calculation, - failureMechanismSection, failureMechanism.GeneralInput); break; case LoadSchematizationType.Quadratic: input = CreateLowSillQuadraticCalculationInput( calculation, - failureMechanismSection, failureMechanism.GeneralInput); break; default: @@ -265,13 +258,11 @@ case LoadSchematizationType.Linear: input = CreateFloodedCulvertLinearCalculationInput( calculation, - failureMechanismSection, failureMechanism.GeneralInput); break; case LoadSchematizationType.Quadratic: input = CreateFloodedCulvertQuadraticCalculationInput( calculation, - failureMechanismSection, failureMechanism.GeneralInput); break; default: @@ -291,12 +282,11 @@ } private StructuresStabilityPointLowSillLinearCalculationInput CreateLowSillLinearCalculationInput(StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, GeneralStabilityPointStructuresInput generalInput) { var structuresStabilityPointLowSillLinearCalculationInput = new StructuresStabilityPointLowSillLinearCalculationInput( calculation.InputParameters.HydraulicBoundaryLocation.Id, - new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), + calculation.InputParameters.StructureNormalOrientation, HydraRingInputParser.ParseForeshore(calculation.InputParameters), HydraRingInputParser.ParseBreakWater(calculation.InputParameters), calculation.InputParameters.VolumicWeightWater, @@ -364,12 +354,11 @@ private StructuresStabilityPointLowSillQuadraticCalculationInput CreateLowSillQuadraticCalculationInput( StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, GeneralStabilityPointStructuresInput generalInput) { return new StructuresStabilityPointLowSillQuadraticCalculationInput( calculation.InputParameters.HydraulicBoundaryLocation.Id, - new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), + calculation.InputParameters.StructureNormalOrientation, HydraRingInputParser.ParseForeshore(calculation.InputParameters), HydraRingInputParser.ParseBreakWater(calculation.InputParameters), calculation.InputParameters.VolumicWeightWater, @@ -435,12 +424,11 @@ private StructuresStabilityPointFloodedCulvertLinearCalculationInput CreateFloodedCulvertLinearCalculationInput( StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, GeneralStabilityPointStructuresInput generalInput) { return new StructuresStabilityPointFloodedCulvertLinearCalculationInput( calculation.InputParameters.HydraulicBoundaryLocation.Id, - new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), + calculation.InputParameters.StructureNormalOrientation, HydraRingInputParser.ParseForeshore(calculation.InputParameters), HydraRingInputParser.ParseBreakWater(calculation.InputParameters), calculation.InputParameters.VolumicWeightWater, @@ -506,12 +494,11 @@ private StructuresStabilityPointFloodedCulvertQuadraticCalculationInput CreateFloodedCulvertQuadraticCalculationInput( StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, GeneralStabilityPointStructuresInput generalInput) { return new StructuresStabilityPointFloodedCulvertQuadraticCalculationInput( calculation.InputParameters.HydraulicBoundaryLocation.Id, - new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), + calculation.InputParameters.StructureNormalOrientation, HydraRingInputParser.ParseForeshore(calculation.InputParameters), HydraRingInputParser.ParseBreakWater(calculation.InputParameters), calculation.InputParameters.VolumicWeightWater,