Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -rd87fc9c41a2cf056c18f9353c831d22ed103a6bb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision d87fc9c41a2cf056c18f9353c831d22ed103a6bb) @@ -48,7 +48,7 @@ private readonly double failureProbabilityStructureWithErosion; private readonly double stormDurationMean; private readonly double stormDurationVariation; - private readonly double probabilityOrFrequencyOpenStructureBeforeFlooding; + private readonly double probabilityOpenStructureBeforeFlooding; /// /// Creates a new instance of . @@ -76,7 +76,7 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. - /// The probability or frequency of an open structure before flooding. + /// The probability of an open structure before flooding. protected StructuresClosureCalculationInput(long hydraulicBoundaryLocationId, double sectionNormal, IEnumerable forelandPoints, @@ -94,7 +94,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOrFrequencyOpenStructureBeforeFlooding) + double probabilityOpenStructureBeforeFlooding) : base(hydraulicBoundaryLocationId) { Section = new HydraRingSection(1, double.NaN, sectionNormal); @@ -119,7 +119,7 @@ this.failureProbabilityStructureWithErosion = failureProbabilityStructureWithErosion; this.stormDurationMean = stormDurationMean; this.stormDurationVariation = stormDurationVariation; - this.probabilityOrFrequencyOpenStructureBeforeFlooding = probabilityOrFrequencyOpenStructureBeforeFlooding; + this.probabilityOpenStructureBeforeFlooding = probabilityOpenStructureBeforeFlooding; } public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.StructuresClosure; @@ -145,7 +145,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 DeterministicHydraRingVariable(129, probabilityOrFrequencyOpenStructureBeforeFlooding); + yield return new DeterministicHydraRingVariable(129, probabilityOpenStructureBeforeFlooding); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -rd87fc9c41a2cf056c18f9353c831d22ed103a6bb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision d87fc9c41a2cf056c18f9353c831d22ed103a6bb) @@ -63,7 +63,7 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. - /// The probability of an open structure before flooding. + /// The probability of an open structure before flooding. /// The mean of the drain coefficient. /// The standard deviation of the drain coefficient. /// The mean of the area of flow apertures. @@ -87,7 +87,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOrFrequencyOpenStructureBeforeFlooding, + double probabilityOpenStructureBeforeFlooding, double drainCoefficientMean, double drainCoefficientStandardDeviation, double areaFlowAperturesMean, double areaFlowAperturesStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation) @@ -107,7 +107,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOrFrequencyOpenStructureBeforeFlooding) + probabilityOpenStructureBeforeFlooding) { this.drainCoefficientMean = drainCoefficientMean; this.drainCoefficientStandardDeviation = drainCoefficientStandardDeviation; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -rd87fc9c41a2cf056c18f9353c831d22ed103a6bb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision d87fc9c41a2cf056c18f9353c831d22ed103a6bb) @@ -67,7 +67,7 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. - /// The probability or frequency of an open structure before flooding. + /// The probability of an open structure before flooding. /// The mean of the model factor super critical flow. /// The standard deviation of the model factor super critical flow. /// The mean of the model factor sub critical flow. @@ -95,7 +95,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOrFrequencyOpenStructureBeforeFlooding, + double probabilityOpenStructureBeforeFlooding, double modelFactorSuperCriticalFlowMean, double modelFactorSuperCriticalFlowStandardDeviation, double modelFactorSubCriticalFlowMean, double modelFactorSubCriticalFlowVariation, double thresholdHeightOpenWeirMean, double thresholdHeightOpenWeirStandardDeviation, @@ -117,7 +117,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOrFrequencyOpenStructureBeforeFlooding) + probabilityOpenStructureBeforeFlooding) { this.modelFactorSuperCriticalFlowMean = modelFactorSuperCriticalFlowMean; this.modelFactorSuperCriticalFlowStandardDeviation = modelFactorSuperCriticalFlowStandardDeviation; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -rd87fc9c41a2cf056c18f9353c831d22ed103a6bb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision d87fc9c41a2cf056c18f9353c831d22ed103a6bb) @@ -67,7 +67,7 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. - /// The probability or frequency of an open structure before flooding. + /// The probability of an open structure before flooding. /// The mean of the model factor overtopping flow. /// The standard deviation of the model factor overtopping flow. /// The orientation of the normal of the structure. @@ -95,7 +95,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOrFrequencyOpenStructureBeforeFlooding, + double probabilityOpenStructureBeforeFlooding, double modelFactorOvertoppingFlowMean, double modelFactorOvertoppingFlowStandardDeviation, double structureNormalOrientation, double modelFactorSuperCriticalFlowMean, double modelFactorSuperCriticalFlowStandardDeviation, @@ -118,7 +118,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOrFrequencyOpenStructureBeforeFlooding) + probabilityOpenStructureBeforeFlooding) { this.modelFactorOvertoppingFlowMean = modelFactorOvertoppingFlowMean; this.modelFactorOvertoppingFlowStandardDeviation = modelFactorOvertoppingFlowStandardDeviation; Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -rd87fc9c41a2cf056c18f9353c831d22ed103a6bb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision d87fc9c41a2cf056c18f9353c831d22ed103a6bb) @@ -62,7 +62,7 @@ const double failureProbabilityStructureWithErosion = 17.7; const double stormDurationMean = 18.8; const double stormDurationVariation = 19.9; - const double probabilityOrFrequencyOpenStructureBeforeFlooding = 20.0; + const double probabilityOpenStructureBeforeFlooding = 20.0; // Call var input = new TestStructuresClosureCalculationInput(hydraulicBoundaryLocationId, @@ -81,7 +81,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOrFrequencyOpenStructureBeforeFlooding); + probabilityOpenStructureBeforeFlooding); // Assert Assert.IsInstanceOf(input); @@ -136,7 +136,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOrFrequencyOpenStructureBeforeFlooding) + double probabilityOpenStructureBeforeFlooding) : base(hydraulicBoundaryLocationId, sectionNormal, forelandPoints, breakWater, @@ -153,7 +153,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOrFrequencyOpenStructureBeforeFlooding) {} + probabilityOpenStructureBeforeFlooding) {} public override int? GetSubMechanismModelId(int subMechanismId) { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs =================================================================== diff -u -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08 -rd87fc9c41a2cf056c18f9353c831d22ed103a6bb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision d87fc9c41a2cf056c18f9353c831d22ed103a6bb) @@ -60,7 +60,7 @@ const double failureProbabilityStructureWithErosion = 17.7; const double stormDurationMean = 18.8; const double stormDurationVariation = 19.9; - const double probabilityOrFrequencyOpenStructureBeforeFlooding = 20.0; + const double probabilityOpenStructureBeforeFlooding = 20.0; const double drainCoefficientMean = 21.1; const double drainCoefficientStandardDeviation = 22.2; const double areaFlowAperturesMean = 23.3; @@ -85,7 +85,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOrFrequencyOpenStructureBeforeFlooding, + probabilityOpenStructureBeforeFlooding, drainCoefficientMean, drainCoefficientStandardDeviation, areaFlowAperturesMean, areaFlowAperturesStandardDeviation, insideWaterLevelMean, insideWaterLevelStandardDeviation); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs =================================================================== diff -u -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08 -rd87fc9c41a2cf056c18f9353c831d22ed103a6bb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision d87fc9c41a2cf056c18f9353c831d22ed103a6bb) @@ -60,7 +60,7 @@ const double failureProbabilityStructureWithErosion = 17.7; const double stormDurationMean = 18.8; const double stormDurationVariation = 19.9; - const double probabilityOrFrequencyOpenStructureBeforeFlooding = 20.0; + const double probabilityOpenStructureBeforeFlooding = 20.0; const double modelFactorSuperCriticalFlowMean = 21.1; const double modelFactorSuperCriticalFlowStandardDeviation = 22.2; const double modelFactorSubCriticalFlowMean = 23.3; @@ -89,7 +89,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOrFrequencyOpenStructureBeforeFlooding, + probabilityOpenStructureBeforeFlooding, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, modelFactorSubCriticalFlowMean, modelFactorSubCriticalFlowVariation, thresholdHeightOpenWeirMean, thresholdHeightOpenWeirStandardDeviation, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs =================================================================== diff -u -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08 -rd87fc9c41a2cf056c18f9353c831d22ed103a6bb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision d87fc9c41a2cf056c18f9353c831d22ed103a6bb) @@ -60,7 +60,7 @@ const double failureProbabilityStructureWithErosion = 17.7; const double stormDurationMean = 18.8; const double stormDurationVariation = 19.9; - const double probabilityOrFrequencyOpenStructureBeforeFlooding = 20.0; + const double probabilityOpenStructureBeforeFlooding = 20.0; const double modelFactorOvertoppingFlowMean = 21.1; const double modelFactorOvertoppingFlowStandardDeviation = 22.2; const double structureNormalOrientation = 23.3; @@ -89,7 +89,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOrFrequencyOpenStructureBeforeFlooding, + probabilityOpenStructureBeforeFlooding, modelFactorOvertoppingFlowMean, modelFactorOvertoppingFlowStandardDeviation, structureNormalOrientation, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation,