Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs =================================================================== diff -u -r6181b47c13d78023ce936b0037294a94cc1f1708 -rf480fb0039a777a577a19bfe3e46db7c643f2607 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 6181b47c13d78023ce936b0037294a94cc1f1708) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision f480fb0039a777a577a19bfe3e46db7c643f2607) @@ -30,8 +30,6 @@ /// public class StructuresStabilityPointLowSillLinearCalculationInput : StructuresStabilityPointCalculationInput { - private readonly double modelFactorSuperCriticalFlowMean; - private readonly double modelFactorSuperCriticalFlowStandardDeviation; private readonly double constructiveStrengthLinearLoadModelMean; private readonly double constructiveStrengthLinearLoadModelVariation; private readonly double stabilityLinearLoadModelMean; @@ -95,8 +93,6 @@ /// The vertical distance. /// The modification factor waves slowly-varying pressure component. /// The modification factor dynamic or impulsive pressure component. - /// The mean of the model factor super critical flow. - /// The standard deviation of the model factor super critical flow. /// The mean of the constructive strength linear load model. /// The variation of the constructive strength linear load model. /// The mean of the stability linear load model. @@ -138,7 +134,6 @@ double verticalDistance, double modificationFactorWavesSlowlyVaryingPressureComponent, double modificationFactorDynamicOrImpulsivePressureComponent, - double modelFactorSuperCriticalFlowMean, double modelFactorSuperCriticalFlowStandardDeviation, double constructiveStrengthLinearLoadModelMean, double constructiveStrengthLinearLoadModelVariation, double stabilityLinearLoadModelMean, double stabilityLinearLoadModelVariation, double widthFlowAperturesMean, double widthFlowAperturesStandardDeviation) @@ -177,8 +172,6 @@ modificationFactorWavesSlowlyVaryingPressureComponent, modificationFactorDynamicOrImpulsivePressureComponent) { - this.modelFactorSuperCriticalFlowMean = modelFactorSuperCriticalFlowMean; - this.modelFactorSuperCriticalFlowStandardDeviation = modelFactorSuperCriticalFlowStandardDeviation; this.constructiveStrengthLinearLoadModelMean = constructiveStrengthLinearLoadModelMean; this.constructiveStrengthLinearLoadModelVariation = constructiveStrengthLinearLoadModelVariation; this.stabilityLinearLoadModelMean = stabilityLinearLoadModelMean; @@ -217,7 +210,6 @@ private IEnumerable GetVariables() { - yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation); yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation); yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation); yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, widthFlowAperturesMean, widthFlowAperturesStandardDeviation); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs =================================================================== diff -u -r7846c867eb8507a03c02801848023bf761560a7f -rf480fb0039a777a577a19bfe3e46db7c643f2607 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 7846c867eb8507a03c02801848023bf761560a7f) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision f480fb0039a777a577a19bfe3e46db7c643f2607) @@ -90,14 +90,12 @@ const double verticalDistance = 47.47; const double modificationFactorWavesSlowlyVaryingPressureComponent = 48.48; const double modificationFactorDynamicOrImpulsivePressureComponent = 49.49; - const double modelFactorSuperCriticalFlowMean = 50.50; - const double modelFactorSuperCriticalFlowStandardDeviation = 51.51; - const double constructiveStrengthLinearLoadModelMean = 52.52; - const double constructiveStrengthLinearLoadModelVariation = 53.53; - const double stabilityLinearLoadModelMean = 54.54; - const double stabilityLinearLoadModelVariation = 55.55; - const double widthFlowAperturesMean = 56.56; - const double widthFlowAperturesStandardDeviation = 57.57; + const double constructiveStrengthLinearLoadModelMean = 50.50; + const double constructiveStrengthLinearLoadModelVariation = 51.51; + const double stabilityLinearLoadModelMean = 52.52; + const double stabilityLinearLoadModelVariation = 53.53; + const double widthFlowAperturesMean = 54.54; + const double widthFlowAperturesStandardDeviation = 55.55; // Call var input = new StructuresStabilityPointLowSillLinearCalculationInput(hydraulicBoundaryLocationId, sectionNormal, @@ -133,7 +131,6 @@ verticalDistance, modificationFactorWavesSlowlyVaryingPressureComponent, modificationFactorDynamicOrImpulsivePressureComponent, - modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation, stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation, widthFlowAperturesMean, widthFlowAperturesStandardDeviation); @@ -174,7 +171,7 @@ 32.32, 33.33, 34.34, 35.35, 36.36, 37.37, 38.38, 39.39, 40.40, 41.41, 42.42, 43.43, 44.44, 45.45, 46.46, 47.47, 48.48, 49.49, 50.50, 51.51, 52.52, - 53.53, 54.54, 55.55, 56.56, 57.57); + 53.53, 54.54, 55.55); // Call int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r3f610bc3fa2f00b115784c53fbeaa365f8d515ff -rf480fb0039a777a577a19bfe3e46db7c643f2607 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 3f610bc3fa2f00b115784c53fbeaa365f8d515ff) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision f480fb0039a777a577a19bfe3e46db7c643f2607) @@ -1914,7 +1914,7 @@ 43.3, 44.4, 45.5, 46.6, 47.7, 48.8, 49.9, 50.0, 51.1, 52.2, 53.3, 54.4, - 55.5, 56.6, 57.7) + 55.5) { PreprocessorSetting = CreatePreprocessorSetting(runPreprocessor), DesignTablesSetting = new DesignTablesSetting(0, 0), Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -r8b61e5e63c28e3b28e1b65e04440f26fce364475 -rf480fb0039a777a577a19bfe3e46db7c643f2607 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 8b61e5e63c28e3b28e1b65e04440f26fce364475) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision f480fb0039a777a577a19bfe3e46db7c643f2607) @@ -205,8 +205,6 @@ structureInput.VerticalDistance, generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, - 0.0, - 0.0, structureInput.ConstructiveStrengthLinearLoadModel.Mean, structureInput.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, structureInput.StabilityLinearLoadModel.Mean, Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationStochastAssignerTest.cs =================================================================== diff -u -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7 -rf480fb0039a777a577a19bfe3e46db7c643f2607 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationStochastAssignerTest.cs (.../StabilityPointStructuresCalculationStochastAssignerTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationStochastAssignerTest.cs (.../StabilityPointStructuresCalculationStochastAssignerTest.cs) (revision f480fb0039a777a577a19bfe3e46db7c643f2607) @@ -181,10 +181,6 @@ { Mean = 10 }, - ModelFactorSuperCriticalFlow = new StochastConfiguration - { - Mean = 11 - }, FlowVelocityStructureClosable = new StochastConfiguration { Mean = 1 Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -r8b61e5e63c28e3b28e1b65e04440f26fce364475 -rf480fb0039a777a577a19bfe3e46db7c643f2607 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 8b61e5e63c28e3b28e1b65e04440f26fce364475) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision f480fb0039a777a577a19bfe3e46db7c643f2607) @@ -671,8 +671,6 @@ input.VerticalDistance, generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, - 0.0, - 0.0, input.ConstructiveStrengthLinearLoadModel.Mean, input.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, input.StabilityLinearLoadModel.Mean, @@ -790,8 +788,6 @@ input.VerticalDistance, generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, - 0.0, - 0.0, input.ConstructiveStrengthLinearLoadModel.Mean, input.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, input.StabilityLinearLoadModel.Mean,