Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rb2fcf3397249818ed401f0de71a60a156b101e4b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision b2fcf3397249818ed401f0de71a60a156b101e4b) @@ -68,6 +68,8 @@ private readonly double failureProbabilityStructureWithErosion; private readonly double stormDurationMean; private readonly double stormDurationVariation; + private readonly double modelFactorLongThresholdMean; + private readonly double modelFactorLongThresholdStandardDeviation; private readonly double bankWidthMean; private readonly double bankWidthStandardDeviation; private readonly double evaluationLevel; @@ -125,6 +127,8 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. + /// The mean of the model factor long threshold. + /// The standard deviation of the model factor long threshold. /// The mean of the bank width. /// The standard deviation of the bank width. /// The evaluation level. @@ -163,6 +167,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, + double modelFactorLongThresholdMean, double modelFactorLongThresholdStandardDeviation, double bankWidthMean, double bankWidthStandardDeviation, double evaluationLevel, double modelFactorLoadEffectMean, double modelFactorLoadEffectStandardDeviation, @@ -214,6 +219,8 @@ this.failureProbabilityStructureWithErosion = failureProbabilityStructureWithErosion; this.stormDurationMean = stormDurationMean; this.stormDurationVariation = stormDurationVariation; + this.modelFactorLongThresholdMean = modelFactorLongThresholdMean; + this.modelFactorLongThresholdStandardDeviation = modelFactorLongThresholdStandardDeviation; this.bankWidthMean = bankWidthMean; this.bankWidthStandardDeviation = bankWidthStandardDeviation; this.evaluationLevel = evaluationLevel; @@ -260,6 +267,7 @@ yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation); yield return new DeterministicHydraRingVariable(105, failureProbabilityStructureWithErosion); yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation); + yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, bankWidthMean, bankWidthStandardDeviation); yield return new DeterministicHydraRingVariable(131, evaluationLevel); yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, modelFactorLoadEffectMean, modelFactorLoadEffectStandardDeviation); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs =================================================================== diff -u -ree18f86a1655fac1b7a73bce1baaab7e91cba46e -rb2fcf3397249818ed401f0de71a60a156b101e4b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision ee18f86a1655fac1b7a73bce1baaab7e91cba46e) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision b2fcf3397249818ed401f0de71a60a156b101e4b) @@ -38,8 +38,6 @@ private readonly double constructiveStrengthLinearLoadModelVariation; private readonly double stabilityLinearLoadModelMean; private readonly double stabilityLinearLoadModelVariation; - private readonly double modelFactorLongThresholdMean; - private readonly double modelFactorLongThresholdStandardDeviation; /// /// Creates a new instance of . @@ -174,6 +172,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation, bankWidthMean, bankWidthStandardDeviation, evaluationLevel, modelFactorLoadEffectMean, modelFactorLoadEffectStandardDeviation, @@ -190,8 +189,6 @@ this.constructiveStrengthLinearLoadModelVariation = constructiveStrengthLinearLoadModelVariation; this.stabilityLinearLoadModelMean = stabilityLinearLoadModelMean; this.stabilityLinearLoadModelVariation = stabilityLinearLoadModelVariation; - this.modelFactorLongThresholdMean = modelFactorLongThresholdMean; - this.modelFactorLongThresholdStandardDeviation = modelFactorLongThresholdStandardDeviation; } public override IEnumerable Variables @@ -228,7 +225,6 @@ yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation); yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation); yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation); - yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs =================================================================== diff -u -r9bbed07929837ea484c6d3a8424eda86148af481 -rb2fcf3397249818ed401f0de71a60a156b101e4b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 9bbed07929837ea484c6d3a8424eda86148af481) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision b2fcf3397249818ed401f0de71a60a156b101e4b) @@ -38,8 +38,6 @@ private readonly double constructiveStrengthQuadraticLoadModelVariation; private readonly double stabilityQuadraticLoadModelMean; private readonly double stabilityQuadraticLoadModelVariation; - private readonly double modelFactorLongThresholdMean; - private readonly double modelFactorLongThresholdStandardDeviation; /// /// Creates a new instance of . @@ -174,6 +172,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation, bankWidthMean, bankWidthStandardDeviation, evaluationLevel, modelFactorLoadEffectMean, modelFactorLoadEffectStandardDeviation, @@ -190,8 +189,6 @@ this.constructiveStrengthQuadraticLoadModelVariation = constructiveStrengthQuadraticLoadModelVariation; this.stabilityQuadraticLoadModelMean = stabilityQuadraticLoadModelMean; this.stabilityQuadraticLoadModelVariation = stabilityQuadraticLoadModelVariation; - this.modelFactorLongThresholdMean = modelFactorLongThresholdMean; - this.modelFactorLongThresholdStandardDeviation = modelFactorLongThresholdStandardDeviation; } public override IEnumerable Variables @@ -228,7 +225,6 @@ yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation); yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, constructiveStrengthQuadraticLoadModelVariation); yield return new LogNormalHydraRingVariable(84, HydraRingDeviationType.Variation, stabilityQuadraticLoadModelMean, stabilityQuadraticLoadModelVariation); - yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rb2fcf3397249818ed401f0de71a60a156b101e4b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision b2fcf3397249818ed401f0de71a60a156b101e4b) @@ -36,8 +36,6 @@ private readonly double stabilityLinearLoadModelVariation; private readonly double widthFlowAperturesMean; private readonly double widthFlowAperturesStandardDeviation; - private readonly double modelFactorLongThresholdMean; - private readonly double modelFactorLongThresholdStandardDeviation; /// /// Creates a new instance of . @@ -169,6 +167,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation, bankWidthMean, bankWidthStandardDeviation, evaluationLevel, modelFactorLoadEffectMean, modelFactorLoadEffectStandardDeviation, @@ -183,8 +182,6 @@ this.stabilityLinearLoadModelVariation = stabilityLinearLoadModelVariation; this.widthFlowAperturesMean = widthFlowAperturesMean; this.widthFlowAperturesStandardDeviation = widthFlowAperturesStandardDeviation; - this.modelFactorLongThresholdMean = modelFactorLongThresholdMean; - this.modelFactorLongThresholdStandardDeviation = modelFactorLongThresholdStandardDeviation; } public override IEnumerable Variables @@ -220,7 +217,6 @@ 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); - yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rb2fcf3397249818ed401f0de71a60a156b101e4b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision b2fcf3397249818ed401f0de71a60a156b101e4b) @@ -36,8 +36,6 @@ private readonly double stabilityQuadraticLoadModelVariation; private readonly double widthFlowAperturesMean; private readonly double widthFlowAperturesStandardDeviation; - private readonly double modelFactorLongThresholdMean; - private readonly double modelFactorLongThresholdStandardDeviation; /// /// Creates a new instance of . @@ -169,6 +167,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation, bankWidthMean, bankWidthStandardDeviation, evaluationLevel, modelFactorLoadEffectMean, modelFactorLoadEffectStandardDeviation, @@ -183,8 +182,6 @@ this.stabilityQuadraticLoadModelVariation = stabilityQuadraticLoadModelVariation; this.widthFlowAperturesMean = widthFlowAperturesMean; this.widthFlowAperturesStandardDeviation = widthFlowAperturesStandardDeviation; - this.modelFactorLongThresholdMean = modelFactorLongThresholdMean; - this.modelFactorLongThresholdStandardDeviation = modelFactorLongThresholdStandardDeviation; } public override IEnumerable Variables @@ -220,7 +217,6 @@ yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, constructiveStrengthQuadraticLoadModelVariation); yield return new LogNormalHydraRingVariable(84, HydraRingDeviationType.Variation, stabilityQuadraticLoadModelMean, stabilityQuadraticLoadModelVariation); yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, widthFlowAperturesMean, widthFlowAperturesStandardDeviation); - yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rb2fcf3397249818ed401f0de71a60a156b101e4b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision b2fcf3397249818ed401f0de71a60a156b101e4b) @@ -82,16 +82,18 @@ const double failureProbabilityStructureWithErosion = 37.37; const double stormDurationMean = 38.38; const double stormDurationVariation = 39.39; - const double bankWidthMean = 40.40; - const double bankWidthStandardDeviation = 41.41; - const double evaluationLevel = 42.42; - const double modelFactorLoadEffectMean = 43.43; - const double modelFactorLoadEffectStandardDeviation = 44.44; - const double waveRatioMaxHN = 45.45; - const double waveRatioMaxHStandardDeviation = 46.46; - const double verticalDistance = 47.47; - const double modificationFactorWavesSlowlyVaryingPressureComponent = 48.48; - const double modificationFactorDynamicOrImpulsivePressureComponent = 49.49; + const double modelFactorLongThresholdMean = 40.40; + const double modelFactorLongThresholdStandardDeviation = 41.41; + const double bankWidthMean = 42.42; + const double bankWidthStandardDeviation = 43.43; + const double evaluationLevel = 44.44; + const double modelFactorLoadEffectMean = 45.45; + const double modelFactorLoadEffectStandardDeviation = 46.46; + const double waveRatioMaxHN = 47.47; + const double waveRatioMaxHStandardDeviation = 48.48; + const double verticalDistance = 49.49; + const double modificationFactorWavesSlowlyVaryingPressureComponent = 50.50; + const double modificationFactorDynamicOrImpulsivePressureComponent = 51.51; // Call var input = new TestStructuresStabilityPointCalculationInput(hydraulicBoundaryLocationId, sectionNormal, @@ -120,6 +122,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation, bankWidthMean, bankWidthStandardDeviation, evaluationLevel, modelFactorLoadEffectMean, modelFactorLoadEffectStandardDeviation, @@ -171,13 +174,14 @@ yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 35.35, 36.36); yield return new DeterministicHydraRingVariable(105, 37.37); yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 38.38, 39.39); - yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 40.40, 41.41); - yield return new DeterministicHydraRingVariable(131, 42.42); - yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, 43.43, 44.44); - yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 45.45, 46.46); - yield return new DeterministicHydraRingVariable(134, 47.47); - yield return new DeterministicHydraRingVariable(135, 48.48); - yield return new DeterministicHydraRingVariable(136, 49.49); + yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, 40.40, 41.41); + yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 42.42, 43.43); + yield return new DeterministicHydraRingVariable(131, 44.44); + yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, 45.45, 46.46); + yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 47.47, 48.48); + yield return new DeterministicHydraRingVariable(134, 49.49); + yield return new DeterministicHydraRingVariable(135, 50.50); + yield return new DeterministicHydraRingVariable(136, 51.51); } private class TestStructuresStabilityPointCalculationInput : StructuresStabilityPointCalculationInput @@ -209,6 +213,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, + double modelFactorLongThresholdMean, double modelFactorLongThresholdStandardDeviation, double bankWidthMean, double bankWidthStandardDeviation, double evaluationLevel, double modelFactorLoadEffectMean, double modelFactorLoadEffectStandardDeviation, @@ -243,6 +248,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation, bankWidthMean, bankWidthStandardDeviation, evaluationLevel, modelFactorLoadEffectMean, modelFactorLoadEffectStandardDeviation,