Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs =================================================================== diff -u -r2ce616712364410b1c04b0394b0d1f1a29528061 -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 2ce616712364410b1c04b0394b0d1f1a29528061) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) @@ -34,7 +34,7 @@ private readonly double factorStormDurationOpenStructure; private readonly double failureProbabilityOpenStructure; private readonly double failureProbabilityReparation; - private readonly double identicalAperture; + private readonly double identicalApertures; private readonly double allowedLevelIncreaseStorageMean; private readonly double allowedLevelIncreaseStorageStandardDeviation; private readonly double modelFactorStorageVolumeMean; @@ -54,65 +54,69 @@ /// /// Creates a new instance of . /// - /// The id of the hydraulic station to use during the calculation. - /// The section to use during the calculation. - /// The foreland points to use during the calculation. - /// The gravitational acceleration to use during the calculation. - /// The factor of the storm duration for an open structure to use during the calculation. - /// The failure probability for an open structure to use during the calculation. - /// The reparation failure probabilty to use during the calculation. - /// The identical aperture to use during the calculation. - /// The mean of the allowed increase of the level for the storage to use during the calculation. - /// The standard deviation of the allowed increase of the level for the storage to use during the calculation. - /// The mean of the model factor for the storage volume to use during the calculation. - /// The standard deviation of the model factor for the storage volume to use during the calculation. - /// The mean of the storage structure area to use during the calculation. - /// The variation of the storage structure area to use during the calculation. - /// The model factor inflow volume to use during the calculation. - /// The mean of the flow width at bottom protection to use during the calculation. - /// The standard deviation of the flow width at bottom protection to use during the calculation. - /// The mean of the critical overtopping discharge to use during the calculation. - /// The variation of the critical overtopping discharge to use during the calculation. - /// The failure probability structure with erosion to use during the calculation. - /// The mean of the storm duration to use during the calculation. - /// The variation of the storm duration to use during the calculation. - /// The propability of an open structure before flooding to use during the calculation. + /// The id of the hydraulic station. + /// The section. + /// The foreland points. + /// The gravitational acceleration. + /// The factor of the storm duration for an open structure. + /// The failure probability for an open structure. + /// The reparation failure probability. + /// The number of identical apertures. + /// The mean of the allowed level of increase for storage. + /// The standard deviation of the allowed level of increase for storage. + /// The mean of the model factor storage volume. + /// The standard deviation of the model factor storage volume. + /// The mean of the storage structure area. + /// The variation of the storage structure area. + /// The model factor inflow volume. + /// The mean of the flow width at bottom protection. + /// The standard deviation of the flow width at bottom protection. + /// The mean of the critical overtopping discharge. + /// The variation of the critical overtopping discharge. + /// 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. protected StructuresClosureCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, IEnumerable forelandPoints, - double hydraRingGravitationalAcceleration, double hydraRingFactorStormDurationOpenStructure, - double hydraRingFailureProbabilityOpenStructure, double hydraRingFailureProbabilityReparation, - double hydraRingIdenticalAperture, double hydraRingAllowedIncreaseLevelStorageMean, - double hydraRingAllowedIncreaseLevelStorageStandardDeviation, double hydraRingModelFactorStorageVolumeMean, - double hydraRingModelFactorStorageVolumeStandardDeviation, double hydraRingStorageStructureAreaMean, - double hydraRingStorageStructureAreaVariation, double hydraRingModelFactorInflowVolume, - double hydraRingFlowWidthAtBottomProtectionMean, double hydraRingFlowWidthAtBottomProtectionStandardDeviation, - double hydraRingCriticalOvertoppingDischargeMean, double hydraRingCriticalOvertoppingDischargeVariation, - double hydraRingFailureProbabilityStructureWithErosion, double hydraRingStormDurationMean, - double hydraRingStormDurationVariation, double hydraRingProbabilityOpenStructureBeforeFlooding) + double gravitationalAcceleration, + double factorStormDurationOpenStructure, + double failureProbabilityOpenStructure, + double failureProbabilityReparation, + double identicalApertures, + double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation, + double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation, + double storageStructureAreaMean, double storageStructureAreaVariation, + double modelFactorInflowVolume, + double flowWidthAtBottomProtectionMean, double flowWidthAtBottomProtectionStandardDeviation, + double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, + double failureProbabilityStructureWithErosion, + double stormDurationMean, double stormDurationVariation, + double probabilityOpenStructureBeforeFlooding) : base(hydraulicBoundaryLocationId) { this.hydraRingSection = hydraRingSection; this.forelandPoints = forelandPoints; - gravitationalAcceleration = hydraRingGravitationalAcceleration; - factorStormDurationOpenStructure = hydraRingFactorStormDurationOpenStructure; - failureProbabilityOpenStructure = hydraRingFailureProbabilityOpenStructure; - failureProbabilityReparation = hydraRingFailureProbabilityReparation; - identicalAperture = hydraRingIdenticalAperture; - allowedLevelIncreaseStorageMean = hydraRingAllowedIncreaseLevelStorageMean; - allowedLevelIncreaseStorageStandardDeviation = hydraRingAllowedIncreaseLevelStorageStandardDeviation; - modelFactorStorageVolumeMean = hydraRingModelFactorStorageVolumeMean; - modelFactorStorageVolumeStandardDeviation = hydraRingModelFactorStorageVolumeStandardDeviation; - storageStructureAreaMean = hydraRingStorageStructureAreaMean; - storageStructureAreaVariation = hydraRingStorageStructureAreaVariation; - modelFactorInflowVolume = hydraRingModelFactorInflowVolume; - flowWidthAtBottomProtectionMean = hydraRingFlowWidthAtBottomProtectionMean; - flowWidthAtBottomProtectionStandardDeviation = hydraRingFlowWidthAtBottomProtectionStandardDeviation; - criticalOvertoppingDischargeMean = hydraRingCriticalOvertoppingDischargeMean; - criticalOvertoppingDischargeVariation = hydraRingCriticalOvertoppingDischargeVariation; - failureProbabilityStructureWithErosion = hydraRingFailureProbabilityStructureWithErosion; - stormDurationMean = hydraRingStormDurationMean; - stormDurationVariation = hydraRingStormDurationVariation; - probabilityOpenStructureBeforeFlooding = hydraRingProbabilityOpenStructureBeforeFlooding; + this.gravitationalAcceleration = gravitationalAcceleration; + this.factorStormDurationOpenStructure = factorStormDurationOpenStructure; + this.failureProbabilityOpenStructure = failureProbabilityOpenStructure; + this.failureProbabilityReparation = failureProbabilityReparation; + this.identicalApertures = identicalApertures; + this.allowedLevelIncreaseStorageMean = allowedLevelIncreaseStorageMean; + this.allowedLevelIncreaseStorageStandardDeviation = allowedLevelIncreaseStorageStandardDeviation; + this.modelFactorStorageVolumeMean = modelFactorStorageVolumeMean; + this.modelFactorStorageVolumeStandardDeviation = modelFactorStorageVolumeStandardDeviation; + this.storageStructureAreaMean = storageStructureAreaMean; + this.storageStructureAreaVariation = storageStructureAreaVariation; + this.modelFactorInflowVolume = modelFactorInflowVolume; + this.flowWidthAtBottomProtectionMean = flowWidthAtBottomProtectionMean; + this.flowWidthAtBottomProtectionStandardDeviation = flowWidthAtBottomProtectionStandardDeviation; + this.criticalOvertoppingDischargeMean = criticalOvertoppingDischargeMean; + this.criticalOvertoppingDischargeVariation = criticalOvertoppingDischargeVariation; + this.failureProbabilityStructureWithErosion = failureProbabilityStructureWithErosion; + this.stormDurationMean = stormDurationMean; + this.stormDurationVariation = stormDurationVariation; + this.probabilityOpenStructureBeforeFlooding = probabilityOpenStructureBeforeFlooding; } public override HydraRingFailureMechanismType FailureMechanismType @@ -151,74 +155,47 @@ { get { - return GetHydraRingVariables(); + return GetVariables(); } } public abstract override int? GetSubMechanismModelId(int subMechanismId); - private IEnumerable GetHydraRingVariables() + private IEnumerable GetVariables() { - // Gravitational acceleration yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - - // Factor storm duration open structure yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, factorStormDurationOpenStructure, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - - // Failure propability of the open structure yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, failureProbabilityOpenStructure, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - - // Fialure propability of reparation yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, failureProbabilityReparation, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - - // Number of identical aperture per system - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, identicalAperture, + yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, identicalApertures, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - - // Allowed level increase storage yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation, double.NaN); - - // Model factor storage volume yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation, double.NaN); - - // Storage structure area yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, storageStructureAreaMean, storageStructureAreaVariation, double.NaN); - - // Model factor inflow volume yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorInflowVolume, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - - // Flow width at bottom protection yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation, double.NaN); - - // Critical overtopping discharge yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, double.NaN); - - // Failure probability structure with erosion yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, failureProbabilityStructureWithErosion, 0.0, double.NaN); // HACK: Pass the deterministic value as normal distribution (with standard deviation 0.0) as Hydra-Ring otherwise crashes - - // Storm duration yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation, double.NaN); - - // Probability open structure just before flooding occurs yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, probabilityOpenStructureBeforeFlooding, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs =================================================================== diff -u -r4fc64174b80f971a226911d60393fbf8b166242d -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 4fc64174b80f971a226911d60393fbf8b166242d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) @@ -39,68 +39,76 @@ /// /// Creates a new instance of . /// - /// The id of the hydraulic station to use during the calculation. - /// The section to use during the calculation. - /// The foreland points to use during the calculation. - /// The gravitational acceleration to use during the calculation. - /// The factor of the storm duration for an open structure to use during the calculation. - /// The failure probability for an open structure to use during the calculation. - /// The reparation failure probabilty to use during the calculation. - /// The identical aperture to use during the calculation. - /// The mean of the allowable increase of the level for the storage to use during the calculation. - /// The standard deviation of the allowable increase of the level for the storage to use during the calculation. - /// The mean of the model factor for the storage volume to use during the calculation. - /// The standard deviation of the model factor for the storage volume to use during the calculation. - /// The mean of the storage structure area to use during the calculation. - /// The variation of the storage structure area to use during the calculation. - /// The model factor for incoming flow volume to use during the calculation. - /// The mean of the flow width at bottom protection to use during the calculation. - /// The standard deviation of the flow width at bottom protection to use during the calculation. - /// The mean of the critical overtopping discharge to use during the calculation. - /// The variation of the critical overtopping discharge to use during the calculation. - /// The failure probability of structure given erosion to use during the calculation. - /// The mean of the storm duration to use during the calculation. - /// The variation of the storm duration to use during the calculation. - /// The propability of an open structure before flooding to use during the calculation. - /// The mean of the drain coefficient to use during the calculation. - /// The standard deviation of the drain coefficient to use during the calculation. - /// The mean of the area of flow apertures to use during the calculation. - /// The standard deviation of the area of flow apertures to use during the calculation. - /// The mean of the inside water level to use during the calculation. - /// The standard deviation of the inside water level to use during the calculation. + /// The id of the hydraulic station. + /// The section. + /// The foreland points. + /// The gravitational acceleration. + /// The factor of the storm duration for an open structure. + /// The failure probability for an open structure. + /// The reparation failure probability. + /// The number of identical apertures. + /// The mean of the allowed level of increase for storage. + /// The standard deviation of the allowed level of increase for storage. + /// The mean of the model factor storage volume. + /// The standard deviation of the model factor storage volume. + /// The mean of the storage structure area. + /// The variation of the storage structure area. + /// The model factor inflow volume. + /// The mean of the flow width at bottom protection. + /// The standard deviation of the flow width at bottom protection. + /// The mean of the critical overtopping discharge. + /// The variation of the critical overtopping discharge. + /// 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 mean of the drain coefficient. + /// The standard deviation of the drain coefficient. + /// The mean of the area of flow apertures. + /// The standard deviation of the area of flow apertures. + /// The mean of the inside water level. + /// The standard deviation of the inside water level. public StructuresClosureFloodedCulvertCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, IEnumerable forelandPoints, - double hydraRingGravitationalAcceleration, double hydraRingFactorStormDurationOpenStructure, - double hydraRingFailureProbabilityOpenStructure, double hydraRingFailureProbabilityReparation, - double hydraRingIdenticalAperture, double hydraRingAllowableIncreaseOfLevelForStorageMean, - double hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, double hydraRingModelFactorForStorageVolumeMean, - double hydraRingModelFactorForStorageVolumeStandardDeviation, double hydraRingStorageStructureAreaMean, - double hydraRingStorageStructureAreaVariation, double hydraRingModelFactorForIncomingFlowVolume, - double hydraRingFlowWidthAtBottomProtectionMean, double hydraRingFlowWidthAtBottomProtectionStandardDeviation, - double hydraRingCriticalOvertoppingDischargeMean, double hydraRingCriticalOvertoppingDischargeVariation, - double hydraRingFailureProbabilityOfStructureGivenErosion, double hydraRingStormDurationMean, - double hydraRingStormDurationVariation, double hydraRingProbabilityOpenStructureBeforeFlooding, - double hydraRingDrainCoefficientMean, double hydraRingDrainCoefficientStandardDeviation, - double hydraRingAreaFlowAperturesMean, double hydraRingAreaFlowAperturesStandardDeviation, - double hydraRingInsideWaterLevelMean, double hydraRingInsideWaterLevelStandardDeviation) + double gravitationalAcceleration, + double factorStormDurationOpenStructure, + double failureProbabilityOpenStructure, + double failureProbabilityReparation, + double identicalApertures, + double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation, + double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation, + double storageStructureAreaMean, double storageStructureAreaVariation, + double modelFactorInflowVolume, + double flowWidthAtBottomProtectionMean, double flowWidthAtBottomProtectionStandardDeviation, + double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, + double failureProbabilityStructureWithErosion, + double stormDurationMean, double stormDurationVariation, + double probabilityOpenStructureBeforeFlooding, + double drainCoefficientMean, double drainCoefficientStandardDeviation, + double areaFlowAperturesMean, double areaFlowAperturesStandardDeviation, + double insideWaterLevelMean, double insideWaterLevelStandardDeviation) : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, - hydraRingGravitationalAcceleration, hydraRingFactorStormDurationOpenStructure, - hydraRingFailureProbabilityOpenStructure, hydraRingFailureProbabilityReparation, - hydraRingIdenticalAperture, hydraRingAllowableIncreaseOfLevelForStorageMean, - hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, hydraRingModelFactorForStorageVolumeMean, - hydraRingModelFactorForStorageVolumeStandardDeviation, hydraRingStorageStructureAreaMean, - hydraRingStorageStructureAreaVariation, hydraRingModelFactorForIncomingFlowVolume, - hydraRingFlowWidthAtBottomProtectionMean, hydraRingFlowWidthAtBottomProtectionStandardDeviation, - hydraRingCriticalOvertoppingDischargeMean, hydraRingCriticalOvertoppingDischargeVariation, - hydraRingFailureProbabilityOfStructureGivenErosion, hydraRingStormDurationMean, - hydraRingStormDurationVariation, hydraRingProbabilityOpenStructureBeforeFlooding) + gravitationalAcceleration, + factorStormDurationOpenStructure, + failureProbabilityOpenStructure, + failureProbabilityReparation, + identicalApertures, + allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation, + modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation, + storageStructureAreaMean, storageStructureAreaVariation, + modelFactorInflowVolume, + flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation, + criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, + failureProbabilityStructureWithErosion, + stormDurationMean, stormDurationVariation, + probabilityOpenStructureBeforeFlooding) { - drainCoefficientMean = hydraRingDrainCoefficientMean; - drainCoefficientStandardDeviation = hydraRingDrainCoefficientStandardDeviation; - areaFlowAperturesMean = hydraRingAreaFlowAperturesMean; - areaFlowAperturesStandardDeviation = hydraRingAreaFlowAperturesStandardDeviation; - insideWaterLevelMean = hydraRingInsideWaterLevelMean; - insideWaterLevelStandardDeviation = hydraRingInsideWaterLevelStandardDeviation; + this.drainCoefficientMean = drainCoefficientMean; + this.drainCoefficientStandardDeviation = drainCoefficientStandardDeviation; + this.areaFlowAperturesMean = areaFlowAperturesMean; + this.areaFlowAperturesStandardDeviation = areaFlowAperturesStandardDeviation; + this.insideWaterLevelMean = insideWaterLevelMean; + this.insideWaterLevelStandardDeviation = insideWaterLevelStandardDeviation; } public override IEnumerable Variables @@ -129,17 +137,12 @@ private IEnumerable GetVariables() { - // Drain coefficient yield return new HydraRingVariable(66, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation, double.NaN); - - // Area flow apertures yield return new HydraRingVariable(67, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation, double.NaN); - - // Inside water level yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, insideWaterLevelMean, insideWaterLevelStandardDeviation, double.NaN); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs =================================================================== diff -u -r4180a5bc32186dc6747a286ae5e490034f6f111a -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 4180a5bc32186dc6747a286ae5e490034f6f111a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) @@ -43,78 +43,86 @@ /// /// Creates a new instance of . /// - /// The id of the hydraulic station to use during the calculation. - /// The section to use during the calculation. - /// The foreland points to use during the calculation. - /// The gravitational acceleration to use during the calculation. - /// The factor of the storm duration for an open structure to use during the calculation. - /// The failure probability for an open structure to use during the calculation. - /// The reparation failure probabilty to use during the calculation. - /// The identical aperture to use during the calculation. - /// The mean of the allowable increase of the level for the storage to use during the calculation. - /// The standard deviation of the allowable increase of the level for the storage to use during the calculation. - /// The mean of the model factor for the storage volume to use during the calculation. - /// The standard deviation of the model factor for the storage volume to use during the calculation. - /// The mean of the storage structure area to use during the calculation. - /// The variation of the storage structure area to use during the calculation. - /// The model factor for incoming flow volume to use during the calculation. - /// The mean of the flow width at bottom protection to use during the calculation. - /// The standard deviation of the flow width at bottom protection to use during the calculation. - /// The mean of the critical overtopping discharge to use during the calculation. - /// The variation of the critical overtopping discharge to use during the calculation. - /// The failure probability of structure given erosion to use during the calculation. - /// The mean of the storm duration to use during the calculation. - /// The variation of the storm duration to use during the calculation. - /// The propability of an open structure before flooding to use during the calculation. - /// The mean of the model factor super critical flow to use during the calculation. - /// The standard deviation of the model factor super critical flow to use during the calculation. - /// The mean of the model factor sub citrical flow to use during the calculation. - /// The variation of the model factor sub citrical flow to use during the calculation. - /// The mean of the threshold height open weir to use during the calculation. - /// The standard deviation of the threshold height open weir to use during the calculation. - /// The mean of the inside water level to use during the calculation. - /// The standard deviation of the inside water level to use during the calculation. - /// The mean of the width of flow apertures to use during the calculation. - /// The variation of the width of flow apertures to use during the calculation. + /// The id of the hydraulic station. + /// The section. + /// The foreland points. + /// The gravitational acceleration. + /// The factor of the storm duration for an open structure. + /// The failure probability for an open structure. + /// The reparation failure probability. + /// The number of identical apertures. + /// The mean of the allowed level of increase for storage. + /// The standard deviation of the allowed level of increase for storage. + /// The mean of the model factor storage volume. + /// The standard deviation of the model factor storage volume. + /// The mean of the storage structure area. + /// The variation of the storage structure area. + /// The model factor inflow volume. + /// The mean of the flow width at bottom protection. + /// The standard deviation of the flow width at bottom protection. + /// The mean of the critical overtopping discharge. + /// The variation of the critical overtopping discharge. + /// 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 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. + /// The variation of the model factor sub critical flow. + /// The mean of the threshold height open weir. + /// The standard deviation of the threshold height open weir. + /// The mean of the inside water level. + /// The standard deviation of the inside water level. + /// The mean of the width flow apertures. + /// The variation of the width flow apertures. public StructuresClosureLowSillCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, IEnumerable forelandPoints, - double hydraRingGravitationalAcceleration, double hydraRingFactorStormDurationOpenStructure, - double hydraRingFailureProbabilityOpenStructure, double hydraRingFailureProbabilityReparation, - double hydraRingIdenticalAperture, double hydraRingAllowableIncreaseOfLevelForStorageMean, - double hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, double hydraRingModelFactorForStorageVolumeMean, - double hydraRingModelFactorForStorageVolumeStandardDeviation, double hydraRingStorageStructureAreaMean, - double hydraRingStorageStructureAreaVariation, double hydraRingModelFactorForIncomingFlowVolume, - double hydraRingFlowWidthAtBottomProtectionMean, double hydraRingFlowWidthAtBottomProtectionStandardDeviation, - double hydraRingCriticalOvertoppingDischargeMean, double hydraRingCriticalOvertoppingDischargeVariation, - double hydraRingFailureProbabilityOfStructureGivenErosion, double hydraRingStormDurationMean, - double hydraRingStormDurationVariation, double hydraRingProbabilityOpenStructureBeforeFlooding, - double hydraRingModelFactorSuperCriticalFlowMean, double hydraRingModelFactorSuperCriticalFlowStandardDeviation, - double hydraRingModelFactorSubCriticalFlowMean, double hydraRingModelFactorSubCriticalFlowVariation, - double hydraRingThresholdHeightOpenWeirMean, double hydraRingThresholdHeightOpenWeirStandardDeviation, - double hydraRingInsideWaterLevelMean, double hydraRingInsideWaterLevelStandardDeviation, - double hydraRingWidthFlowAperturesMean, double hydraRingWidthFlowAperturesVariation) + double gravitationalAcceleration, + double factorStormDurationOpenStructure, + double failureProbabilityOpenStructure, + double failureProbabilityReparation, + double identicalApertures, + double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation, + double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation, + double storageStructureAreaMean, double storageStructureAreaVariation, + double modelFactorInflowVolume, + double flowWidthAtBottomProtectionMean, double flowWidthAtBottomProtectionStandardDeviation, + double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, + double failureProbabilityStructureWithErosion, + double stormDurationMean, double stormDurationVariation, + double probabilityOpenStructureBeforeFlooding, + double modelFactorSuperCriticalFlowMean, double modelFactorSuperCriticalFlowStandardDeviation, + double modelFactorSubCriticalFlowMean, double modelFactorSubCriticalFlowVariation, + double thresholdHeightOpenWeirMean, double thresholdHeightOpenWeirStandardDeviation, + double insideWaterLevelMean, double insideWaterLevelStandardDeviation, + double widthFlowAperturesMean, double widthFlowAperturesVariation) : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, - hydraRingGravitationalAcceleration, hydraRingFactorStormDurationOpenStructure, - hydraRingFailureProbabilityOpenStructure, hydraRingFailureProbabilityReparation, - hydraRingIdenticalAperture, hydraRingAllowableIncreaseOfLevelForStorageMean, - hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, hydraRingModelFactorForStorageVolumeMean, - hydraRingModelFactorForStorageVolumeStandardDeviation, hydraRingStorageStructureAreaMean, - hydraRingStorageStructureAreaVariation, hydraRingModelFactorForIncomingFlowVolume, - hydraRingFlowWidthAtBottomProtectionMean, hydraRingFlowWidthAtBottomProtectionStandardDeviation, - hydraRingCriticalOvertoppingDischargeMean, hydraRingCriticalOvertoppingDischargeVariation, - hydraRingFailureProbabilityOfStructureGivenErosion, hydraRingStormDurationMean, - hydraRingStormDurationVariation, hydraRingProbabilityOpenStructureBeforeFlooding) + gravitationalAcceleration, + factorStormDurationOpenStructure, + failureProbabilityOpenStructure, + failureProbabilityReparation, + identicalApertures, + allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation, + modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation, + storageStructureAreaMean, storageStructureAreaVariation, + modelFactorInflowVolume, + flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation, + criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, + failureProbabilityStructureWithErosion, + stormDurationMean, stormDurationVariation, + probabilityOpenStructureBeforeFlooding) { - modelFactorSuperCriticalFlowMean = hydraRingModelFactorSuperCriticalFlowMean; - modelFactorSuperCriticalFlowStandardDeviation = hydraRingModelFactorSuperCriticalFlowStandardDeviation; - modelFactorSubCriticalFlowMean = hydraRingModelFactorSubCriticalFlowMean; - modelFactorSubCriticalFlowVariation = hydraRingModelFactorSubCriticalFlowVariation; - thresholdHeightOpenWeirMean = hydraRingThresholdHeightOpenWeirMean; - thresholdHeightOpenWeirStandardDeviation = hydraRingThresholdHeightOpenWeirStandardDeviation; - insideWaterLevelMean = hydraRingInsideWaterLevelMean; - insideWaterLevelStandardDeviation = hydraRingInsideWaterLevelStandardDeviation; - widthFlowAperturesMean = hydraRingWidthFlowAperturesMean; - widthFlowAperturesVariation = hydraRingWidthFlowAperturesVariation; + this.modelFactorSuperCriticalFlowMean = modelFactorSuperCriticalFlowMean; + this.modelFactorSuperCriticalFlowStandardDeviation = modelFactorSuperCriticalFlowStandardDeviation; + this.modelFactorSubCriticalFlowMean = modelFactorSubCriticalFlowMean; + this.modelFactorSubCriticalFlowVariation = modelFactorSubCriticalFlowVariation; + this.thresholdHeightOpenWeirMean = thresholdHeightOpenWeirMean; + this.thresholdHeightOpenWeirStandardDeviation = thresholdHeightOpenWeirStandardDeviation; + this.insideWaterLevelMean = insideWaterLevelMean; + this.insideWaterLevelStandardDeviation = insideWaterLevelStandardDeviation; + this.widthFlowAperturesMean = widthFlowAperturesMean; + this.widthFlowAperturesVariation = widthFlowAperturesVariation; } public override IEnumerable Variables @@ -143,27 +151,18 @@ private IEnumerable GetVariables() { - // Model factor super critical flow yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, double.NaN); - - // Model factor sub critical flow yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, modelFactorSubCriticalFlowMean, modelFactorSubCriticalFlowVariation, double.NaN); - - // Threshold height open weir yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, thresholdHeightOpenWeirMean, thresholdHeightOpenWeirStandardDeviation, double.NaN); - - // Inside water level yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, insideWaterLevelMean, insideWaterLevelStandardDeviation, double.NaN); - - // Width flow apertures yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesVariation, double.NaN); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs =================================================================== diff -u -r6a35b370e2b97f2ce1ba0092c59905913a49dde0 -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 6a35b370e2b97f2ce1ba0092c59905913a49dde0) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) @@ -34,87 +34,96 @@ private readonly double structureNormalOrientation; private readonly double modelFactorSuperCriticalFlowMean; private readonly double modelFactorSuperCriticalFlowStandardDeviation; - private readonly double levelCrestOfStructuresNotClosingMean; - private readonly double levelCrestOfStructuresNotClosingStandardDeviation; + private readonly double levelCrestStructureNotClosingMean; + private readonly double levelCrestStructureNotClosingStandardDeviation; private readonly double widthFlowAperturesMean; private readonly double widthFlowAperturesVariation; - private readonly double wavedirectionDeviation; + private readonly double deviationWaveDirection; /// /// Creates a new instance of . /// - /// The id of the hydraulic station to use during the calculation. - /// The section to use during the calculation. - /// The foreland points to use during the calculation. - /// The gravitational acceleration to use during the calculation. - /// The factor of the storm duration for an open structure to use during the calculation. - /// The failure probability for an open structure to use during the calculation. - /// The reparation failure probabilty to use during the calculation. - /// The identical aperture to use during the calculation. - /// The mean of the allowable increase of the level for the storage to use during the calculation. - /// The standard deviation of the allowable increase of the level for the storage to use during the calculation. - /// The mean of the model factor for the storage volume to use during the calculation. - /// The standard deviation of the model factor for the storage volume to use during the calculation. - /// The mean of the storage structure area to use during the calculation. - /// The variation of the storage structure area to use during the calculation. - /// The model factor for incoming flow volume to use during the calculation. - /// The mean of the flow width at bottom protection to use during the calculation. - /// The standard deviation of the flow width at bottom protection to use during the calculation. - /// The mean of the critical overtopping discharge to use during the calculation. - /// The variation of the critical overtopping discharge to use during the calculation. - /// The failure probability of structure given erosion to use during the calculation. - /// The mean of the storm duration to use during the calculation. - /// The variation of the storm duration to use during the calculation. - /// The propability of an open structure before flooding to use during the calculation. - /// The mean of the model factor overtopping flow to use during the calculation. - /// The standard deviation of the model factor overtopping flow to use during the calculation. - /// The orientation of the normal of the structure to use during the calculation. - /// The mean of the model factor super critical flow to use during the calculation. - /// The standard deviation of the model factor super critical flow to use during the calculation. - /// The mean of the level crest of structures not closing to use during the calculation. - /// The standard deviation of the level crest of structures not closing to use during the calculation. - /// The mean of the width of flow apertures to use during the calculation. - /// The variation of the width of flow apertures to use during the calculation. - /// The deviation of the wave direction to use during the calculation. + /// The id of the hydraulic station. + /// The section. + /// The foreland points. + /// The gravitational acceleration. + /// The factor of the storm duration for an open structure. + /// The failure probability for an open structure. + /// The reparation failure probability. + /// The number of identical apertures. + /// The mean of the allowed level of increase for storage. + /// The standard deviation of the allowed level of increase for storage. + /// The mean of the model factor storage volume. + /// The standard deviation of the model factor storage volume. + /// The mean of the storage structure area. + /// The variation of the storage structure area. + /// The model factor inflow volume. + /// The mean of the flow width at bottom protection. + /// The standard deviation of the flow width at bottom protection. + /// The mean of the critical overtopping discharge. + /// The variation of the critical overtopping discharge. + /// 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 mean of the model factor overtopping flow. + /// The standard deviation of the model factor overtopping flow. + /// The orientation of the normal of the structure. + /// The mean of the model factor super critical flow. + /// The standard deviation of the model factor super critical flow. + /// The mean of the level crest of the structure when not closing. + /// The standard deviation of the level crest of the structure when not closing. + /// The mean of the width flow apertures. + /// The variation of the width flow apertures. + /// The deviation of the wave direction. public StructuresClosureVerticalWallCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, IEnumerable forelandPoints, - double hydraRingGravitationalAcceleration, double hydraRingFactorStormDurationOpenStructure, - double hydraRingFailureProbabilityOpenStructure, double hydraRingFailureProbabilityReparation, - double hydraRingIdenticalAperture, double hydraRingAllowableIncreaseOfLevelForStorageMean, - double hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, double hydraRingModelFactorForStorageVolumeMean, - double hydraRingModelFactorForStorageVolumeStandardDeviation, double hydraRingStorageStructureAreaMean, - double hydraRingStorageStructureAreaVariation, double hydraRingModelFactorForIncomingFlowVolume, - double hydraRingFlowWidthAtBottomProtectionMean, double hydraRingFlowWidthAtBottomProtectionStandardDeviation, - double hydraRingCriticalOvertoppingDischargeMean, double hydraRingCriticalOvertoppingDischargeVariation, - double hydraRingFailureProbabilityOfStructureGivenErosion, double hydraRingStormDurationMean, - double hydraRingStormDurationVariation, double hydraRingProbabilityOpenStructureBeforeFlooding, - double hydraRingModelFactorOvertoppingFlowMean, double hydraRingModelFactorOvertoppingFlowStandardDeviation, - double hydraRingStructureNormalOrientation, double hydraRingModelFactorSuperCriticalFlowMean, - double hydraRingModelFactorSuperCriticalFlowStandardDeviation, double hydraRingLevelCrestOfStructuresNotClosingMean, - double hydraRingLevelCrestOfStructuresNotClosingStandardDeviation, double hydraRingWidthFlowAperturesMean, - double hydraRingWidthFlowAperturesVariation, double hydraRingWavedirectionDeviation) + double gravitationalAcceleration, + double factorStormDurationOpenStructure, + double failureProbabilityOpenStructure, + double failureProbabilityReparation, + double identicalApertures, + double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation, + double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation, + double storageStructureAreaMean, double storageStructureAreaVariation, + double modelFactorInflowVolume, + double flowWidthAtBottomProtectionMean, double flowWidthAtBottomProtectionStandardDeviation, + double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, + double failureProbabilityStructureWithErosion, + double stormDurationMean, double stormDurationVariation, + double probabilityOpenStructureBeforeFlooding, + double modelFactorOvertoppingFlowMean, double modelFactorOvertoppingFlowStandardDeviation, + double structureNormalOrientation, + double modelFactorSuperCriticalFlowMean, double modelFactorSuperCriticalFlowStandardDeviation, + double levelCrestStructureNotClosingMean, double levelCrestStructureNotClosingStandardDeviation, + double widthFlowAperturesMean, double widthFlowAperturesVariation, + double deviationWaveDirection) : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, - hydraRingGravitationalAcceleration, hydraRingFactorStormDurationOpenStructure, - hydraRingFailureProbabilityOpenStructure, hydraRingFailureProbabilityReparation, - hydraRingIdenticalAperture, hydraRingAllowableIncreaseOfLevelForStorageMean, - hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, hydraRingModelFactorForStorageVolumeMean, - hydraRingModelFactorForStorageVolumeStandardDeviation, hydraRingStorageStructureAreaMean, - hydraRingStorageStructureAreaVariation, hydraRingModelFactorForIncomingFlowVolume, - hydraRingFlowWidthAtBottomProtectionMean, hydraRingFlowWidthAtBottomProtectionStandardDeviation, - hydraRingCriticalOvertoppingDischargeMean, hydraRingCriticalOvertoppingDischargeVariation, - hydraRingFailureProbabilityOfStructureGivenErosion, hydraRingStormDurationMean, - hydraRingStormDurationVariation, hydraRingProbabilityOpenStructureBeforeFlooding) + gravitationalAcceleration, + factorStormDurationOpenStructure, + failureProbabilityOpenStructure, + failureProbabilityReparation, + identicalApertures, + allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation, + modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation, + storageStructureAreaMean, storageStructureAreaVariation, + modelFactorInflowVolume, + flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation, + criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, + failureProbabilityStructureWithErosion, + stormDurationMean, stormDurationVariation, + probabilityOpenStructureBeforeFlooding) { - modelFactorOvertoppingFlowMean = hydraRingModelFactorOvertoppingFlowMean; - modelFactorOvertoppingFlowStandardDeviation = hydraRingModelFactorOvertoppingFlowStandardDeviation; - structureNormalOrientation = hydraRingStructureNormalOrientation; - modelFactorSuperCriticalFlowMean = hydraRingModelFactorSuperCriticalFlowMean; - modelFactorSuperCriticalFlowStandardDeviation = hydraRingModelFactorSuperCriticalFlowStandardDeviation; - levelCrestOfStructuresNotClosingMean = hydraRingLevelCrestOfStructuresNotClosingMean; - levelCrestOfStructuresNotClosingStandardDeviation = hydraRingLevelCrestOfStructuresNotClosingStandardDeviation; - widthFlowAperturesMean = hydraRingWidthFlowAperturesMean; - widthFlowAperturesVariation = hydraRingWidthFlowAperturesVariation; - wavedirectionDeviation = hydraRingWavedirectionDeviation; + this.modelFactorOvertoppingFlowMean = modelFactorOvertoppingFlowMean; + this.modelFactorOvertoppingFlowStandardDeviation = modelFactorOvertoppingFlowStandardDeviation; + this.structureNormalOrientation = structureNormalOrientation; + this.modelFactorSuperCriticalFlowMean = modelFactorSuperCriticalFlowMean; + this.modelFactorSuperCriticalFlowStandardDeviation = modelFactorSuperCriticalFlowStandardDeviation; + this.levelCrestStructureNotClosingMean = levelCrestStructureNotClosingMean; + this.levelCrestStructureNotClosingStandardDeviation = levelCrestStructureNotClosingStandardDeviation; + this.widthFlowAperturesMean = widthFlowAperturesMean; + this.widthFlowAperturesVariation = widthFlowAperturesVariation; + this.deviationWaveDirection = deviationWaveDirection; } public override IEnumerable Variables @@ -143,32 +152,21 @@ private IEnumerable GetVariables() { - // Model factor overtopping flow yield return new HydraRingVariable(59, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, modelFactorOvertoppingFlowMean, modelFactorOvertoppingFlowStandardDeviation, double.NaN); - - // Orientation of the normal of the structure yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, structureNormalOrientation, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - - // Model factor super critical flow yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, double.NaN); - - // Level crest of structures not closing yield return new HydraRingVariable(72, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, levelCrestOfStructuresNotClosingMean, - levelCrestOfStructuresNotClosingStandardDeviation, double.NaN); - - // Width flow apertures + HydraRingDeviationType.Standard, levelCrestStructureNotClosingMean, + levelCrestStructureNotClosingStandardDeviation, double.NaN); yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesVariation, double.NaN); - - // Deviation of the wave direction - yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, wavedirectionDeviation, + yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, deviationWaveDirection, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs =================================================================== diff -u -r2ce616712364410b1c04b0394b0d1f1a29528061 -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 2ce616712364410b1c04b0394b0d1f1a29528061) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) @@ -110,7 +110,7 @@ IEnumerable forelandPoints, double hydraRingGravitationalAcceleration, double hydraRingFactorStormDurationOpenStructure, double hydraRingFailureProbabilityOpenStructure, double hydraRingFailureProbabilityReparation, - double hydraRingIdenticalAperture, double hydraRingAllowableIncreaseOfLevelForStorageMean, + double hydraRingIdenticalApertures, double hydraRingAllowableIncreaseOfLevelForStorageMean, double hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, double hydraRingModelFactorForStorageVolumeMean, double hydraRingModelFactorForStorageVolumeStandardDeviation, double hydraRingStorageStructureAreaMean, double hydraRingStorageStructureAreaVariation, double hydraRingModelFactorForIncomingFlowVolume, @@ -121,7 +121,7 @@ : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, hydraRingGravitationalAcceleration, hydraRingFactorStormDurationOpenStructure, hydraRingFailureProbabilityOpenStructure, hydraRingFailureProbabilityReparation, - hydraRingIdenticalAperture, hydraRingAllowableIncreaseOfLevelForStorageMean, + hydraRingIdenticalApertures, hydraRingAllowableIncreaseOfLevelForStorageMean, hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, hydraRingModelFactorForStorageVolumeMean, hydraRingModelFactorForStorageVolumeStandardDeviation, hydraRingStorageStructureAreaMean, hydraRingStorageStructureAreaVariation, hydraRingModelFactorForIncomingFlowVolume, Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d689ea05c1014eb4d51b927e11eb6c48255f0a47) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) @@ -845,36 +845,36 @@ /// /// Looks up a localized string similar to Kans op heave [1/jaar]. /// - public static string PipingScenarioView_PipingScenarioRow_FailureProbabiltyHeave { + public static string PipingScenarioView_PipingScenarioRow_FailureProbabilityHeave { get { - return ResourceManager.GetString("PipingScenarioView_PipingScenarioRow_FailureProbabiltyHeave", resourceCulture); + return ResourceManager.GetString("PipingScenarioView_PipingScenarioRow_FailureProbabilityHeave", resourceCulture); } } /// /// Looks up a localized string similar to Faalkans [1/jaar]. /// - public static string PipingScenarioView_PipingScenarioRow_FailureProbabiltyPiping { + public static string PipingScenarioView_PipingScenarioRow_FailureProbabilityPiping { get { - return ResourceManager.GetString("PipingScenarioView_PipingScenarioRow_FailureProbabiltyPiping", resourceCulture); + return ResourceManager.GetString("PipingScenarioView_PipingScenarioRow_FailureProbabilityPiping", resourceCulture); } } /// /// Looks up a localized string similar to Kans op terugschrijdende erosie [1/jaar]. /// - public static string PipingScenarioView_PipingScenarioRow_FailureProbabiltySellmeijer { + public static string PipingScenarioView_PipingScenarioRow_FailureProbabilitySellmeijer { get { - return ResourceManager.GetString("PipingScenarioView_PipingScenarioRow_FailureProbabiltySellmeijer", resourceCulture); + return ResourceManager.GetString("PipingScenarioView_PipingScenarioRow_FailureProbabilitySellmeijer", resourceCulture); } } /// /// Looks up a localized string similar to Kans op opbarsten [1/jaar]. /// - public static string PipingScenarioView_PipingScenarioRow_FailureProbabiltyUplift { + public static string PipingScenarioView_PipingScenarioRow_FailureProbabilityUplift { get { - return ResourceManager.GetString("PipingScenarioView_PipingScenarioRow_FailureProbabiltyUplift", resourceCulture); + return ResourceManager.GetString("PipingScenarioView_PipingScenarioRow_FailureProbabilityUplift", resourceCulture); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision d689ea05c1014eb4d51b927e11eb6c48255f0a47) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) @@ -583,16 +583,16 @@ De berekening - + Kans op heave [1/jaar] - + Faalkans [1/jaar] - + Kans op terugschrijdende erosie [1/jaar] - + Kans op opbarsten [1/jaar] Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs =================================================================== diff -u -r5bdb5ecc12d8c8e7ef49b63f0a40dfbdd2532d54 -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs (.../PipingScenarioRow.cs) (revision 5bdb5ecc12d8c8e7ef49b63f0a40dfbdd2532d54) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs (.../PipingScenarioRow.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) @@ -106,7 +106,7 @@ } /// - /// Gets failure probabilty of piping of the . + /// Gets the failure probability of piping of the . /// [TypeConverter(typeof(FailureMechanismSectionResultNoProbabilityValueDoubleConverter))] public string FailureProbabilityPiping @@ -122,7 +122,7 @@ } /// - /// Gets failure probabilty of uplift sub failure mechanism of the . + /// Gets the failure probability of uplift sub failure mechanism of the . /// [TypeConverter(typeof(FailureMechanismSectionResultNoProbabilityValueDoubleConverter))] public string FailureProbabilityUplift @@ -138,7 +138,7 @@ } /// - /// Gets failure probabilty of heave sub failure mechanism of the . + /// Gets the failure probability of heave sub failure mechanism of the . /// [TypeConverter(typeof(FailureMechanismSectionResultNoProbabilityValueDoubleConverter))] public string FailureProbabilityHeave @@ -154,7 +154,7 @@ } /// - /// Gets failure probabilty of sellmeijer sub failure mechanism of the . + /// Gets the failure probability of sellmeijer sub failure mechanism of the . /// [TypeConverter(typeof(FailureMechanismSectionResultNoProbabilityValueDoubleConverter))] public string FailureProbabilitySellmeijer Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) @@ -139,19 +139,19 @@ ); dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(row => row.FailureProbabilityPiping), - Resources.PipingScenarioView_PipingScenarioRow_FailureProbabiltyPiping + Resources.PipingScenarioView_PipingScenarioRow_FailureProbabilityPiping ); dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(row => row.FailureProbabilityUplift), - Resources.PipingScenarioView_PipingScenarioRow_FailureProbabiltyUplift + Resources.PipingScenarioView_PipingScenarioRow_FailureProbabilityUplift ); dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(row => row.FailureProbabilityHeave), - Resources.PipingScenarioView_PipingScenarioRow_FailureProbabiltyHeave + Resources.PipingScenarioView_PipingScenarioRow_FailureProbabilityHeave ); dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(row => row.FailureProbabilitySellmeijer), - Resources.PipingScenarioView_PipingScenarioRow_FailureProbabiltySellmeijer + Resources.PipingScenarioView_PipingScenarioRow_FailureProbabilitySellmeijer ); }