Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs =================================================================== diff -u -r8c0bbb7383a8d2ffc9d12104e393a820b38bb9be -rfc3d8d90f23406d1cbc5792f3b4e21acfaa9d451 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs (.../GeneralClosingStructuresInput.cs) (revision 8c0bbb7383a8d2ffc9d12104e393a820b38bb9be) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs (.../GeneralClosingStructuresInput.cs) (revision fc3d8d90f23406d1cbc5792f3b4e21acfaa9d451) @@ -40,15 +40,35 @@ c = new RoundedDouble(2, 0.5); N2A = 1; - ModelFactorOvertoppingFlow = new LogNormalDistribution(3); - ModelFactorForStorageVolume = new LogNormalDistribution(2); + GravitationalAcceleration = new RoundedDouble(2, 9.81); + + ModelFactorOvertoppingFlow = new LogNormalDistribution(3) + { + Mean = (RoundedDouble) 0.09, + StandardDeviation = (RoundedDouble) 0.06 + }; + ModelFactorForStorageVolume = new LogNormalDistribution(2) + { + Mean = (RoundedDouble) 1, + StandardDeviation = (RoundedDouble) 0.2 + }; ModelfactorForSubcriticalFlow = new NormalDistribution(1) { Mean = (RoundedDouble) 1, StandardDeviation = (RoundedDouble) 0.1 }; + ModelFactorForIncomingFlowVolume = new RoundedDouble(2, 1); } + #region Constants + + /// + /// Gets the gravitational acceleration. + /// + public RoundedDouble GravitationalAcceleration { get; private set; } + + #endregion + #region Length effect parameters /// @@ -101,6 +121,11 @@ /// public NormalDistribution ModelfactorForSubcriticalFlow { get; private set; } + /// + /// Get the model factor for incoming flow volume. + /// + public RoundedDouble ModelFactorForIncomingFlowVolume { get; private set; } + #endregion } } \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs =================================================================== diff -u -r4aec4f891bba7a6f4b103c78df763bd6f08b64df -rfc3d8d90f23406d1cbc5792f3b4e21acfaa9d451 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision 4aec4f891bba7a6f4b103c78df763bd6f08b64df) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision fc3d8d90f23406d1cbc5792f3b4e21acfaa9d451) @@ -44,13 +44,35 @@ Assert.AreEqual(2, inputParameters.N.NumberOfDecimalPlaces); Assert.AreEqual(1, inputParameters.N, inputParameters.N.GetAccuracy()); + Assert.AreEqual(2, inputParameters.GravitationalAcceleration.NumberOfDecimalPlaces); + Assert.AreEqual(9.81, inputParameters.GravitationalAcceleration, inputParameters.GravitationalAcceleration.GetAccuracy()); + var modelfactorForSubcriticalFlow = new NormalDistribution(2) { Mean = new RoundedDouble(1, 1), StandardDeviation = new RoundedDouble(1, 0.1) }; Assert.AreEqual(modelfactorForSubcriticalFlow.Mean, inputParameters.ModelfactorForSubcriticalFlow.Mean); Assert.AreEqual(modelfactorForSubcriticalFlow.StandardDeviation, inputParameters.ModelfactorForSubcriticalFlow.StandardDeviation); + + var modelfactorForOvertoppingFlow = new LogNormalDistribution(3) + { + Mean = new RoundedDouble(2, 0.09), + StandardDeviation = new RoundedDouble(2, 0.06) + }; + Assert.AreEqual(modelfactorForOvertoppingFlow.Mean, inputParameters.ModelFactorOvertoppingFlow.Mean); + Assert.AreEqual(modelfactorForOvertoppingFlow.StandardDeviation, inputParameters.ModelFactorOvertoppingFlow.StandardDeviation); + + var modelfactorForStorageVolume = new LogNormalDistribution(2) + { + Mean = (RoundedDouble) 1.0, + StandardDeviation = (RoundedDouble) 0.2 + }; + Assert.AreEqual(modelfactorForStorageVolume.Mean, inputParameters.ModelFactorForStorageVolume.Mean); + Assert.AreEqual(modelfactorForStorageVolume.StandardDeviation, inputParameters.ModelFactorForStorageVolume.StandardDeviation); + + Assert.AreEqual(2, inputParameters.ModelFactorForIncomingFlowVolume.NumberOfDecimalPlaces); + Assert.AreEqual(1.0, inputParameters.ModelFactorForIncomingFlowVolume, inputParameters.ModelFactorForIncomingFlowVolume.GetAccuracy()); } [Test]