Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs =================================================================== diff -u -r6181b47c13d78023ce936b0037294a94cc1f1708 -rd69452647d1dd817837c5a0814db43a783e9fcbe --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 6181b47c13d78023ce936b0037294a94cc1f1708) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision d69452647d1dd817837c5a0814db43a783e9fcbe) @@ -129,7 +129,8 @@ structureInput.ModelFactorSuperCriticalFlow.Mean, structureInput.ModelFactorSuperCriticalFlow.StandardDeviation, structureInput.ThresholdHeightOpenWeir.Mean, structureInput.ThresholdHeightOpenWeir.StandardDeviation, structureInput.InsideWaterLevel.Mean, structureInput.InsideWaterLevel.StandardDeviation, - structureInput.WidthFlowApertures.Mean, structureInput.WidthFlowApertures.StandardDeviation); + structureInput.WidthFlowApertures.Mean, structureInput.WidthFlowApertures.StandardDeviation, + generalInput.ModelFactorLongThreshold.Mean, generalInput.ModelFactorLongThreshold.StandardDeviation); } private static StructuresClosureFloodedCulvertCalculationInput CreateFloodedCulvertCalculationInput( Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -r5e74e94a99f82fbc979e58440d83dc3f2914fc11 -rd69452647d1dd817837c5a0814db43a783e9fcbe --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 5e74e94a99f82fbc979e58440d83dc3f2914fc11) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision d69452647d1dd817837c5a0814db43a783e9fcbe) @@ -568,7 +568,8 @@ input.ModelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.StandardDeviation, input.ThresholdHeightOpenWeir.Mean, input.ThresholdHeightOpenWeir.StandardDeviation, input.InsideWaterLevel.Mean, input.InsideWaterLevel.StandardDeviation, - input.WidthFlowApertures.Mean, input.WidthFlowApertures.StandardDeviation); + input.WidthFlowApertures.Mean, input.WidthFlowApertures.StandardDeviation, + generalInput.ModelFactorLongThreshold.Mean, generalInput.ModelFactorLongThreshold.StandardDeviation); var actualInput = (StructuresClosureLowSillCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); @@ -648,7 +649,8 @@ input.ModelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.StandardDeviation, input.ThresholdHeightOpenWeir.Mean, input.ThresholdHeightOpenWeir.StandardDeviation, input.InsideWaterLevel.Mean, input.InsideWaterLevel.StandardDeviation, - input.WidthFlowApertures.Mean, input.WidthFlowApertures.StandardDeviation); + input.WidthFlowApertures.Mean, input.WidthFlowApertures.StandardDeviation, + generalInput.ModelFactorLongThreshold.Mean, generalInput.ModelFactorLongThreshold.StandardDeviation); var actualInput = (StructuresClosureLowSillCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs =================================================================== diff -u -r54dcc877bab606dd436efab7ded75f931c74102c -rd69452647d1dd817837c5a0814db43a783e9fcbe --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 54dcc877bab606dd436efab7ded75f931c74102c) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision d69452647d1dd817837c5a0814db43a783e9fcbe) @@ -38,6 +38,8 @@ private readonly double insideWaterLevelStandardDeviation; private readonly double widthFlowAperturesMean; private readonly double widthFlowAperturesStandardDeviation; + private readonly double modelFactorLongThresholdMean; + private readonly double modelFactorLongThresholdStandardDeviation; /// /// Creates a new instance of . @@ -74,6 +76,8 @@ /// The standard deviation of the inside water level. /// The mean of the width flow apertures. /// The standard deviation of the width flow apertures. + /// The mean of the model factor long threshold. + /// The standard deviation of the model factor long threshold. public StructuresClosureLowSillCalculationInput(long hydraulicBoundaryLocationId, double sectionNormal, IEnumerable forelandPoints, @@ -95,7 +99,8 @@ double modelFactorSuperCriticalFlowMean, double modelFactorSuperCriticalFlowStandardDeviation, double thresholdHeightOpenWeirMean, double thresholdHeightOpenWeirStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation, - double widthFlowAperturesMean, double widthFlowAperturesStandardDeviation) + double widthFlowAperturesMean, double widthFlowAperturesStandardDeviation, + double modelFactorLongThresholdMean, double modelFactorLongThresholdStandardDeviation) : base(hydraulicBoundaryLocationId, sectionNormal, forelandPoints, breakWater, @@ -122,6 +127,8 @@ this.insideWaterLevelStandardDeviation = insideWaterLevelStandardDeviation; this.widthFlowAperturesMean = widthFlowAperturesMean; this.widthFlowAperturesStandardDeviation = widthFlowAperturesStandardDeviation; + this.modelFactorLongThresholdMean = modelFactorLongThresholdMean; + this.modelFactorLongThresholdStandardDeviation = modelFactorLongThresholdStandardDeviation; } public override IEnumerable Variables @@ -154,7 +161,7 @@ yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, thresholdHeightOpenWeirMean, thresholdHeightOpenWeirStandardDeviation); yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, insideWaterLevelMean, insideWaterLevelStandardDeviation); yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, widthFlowAperturesMean, widthFlowAperturesStandardDeviation); - yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, 0.9, 0.05); + yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs =================================================================== diff -u -r54dcc877bab606dd436efab7ded75f931c74102c -rd69452647d1dd817837c5a0814db43a783e9fcbe --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 54dcc877bab606dd436efab7ded75f931c74102c) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision d69452647d1dd817837c5a0814db43a783e9fcbe) @@ -69,6 +69,8 @@ const double insideWaterLevelStandardDeviation = 26.6; const double widthFlowAperturesMean = 27.7; const double widthFlowAperturesStandardDeviation = 28.8; + const double modelFactorLongThresholdMean = 29.9; + const double modelFactorLongThresholdStandardDeviation = 30.0; // Call var input = new StructuresClosureLowSillCalculationInput(hydraulicBoundaryLocationId, @@ -91,7 +93,8 @@ modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, thresholdHeightOpenWeirMean, thresholdHeightOpenWeirStandardDeviation, insideWaterLevelMean, insideWaterLevelStandardDeviation, - widthFlowAperturesMean, widthFlowAperturesStandardDeviation); + widthFlowAperturesMean, widthFlowAperturesStandardDeviation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); // Assert Assert.IsInstanceOf(input); @@ -122,7 +125,7 @@ new HydraRingBreakWater(1, 1.1), 1.1, 222, 333, 5.5, 6, 7.7, 8.8, 11, 22, 33, 44, 55, 66, 77, 88, 99, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23); + 22, 23, 24, 25); // Call int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId); @@ -150,7 +153,7 @@ yield return new DeterministicHydraRingVariable(105, 17.7); yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, 27.7, 28.8); yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 18.8, 19.9); - yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, 0.9, 0.05); + yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, 29.9, 30.0); yield return new DeterministicHydraRingVariable(129, 20.0); } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r8a6ff462fdb8fe288eb051d097bed95d6e743a61 -rd69452647d1dd817837c5a0814db43a783e9fcbe --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 8a6ff462fdb8fe288eb051d097bed95d6e743a61) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision d69452647d1dd817837c5a0814db43a783e9fcbe) @@ -1301,7 +1301,7 @@ 15.5, 16.6, 17.7, 18.8, 19.9, 20.0, 21.1, 22.2, 23.3, 24.4, 25.5, 26.6, - 27.7, 28.8) + 27.7, 28.8, 29.9, 30.0) { PreprocessorSetting = CreatePreprocessorSetting(runPreprocessor), DesignTablesSetting = new DesignTablesSetting(0, 0), @@ -1354,7 +1354,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 105, 17.7, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 106, 0, 2, 27.7, 28.8, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 108, 0, 4, 18.8, NULL, NULL, NULL, 0, 19.9, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 125, 0, 2, 0.9, 0.05, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 125, 0, 2, 29.9, 30, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 129, 20, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [CalculationProfiles];" + Environment.NewLine +