Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -rf09f2ae0881378aedf0b5b576df6ecc3ff44ceee -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision f09f2ae0881378aedf0b5b576df6ecc3ff44ceee)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -157,6 +157,9 @@
{
return new OvertoppingCalculationInput(calculation.InputParameters.HydraulicBoundaryLocation.Id,
new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.Orientation),
+ ParseProfilePoints(calculation.InputParameters.DikeGeometry),
+ ParseForeshore(calculation.InputParameters),
+ ParseBreakWater(calculation.InputParameters),
calculation.InputParameters.DikeHeight,
generalInput.CriticalOvertoppingModelFactor,
generalInput.FbFactor.Mean,
@@ -169,10 +172,7 @@
generalInput.FrunupModelFactor.Mean,
generalInput.FrunupModelFactor.StandardDeviation,
generalInput.FshallowModelFactor.Mean,
- generalInput.FshallowModelFactor.StandardDeviation,
- ParseProfilePoints(calculation.InputParameters.DikeGeometry),
- ParseForeshore(calculation.InputParameters),
- ParseBreakWater(calculation.InputParameters));
+ generalInput.FshallowModelFactor.StandardDeviation);
}
private static DikeHeightCalculationInput CreateDikeHeightInput(GrassCoverErosionInwardsCalculation calculation, IAssessmentSection assessmentSection,
@@ -181,6 +181,9 @@
return new DikeHeightCalculationInput(calculation.InputParameters.HydraulicBoundaryLocation.Id,
assessmentSection.FailureMechanismContribution.Norm,
new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.Orientation),
+ ParseProfilePoints(calculation.InputParameters.DikeGeometry),
+ ParseForeshore(calculation.InputParameters),
+ ParseBreakWater(calculation.InputParameters),
generalInput.CriticalOvertoppingModelFactor,
generalInput.FbFactor.Mean,
generalInput.FbFactor.StandardDeviation,
@@ -192,10 +195,7 @@
generalInput.FrunupModelFactor.Mean,
generalInput.FrunupModelFactor.StandardDeviation,
generalInput.FshallowModelFactor.Mean,
- generalInput.FshallowModelFactor.StandardDeviation,
- ParseProfilePoints(calculation.InputParameters.DikeGeometry),
- ParseForeshore(calculation.InputParameters),
- ParseBreakWater(calculation.InputParameters));
+ generalInput.FshallowModelFactor.StandardDeviation);
}
private static HydraRingBreakWater ParseBreakWater(GrassCoverErosionInwardsInput input)
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs
===================================================================
diff -u -r03b153b8f94dc5ff3619bdd52c79394a0d7fde85 -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs (.../AssessmentLevelCalculationInput.cs) (revision 03b153b8f94dc5ff3619bdd52c79394a0d7fde85)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs (.../AssessmentLevelCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -33,10 +33,11 @@
///
/// Creates a new instance of the class.
///
- /// The id of the section to use during the calculation.
- /// The id of the hydraulic station to use during the calculation.
- /// The norm to use during the calculation.
- public AssessmentLevelCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm) : base(hydraulicBoundaryLocationId, norm)
+ /// The id of the section.
+ /// The id of the hydraulic station.
+ /// The norm.
+ public AssessmentLevelCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm)
+ : base(hydraulicBoundaryLocationId, norm)
{
section = new HydraRingSection(sectionId, double.NaN, double.NaN);
}
@@ -69,7 +70,6 @@
{
get
{
- // Assessment level
yield return new HydraRingVariable(26, HydraRingDistributionType.Deterministic, 0,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs
===================================================================
diff -u -r03b153b8f94dc5ff3619bdd52c79394a0d7fde85 -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 03b153b8f94dc5ff3619bdd52c79394a0d7fde85)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -33,7 +33,6 @@
private readonly IEnumerable profilePoints;
private readonly IEnumerable forelandPoints;
private readonly HydraRingBreakWater breakWater;
-
private readonly double modelFactorCriticalOvertopping;
private readonly double factorFbMean;
private readonly double factorFbStandardDeviation;
@@ -50,54 +49,54 @@
///
/// Creates a new instance of the class.
///
- /// The id of the hydraulic station to use during the calculation.
- /// The norm to use during the calculation.
- /// The section to use during the calculation.
- /// The model factor critical overtopping to use during the calculation.
- /// The mean of the factor Fb to use during the calculation
- /// The standard deviation of the factor Fb to use during the calculation.
- /// The mean of the factor Fn to use during the calculation.
- /// The standard deviation of the factor Fn to use during the calculation.
- /// The factor overtopping to use during the calculation.
- /// The mean of the critical overtopping to use during the calculation.
- /// The standard deviation of the critical overtopping to use during the calculation.
- /// The mean of the factor frunup to use during the calculation.
- /// The standard deviation of the factor frunup to use during the calculation.
- /// The mean of the exponent model factor shallow to use during the calculation.
- /// The standard deviation of the exponent model factor shallow to use during the calculation.
- /// The profile points to use during the calculation.
- /// The foreland points to use during the calculation.
- /// The break water to use during the calculation.
+ /// The id of the hydraulic station.
+ /// The norm.
+ /// The section.
+ /// The profile points.
+ /// The foreland points.
+ /// The break water.
+ /// The model factor critical overtopping.
+ /// The mean of the factor Fb
+ /// The standard deviation of the factor Fb.
+ /// The mean of the factor Fn.
+ /// The standard deviation of the factor Fn.
+ /// The factor overtopping.
+ /// The mean of the critical overtopping.
+ /// The standard deviation of the critical overtopping.
+ /// The mean of the factor frunup.
+ /// The standard deviation of the factor frunup.
+ /// The mean of the exponent model factor shallow.
+ /// The standard deviation of the exponent model factor shallow.
public DikeHeightCalculationInput(long hydraulicBoundaryLocationId, double norm,
- HydraRingSection hydraRingSection, double hydraRingModelFactorCriticalOvertopping,
- double hydraRingFactorFbMean, double hydraRingFactorFbStandardDeviation,
- double hydraRingFactorFnMean, double hydraRingFactorFnStandardDeviation,
- double hydraRingmodelFactorOvertopping, double hydraRingCriticalOvertoppingMean,
- double hydraRingCriticalOvertoppingStandardDeviation, double hydraRingModelFactorFrunupMean,
- double hydraRingModelFactorFrunupStandardDeviation, double hydraRingExponentModelFactorShallowMean,
- double hydraRingExponentModelFactorShallowStandardDeviation,
- IEnumerable hydraRingProfilePoints,
- IEnumerable hydraRingForelandPoints,
- HydraRingBreakWater hydraRingBreakWater)
+ HydraRingSection section,
+ IEnumerable profilePoints,
+ IEnumerable forelandPoints,
+ HydraRingBreakWater breakWater,
+ double modelFactorCriticalOvertopping,
+ double factorFbMean, double factorFbStandardDeviation,
+ double factorFnMean, double factorFnStandardDeviation,
+ double modelFactorOvertopping,
+ double criticalOvertoppingMean, double criticalOvertoppingStandardDeviation,
+ double modelFactorFrunupMean, double modelFactorFrunupStandardDeviation,
+ double exponentModelFactorShallowMean, double exponentModelFactorShallowStandardDeviation)
: base(hydraulicBoundaryLocationId, norm)
{
- section = hydraRingSection;
- modelFactorCriticalOvertopping = hydraRingModelFactorCriticalOvertopping;
- factorFbMean = hydraRingFactorFbMean;
- factorFbStandardDeviation = hydraRingFactorFbStandardDeviation;
- factorFnMean = hydraRingFactorFnMean;
- factorFnStandardDeviation = hydraRingFactorFnStandardDeviation;
- modelFactorOvertopping = hydraRingmodelFactorOvertopping;
- modelFactorFrunupMean = hydraRingModelFactorFrunupMean;
- modelFactorFrunupStandardDeviation = hydraRingModelFactorFrunupStandardDeviation;
- exponentModelFactorShallowMean = hydraRingExponentModelFactorShallowMean;
- exponentModelFactorShallowStandardDeviation = hydraRingExponentModelFactorShallowStandardDeviation;
-
- criticalOvertoppingMean = hydraRingCriticalOvertoppingMean;
- criticalOvertoppingStandardDeviation = hydraRingCriticalOvertoppingStandardDeviation;
- profilePoints = hydraRingProfilePoints;
- forelandPoints = hydraRingForelandPoints;
- breakWater = hydraRingBreakWater;
+ this.section = section;
+ this.modelFactorCriticalOvertopping = modelFactorCriticalOvertopping;
+ this.factorFbMean = factorFbMean;
+ this.factorFbStandardDeviation = factorFbStandardDeviation;
+ this.factorFnMean = factorFnMean;
+ this.factorFnStandardDeviation = factorFnStandardDeviation;
+ this.modelFactorOvertopping = modelFactorOvertopping;
+ this.modelFactorFrunupMean = modelFactorFrunupMean;
+ this.modelFactorFrunupStandardDeviation = modelFactorFrunupStandardDeviation;
+ this.exponentModelFactorShallowMean = exponentModelFactorShallowMean;
+ this.exponentModelFactorShallowStandardDeviation = exponentModelFactorShallowStandardDeviation;
+ this.criticalOvertoppingMean = criticalOvertoppingMean;
+ this.criticalOvertoppingStandardDeviation = criticalOvertoppingStandardDeviation;
+ this.profilePoints = profilePoints;
+ this.forelandPoints = forelandPoints;
+ this.breakWater = breakWater;
}
public override HydraRingFailureMechanismType FailureMechanismType
@@ -152,7 +151,7 @@
{
get
{
- return GetHydraRingVariables();
+ return GetVariables();
}
}
@@ -169,41 +168,26 @@
}
}
- private IEnumerable GetHydraRingVariables()
+ private IEnumerable GetVariables()
{
- // Dike height
yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 0.0,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-
- // Model factor critical overtopping
yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertopping,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-
- // Factor Fb
yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN,
HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation,
double.NaN);
-
- // Factor Fn
yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN,
HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation,
double.NaN);
-
- // Model factor overtopping
yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, modelFactorOvertopping,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-
- // Critical overtopping
yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN,
HydraRingDeviationType.Standard, criticalOvertoppingMean,
criticalOvertoppingStandardDeviation, double.NaN);
-
- // Model factor Frunup
yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN,
HydraRingDeviationType.Standard, modelFactorFrunupMean,
modelFactorFrunupStandardDeviation, double.NaN);
-
- // Exponent model factor shallow
yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN,
HydraRingDeviationType.Standard, exponentModelFactorShallowMean,
exponentModelFactorShallowStandardDeviation, double.NaN);
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs
===================================================================
diff -u -r03b153b8f94dc5ff3619bdd52c79394a0d7fde85 -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs (.../WaveHeightCalculationInput .cs) (revision 03b153b8f94dc5ff3619bdd52c79394a0d7fde85)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs (.../WaveHeightCalculationInput .cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -33,9 +33,9 @@
///
/// Creates a new instance of the class.
///
- /// The id of the section to use during the calculation.
- /// The id of the hydraulic station to use during the calculation.
- /// The norm to use during the calculation.
+ /// The id of the section.
+ /// The id of the hydraulic station.
+ /// The norm.
public WaveHeightCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm)
: base(hydraulicBoundaryLocationId, norm)
{
@@ -70,7 +70,6 @@
{
get
{
- // Wave height
yield return new HydraRingVariable(28, HydraRingDistributionType.Deterministic, 0,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs
===================================================================
diff -u -r619ec034c9747bd7bd8ba9446487086313df27b1 -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 619ec034c9747bd7bd8ba9446487086313df27b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -32,7 +32,6 @@
private readonly IEnumerable profilePoints;
private readonly IEnumerable forelandPoints;
private readonly HydraRingBreakWater breakWater;
-
private readonly double dikeHeight;
private readonly double modelFactorCriticalOvertopping;
private readonly double factorFbMean;
@@ -50,55 +49,55 @@
///
/// Creates a new instance of the class.
///
- /// The id of the hydraulic station to use during the calculation.
- /// The section to use during the calculation.
- /// The dike height to use during the calculation.
- /// The model factor critical overtopping to use during the calculation.
- /// The mean of the factor Fb to use during the calculation
- /// The standard deviation of the factor Fb to use during the calculation.
- /// The mean of the factor Fn to use during the calculation.
- /// The standard deviation of the factor Fn to use during the calculation.
- /// The factor overtopping to use during the calculation.
- /// The mean of the critical overtopping to use during the calculation.
- /// The standard deviation of the critical overtopping to use during the calculation.
- /// The mean of the factor frunup to use during the calculation.
- /// The standard deviation of the factor frunup to use during the calculation.
- /// The mean of the exponent model factor shallow to use during the calculation.
- /// The standard deviation of the exponent model factor shallow to use during the calculation.
- /// The profile points to use during the calculation.
- /// The foreland points to use during the calculation.
- /// The break water to use during the calculation.
- public OvertoppingCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection hydraRingSection,
- double hydraRingDikeHeight, double hydraRingModelFactorCriticalOvertopping,
- double hydraRingFactorFbMean, double hydraRingFactorFbStandardDeviation,
- double hydraRingFactorFnMean, double hydraRingFactorFnStandardDeviation,
- double hydraRingmodelFactorOvertopping,
- double hydraRingCriticalOvertoppingMean, double hydraRingCriticalOvertoppingStandardDeviation,
- double hydraRingModelFactorFrunupMean, double hydraRingModelFactorFrunupStandardDeviation,
- double hydraRingExponentModelFactorShallowMean, double hydraRingExponentModelFactorShallowStandardDeviation,
- IEnumerable hydraRingProfilePoints,
- IEnumerable hydraRingForelandPoints,
- HydraRingBreakWater hydraRingBreakWater)
+ /// The id of the hydraulic station.
+ /// The section.
+ /// The profile points.
+ /// The foreland points.
+ /// The break water.
+ /// The dike height.
+ /// The model factor critical overtopping.
+ /// The mean of the factor Fb
+ /// The standard deviation of the factor Fb.
+ /// The mean of the factor Fn.
+ /// The standard deviation of the factor Fn.
+ /// The factor overtopping.
+ /// The mean of the critical overtopping.
+ /// The standard deviation of the critical overtopping.
+ /// The mean of the factor frunup.
+ /// The standard deviation of the factor frunup.
+ /// The mean of the exponent model factor shallow.
+ /// The standard deviation of the exponent model factor shallow.
+ public OvertoppingCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section,
+ IEnumerable profilePoints,
+ IEnumerable forelandPoints,
+ HydraRingBreakWater breakWater,
+ double dikeHeight,
+ double modelFactorCriticalOvertopping,
+ double factorFbMean, double factorFbStandardDeviation,
+ double factorFnMean, double factorFnStandardDeviation,
+ double modelFactorOvertopping,
+ double criticalOvertoppingMean, double criticalOvertoppingStandardDeviation,
+ double modelFactorFrunupMean, double modelFactorFrunupStandardDeviation,
+ double exponentModelFactorShallowMean, double exponentModelFactorShallowStandardDeviation)
: base(hydraulicBoundaryLocationId)
{
- section = hydraRingSection;
- dikeHeight = hydraRingDikeHeight;
- modelFactorCriticalOvertopping = hydraRingModelFactorCriticalOvertopping;
- factorFbMean = hydraRingFactorFbMean;
- factorFbStandardDeviation = hydraRingFactorFbStandardDeviation;
- factorFnMean = hydraRingFactorFnMean;
- factorFnStandardDeviation = hydraRingFactorFnStandardDeviation;
- modelFactorOvertopping = hydraRingmodelFactorOvertopping;
- modelFactorFrunupMean = hydraRingModelFactorFrunupMean;
- modelFactorFrunupStandardDeviation = hydraRingModelFactorFrunupStandardDeviation;
- exponentModelFactorShallowMean = hydraRingExponentModelFactorShallowMean;
- exponentModelFactorShallowStandardDeviation = hydraRingExponentModelFactorShallowStandardDeviation;
-
- criticalOvertoppingMean = hydraRingCriticalOvertoppingMean;
- criticalOvertoppingStandardDeviation = hydraRingCriticalOvertoppingStandardDeviation;
- profilePoints = hydraRingProfilePoints;
- forelandPoints = hydraRingForelandPoints;
- breakWater = hydraRingBreakWater;
+ this.section = section;
+ this.profilePoints = profilePoints;
+ this.forelandPoints = forelandPoints;
+ this.breakWater = breakWater;
+ this.dikeHeight = dikeHeight;
+ this.modelFactorCriticalOvertopping = modelFactorCriticalOvertopping;
+ this.factorFbMean = factorFbMean;
+ this.factorFbStandardDeviation = factorFbStandardDeviation;
+ this.factorFnMean = factorFnMean;
+ this.factorFnStandardDeviation = factorFnStandardDeviation;
+ this.modelFactorOvertopping = modelFactorOvertopping;
+ this.modelFactorFrunupMean = modelFactorFrunupMean;
+ this.modelFactorFrunupStandardDeviation = modelFactorFrunupStandardDeviation;
+ this.exponentModelFactorShallowMean = exponentModelFactorShallowMean;
+ this.exponentModelFactorShallowStandardDeviation = exponentModelFactorShallowStandardDeviation;
+ this.criticalOvertoppingMean = criticalOvertoppingMean;
+ this.criticalOvertoppingStandardDeviation = criticalOvertoppingStandardDeviation;
}
public override HydraRingFailureMechanismType FailureMechanismType
@@ -153,7 +152,7 @@
{
get
{
- return GetHydraRingVariables();
+ return GetVariables();
}
}
@@ -170,41 +169,26 @@
}
}
- private IEnumerable GetHydraRingVariables()
+ private IEnumerable GetVariables()
{
- // Dike height
yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, dikeHeight,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-
- // Model factor critical overtopping
yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertopping,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-
- // Factor Fb
yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN,
HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation,
double.NaN);
-
- // Factor Fn
yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN,
HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation,
double.NaN);
-
- // Model factor overtopping
yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, modelFactorOvertopping,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-
- // Critical overtopping
yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN,
HydraRingDeviationType.Standard, criticalOvertoppingMean,
criticalOvertoppingStandardDeviation, double.NaN);
-
- // Model factor Frunup
yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN,
HydraRingDeviationType.Standard, modelFactorFrunupMean,
modelFactorFrunupStandardDeviation, double.NaN);
-
- // Exponent model factor shallow
yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN,
HydraRingDeviationType.Standard, exponentModelFactorShallowMean,
exponentModelFactorShallowStandardDeviation, double.NaN);
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs
===================================================================
diff -u -r3b9088c00c08d2d55eeb857a6a21a4c43b90fd60 -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs (.../WaveConditionsCalculationInput.cs) (revision 3b9088c00c08d2d55eeb857a6a21a4c43b90fd60)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs (.../WaveConditionsCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -40,15 +40,15 @@
///
/// Creates a new instance of the class.
///
- /// The id of the section to use during the calculation.
- /// The normal of the section to use during the calculation.
- /// The id of the hydraulic station to use during the calculation.
- /// The norm to use during the calculation.
- /// The foreland points to use during the calculation.
- /// The break water to use during the calculation.
+ /// The id of the section.
+ /// The normal of the section.
+ /// The id of the hydraulic station.
+ /// The norm.
+ /// The foreland points.
+ /// The break water.
/// The water level to calculate the wave conditions for.
- /// The a-value to use during the calculation.
- /// The b-value to use during the calculation.
+ /// The a-value.
+ /// The b-value.
/// As a part of the constructor, the is automatically converted into a reliability index.
protected WaveConditionsCalculationInput(int sectionId,
double sectionNormal,
@@ -106,19 +106,12 @@
{
get
{
- // Water level
yield return new HydraRingVariable(113, HydraRingDistributionType.Deterministic, waterLevel,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-
- // Resistance Q-variant
yield return new HydraRingVariable(114, HydraRingDistributionType.Deterministic, 1.0,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-
- // a-value
yield return new HydraRingVariable(115, HydraRingDistributionType.Deterministic, a,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-
- // b-value
yield return new HydraRingVariable(116, HydraRingDistributionType.Deterministic, b,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs
===================================================================
diff -u -r3b9088c00c08d2d55eeb857a6a21a4c43b90fd60 -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs (.../WaveConditionsCosineCalculationInput.cs) (revision 3b9088c00c08d2d55eeb857a6a21a4c43b90fd60)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs (.../WaveConditionsCosineCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -34,16 +34,16 @@
///
/// Creates a new instance of the class.
///
- /// The id of the section to use during the calculation.
- /// The normal of the section to use during the calculation.
- /// The id of the hydraulic station to use during the calculation.
- /// The norm to use during the calculation.
- /// The foreland points to use during the calculation.
- /// The break water to use during the calculation.
+ /// The id of the section.
+ /// The normal of the section.
+ /// The id of the hydraulic station.
+ /// The norm.
+ /// The foreland points.
+ /// The break water.
/// The water level to calculate the wave conditions for.
- /// The a-value to use during the calculation.
- /// The b-value to use during the calculation.
- /// The c-value to use during the calculation.
+ /// The a-value.
+ /// The b-value.
+ /// The c-value.
public WaveConditionsCosineCalculationInput(int sectionId,
double sectionNormal,
long hydraulicBoundaryLocationId,
@@ -73,7 +73,6 @@
{
var variables = base.Variables.ToList();
- // c-value
variables.Add(new HydraRingVariable(119, HydraRingDistributionType.Deterministic, c,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN));
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs
===================================================================
diff -u -r3b9088c00c08d2d55eeb857a6a21a4c43b90fd60 -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs (.../WaveConditionsTrapezoidCalculationInput.cs) (revision 3b9088c00c08d2d55eeb857a6a21a4c43b90fd60)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs (.../WaveConditionsTrapezoidCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -35,17 +35,17 @@
///
/// Creates a new instance of the class.
///
- /// The id of the section to use during the calculation.
- /// The normal of the section to use during the calculation.
- /// The id of the hydraulic station to use during the calculation.
- /// The norm to use during the calculation.
- /// The foreland points to use during the calculation.
- /// The break water to use during the calculation.
+ /// The id of the section.
+ /// The normal of the section.
+ /// The id of the hydraulic station.
+ /// The norm.
+ /// The foreland points.
+ /// The break water.
/// The water level to calculate the wave conditions for.
- /// The a-value to use during the calculation.
- /// The b-value to use during the calculation.
- /// The beta1-value to use during the calculation.
- /// The beta2-value to use during the calculation.
+ /// The a-value.
+ /// The b-value.
+ /// The beta1-value.
+ /// The beta2-value.
public WaveConditionsTrapezoidCalculationInput(int sectionId,
double sectionNormal,
long hydraulicBoundaryLocationId,
@@ -77,11 +77,8 @@
{
var variables = base.Variables.ToList();
- // beta1-value
variables.Add(new HydraRingVariable(117, HydraRingDistributionType.Deterministic, beta1,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN));
-
- // beta2-value
variables.Add(new HydraRingVariable(118, HydraRingDistributionType.Deterministic, beta2,
HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN));
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs
===================================================================
diff -u -r03b153b8f94dc5ff3619bdd52c79394a0d7fde85 -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 03b153b8f94dc5ff3619bdd52c79394a0d7fde85)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -66,12 +66,12 @@
// Call
DikeHeightCalculationInput dikeHeightCalculationInput = new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, hydraRingSection,
+ expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater,
modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation,
hydraRingFactorFnMean, hydraRingFactorFnStandardDeviation, hydraRingmodelFactorOvertopping,
criticalOvertoppingMean, criticalOvertoppingStandardDeviation, hydraRingModelFactorFrunupMean,
hydraRingModelFactorFrunupStandardDeviation, hydraRingExponentModelFactorShallowMean,
- hydraRingExponentModelFactorShallowStandardDeviation, expectedRingProfilePoints,
- expectedRingForelandPoints, expectedRingBreakWater);
+ hydraRingExponentModelFactorShallowStandardDeviation);
// Assert
const int expectedCalculationTypeId = 2;
@@ -102,10 +102,11 @@
HydraRingSection hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN);
// Call
- DikeHeightCalculationInput dikeHeightCalculationInput = new DikeHeightCalculationInput(1, 1000, hydraRingSection, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ DikeHeightCalculationInput dikeHeightCalculationInput = new DikeHeightCalculationInput(1, 1000, hydraRingSection,
new List(),
new List(),
- new HydraRingBreakWater(0, 1.1));
+ new HydraRingBreakWater(0, 1.1),
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
// Assert
Assert.AreEqual(expectedSubMechanismModelId, dikeHeightCalculationInput.GetSubMechanismModelId(subMechanismModelId));
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs
===================================================================
diff -u -rfc25acac78ccc302ea4fcc0414fc5e6adc0fccae -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision fc25acac78ccc302ea4fcc0414fc5e6adc0fccae)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -63,11 +63,13 @@
// Call
- OvertoppingCalculationInput overtoppingCalculationInput = new OvertoppingCalculationInput(hydraulicBoundaryLocationId, expectedHydraRingSection, dikeHeight,
- modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation, hydraRingFactorFnMean, hydraRingFactorFnStandardDeviation,
- hydraRingmodelFactorOvertopping, criticalOvertoppingMean, criticalOvertoppingStandardDeviation, hydraRingModelFactorFrunupMean,
- hydraRingModelFactorFrunupStandardDeviation, hydraRingExponentModelFactorShallowMean, hydraRingExponentModelFactorShallowStandardDeviation,
- expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater);
+ OvertoppingCalculationInput overtoppingCalculationInput = new OvertoppingCalculationInput(hydraulicBoundaryLocationId, expectedHydraRingSection,
+ expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater,
+ dikeHeight, modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation,
+ hydraRingFactorFnMean, hydraRingFactorFnStandardDeviation, hydraRingmodelFactorOvertopping,
+ criticalOvertoppingMean, criticalOvertoppingStandardDeviation,
+ hydraRingModelFactorFrunupMean, hydraRingModelFactorFrunupStandardDeviation,
+ hydraRingExponentModelFactorShallowMean, hydraRingExponentModelFactorShallowStandardDeviation);
// Assert
const int expectedCalculationTypeId = 1;
@@ -98,10 +100,11 @@
HydraRingSection hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN);
// Call
- OvertoppingCalculationInput overtoppingCalculationInput = new OvertoppingCalculationInput(1, hydraRingSection, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ OvertoppingCalculationInput overtoppingCalculationInput = new OvertoppingCalculationInput(1, hydraRingSection,
new List(),
new List(),
- new HydraRingBreakWater(0, 1.1));
+ new HydraRingBreakWater(0, 1.1),
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14);
// Assert
Assert.AreEqual(expectedSubMechanismModelId, overtoppingCalculationInput.GetSubMechanismModelId(subMechanismModelId));
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -rccce1ae96e85aa2603c218de61de03fb14cfae11 -r19674fbb52038a17df349319e2bd9fca258e8df6
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision ccce1ae96e85aa2603c218de61de03fb14cfae11)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6)
@@ -217,11 +217,11 @@
hydraRingConfigurationService.AddHydraRingCalculationInput(
new OvertoppingCalculationInput(
hydraulicBoundaryLocationId, hydraRingSection,
- dikeHeight,
- modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation, hydraRingFactorFnMean, hydraRingFactorFnStandardDeviation,
- hydraRingmodelFactorOvertopping, criticalOvertoppingMean, criticalOvertoppingStandardDeviation, hydraRingModelFactorFrunupMean,
- hydraRingModelFactorFrunupStandardDeviation, hydraRingExponentModelFactorShallowMean, hydraRingExponentModelFactorShallowStandardDeviation,
- profilePoints, forelandPoints, breakWater));
+ profilePoints, forelandPoints, breakWater,
+ dikeHeight, modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation, hydraRingFactorFnMean,
+ hydraRingFactorFnStandardDeviation, hydraRingmodelFactorOvertopping, criticalOvertoppingMean,
+ criticalOvertoppingStandardDeviation, hydraRingModelFactorFrunupMean, hydraRingModelFactorFrunupStandardDeviation,
+ hydraRingExponentModelFactorShallowMean, hydraRingExponentModelFactorShallowStandardDeviation));
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine +
@@ -335,10 +335,10 @@
hydraRingConfigurationService.AddHydraRingCalculationInput(
new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, hydraRingSection,
+ profilePoints, forelandPoints, breakWater,
modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation, hydraRingFactorFnMean, hydraRingFactorFnStandardDeviation,
hydraRingmodelFactorOvertopping, criticalOvertoppingMean, criticalOvertoppingStandardDeviation, hydraRingModelFactorFrunupMean,
- hydraRingModelFactorFrunupStandardDeviation, hydraRingExponentModelFactorShallowMean, hydraRingExponentModelFactorShallowStandardDeviation,
- profilePoints, forelandPoints, breakWater));
+ hydraRingModelFactorFrunupStandardDeviation, hydraRingExponentModelFactorShallowMean, hydraRingExponentModelFactorShallowStandardDeviation));
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine +