Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/StructuresCalculationScenarioCreateExtensions.cs =================================================================== diff -u -rc360f49cedb42a350189ba43209c70dfac395c9c -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/StructuresCalculationScenarioCreateExtensions.cs (.../StructuresCalculationScenarioCreateExtensions.cs) (revision c360f49cedb42a350189ba43209c70dfac395c9c) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/StructuresCalculationScenarioCreateExtensions.cs (.../StructuresCalculationScenarioCreateExtensions.cs) (revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c) @@ -142,6 +142,7 @@ entity.ModelFactorSuperCriticalFlowMean = input.ModelFactorSuperCriticalFlow.Mean.ToNaNAsNull(); entity.DrainCoefficientMean = input.DrainCoefficient.Mean.ToNaNAsNull(); + entity.DrainCoefficientStandardDeviation = input.DrainCoefficient.StandardDeviation.ToNaNAsNull(); entity.FactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure.ToNaNAsNull(); @@ -341,6 +342,7 @@ entity.VolumicWeightWater = input.VolumicWeightWater.ToNaNAsNull(); entity.FactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure.ToNaNAsNull(); entity.DrainCoefficientMean = input.DrainCoefficient.Mean.ToNaNAsNull(); + entity.DrainCoefficientStandardDeviation = input.DrainCoefficient.StandardDeviation.ToNaNAsNull(); } private static void SetStabilityPointStructuresOutputEntity(StructuresCalculation calculation, Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs =================================================================== diff -u -r2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs (.../ClosingStructuresCalculationEntityReadExtensions.cs) (revision 2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs (.../ClosingStructuresCalculationEntityReadExtensions.cs) (revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c) @@ -85,6 +85,7 @@ inputParameters.DeviationWaveDirection = (RoundedDouble) entity.DeviationWaveDirection.ToNullAsNaN(); inputParameters.ModelFactorSuperCriticalFlow.Mean = (RoundedDouble) entity.ModelFactorSuperCriticalFlowMean.ToNullAsNaN(); inputParameters.DrainCoefficient.Mean = (RoundedDouble) entity.DrainCoefficientMean.ToNullAsNaN(); + inputParameters.DrainCoefficient.StandardDeviation = (RoundedDouble) entity.DrainCoefficientStandardDeviation.ToNullAsNaN(); inputParameters.FactorStormDurationOpenStructure = (RoundedDouble) entity.FactorStormDurationOpenStructure.ToNullAsNaN(); inputParameters.ThresholdHeightOpenWeir.Mean = (RoundedDouble) entity.ThresholdHeightOpenWeirMean.ToNullAsNaN(); inputParameters.ThresholdHeightOpenWeir.StandardDeviation = (RoundedDouble) entity.ThresholdHeightOpenWeirStandardDeviation.ToNullAsNaN(); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs =================================================================== diff -u -r2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs (.../StabilityPointStructuresCalculationEntityReadExtensions.cs) (revision 2cb7a4ee6a726ec8a9758fb951d35eb81a54a19f) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs (.../StabilityPointStructuresCalculationEntityReadExtensions.cs) (revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c) @@ -116,6 +116,7 @@ inputParameters.VolumicWeightWater = (RoundedDouble) entity.VolumicWeightWater.ToNullAsNaN(); inputParameters.FactorStormDurationOpenStructure = (RoundedDouble) entity.FactorStormDurationOpenStructure.ToNullAsNaN(); inputParameters.DrainCoefficient.Mean = (RoundedDouble) entity.DrainCoefficientMean.ToNullAsNaN(); + inputParameters.DrainCoefficient.StandardDeviation = (RoundedDouble) entity.DrainCoefficientStandardDeviation.ToNullAsNaN(); } private static void ReadOutput(StructuresCalculation calculation, Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StructuresCalculationScenarioCreateExtensionsTest.cs =================================================================== diff -u -r7c1b01c940b94bee859844ac28b2d5490ad78b28 -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StructuresCalculationScenarioCreateExtensionsTest.cs (.../StructuresCalculationScenarioCreateExtensionsTest.cs) (revision 7c1b01c940b94bee859844ac28b2d5490ad78b28) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StructuresCalculationScenarioCreateExtensionsTest.cs (.../StructuresCalculationScenarioCreateExtensionsTest.cs) (revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c) @@ -509,6 +509,7 @@ Assert.AreEqual(inputParameters.InsideWaterLevel.StandardDeviation.Value, entity.InsideWaterLevelStandardDeviation); Assert.AreEqual(inputParameters.DeviationWaveDirection.Value, entity.DeviationWaveDirection); Assert.AreEqual(inputParameters.DrainCoefficient.Mean.Value, entity.DrainCoefficientMean); + Assert.AreEqual(inputParameters.DrainCoefficient.StandardDeviation.Value, entity.DrainCoefficientStandardDeviation); Assert.AreEqual(inputParameters.FactorStormDurationOpenStructure.Value, entity.FactorStormDurationOpenStructure); Assert.AreEqual(inputParameters.ThresholdHeightOpenWeir.Mean.Value, entity.ThresholdHeightOpenWeirMean); Assert.AreEqual(inputParameters.ThresholdHeightOpenWeir.StandardDeviation.Value, entity.ThresholdHeightOpenWeirStandardDeviation); @@ -629,6 +630,7 @@ Assert.IsNull(entity.InsideWaterLevelStandardDeviation); Assert.IsNull(entity.DeviationWaveDirection); Assert.IsNull(entity.DrainCoefficientMean); + Assert.IsNull(entity.DrainCoefficientStandardDeviation); Assert.IsNull(entity.FactorStormDurationOpenStructure); Assert.IsNull(entity.ThresholdHeightOpenWeirMean); Assert.IsNull(entity.ThresholdHeightOpenWeirStandardDeviation); @@ -956,6 +958,7 @@ Assert.AreEqual(inputParameters.VolumicWeightWater.Value, entity.VolumicWeightWater); Assert.AreEqual(inputParameters.FactorStormDurationOpenStructure.Value, entity.FactorStormDurationOpenStructure); Assert.AreEqual(inputParameters.DrainCoefficient.Mean.Value, entity.DrainCoefficientMean); + Assert.AreEqual(inputParameters.DrainCoefficient.StandardDeviation.Value, entity.DrainCoefficientStandardDeviation); Assert.AreEqual(Convert.ToByte(inputParameters.ShouldIllustrationPointsBeCalculated), entity.ShouldIllustrationPointsBeCalculated); Assert.AreEqual(order, entity.Order); @@ -1142,6 +1145,7 @@ Assert.IsNull(entity.VolumicWeightWater); Assert.IsNull(entity.FactorStormDurationOpenStructure); Assert.IsNull(entity.DrainCoefficientMean); + Assert.IsNull(entity.DrainCoefficientStandardDeviation); } [Test] Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r5c6a5f8b9901e77fd2d9fadc1fd482468e2137c8 -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs (.../ClosingStructuresCalculationEntityReadExtensionsTest.cs) (revision 5c6a5f8b9901e77fd2d9fadc1fd482468e2137c8) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs (.../ClosingStructuresCalculationEntityReadExtensionsTest.cs) (revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c) @@ -83,6 +83,7 @@ InsideWaterLevelStandardDeviation = 17.17, DeviationWaveDirection = 18.18, DrainCoefficientMean = 19.19, + DrainCoefficientStandardDeviation = 0.02, FactorStormDurationOpenStructure = 20.20, ThresholdHeightOpenWeirMean = 21.21, ThresholdHeightOpenWeirStandardDeviation = 22.22, @@ -134,6 +135,7 @@ Assert.AreEqual(entity.InsideWaterLevelStandardDeviation, inputParameters.InsideWaterLevel.StandardDeviation.Value); Assert.AreEqual(entity.DeviationWaveDirection, inputParameters.DeviationWaveDirection.Value); Assert.AreEqual(entity.DrainCoefficientMean, inputParameters.DrainCoefficient.Mean.Value); + Assert.AreEqual(entity.DrainCoefficientStandardDeviation, inputParameters.DrainCoefficient.StandardDeviation.Value); Assert.AreEqual(entity.FactorStormDurationOpenStructure, inputParameters.FactorStormDurationOpenStructure.Value); Assert.AreEqual(entity.ThresholdHeightOpenWeirMean, inputParameters.ThresholdHeightOpenWeir.Mean.Value); Assert.AreEqual(entity.ThresholdHeightOpenWeirStandardDeviation, inputParameters.ThresholdHeightOpenWeir.StandardDeviation.Value); @@ -173,6 +175,7 @@ InsideWaterLevelStandardDeviation = null, DeviationWaveDirection = null, DrainCoefficientMean = null, + DrainCoefficientStandardDeviation = null, FactorStormDurationOpenStructure = null, ThresholdHeightOpenWeirMean = null, ThresholdHeightOpenWeirStandardDeviation = null, @@ -210,6 +213,7 @@ Assert.IsNaN(inputParameters.InsideWaterLevel.StandardDeviation); Assert.IsNaN(inputParameters.DeviationWaveDirection); Assert.IsNaN(inputParameters.DrainCoefficient.Mean); + Assert.IsNaN(inputParameters.DrainCoefficient.StandardDeviation); Assert.IsNaN(inputParameters.FactorStormDurationOpenStructure); Assert.IsNaN(inputParameters.ThresholdHeightOpenWeir.Mean); Assert.IsNaN(inputParameters.ThresholdHeightOpenWeir.StandardDeviation); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rc360f49cedb42a350189ba43209c70dfac395c9c -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs (.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs) (revision c360f49cedb42a350189ba43209c70dfac395c9c) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs (.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs) (revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c) @@ -113,7 +113,8 @@ LoadSchematizationType = Convert.ToByte(LoadSchematizationType.Quadratic), VolumicWeightWater = 47.47, FactorStormDurationOpenStructure = 48.48, - DrainCoefficientMean = 49.49 + DrainCoefficientMean = 49.49, + DrainCoefficientStandardDeviation = 0.02 }; var collector = new ReadConversionCollector(); @@ -185,6 +186,7 @@ Assert.AreEqual(entity.VolumicWeightWater, inputParameters.VolumicWeightWater.Value); Assert.AreEqual(entity.FactorStormDurationOpenStructure, inputParameters.FactorStormDurationOpenStructure.Value); Assert.AreEqual(entity.DrainCoefficientMean, inputParameters.DrainCoefficient.Mean.Value); + Assert.AreEqual(entity.DrainCoefficientStandardDeviation, inputParameters.DrainCoefficient.StandardDeviation.Value); Assert.IsFalse(calculation.HasOutput); } @@ -239,7 +241,8 @@ AreaFlowAperturesStandardDeviation = null, VolumicWeightWater = null, FactorStormDurationOpenStructure = null, - DrainCoefficientMean = null + DrainCoefficientMean = null, + DrainCoefficientStandardDeviation = null }; var collector = new ReadConversionCollector(); @@ -296,6 +299,7 @@ Assert.IsNaN(inputParameters.VolumicWeightWater); Assert.IsNaN(inputParameters.FactorStormDurationOpenStructure); Assert.IsNaN(inputParameters.DrainCoefficient.Mean); + Assert.IsNaN(inputParameters.DrainCoefficient.StandardDeviation); } [Test]