Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs
===================================================================
diff -u -rf71fb2faaae836236b85a1c3a4483f6aee4f4d88 -r19f983eab8eac43d27e39f6eb9de019bad677652
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs	(.../StabilityPointStructuresCalculationService.cs)	(revision f71fb2faaae836236b85a1c3a4483f6aee4f4d88)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs	(.../StabilityPointStructuresCalculationService.cs)	(revision 19f983eab8eac43d27e39f6eb9de019bad677652)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.ComponentModel;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.Structures;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
@@ -31,7 +30,8 @@
     /// <summary>
     /// Service that provides methods for performing Hydra-ring calculations for stability point structures.
     /// </summary>
-    public class StabilityPointStructuresCalculationService : StructuresCalculationServiceBase<StabilityPointStructuresValidationRulesRegistry,
+    public class StabilityPointStructuresCalculationService : StructuresCalculationServiceBase<
+        StabilityPointStructuresValidationRulesRegistry,
         StabilityPointStructuresInput,
         StabilityPointStructure,
         GeneralStabilityPointStructuresInput,
@@ -42,340 +42,341 @@
         /// </summary>
         public StabilityPointStructuresCalculationService() : base(new StabilityPointStructuresCalculationMessageProvider()) {}
 
-        protected override StructuresStabilityPointCalculationInput CreateInput(StructuresCalculation<StabilityPointStructuresInput> calculation,
+        protected override StructuresStabilityPointCalculationInput CreateInput(StabilityPointStructuresInput structureInput,
                                                                                 GeneralStabilityPointStructuresInput generalInput,
                                                                                 string hydraulicBoundaryDatabaseFilePath)
         {
             StructuresStabilityPointCalculationInput input;
-            switch (calculation.InputParameters.InflowModelType)
+            switch (structureInput.InflowModelType)
             {
                 case StabilityPointStructureInflowModelType.LowSill:
-                    switch (calculation.InputParameters.LoadSchematizationType)
+                    switch (structureInput.LoadSchematizationType)
                     {
                         case LoadSchematizationType.Linear:
                             input = CreateLowSillLinearCalculationInput(
-                                calculation,
+                                structureInput,
                                 generalInput);
                             break;
                         case LoadSchematizationType.Quadratic:
                             input = CreateLowSillQuadraticCalculationInput(
-                                calculation,
+                                structureInput,
                                 generalInput);
                             break;
                         default:
-                            throw new InvalidEnumArgumentException(nameof(calculation),
-                                                                   (int) calculation.InputParameters.LoadSchematizationType,
+                            throw new InvalidEnumArgumentException(nameof(structureInput),
+                                                                   (int) structureInput.LoadSchematizationType,
                                                                    typeof(LoadSchematizationType));
                     }
                     break;
                 case StabilityPointStructureInflowModelType.FloodedCulvert:
-                    switch (calculation.InputParameters.LoadSchematizationType)
+                    switch (structureInput.LoadSchematizationType)
                     {
                         case LoadSchematizationType.Linear:
                             input = CreateFloodedCulvertLinearCalculationInput(
-                                calculation,
+                                structureInput,
                                 generalInput);
                             break;
                         case LoadSchematizationType.Quadratic:
                             input = CreateFloodedCulvertQuadraticCalculationInput(
-                                calculation,
+                                structureInput,
                                 generalInput);
                             break;
                         default:
-                            throw new InvalidEnumArgumentException(nameof(calculation),
-                                                                   (int) calculation.InputParameters.LoadSchematizationType,
+                            throw new InvalidEnumArgumentException(nameof(structureInput),
+                                                                   (int) structureInput.LoadSchematizationType,
                                                                    typeof(LoadSchematizationType));
                     }
                     break;
                 default:
-                    throw new InvalidEnumArgumentException(nameof(calculation),
-                                                           (int) calculation.InputParameters.InflowModelType,
+                    throw new InvalidEnumArgumentException(nameof(structureInput),
+                                                           (int) structureInput.InflowModelType,
                                                            typeof(StabilityPointStructureInflowModelType));
             }
 
             HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, hydraulicBoundaryDatabaseFilePath);
             return input;
         }
 
-        private StructuresStabilityPointLowSillLinearCalculationInput CreateLowSillLinearCalculationInput(StructuresCalculation<StabilityPointStructuresInput> calculation,
-                                                                                                          GeneralStabilityPointStructuresInput generalInput)
+        private StructuresStabilityPointLowSillLinearCalculationInput CreateLowSillLinearCalculationInput(
+            StabilityPointStructuresInput structureInput,
+            GeneralStabilityPointStructuresInput generalInput)
         {
             var structuresStabilityPointLowSillLinearCalculationInput = new StructuresStabilityPointLowSillLinearCalculationInput(
-                calculation.InputParameters.HydraulicBoundaryLocation.Id,
-                calculation.InputParameters.StructureNormalOrientation,
-                HydraRingInputParser.ParseForeshore(calculation.InputParameters),
-                HydraRingInputParser.ParseBreakWater(calculation.InputParameters),
-                calculation.InputParameters.VolumicWeightWater,
+                structureInput.HydraulicBoundaryLocation.Id,
+                structureInput.StructureNormalOrientation,
+                HydraRingInputParser.ParseForeshore(structureInput),
+                HydraRingInputParser.ParseBreakWater(structureInput),
+                structureInput.VolumicWeightWater,
                 generalInput.GravitationalAcceleration,
-                calculation.InputParameters.LevelCrestStructure.Mean,
-                calculation.InputParameters.LevelCrestStructure.StandardDeviation,
-                calculation.InputParameters.StructureNormalOrientation,
-                calculation.InputParameters.FactorStormDurationOpenStructure,
+                structureInput.LevelCrestStructure.Mean,
+                structureInput.LevelCrestStructure.StandardDeviation,
+                structureInput.StructureNormalOrientation,
+                structureInput.FactorStormDurationOpenStructure,
                 generalInput.ModelFactorSubCriticalFlow.Mean,
                 generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
-                calculation.InputParameters.ThresholdHeightOpenWeir.Mean,
-                calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation,
-                calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean,
-                calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation,
-                calculation.InputParameters.FailureProbabilityRepairClosure,
-                calculation.InputParameters.FailureCollisionEnergy.Mean,
-                calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation,
+                structureInput.ThresholdHeightOpenWeir.Mean,
+                structureInput.ThresholdHeightOpenWeir.StandardDeviation,
+                structureInput.InsideWaterLevelFailureConstruction.Mean,
+                structureInput.InsideWaterLevelFailureConstruction.StandardDeviation,
+                structureInput.FailureProbabilityRepairClosure,
+                structureInput.FailureCollisionEnergy.Mean,
+                structureInput.FailureCollisionEnergy.CoefficientOfVariation,
                 generalInput.ModelFactorCollisionLoad.Mean,
                 generalInput.ModelFactorCollisionLoad.CoefficientOfVariation,
-                calculation.InputParameters.ShipMass.Mean,
-                calculation.InputParameters.ShipMass.CoefficientOfVariation,
-                calculation.InputParameters.ShipVelocity.Mean,
-                calculation.InputParameters.ShipVelocity.CoefficientOfVariation,
-                calculation.InputParameters.LevellingCount,
-                calculation.InputParameters.ProbabilityCollisionSecondaryStructure,
-                calculation.InputParameters.FlowVelocityStructureClosable.Mean,
-                calculation.InputParameters.FlowVelocityStructureClosable.CoefficientOfVariation,
-                calculation.InputParameters.InsideWaterLevel.Mean,
-                calculation.InputParameters.InsideWaterLevel.StandardDeviation,
-                calculation.InputParameters.AllowedLevelIncreaseStorage.Mean,
-                calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation,
+                structureInput.ShipMass.Mean,
+                structureInput.ShipMass.CoefficientOfVariation,
+                structureInput.ShipVelocity.Mean,
+                structureInput.ShipVelocity.CoefficientOfVariation,
+                structureInput.LevellingCount,
+                structureInput.ProbabilityCollisionSecondaryStructure,
+                structureInput.FlowVelocityStructureClosable.Mean,
+                structureInput.FlowVelocityStructureClosable.CoefficientOfVariation,
+                structureInput.InsideWaterLevel.Mean,
+                structureInput.InsideWaterLevel.StandardDeviation,
+                structureInput.AllowedLevelIncreaseStorage.Mean,
+                structureInput.AllowedLevelIncreaseStorage.StandardDeviation,
                 generalInput.ModelFactorStorageVolume.Mean,
                 generalInput.ModelFactorStorageVolume.StandardDeviation,
-                calculation.InputParameters.StorageStructureArea.Mean,
-                calculation.InputParameters.StorageStructureArea.CoefficientOfVariation,
+                structureInput.StorageStructureArea.Mean,
+                structureInput.StorageStructureArea.CoefficientOfVariation,
                 generalInput.ModelFactorInflowVolume,
-                calculation.InputParameters.FlowWidthAtBottomProtection.Mean,
-                calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation,
-                calculation.InputParameters.CriticalOvertoppingDischarge.Mean,
-                calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation,
-                calculation.InputParameters.FailureProbabilityStructureWithErosion,
-                calculation.InputParameters.StormDuration.Mean,
-                calculation.InputParameters.StormDuration.CoefficientOfVariation,
-                calculation.InputParameters.BankWidth.Mean,
-                calculation.InputParameters.BankWidth.StandardDeviation,
-                calculation.InputParameters.EvaluationLevel,
+                structureInput.FlowWidthAtBottomProtection.Mean,
+                structureInput.FlowWidthAtBottomProtection.StandardDeviation,
+                structureInput.CriticalOvertoppingDischarge.Mean,
+                structureInput.CriticalOvertoppingDischarge.CoefficientOfVariation,
+                structureInput.FailureProbabilityStructureWithErosion,
+                structureInput.StormDuration.Mean,
+                structureInput.StormDuration.CoefficientOfVariation,
+                structureInput.BankWidth.Mean,
+                structureInput.BankWidth.StandardDeviation,
+                structureInput.EvaluationLevel,
                 generalInput.ModelFactorLoadEffect.Mean,
                 generalInput.ModelFactorLoadEffect.StandardDeviation,
                 generalInput.WaveRatioMaxHN,
                 generalInput.WaveRatioMaxHStandardDeviation,
-                calculation.InputParameters.VerticalDistance,
+                structureInput.VerticalDistance,
                 generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent,
                 generalInput.ModificationFactorDynamicOrImpulsivePressureComponent,
-                calculation.InputParameters.ModelFactorSuperCriticalFlow.Mean,
-                calculation.InputParameters.ModelFactorSuperCriticalFlow.StandardDeviation,
-                calculation.InputParameters.ConstructiveStrengthLinearLoadModel.Mean,
-                calculation.InputParameters.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation,
-                calculation.InputParameters.StabilityLinearLoadModel.Mean,
-                calculation.InputParameters.StabilityLinearLoadModel.CoefficientOfVariation,
-                calculation.InputParameters.WidthFlowApertures.Mean,
-                calculation.InputParameters.WidthFlowApertures.StandardDeviation);
+                structureInput.ModelFactorSuperCriticalFlow.Mean,
+                structureInput.ModelFactorSuperCriticalFlow.StandardDeviation,
+                structureInput.ConstructiveStrengthLinearLoadModel.Mean,
+                structureInput.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation,
+                structureInput.StabilityLinearLoadModel.Mean,
+                structureInput.StabilityLinearLoadModel.CoefficientOfVariation,
+                structureInput.WidthFlowApertures.Mean,
+                structureInput.WidthFlowApertures.StandardDeviation);
 
             return structuresStabilityPointLowSillLinearCalculationInput;
         }
 
         private StructuresStabilityPointLowSillQuadraticCalculationInput CreateLowSillQuadraticCalculationInput(
-            StructuresCalculation<StabilityPointStructuresInput> calculation,
+            StabilityPointStructuresInput structureInput,
             GeneralStabilityPointStructuresInput generalInput)
         {
             return new StructuresStabilityPointLowSillQuadraticCalculationInput(
-                calculation.InputParameters.HydraulicBoundaryLocation.Id,
-                calculation.InputParameters.StructureNormalOrientation,
-                HydraRingInputParser.ParseForeshore(calculation.InputParameters),
-                HydraRingInputParser.ParseBreakWater(calculation.InputParameters),
-                calculation.InputParameters.VolumicWeightWater,
+                structureInput.HydraulicBoundaryLocation.Id,
+                structureInput.StructureNormalOrientation,
+                HydraRingInputParser.ParseForeshore(structureInput),
+                HydraRingInputParser.ParseBreakWater(structureInput),
+                structureInput.VolumicWeightWater,
                 generalInput.GravitationalAcceleration,
-                calculation.InputParameters.LevelCrestStructure.Mean,
-                calculation.InputParameters.LevelCrestStructure.StandardDeviation,
-                calculation.InputParameters.StructureNormalOrientation,
-                calculation.InputParameters.FactorStormDurationOpenStructure,
+                structureInput.LevelCrestStructure.Mean,
+                structureInput.LevelCrestStructure.StandardDeviation,
+                structureInput.StructureNormalOrientation,
+                structureInput.FactorStormDurationOpenStructure,
                 generalInput.ModelFactorSubCriticalFlow.Mean,
                 generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
-                calculation.InputParameters.ThresholdHeightOpenWeir.Mean,
-                calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation,
-                calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean,
-                calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation,
-                calculation.InputParameters.FailureProbabilityRepairClosure,
-                calculation.InputParameters.FailureCollisionEnergy.Mean,
-                calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation,
+                structureInput.ThresholdHeightOpenWeir.Mean,
+                structureInput.ThresholdHeightOpenWeir.StandardDeviation,
+                structureInput.InsideWaterLevelFailureConstruction.Mean,
+                structureInput.InsideWaterLevelFailureConstruction.StandardDeviation,
+                structureInput.FailureProbabilityRepairClosure,
+                structureInput.FailureCollisionEnergy.Mean,
+                structureInput.FailureCollisionEnergy.CoefficientOfVariation,
                 generalInput.ModelFactorCollisionLoad.Mean,
                 generalInput.ModelFactorCollisionLoad.CoefficientOfVariation,
-                calculation.InputParameters.ShipMass.Mean,
-                calculation.InputParameters.ShipMass.CoefficientOfVariation,
-                calculation.InputParameters.ShipVelocity.Mean,
-                calculation.InputParameters.ShipVelocity.CoefficientOfVariation,
-                calculation.InputParameters.LevellingCount,
-                calculation.InputParameters.ProbabilityCollisionSecondaryStructure,
-                calculation.InputParameters.FlowVelocityStructureClosable.Mean,
-                calculation.InputParameters.FlowVelocityStructureClosable.CoefficientOfVariation,
-                calculation.InputParameters.InsideWaterLevel.Mean,
-                calculation.InputParameters.InsideWaterLevel.StandardDeviation,
-                calculation.InputParameters.AllowedLevelIncreaseStorage.Mean,
-                calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation,
+                structureInput.ShipMass.Mean,
+                structureInput.ShipMass.CoefficientOfVariation,
+                structureInput.ShipVelocity.Mean,
+                structureInput.ShipVelocity.CoefficientOfVariation,
+                structureInput.LevellingCount,
+                structureInput.ProbabilityCollisionSecondaryStructure,
+                structureInput.FlowVelocityStructureClosable.Mean,
+                structureInput.FlowVelocityStructureClosable.CoefficientOfVariation,
+                structureInput.InsideWaterLevel.Mean,
+                structureInput.InsideWaterLevel.StandardDeviation,
+                structureInput.AllowedLevelIncreaseStorage.Mean,
+                structureInput.AllowedLevelIncreaseStorage.StandardDeviation,
                 generalInput.ModelFactorStorageVolume.Mean,
                 generalInput.ModelFactorStorageVolume.StandardDeviation,
-                calculation.InputParameters.StorageStructureArea.Mean,
-                calculation.InputParameters.StorageStructureArea.CoefficientOfVariation,
+                structureInput.StorageStructureArea.Mean,
+                structureInput.StorageStructureArea.CoefficientOfVariation,
                 generalInput.ModelFactorInflowVolume,
-                calculation.InputParameters.FlowWidthAtBottomProtection.Mean,
-                calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation,
-                calculation.InputParameters.CriticalOvertoppingDischarge.Mean,
-                calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation,
-                calculation.InputParameters.FailureProbabilityStructureWithErosion,
-                calculation.InputParameters.StormDuration.Mean,
-                calculation.InputParameters.StormDuration.CoefficientOfVariation,
-                calculation.InputParameters.BankWidth.Mean,
-                calculation.InputParameters.BankWidth.StandardDeviation,
-                calculation.InputParameters.EvaluationLevel,
+                structureInput.FlowWidthAtBottomProtection.Mean,
+                structureInput.FlowWidthAtBottomProtection.StandardDeviation,
+                structureInput.CriticalOvertoppingDischarge.Mean,
+                structureInput.CriticalOvertoppingDischarge.CoefficientOfVariation,
+                structureInput.FailureProbabilityStructureWithErosion,
+                structureInput.StormDuration.Mean,
+                structureInput.StormDuration.CoefficientOfVariation,
+                structureInput.BankWidth.Mean,
+                structureInput.BankWidth.StandardDeviation,
+                structureInput.EvaluationLevel,
                 generalInput.ModelFactorLoadEffect.Mean,
                 generalInput.ModelFactorLoadEffect.StandardDeviation,
                 generalInput.WaveRatioMaxHN,
                 generalInput.WaveRatioMaxHStandardDeviation,
-                calculation.InputParameters.VerticalDistance,
+                structureInput.VerticalDistance,
                 generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent,
                 generalInput.ModificationFactorDynamicOrImpulsivePressureComponent,
-                calculation.InputParameters.ModelFactorSuperCriticalFlow.Mean,
-                calculation.InputParameters.ModelFactorSuperCriticalFlow.StandardDeviation,
-                calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.Mean,
-                calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation,
-                calculation.InputParameters.StabilityQuadraticLoadModel.Mean,
-                calculation.InputParameters.StabilityQuadraticLoadModel.CoefficientOfVariation,
-                calculation.InputParameters.WidthFlowApertures.Mean,
-                calculation.InputParameters.WidthFlowApertures.StandardDeviation);
+                structureInput.ModelFactorSuperCriticalFlow.Mean,
+                structureInput.ModelFactorSuperCriticalFlow.StandardDeviation,
+                structureInput.ConstructiveStrengthQuadraticLoadModel.Mean,
+                structureInput.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation,
+                structureInput.StabilityQuadraticLoadModel.Mean,
+                structureInput.StabilityQuadraticLoadModel.CoefficientOfVariation,
+                structureInput.WidthFlowApertures.Mean,
+                structureInput.WidthFlowApertures.StandardDeviation);
         }
 
         private StructuresStabilityPointFloodedCulvertLinearCalculationInput CreateFloodedCulvertLinearCalculationInput(
-            StructuresCalculation<StabilityPointStructuresInput> calculation,
+            StabilityPointStructuresInput structureInput,
             GeneralStabilityPointStructuresInput generalInput)
         {
             return new StructuresStabilityPointFloodedCulvertLinearCalculationInput(
-                calculation.InputParameters.HydraulicBoundaryLocation.Id,
-                calculation.InputParameters.StructureNormalOrientation,
-                HydraRingInputParser.ParseForeshore(calculation.InputParameters),
-                HydraRingInputParser.ParseBreakWater(calculation.InputParameters),
-                calculation.InputParameters.VolumicWeightWater,
+                structureInput.HydraulicBoundaryLocation.Id,
+                structureInput.StructureNormalOrientation,
+                HydraRingInputParser.ParseForeshore(structureInput),
+                HydraRingInputParser.ParseBreakWater(structureInput),
+                structureInput.VolumicWeightWater,
                 generalInput.GravitationalAcceleration,
-                calculation.InputParameters.LevelCrestStructure.Mean,
-                calculation.InputParameters.LevelCrestStructure.StandardDeviation,
-                calculation.InputParameters.StructureNormalOrientation,
-                calculation.InputParameters.FactorStormDurationOpenStructure,
+                structureInput.LevelCrestStructure.Mean,
+                structureInput.LevelCrestStructure.StandardDeviation,
+                structureInput.StructureNormalOrientation,
+                structureInput.FactorStormDurationOpenStructure,
                 generalInput.ModelFactorSubCriticalFlow.Mean,
                 generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
-                calculation.InputParameters.ThresholdHeightOpenWeir.Mean,
-                calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation,
-                calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean,
-                calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation,
-                calculation.InputParameters.FailureProbabilityRepairClosure,
-                calculation.InputParameters.FailureCollisionEnergy.Mean,
-                calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation,
+                structureInput.ThresholdHeightOpenWeir.Mean,
+                structureInput.ThresholdHeightOpenWeir.StandardDeviation,
+                structureInput.InsideWaterLevelFailureConstruction.Mean,
+                structureInput.InsideWaterLevelFailureConstruction.StandardDeviation,
+                structureInput.FailureProbabilityRepairClosure,
+                structureInput.FailureCollisionEnergy.Mean,
+                structureInput.FailureCollisionEnergy.CoefficientOfVariation,
                 generalInput.ModelFactorCollisionLoad.Mean,
                 generalInput.ModelFactorCollisionLoad.CoefficientOfVariation,
-                calculation.InputParameters.ShipMass.Mean,
-                calculation.InputParameters.ShipMass.CoefficientOfVariation,
-                calculation.InputParameters.ShipVelocity.Mean,
-                calculation.InputParameters.ShipVelocity.CoefficientOfVariation,
-                calculation.InputParameters.LevellingCount,
-                calculation.InputParameters.ProbabilityCollisionSecondaryStructure,
-                calculation.InputParameters.FlowVelocityStructureClosable.Mean,
-                calculation.InputParameters.FlowVelocityStructureClosable.CoefficientOfVariation,
-                calculation.InputParameters.InsideWaterLevel.Mean,
-                calculation.InputParameters.InsideWaterLevel.StandardDeviation,
-                calculation.InputParameters.AllowedLevelIncreaseStorage.Mean,
-                calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation,
+                structureInput.ShipMass.Mean,
+                structureInput.ShipMass.CoefficientOfVariation,
+                structureInput.ShipVelocity.Mean,
+                structureInput.ShipVelocity.CoefficientOfVariation,
+                structureInput.LevellingCount,
+                structureInput.ProbabilityCollisionSecondaryStructure,
+                structureInput.FlowVelocityStructureClosable.Mean,
+                structureInput.FlowVelocityStructureClosable.CoefficientOfVariation,
+                structureInput.InsideWaterLevel.Mean,
+                structureInput.InsideWaterLevel.StandardDeviation,
+                structureInput.AllowedLevelIncreaseStorage.Mean,
+                structureInput.AllowedLevelIncreaseStorage.StandardDeviation,
                 generalInput.ModelFactorStorageVolume.Mean,
                 generalInput.ModelFactorStorageVolume.StandardDeviation,
-                calculation.InputParameters.StorageStructureArea.Mean,
-                calculation.InputParameters.StorageStructureArea.CoefficientOfVariation,
+                structureInput.StorageStructureArea.Mean,
+                structureInput.StorageStructureArea.CoefficientOfVariation,
                 generalInput.ModelFactorInflowVolume,
-                calculation.InputParameters.FlowWidthAtBottomProtection.Mean,
-                calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation,
-                calculation.InputParameters.CriticalOvertoppingDischarge.Mean,
-                calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation,
-                calculation.InputParameters.FailureProbabilityStructureWithErosion,
-                calculation.InputParameters.StormDuration.Mean,
-                calculation.InputParameters.StormDuration.CoefficientOfVariation,
-                calculation.InputParameters.BankWidth.Mean,
-                calculation.InputParameters.BankWidth.StandardDeviation,
-                calculation.InputParameters.EvaluationLevel,
+                structureInput.FlowWidthAtBottomProtection.Mean,
+                structureInput.FlowWidthAtBottomProtection.StandardDeviation,
+                structureInput.CriticalOvertoppingDischarge.Mean,
+                structureInput.CriticalOvertoppingDischarge.CoefficientOfVariation,
+                structureInput.FailureProbabilityStructureWithErosion,
+                structureInput.StormDuration.Mean,
+                structureInput.StormDuration.CoefficientOfVariation,
+                structureInput.BankWidth.Mean,
+                structureInput.BankWidth.StandardDeviation,
+                structureInput.EvaluationLevel,
                 generalInput.ModelFactorLoadEffect.Mean,
                 generalInput.ModelFactorLoadEffect.StandardDeviation,
                 generalInput.WaveRatioMaxHN,
                 generalInput.WaveRatioMaxHStandardDeviation,
-                calculation.InputParameters.VerticalDistance,
+                structureInput.VerticalDistance,
                 generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent,
                 generalInput.ModificationFactorDynamicOrImpulsivePressureComponent,
-                calculation.InputParameters.DrainCoefficient.Mean,
-                calculation.InputParameters.DrainCoefficient.StandardDeviation,
-                calculation.InputParameters.AreaFlowApertures.Mean,
-                calculation.InputParameters.AreaFlowApertures.StandardDeviation,
-                calculation.InputParameters.ConstructiveStrengthLinearLoadModel.Mean,
-                calculation.InputParameters.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation,
-                calculation.InputParameters.StabilityLinearLoadModel.Mean,
-                calculation.InputParameters.StabilityLinearLoadModel.CoefficientOfVariation);
+                structureInput.DrainCoefficient.Mean,
+                structureInput.DrainCoefficient.StandardDeviation,
+                structureInput.AreaFlowApertures.Mean,
+                structureInput.AreaFlowApertures.StandardDeviation,
+                structureInput.ConstructiveStrengthLinearLoadModel.Mean,
+                structureInput.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation,
+                structureInput.StabilityLinearLoadModel.Mean,
+                structureInput.StabilityLinearLoadModel.CoefficientOfVariation);
         }
 
         private StructuresStabilityPointFloodedCulvertQuadraticCalculationInput CreateFloodedCulvertQuadraticCalculationInput(
-            StructuresCalculation<StabilityPointStructuresInput> calculation,
+            StabilityPointStructuresInput structureInput,
             GeneralStabilityPointStructuresInput generalInput)
         {
             return new StructuresStabilityPointFloodedCulvertQuadraticCalculationInput(
-                calculation.InputParameters.HydraulicBoundaryLocation.Id,
-                calculation.InputParameters.StructureNormalOrientation,
-                HydraRingInputParser.ParseForeshore(calculation.InputParameters),
-                HydraRingInputParser.ParseBreakWater(calculation.InputParameters),
-                calculation.InputParameters.VolumicWeightWater,
+                structureInput.HydraulicBoundaryLocation.Id,
+                structureInput.StructureNormalOrientation,
+                HydraRingInputParser.ParseForeshore(structureInput),
+                HydraRingInputParser.ParseBreakWater(structureInput),
+                structureInput.VolumicWeightWater,
                 generalInput.GravitationalAcceleration,
-                calculation.InputParameters.LevelCrestStructure.Mean,
-                calculation.InputParameters.LevelCrestStructure.StandardDeviation,
-                calculation.InputParameters.StructureNormalOrientation,
-                calculation.InputParameters.FactorStormDurationOpenStructure,
+                structureInput.LevelCrestStructure.Mean,
+                structureInput.LevelCrestStructure.StandardDeviation,
+                structureInput.StructureNormalOrientation,
+                structureInput.FactorStormDurationOpenStructure,
                 generalInput.ModelFactorSubCriticalFlow.Mean,
                 generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
-                calculation.InputParameters.ThresholdHeightOpenWeir.Mean,
-                calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation,
-                calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean,
-                calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation,
-                calculation.InputParameters.FailureProbabilityRepairClosure,
-                calculation.InputParameters.FailureCollisionEnergy.Mean,
-                calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation,
+                structureInput.ThresholdHeightOpenWeir.Mean,
+                structureInput.ThresholdHeightOpenWeir.StandardDeviation,
+                structureInput.InsideWaterLevelFailureConstruction.Mean,
+                structureInput.InsideWaterLevelFailureConstruction.StandardDeviation,
+                structureInput.FailureProbabilityRepairClosure,
+                structureInput.FailureCollisionEnergy.Mean,
+                structureInput.FailureCollisionEnergy.CoefficientOfVariation,
                 generalInput.ModelFactorCollisionLoad.Mean,
                 generalInput.ModelFactorCollisionLoad.CoefficientOfVariation,
-                calculation.InputParameters.ShipMass.Mean,
-                calculation.InputParameters.ShipMass.CoefficientOfVariation,
-                calculation.InputParameters.ShipVelocity.Mean,
-                calculation.InputParameters.ShipVelocity.CoefficientOfVariation,
-                calculation.InputParameters.LevellingCount,
-                calculation.InputParameters.ProbabilityCollisionSecondaryStructure,
-                calculation.InputParameters.FlowVelocityStructureClosable.Mean,
-                calculation.InputParameters.FlowVelocityStructureClosable.CoefficientOfVariation,
-                calculation.InputParameters.InsideWaterLevel.Mean,
-                calculation.InputParameters.InsideWaterLevel.StandardDeviation,
-                calculation.InputParameters.AllowedLevelIncreaseStorage.Mean,
-                calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation,
+                structureInput.ShipMass.Mean,
+                structureInput.ShipMass.CoefficientOfVariation,
+                structureInput.ShipVelocity.Mean,
+                structureInput.ShipVelocity.CoefficientOfVariation,
+                structureInput.LevellingCount,
+                structureInput.ProbabilityCollisionSecondaryStructure,
+                structureInput.FlowVelocityStructureClosable.Mean,
+                structureInput.FlowVelocityStructureClosable.CoefficientOfVariation,
+                structureInput.InsideWaterLevel.Mean,
+                structureInput.InsideWaterLevel.StandardDeviation,
+                structureInput.AllowedLevelIncreaseStorage.Mean,
+                structureInput.AllowedLevelIncreaseStorage.StandardDeviation,
                 generalInput.ModelFactorStorageVolume.Mean,
                 generalInput.ModelFactorStorageVolume.StandardDeviation,
-                calculation.InputParameters.StorageStructureArea.Mean,
-                calculation.InputParameters.StorageStructureArea.CoefficientOfVariation,
+                structureInput.StorageStructureArea.Mean,
+                structureInput.StorageStructureArea.CoefficientOfVariation,
                 generalInput.ModelFactorInflowVolume,
-                calculation.InputParameters.FlowWidthAtBottomProtection.Mean,
-                calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation,
-                calculation.InputParameters.CriticalOvertoppingDischarge.Mean,
-                calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation,
-                calculation.InputParameters.FailureProbabilityStructureWithErosion,
-                calculation.InputParameters.StormDuration.Mean,
-                calculation.InputParameters.StormDuration.CoefficientOfVariation,
-                calculation.InputParameters.BankWidth.Mean,
-                calculation.InputParameters.BankWidth.StandardDeviation,
-                calculation.InputParameters.EvaluationLevel,
+                structureInput.FlowWidthAtBottomProtection.Mean,
+                structureInput.FlowWidthAtBottomProtection.StandardDeviation,
+                structureInput.CriticalOvertoppingDischarge.Mean,
+                structureInput.CriticalOvertoppingDischarge.CoefficientOfVariation,
+                structureInput.FailureProbabilityStructureWithErosion,
+                structureInput.StormDuration.Mean,
+                structureInput.StormDuration.CoefficientOfVariation,
+                structureInput.BankWidth.Mean,
+                structureInput.BankWidth.StandardDeviation,
+                structureInput.EvaluationLevel,
                 generalInput.ModelFactorLoadEffect.Mean,
                 generalInput.ModelFactorLoadEffect.StandardDeviation,
                 generalInput.WaveRatioMaxHN,
                 generalInput.WaveRatioMaxHStandardDeviation,
-                calculation.InputParameters.VerticalDistance,
+                structureInput.VerticalDistance,
                 generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent,
                 generalInput.ModificationFactorDynamicOrImpulsivePressureComponent,
-                calculation.InputParameters.DrainCoefficient.Mean,
-                calculation.InputParameters.DrainCoefficient.StandardDeviation,
-                calculation.InputParameters.AreaFlowApertures.Mean,
-                calculation.InputParameters.AreaFlowApertures.StandardDeviation,
-                calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.Mean,
-                calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation,
-                calculation.InputParameters.StabilityQuadraticLoadModel.Mean,
-                calculation.InputParameters.StabilityQuadraticLoadModel.CoefficientOfVariation);
+                structureInput.DrainCoefficient.Mean,
+                structureInput.DrainCoefficient.StandardDeviation,
+                structureInput.AreaFlowApertures.Mean,
+                structureInput.AreaFlowApertures.StandardDeviation,
+                structureInput.ConstructiveStrengthQuadraticLoadModel.Mean,
+                structureInput.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation,
+                structureInput.StabilityQuadraticLoadModel.Mean,
+                structureInput.StabilityQuadraticLoadModel.CoefficientOfVariation);
         }
     }
 }
\ No newline at end of file