Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs =================================================================== diff -u -r19674fbb52038a17df349319e2bd9fca258e8df6 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -151,7 +151,27 @@ { get { - return GetVariables(); + yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 0.0, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertopping, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation, + double.NaN); + yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation, + double.NaN); + yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, modelFactorOvertopping, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Standard, criticalOvertoppingMean, + criticalOvertoppingStandardDeviation, double.NaN); + yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, modelFactorFrunupMean, + modelFactorFrunupStandardDeviation, double.NaN); + yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, exponentModelFactorShallowMean, + exponentModelFactorShallowStandardDeviation, double.NaN); } } @@ -167,30 +187,5 @@ return null; } } - - private IEnumerable GetVariables() - { - yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 0.0, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertopping, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation, - double.NaN); - yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation, - double.NaN); - yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, modelFactorOvertopping, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, criticalOvertoppingMean, - criticalOvertoppingStandardDeviation, double.NaN); - yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorFrunupMean, - modelFactorFrunupStandardDeviation, double.NaN); - yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, exponentModelFactorShallowMean, - exponentModelFactorShallowStandardDeviation, double.NaN); - } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs =================================================================== diff -u -r19674fbb52038a17df349319e2bd9fca258e8df6 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -152,7 +152,27 @@ { get { - return GetVariables(); + yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, dikeHeight, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertopping, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation, + double.NaN); + yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation, + double.NaN); + yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, modelFactorOvertopping, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Standard, criticalOvertoppingMean, + criticalOvertoppingStandardDeviation, double.NaN); + yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, modelFactorFrunupMean, + modelFactorFrunupStandardDeviation, double.NaN); + yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, exponentModelFactorShallowMean, + exponentModelFactorShallowStandardDeviation, double.NaN); } } @@ -168,30 +188,5 @@ return null; } } - - private IEnumerable GetVariables() - { - yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, dikeHeight, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertopping, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation, - double.NaN); - yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation, - double.NaN); - yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, modelFactorOvertopping, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, criticalOvertoppingMean, - criticalOvertoppingStandardDeviation, double.NaN); - yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorFrunupMean, - modelFactorFrunupStandardDeviation, double.NaN); - yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, exponentModelFactorShallowMean, - exponentModelFactorShallowStandardDeviation, double.NaN); - } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs =================================================================== diff -u -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -28,7 +28,7 @@ /// public abstract class StructuresClosureCalculationInput : ExceedanceProbabilityCalculationInput { - private readonly HydraRingSection hydraRingSection; + private readonly HydraRingSection section; private readonly IEnumerable forelandPoints; private readonly double gravitationalAcceleration; private readonly double factorStormDurationOpenStructure; @@ -55,7 +55,7 @@ /// Creates a new instance of . /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The foreland points. /// The gravitational acceleration. /// The factor of the storm duration for an open structure. @@ -77,7 +77,7 @@ /// 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, + protected StructuresClosureCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double gravitationalAcceleration, double factorStormDurationOpenStructure, @@ -95,7 +95,7 @@ double probabilityOpenStructureBeforeFlooding) : base(hydraulicBoundaryLocationId) { - this.hydraRingSection = hydraRingSection; + this.section = section; this.forelandPoints = forelandPoints; this.gravitationalAcceleration = gravitationalAcceleration; this.factorStormDurationOpenStructure = factorStormDurationOpenStructure; @@ -139,7 +139,7 @@ { get { - return hydraRingSection; + return section; } } @@ -155,49 +155,44 @@ { get { - return GetVariables(); + yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, factorStormDurationOpenStructure, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, failureProbabilityOpenStructure, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, failureProbabilityReparation, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, identicalApertures, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, + allowedLevelIncreaseStorageStandardDeviation, double.NaN); + yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, + modelFactorStorageVolumeStandardDeviation, double.NaN); + yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Variation, storageStructureAreaMean, + storageStructureAreaVariation, double.NaN); + yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorInflowVolume, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, + flowWidthAtBottomProtectionStandardDeviation, double.NaN); + yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, + criticalOvertoppingDischargeVariation, double.NaN); + 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 + yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Variation, stormDurationMean, + stormDurationVariation, double.NaN); + yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, probabilityOpenStructureBeforeFlooding, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); } } public abstract override int? GetSubMechanismModelId(int subMechanismId); - - private IEnumerable GetVariables() - { - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, factorStormDurationOpenStructure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, failureProbabilityOpenStructure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, failureProbabilityReparation, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, identicalApertures, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, - allowedLevelIncreaseStorageStandardDeviation, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, - modelFactorStorageVolumeStandardDeviation, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, storageStructureAreaMean, - storageStructureAreaVariation, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorInflowVolume, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, - flowWidthAtBottomProtectionStandardDeviation, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, - criticalOvertoppingDischargeVariation, double.NaN); - 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 - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, stormDurationMean, - stormDurationVariation, double.NaN); - yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, probabilityOpenStructureBeforeFlooding, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs =================================================================== diff -u -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -40,7 +40,7 @@ /// Creates a new instance of . /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The foreland points. /// The gravitational acceleration. /// The factor of the storm duration for an open structure. @@ -68,7 +68,7 @@ /// 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, + public StructuresClosureFloodedCulvertCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double gravitationalAcceleration, double factorStormDurationOpenStructure, @@ -87,7 +87,7 @@ double drainCoefficientMean, double drainCoefficientStandardDeviation, double areaFlowAperturesMean, double areaFlowAperturesStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation) - : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + : base(hydraulicBoundaryLocationId, section, forelandPoints, gravitationalAcceleration, factorStormDurationOpenStructure, failureProbabilityOpenStructure, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs =================================================================== diff -u -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -44,7 +44,7 @@ /// Creates a new instance of . /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The foreland points. /// The gravitational acceleration. /// The factor of the storm duration for an open structure. @@ -76,7 +76,7 @@ /// 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, + public StructuresClosureLowSillCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double gravitationalAcceleration, double factorStormDurationOpenStructure, @@ -97,7 +97,7 @@ double thresholdHeightOpenWeirMean, double thresholdHeightOpenWeirStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation, double widthFlowAperturesMean, double widthFlowAperturesVariation) - : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + : base(hydraulicBoundaryLocationId, section, forelandPoints, gravitationalAcceleration, factorStormDurationOpenStructure, failureProbabilityOpenStructure, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs =================================================================== diff -u -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -44,7 +44,7 @@ /// Creates a new instance of . /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The foreland points. /// The gravitational acceleration. /// The factor of the storm duration for an open structure. @@ -76,7 +76,7 @@ /// 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, + public StructuresClosureVerticalWallCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double gravitationalAcceleration, double factorStormDurationOpenStructure, @@ -98,7 +98,7 @@ double levelCrestStructureNotClosingMean, double levelCrestStructureNotClosingStandardDeviation, double widthFlowAperturesMean, double widthFlowAperturesVariation, double deviationWaveDirection) - : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + : base(hydraulicBoundaryLocationId, section, forelandPoints, gravitationalAcceleration, factorStormDurationOpenStructure, failureProbabilityOpenStructure, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs =================================================================== diff -u -r1b34e00a4004ae422b72cc09ab535c9f0c264107 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 1b34e00a4004ae422b72cc09ab535c9f0c264107) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -59,7 +59,7 @@ /// Creates a new instance of the class. /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The gravitational acceleration. /// The mean of the model factor overtopping flow. /// The standard deviation of the model factor overtopping flow. @@ -85,7 +85,7 @@ /// The deviation of the wave direction. /// The mean of the storm duration. /// The variation of the storm duration. - public StructuresOvertoppingCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, + public StructuresOvertoppingCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, double gravitationalAcceleration, double modelFactorOvertoppingFlowMean, double modelFactorOvertoppingFlowStandardDeviation, double levelCrestStructureMean, double levelCrestStructureStandardDeviation, @@ -103,7 +103,7 @@ double stormDurationMean, double stormDurationVariation) : base(hydraulicBoundaryLocationId) { - section = hydraRingSection; + this.section = section; this.gravitationalAcceleration = gravitationalAcceleration; this.modelFactorOvertoppingFlowMean = modelFactorOvertoppingFlowMean; this.modelFactorOvertoppingFlowStandardDeviation = modelFactorOvertoppingFlowStandardDeviation; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs =================================================================== diff -u -r4fc64174b80f971a226911d60393fbf8b166242d -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 4fc64174b80f971a226911d60393fbf8b166242d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -28,7 +28,7 @@ /// public abstract class StructuresStabilityPointCalculationInput : ExceedanceProbabilityCalculationInput { - private readonly HydraRingSection hydraRingSection; + private readonly HydraRingSection section; private readonly IEnumerable forelandPoints; private readonly double volumicWeightWater; private readonly double gravitationalAcceleration; @@ -86,7 +86,7 @@ /// Creates a new instance of . /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The foreland points. /// The volumic weight of water. /// The gravitational acceleration. @@ -139,7 +139,7 @@ /// The vertical distance. /// The modification factor waves slowly-varying pressure component. /// The modification factor dynamic or impulsive pressure component. - protected StructuresStabilityPointCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, + protected StructuresStabilityPointCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double volumicWeightWater, double gravitationalAcceleration, @@ -175,7 +175,7 @@ double modificationFactorDynamicOrImpulsivePressureComponent) : base(hydraulicBoundaryLocationId) { - this.hydraRingSection = hydraRingSection; + this.section = section; this.forelandPoints = forelandPoints; this.volumicWeightWater = volumicWeightWater; this.gravitationalAcceleration = gravitationalAcceleration; @@ -250,7 +250,7 @@ { get { - return hydraRingSection; + return section; } } @@ -266,98 +266,93 @@ { get { - return GetVariables(); + yield return new HydraRingVariable(43, HydraRingDistributionType.Deterministic, volumicWeightWater, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, levelCrestStructureMean, + levelCrestStructureStandardDeviation, double.NaN); + yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, structureNormalOrientation, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, factorStormDurationOpenStructure, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Variation, modelFactorSubCriticalFlowMean, + modelFactorSubCriticalFlowVariation, double.NaN); + yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, thresholdHeightOpenWeirMean, + thresholdHeightOpenWeirStandardDeviation, double.NaN); + yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, insideWaterLevelFailureConstructionMean, + insideWaterLevelFailureConstructionStandardDeviation, double.NaN); + yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, failureProbabilityRepairClosure, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Variation, failureCollisionEnergyMean, + failureCollisionEnergyVariation, double.NaN); + yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Variation, modelFactorCollisionLoadMean, + modelFactorCollisionLoadVariation, double.NaN); + yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Variation, shipMassMean, + shipMassVariation, double.NaN); + yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Variation, shipVelocityMean, + shipVelocityVariation, double.NaN); + yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, levelingCount, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, probabilityCollisionSecondaryStructure, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, flowVelocityStructureClosableMean, + flowVelocityStructureClosableStandardDeviation, double.NaN); + yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, insideWaterLevelMean, + insideWaterLevelStandardDeviation, double.NaN); + yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, + allowedLevelIncreaseStorageStandardDeviation, double.NaN); + yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, + modelFactorStorageVolumeStandardDeviation, double.NaN); + yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Variation, storageStructureAreaMean, + storageStructureAreaVariation, double.NaN); + yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorInflowVolume, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, + flowWidthAtBottomProtectionStandardDeviation, double.NaN); + yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, + criticalOvertoppingDischargeVariation, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, failureProbabilityStructureWithErosion, + 0, double.NaN); // HACK: Pass the deterministic value as normal distribution (with standard deviation 0.0) as Hydra-Ring otherwise crashes + yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Variation, stormDurationMean, + stormDurationVariation, double.NaN); + yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, bermWidthMean, + bermWidthStandardDeviation, double.NaN); + yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, evaluationLevel, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(132, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, modelFactorLoadEffectMean, + modelFactorLoadEffectStandardDeviation, double.NaN); + yield return new HydraRingVariable(133, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, waveRatioMaxHMean, + waveRatioMaxHStandardDeviation, double.NaN); + yield return new HydraRingVariable(134, HydraRingDistributionType.Deterministic, verticalDistance, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(135, HydraRingDistributionType.Deterministic, modificationFactorWavesSlowlyVaryingPressureComponent, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(136, HydraRingDistributionType.Deterministic, modificationFactorDynamicOrImpulsivePressureComponent, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); } } public abstract override int? GetSubMechanismModelId(int subMechanismId); - - private IEnumerable GetVariables() - { - yield return new HydraRingVariable(43, HydraRingDistributionType.Deterministic, volumicWeightWater, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, levelCrestStructureMean, - levelCrestStructureStandardDeviation, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, structureNormalOrientation, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, factorStormDurationOpenStructure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, modelFactorSubCriticalFlowMean, - modelFactorSubCriticalFlowVariation, double.NaN); - yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, thresholdHeightOpenWeirMean, - thresholdHeightOpenWeirStandardDeviation, double.NaN); - yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, insideWaterLevelFailureConstructionMean, - insideWaterLevelFailureConstructionStandardDeviation, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, failureProbabilityRepairClosure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, failureCollisionEnergyMean, - failureCollisionEnergyVariation, double.NaN); - yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, modelFactorCollisionLoadMean, - modelFactorCollisionLoadVariation, double.NaN); - yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, shipMassMean, - shipMassVariation, double.NaN); - yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, shipVelocityMean, - shipVelocityVariation, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, levelingCount, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, probabilityCollisionSecondaryStructure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, flowVelocityStructureClosableMean, - flowVelocityStructureClosableStandardDeviation, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, insideWaterLevelMean, - insideWaterLevelStandardDeviation, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, - allowedLevelIncreaseStorageStandardDeviation, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, - modelFactorStorageVolumeStandardDeviation, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, storageStructureAreaMean, - storageStructureAreaVariation, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorInflowVolume, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, - flowWidthAtBottomProtectionStandardDeviation, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, - criticalOvertoppingDischargeVariation, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, failureProbabilityStructureWithErosion, - 0, double.NaN); // HACK: Pass the deterministic value as normal distribution (with standard deviation 0.0) as Hydra-Ring otherwise crashes - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, stormDurationMean, - stormDurationVariation, double.NaN); - yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, bermWidthMean, - bermWidthStandardDeviation, double.NaN); - yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, evaluationLevel, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(132, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorLoadEffectMean, - modelFactorLoadEffectStandardDeviation, double.NaN); - yield return new HydraRingVariable(133, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, waveRatioMaxHMean, - waveRatioMaxHStandardDeviation, double.NaN); - yield return new HydraRingVariable(134, HydraRingDistributionType.Deterministic, verticalDistance, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(135, HydraRingDistributionType.Deterministic, modificationFactorWavesSlowlyVaryingPressureComponent, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(136, HydraRingDistributionType.Deterministic, modificationFactorDynamicOrImpulsivePressureComponent, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs =================================================================== diff -u -r4fc64174b80f971a226911d60393fbf8b166242d -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 4fc64174b80f971a226911d60393fbf8b166242d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -42,7 +42,7 @@ /// Creates a new instance of . /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The foreland points. /// The volumic weight of water. /// The gravitational acceleration. @@ -103,7 +103,7 @@ /// The variation of the stability linear load model. /// The mean of the constructive strength linear load model. /// The variation of the constructive strength linear load model. - public StructuresStabilityPointFloodedCulvertLinearCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, + public StructuresStabilityPointFloodedCulvertLinearCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double volumicWeightWater, double gravitationalAcceleration, @@ -141,7 +141,7 @@ double areaFlowAperturesMean, double areaFlowAperturesStandardDeviation, double stabilityLinearLoadModelMean, double stabilityLinearLoadModelVariation, double constructiveStrengthLinearLoadModelMean, double constructiveStrengthLinearLoadModelVariation) - : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + : base(hydraulicBoundaryLocationId, section, forelandPoints, volumicWeightWater, gravitationalAcceleration, levelCrestStructureMean, levelCrestStructureStandardDeviation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs =================================================================== diff -u -r4fc64174b80f971a226911d60393fbf8b166242d -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 4fc64174b80f971a226911d60393fbf8b166242d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -42,7 +42,7 @@ /// Creates a new instance of . /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The foreland points. /// The volumic weight of water. /// The gravitational acceleration. @@ -103,7 +103,7 @@ /// The variation of the stability quadratic load model. /// The mean of the constructive strength quadratic load model. /// The variation of the constructive strength quadratic load model. - public StructuresStabilityPointFloodedCulvertQuadraticCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, + public StructuresStabilityPointFloodedCulvertQuadraticCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double volumicWeightWater, double gravitationalAcceleration, @@ -141,7 +141,7 @@ double areaFlowAperturesMean, double areaFlowAperturesStandardDeviation, double stabilityQuadraticLoadModelMean, double stabilityQuadraticLoadModelVariation, double constructiveStrengthQuadraticLoadModelMean, double constructiveStrengthQuadraticLoadModelVariation) - : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + : base(hydraulicBoundaryLocationId, section, forelandPoints, volumicWeightWater, gravitationalAcceleration, levelCrestStructureMean, levelCrestStructureStandardDeviation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs =================================================================== diff -u -r4fc64174b80f971a226911d60393fbf8b166242d -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 4fc64174b80f971a226911d60393fbf8b166242d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -42,7 +42,7 @@ /// Creates a new instance of . /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The foreland points. /// The volumic weight of water. /// The gravitational acceleration. @@ -103,7 +103,7 @@ /// The variation of the constructive strength linear load model. /// The mean of the width flow apertures. /// The variation of the width flow apertures. - public StructuresStabilityPointLowSillLinearCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, + public StructuresStabilityPointLowSillLinearCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double volumicWeightWater, double gravitationalAcceleration, @@ -141,7 +141,7 @@ double stabilityLinearLoadModelMean, double stabilityLinearLoadModelVariation, double constructiveStrengthLinearLoadModelMean, double constructiveStrengthLinearLoadModelVariation, double widthFlowAperturesMean, double widthFlowAperturesVariation) - : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + : base(hydraulicBoundaryLocationId, section, forelandPoints, volumicWeightWater, gravitationalAcceleration, levelCrestStructureMean, levelCrestStructureStandardDeviation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs =================================================================== diff -u -r4fc64174b80f971a226911d60393fbf8b166242d -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 4fc64174b80f971a226911d60393fbf8b166242d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -42,7 +42,7 @@ /// Creates a new instance of . /// /// The id of the hydraulic station. - /// The section. + /// The section. /// The foreland points. /// The volumic weight of water. /// The gravitational acceleration. @@ -103,7 +103,7 @@ /// The variation of the constructive strength quadratic load model. /// The mean of the width flow apertures. /// The variation of the width flow apertures. - public StructuresStabilityPointLowSillQuadraticCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, + public StructuresStabilityPointLowSillQuadraticCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double volumicWeightWater, double gravitationalAcceleration, @@ -141,7 +141,7 @@ double stabilityQuadraticLoadModelMean, double stabilityQuadraticLoadModelVariation, double constructiveStrengthQuadraticLoadModelMean, double constructiveStrengthQuadraticLoadModelVariation, double widthFlowAperturesMean, double widthFlowAperturesVariation) - : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + : base(hydraulicBoundaryLocationId, section, forelandPoints, volumicWeightWater, gravitationalAcceleration, levelCrestStructureMean, levelCrestStructureStandardDeviation, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs =================================================================== diff -u -rff012303ef231b9e823e1c59f0829030962c8115 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision ff012303ef231b9e823e1c59f0829030962c8115) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -54,10 +54,10 @@ Assert.IsNull(assessmentLevelCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, assessmentLevelCalculationInput.Beta); - var hydraRingSection = assessmentLevelCalculationInput.Section; - Assert.AreEqual(sectionId, hydraRingSection.SectionId); - Assert.IsNaN(hydraRingSection.SectionLength); - Assert.IsNaN(hydraRingSection.CrossSectionNormal); + var section = assessmentLevelCalculationInput.Section; + Assert.AreEqual(sectionId, section.SectionId); + Assert.IsNaN(section.SectionLength); + Assert.IsNaN(section.CrossSectionNormal); var assessmentLevelVariable = assessmentLevelCalculationInput.Variables.First(); Assert.AreEqual(26, assessmentLevelVariable.VariableId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs =================================================================== diff -u -r19674fbb52038a17df349319e2bd9fca258e8df6 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -40,7 +40,7 @@ // Setup var norm = 10000; int hydraulicBoundaryLocationId = 1000; - HydraRingSection hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + HydraRingSection section = new HydraRingSection(1, double.NaN, double.NaN); const double modelFactorCriticalOvertopping = 1; const double factorFnMean = 4.75; @@ -65,7 +65,7 @@ var expectedRingBreakWater = new HydraRingBreakWater(2, 3.3); // Call - DikeHeightCalculationInput dikeHeightCalculationInput = new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, hydraRingSection, + DikeHeightCalculationInput dikeHeightCalculationInput = new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, section, expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater, modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation, hydraRingFactorFnMean, hydraRingFactorFnStandardDeviation, hydraRingmodelFactorOvertopping, @@ -88,7 +88,7 @@ CollectionAssert.AreEqual(expectedRingForelandPoints, dikeHeightCalculationInput.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, dikeHeightCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, dikeHeightCalculationInput.Beta); - Assert.AreSame(hydraRingSection, dikeHeightCalculationInput.Section); + Assert.AreSame(section, dikeHeightCalculationInput.Section); } [Test] @@ -99,10 +99,10 @@ public void GetSubMechanismModelId_Always_ReturnsExpectedValues(int subMechanismModelId, int? expectedSubMechanismModelId) { // Setup - HydraRingSection hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + HydraRingSection section = new HydraRingSection(1, double.NaN, double.NaN); // Call - DikeHeightCalculationInput dikeHeightCalculationInput = new DikeHeightCalculationInput(1, 1000, hydraRingSection, + DikeHeightCalculationInput dikeHeightCalculationInput = new DikeHeightCalculationInput(1, 1000, section, new List(), new List(), new HydraRingBreakWater(0, 1.1), Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs =================================================================== diff -u -rff012303ef231b9e823e1c59f0829030962c8115 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision ff012303ef231b9e823e1c59f0829030962c8115) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -54,10 +54,10 @@ Assert.IsNull(waveHeightCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, waveHeightCalculationInput.Beta); - HydraRingSection hydraRingSection = waveHeightCalculationInput.Section; - Assert.AreEqual(sectionId, hydraRingSection.SectionId); - Assert.IsNaN(hydraRingSection.SectionLength); - Assert.IsNaN(hydraRingSection.CrossSectionNormal); + HydraRingSection section = waveHeightCalculationInput.Section; + Assert.AreEqual(sectionId, section.SectionId); + Assert.IsNaN(section.SectionLength); + Assert.IsNaN(section.CrossSectionNormal); var waveHeightVariable = waveHeightCalculationInput.Variables.First(); Assert.AreEqual(28, waveHeightVariable.VariableId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs =================================================================== diff -u -r19674fbb52038a17df349319e2bd9fca258e8df6 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -85,8 +85,8 @@ Assert.AreEqual(expectedRingBreakWater, overtoppingCalculationInput.BreakWater); Assert.IsNaN(overtoppingCalculationInput.Beta); - var hydraRingSection = overtoppingCalculationInput.Section; - Assert.AreEqual(expectedHydraRingSection, hydraRingSection); + var section = overtoppingCalculationInput.Section; + Assert.AreEqual(expectedHydraRingSection, section); } [Test] @@ -97,10 +97,10 @@ public void GetSubMechanismModelId_Always_ReturnsExpectedValues(int subMechanismModelId, int? expectedSubMechanismModelId) { // Setup - HydraRingSection hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + HydraRingSection section = new HydraRingSection(1, double.NaN, double.NaN); // Call - OvertoppingCalculationInput overtoppingCalculationInput = new OvertoppingCalculationInput(1, hydraRingSection, + OvertoppingCalculationInput overtoppingCalculationInput = new OvertoppingCalculationInput(1, section, new List(), new List(), new HydraRingBreakWater(0, 1.1), Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs =================================================================== diff -u -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -38,7 +38,7 @@ { // Setup const int hydraulicBoundaryLocationId = 1000; - var hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + var section = new HydraRingSection(1, double.NaN, double.NaN); var forelandPoints = Enumerable.Empty(); const double gravitationalAcceleration = 9.81; @@ -63,7 +63,7 @@ const double probabilityOpenStructureBeforeFlooding = 0.04; // Call - var input = new TestStructuresClosureCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + var input = new TestStructuresClosureCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, gravitationalAcceleration, factorStormDurationOpenStructure, failureProbabilityOpenStructure, failureProbabilityReparation, identicalAperture, allowableIncreaseOfLevelForStorageMean, @@ -81,7 +81,7 @@ Assert.AreEqual(1, input.CalculationTypeId); Assert.AreEqual(58, input.VariableId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresClosure, input.FailureMechanismType); - Assert.AreSame(hydraRingSection, input.Section); + Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); HydraRingVariableAssert.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } @@ -106,7 +106,7 @@ private class TestStructuresClosureCalculationInput : StructuresClosureCalculationInput { - public TestStructuresClosureCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, + public TestStructuresClosureCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double hydraRingGravitationalAcceleration, double hydraRingFactorStormDurationOpenStructure, double hydraRingFailureProbabilityOpenStructure, double hydraRingFailureProbabilityReparation, @@ -118,7 +118,7 @@ double hydraRingCriticalOvertoppingDischargeMean, double hydraRingCriticalOvertoppingDischargeVariation, double hydraRingFailureProbabilityOfStructureGivenErosion, double hydraRingStormDurationMean, double hydraRingStormDurationVariation, double hydraRingProbabilityOpenStructureBeforeFlooding) - : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + : base(hydraulicBoundaryLocationId, section, forelandPoints, hydraRingGravitationalAcceleration, hydraRingFactorStormDurationOpenStructure, hydraRingFailureProbabilityOpenStructure, hydraRingFailureProbabilityReparation, hydraRingIdenticalApertures, hydraRingAllowableIncreaseOfLevelForStorageMean, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs =================================================================== diff -u -r2ce616712364410b1c04b0394b0d1f1a29528061 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 2ce616712364410b1c04b0394b0d1f1a29528061) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -36,7 +36,7 @@ { // Setup const int hydraulicBoundaryLocationId = 1000; - var hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + var section = new HydraRingSection(1, double.NaN, double.NaN); var forelandPoints = Enumerable.Empty(); const double gravitationalAcceleration = 9.81; @@ -67,7 +67,7 @@ const double waterLevelInsideStandardDeviation = 0.1; // Call - var input = new StructuresClosureFloodedCulvertCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + var input = new StructuresClosureFloodedCulvertCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, gravitationalAcceleration, factorStormDurationOpenStructure, failureProbabilityOpenStructure, failureProbabilityReparation, identicalAperture, allowableIncreaseOfLevelForStorageMean, @@ -88,7 +88,7 @@ Assert.AreEqual(1, input.CalculationTypeId); Assert.AreEqual(58, input.VariableId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresClosure, input.FailureMechanismType); - Assert.AreSame(hydraRingSection, input.Section); + Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); HydraRingVariableAssert.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs =================================================================== diff -u -rccce1ae96e85aa2603c218de61de03fb14cfae11 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision ccce1ae96e85aa2603c218de61de03fb14cfae11) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -36,7 +36,7 @@ { // Setup const int hydraulicBoundaryLocationId = 1000; - var hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + var section = new HydraRingSection(1, double.NaN, double.NaN); var forelandPoints = Enumerable.Empty(); const double gravitationalAcceleration = 9.81; @@ -71,7 +71,7 @@ const double widthOfFlowAperturesVariation = 0.05; // Call - var input = new StructuresClosureLowSillCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + var input = new StructuresClosureLowSillCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, gravitationalAcceleration, factorStormDurationOpenStructure, failureProbabilityOpenStructure, failureProbabilityReparation, identicalAperture, allowableIncreaseOfLevelForStorageMean, @@ -94,7 +94,7 @@ Assert.AreEqual(1, input.CalculationTypeId); Assert.AreEqual(58, input.VariableId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresClosure, input.FailureMechanismType); - Assert.AreSame(hydraRingSection, input.Section); + Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); HydraRingVariableAssert.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs =================================================================== diff -u -r6a35b370e2b97f2ce1ba0092c59905913a49dde0 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 6a35b370e2b97f2ce1ba0092c59905913a49dde0) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -36,7 +36,7 @@ { // Setup const int hydraulicBoundaryLocationId = 1000; - var hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + var section = new HydraRingSection(1, double.NaN, double.NaN); var forelandPoints = Enumerable.Empty(); const double gravitationalAcceleration = 9.81; @@ -71,7 +71,7 @@ const double wavedirectionDeviation = 0.03; // Call - var input = new StructuresClosureVerticalWallCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + var input = new StructuresClosureVerticalWallCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, gravitationalAcceleration, factorStormDurationOpenStructure, failureProbabilityOpenStructure, failureProbabilityReparation, identicalAperture, allowableIncreaseOfLevelForStorageMean, @@ -94,7 +94,7 @@ Assert.AreEqual(1, input.CalculationTypeId); Assert.AreEqual(58, input.VariableId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresClosure, input.FailureMechanismType); - Assert.AreSame(hydraRingSection, input.Section); + Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); HydraRingVariableAssert.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs =================================================================== diff -u -rccce1ae96e85aa2603c218de61de03fb14cfae11 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision ccce1ae96e85aa2603c218de61de03fb14cfae11) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -37,7 +37,7 @@ // Setup const int hydraulicBoundaryLocationId = 1000; - HydraRingSection hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + HydraRingSection section = new HydraRingSection(1, double.NaN, double.NaN); const double gravitationalAcceleration = 9.81; const double modelFactorOvertoppingMean = 0.09; const double modelFactorOvertoppingStandardDeviation = 0.06; @@ -66,7 +66,7 @@ const double deviationOfTheWaveDirection = 9.9; // Call - var structuresOvertoppingCalculationInput = new StructuresOvertoppingCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, + var structuresOvertoppingCalculationInput = new StructuresOvertoppingCalculationInput(hydraulicBoundaryLocationId, section, gravitationalAcceleration, modelFactorOvertoppingMean, modelFactorOvertoppingStandardDeviation, levelOfCrestOfStructureMean, levelOfCrestOfStructureStandardDeviation, @@ -90,7 +90,7 @@ Assert.AreEqual(hydraulicBoundaryLocationId, structuresOvertoppingCalculationInput.HydraulicBoundaryLocationId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresOvertopping, structuresOvertoppingCalculationInput.FailureMechanismType); Assert.AreEqual(variableId, structuresOvertoppingCalculationInput.VariableId); - Assert.AreEqual(hydraRingSection, structuresOvertoppingCalculationInput.Section); + Assert.AreEqual(section, structuresOvertoppingCalculationInput.Section); HydraRingVariableAssert.AreEqual(GetDefaultOvertoppingVariables().ToArray(), structuresOvertoppingCalculationInput.Variables.ToArray()); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs =================================================================== diff -u -r4180a5bc32186dc6747a286ae5e490034f6f111a -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 4180a5bc32186dc6747a286ae5e490034f6f111a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -37,11 +37,11 @@ { // Setup const int hydraulicBoundaryLocationId = 1000; - var hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + var section = new HydraRingSection(1, double.NaN, double.NaN); var forelandPoints = Enumerable.Empty(); // Call - var input = new TestStructuresStabilityPointCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + var input = new TestStructuresStabilityPointCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, 18.18, 19.19, 20.20, 21.21, 22.22, 23.23, 24.24, @@ -56,13 +56,13 @@ Assert.AreEqual(1, input.CalculationTypeId); Assert.AreEqual(58, input.VariableId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresStructuralFailure, input.FailureMechanismType); - Assert.AreSame(hydraRingSection, input.Section); + Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); } private class TestStructuresStabilityPointCalculationInput : StructuresStabilityPointCalculationInput { - public TestStructuresStabilityPointCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection, + public TestStructuresStabilityPointCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, double hydraRingVolumicWeightWater, double hydraRingGravitationalAcceleration, double hydraRingLevelCrestStructureMean, double hydraRingLevelCrestStructureStandardDeviation, @@ -93,7 +93,7 @@ double hydraRingVerticalDistance, double hydraRingModificationFactorWavesSlowlyVaryingPressureComponent, double hydraRingModificationFactorDynamicOrImpulsivePressureComponent) - : base(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + : base(hydraulicBoundaryLocationId, section, forelandPoints, hydraRingVolumicWeightWater, hydraRingGravitationalAcceleration, hydraRingLevelCrestStructureMean, hydraRingLevelCrestStructureStandardDeviation, hydraRingStructureNormalOrientation, hydraRingFactorStormDurationOpenStructure, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs =================================================================== diff -u -r4180a5bc32186dc6747a286ae5e490034f6f111a -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 4180a5bc32186dc6747a286ae5e490034f6f111a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -34,11 +34,11 @@ { // Setup const int hydraulicBoundaryLocationId = 1000; - var hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + var section = new HydraRingSection(1, double.NaN, double.NaN); var forelandPoints = Enumerable.Empty(); // Call - var input = new StructuresStabilityPointFloodedCulvertLinearCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + var input = new StructuresStabilityPointFloodedCulvertLinearCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, 18.18, 19.19, 20.20, 21.21, 22.22, 23.23, 24.24, @@ -54,7 +54,7 @@ Assert.AreEqual(1, input.CalculationTypeId); Assert.AreEqual(58, input.VariableId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresStructuralFailure, input.FailureMechanismType); - Assert.AreSame(hydraRingSection, input.Section); + Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs =================================================================== diff -u -r4180a5bc32186dc6747a286ae5e490034f6f111a -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 4180a5bc32186dc6747a286ae5e490034f6f111a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -34,11 +34,11 @@ { // Setup const int hydraulicBoundaryLocationId = 1000; - var hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + var section = new HydraRingSection(1, double.NaN, double.NaN); var forelandPoints = Enumerable.Empty(); // Call - var input = new StructuresStabilityPointFloodedCulvertQuadraticCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + var input = new StructuresStabilityPointFloodedCulvertQuadraticCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, 18.18, 19.19, 20.20, 21.21, 22.22, 23.23, 24.24, @@ -54,7 +54,7 @@ Assert.AreEqual(1, input.CalculationTypeId); Assert.AreEqual(58, input.VariableId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresStructuralFailure, input.FailureMechanismType); - Assert.AreSame(hydraRingSection, input.Section); + Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs =================================================================== diff -u -r4180a5bc32186dc6747a286ae5e490034f6f111a -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 4180a5bc32186dc6747a286ae5e490034f6f111a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -34,11 +34,11 @@ { // Setup const int hydraulicBoundaryLocationId = 1000; - var hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + var section = new HydraRingSection(1, double.NaN, double.NaN); var forelandPoints = Enumerable.Empty(); // Call - var input = new StructuresStabilityPointLowSillLinearCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + var input = new StructuresStabilityPointLowSillLinearCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, 18.18, 19.19, 20.20, 21.21, 22.22, 23.23, 24.24, @@ -54,7 +54,7 @@ Assert.AreEqual(1, input.CalculationTypeId); Assert.AreEqual(58, input.VariableId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresStructuralFailure, input.FailureMechanismType); - Assert.AreSame(hydraRingSection, input.Section); + Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs =================================================================== diff -u -r4180a5bc32186dc6747a286ae5e490034f6f111a -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 4180a5bc32186dc6747a286ae5e490034f6f111a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -34,11 +34,11 @@ { // Setup const int hydraulicBoundaryLocationId = 1000; - var hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + var section = new HydraRingSection(1, double.NaN, double.NaN); var forelandPoints = Enumerable.Empty(); // Call - var input = new StructuresStabilityPointLowSillQuadraticCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, forelandPoints, + var input = new StructuresStabilityPointLowSillQuadraticCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, 18.18, 19.19, 20.20, 21.21, 22.22, 23.23, 24.24, @@ -54,7 +54,7 @@ Assert.AreEqual(1, input.CalculationTypeId); Assert.AreEqual(58, input.VariableId); Assert.AreEqual(HydraRingFailureMechanismType.StructuresStructuralFailure, input.FailureMechanismType); - Assert.AreSame(hydraRingSection, input.Section); + Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r19674fbb52038a17df349319e2bd9fca258e8df6 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -190,7 +190,7 @@ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; - var hydraRingSection = new HydraRingSection(1, 2.2, 3.3); + var section = new HydraRingSection(1, 2.2, 3.3); const double dikeHeight = 11.11; const double modelFactorCriticalOvertopping = 1; const double factorFnMean = 4.75; @@ -216,7 +216,7 @@ hydraRingConfigurationService.AddHydraRingCalculationInput( new OvertoppingCalculationInput( - hydraulicBoundaryLocationId, hydraRingSection, + hydraulicBoundaryLocationId, section, profilePoints, forelandPoints, breakWater, dikeHeight, modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation, hydraRingFactorFnMean, hydraRingFactorFnStandardDeviation, hydraRingmodelFactorOvertopping, criticalOvertoppingMean, @@ -309,7 +309,7 @@ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; - var hydraRingSection = new HydraRingSection(1, 2.2, 3.3); + var section = new HydraRingSection(1, 2.2, 3.3); const double norm = 1000; const double modelFactorCriticalOvertopping = 1; const double factorFnMean = 4.75; @@ -334,7 +334,7 @@ var breakWater = new HydraRingBreakWater(1, 2.2); hydraRingConfigurationService.AddHydraRingCalculationInput( - new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, hydraRingSection, + new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, section, profilePoints, forelandPoints, breakWater, modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation, hydraRingFactorFnMean, hydraRingFactorFnStandardDeviation, hydraRingmodelFactorOvertopping, criticalOvertoppingMean, criticalOvertoppingStandardDeviation, hydraRingModelFactorFrunupMean, @@ -426,7 +426,7 @@ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; - var hydraRingSection = new HydraRingSection(1, 2.2, 3.3); + var section = new HydraRingSection(1, 2.2, 3.3); const double gravitationalAcceleration = 9.81; const double modelFactorOvertoppingMean = 0.09; const double modelFactorOvertoppingStandardDeviation = 0.06; @@ -454,7 +454,7 @@ const double widthOfFlowAperturesMean = 8.8; const double deviationOfTheWaveDirection = 9.9; - hydraRingConfigurationService.AddHydraRingCalculationInput(new StructuresOvertoppingCalculationInput(hydraulicBoundaryLocationId, hydraRingSection, gravitationalAcceleration, + hydraRingConfigurationService.AddHydraRingCalculationInput(new StructuresOvertoppingCalculationInput(hydraulicBoundaryLocationId, section, gravitationalAcceleration, modelFactorOvertoppingMean, modelFactorOvertoppingStandardDeviation, levelOfCrestOfStructureMean, levelOfCrestOfStructureStandardDeviation, orientationOfTheNormalOfTheStructure,