Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructureCreateExtensions.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructureCreateExtensions.cs (.../ClosingStructureCreateExtensions.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructureCreateExtensions.cs (.../ClosingStructureCreateExtensions.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -63,7 +63,7 @@ AllowedLevelIncreaseStorageMean = structure.AllowedLevelIncreaseStorage.Mean.Value.ToNaNAsNull(), AllowedLevelIncreaseStorageStandardDeviation = structure.AllowedLevelIncreaseStorage.StandardDeviation.Value.ToNaNAsNull(), WidthFlowAperturesMean = structure.WidthFlowApertures.Mean.Value.ToNaNAsNull(), - WidthFlowAperturesCoefficientOfVariation = structure.WidthFlowApertures.StandardDeviation.Value.ToNaNAsNull(), + WidthFlowAperturesStandardDeviation = structure.WidthFlowApertures.StandardDeviation.Value.ToNaNAsNull(), LevelCrestStructureNotClosingMean = structure.LevelCrestStructureNotClosing.Mean.Value.ToNaNAsNull(), LevelCrestStructureNotClosingStandardDeviation = structure.LevelCrestStructureNotClosing.StandardDeviation.Value.ToNaNAsNull(), InsideWaterLevelMean = structure.InsideWaterLevel.Mean.Value.ToNaNAsNull(), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructureCreateExtensions.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructureCreateExtensions.cs (.../HeightStructureCreateExtensions.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructureCreateExtensions.cs (.../HeightStructureCreateExtensions.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -70,7 +70,7 @@ StorageStructureAreaMean = structure.StorageStructureArea.Mean.Value.ToNaNAsNull(), StorageStructureAreaCoefficientOfVariation = structure.StorageStructureArea.CoefficientOfVariation.Value.ToNaNAsNull(), WidthFlowAperturesMean = structure.WidthFlowApertures.Mean.Value.ToNaNAsNull(), - WidthFlowAperturesCoefficientOfVariation = structure.WidthFlowApertures.StandardDeviation.Value.ToNaNAsNull(), + WidthFlowAperturesStandardDeviation = structure.WidthFlowApertures.StandardDeviation.Value.ToNaNAsNull(), Order = order }; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructureCreateExtensions.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructureCreateExtensions.cs (.../StabilityPointStructureCreateExtensions.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructureCreateExtensions.cs (.../StabilityPointStructureCreateExtensions.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -64,7 +64,7 @@ AllowedLevelIncreaseStorageMean = structure.AllowedLevelIncreaseStorage.Mean.Value.ToNaNAsNull(), AllowedLevelIncreaseStorageStandardDeviation = structure.AllowedLevelIncreaseStorage.StandardDeviation.Value.ToNaNAsNull(), WidthFlowAperturesMean = structure.WidthFlowApertures.Mean.Value.ToNaNAsNull(), - WidthFlowAperturesCoefficientOfVariation = structure.WidthFlowApertures.StandardDeviation.Value.ToNaNAsNull(), + WidthFlowAperturesStandardDeviation = structure.WidthFlowApertures.StandardDeviation.Value.ToNaNAsNull(), InsideWaterLevelMean = structure.InsideWaterLevel.Mean.Value.ToNaNAsNull(), InsideWaterLevelStandardDeviation = structure.InsideWaterLevel.StandardDeviation.Value.ToNaNAsNull(), ThresholdHeightOpenWeirMean = structure.ThresholdHeightOpenWeir.Mean.Value.ToNaNAsNull(), @@ -95,7 +95,6 @@ LevellingCount = structure.LevellingCount, ProbabilityCollisionSecondaryStructure = structure.ProbabilityCollisionSecondaryStructure.ToNaNAsNull(), FlowVelocityStructureClosableMean = structure.FlowVelocityStructureClosable.Mean.Value.ToNaNAsNull(), - FlowVelocityStructureClosableStandardDeviation = structure.FlowVelocityStructureClosable.CoefficientOfVariation.Value.ToNaNAsNull(), StabilityLinearLoadModelMean = structure.StabilityLinearLoadModel.Mean.Value.ToNaNAsNull(), StabilityLinearLoadModelCoefficientOfVariation = structure.StabilityLinearLoadModel.CoefficientOfVariation.Value.ToNaNAsNull(), StabilityQuadraticLoadModelMean = structure.StabilityQuadraticLoadModel.Mean.Value.ToNaNAsNull(), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs =================================================================== diff -u -rb7bf375a1f563f055df1d09eb16e44a25106606b -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision b7bf375a1f563f055df1d09eb16e44a25106606b) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -83,7 +83,7 @@ entityToUpdate.ModelFactorSuperCriticalFlowMean = input.ModelFactorSuperCriticalFlow.Mean.Value.ToNaNAsNull(); entityToUpdate.WidthFlowAperturesMean = input.WidthFlowApertures.Mean.Value.ToNaNAsNull(); - entityToUpdate.WidthFlowAperturesCoefficientOfVariation = input.WidthFlowApertures.StandardDeviation.Value.ToNaNAsNull(); + entityToUpdate.WidthFlowAperturesStandardDeviation = input.WidthFlowApertures.StandardDeviation.Value.ToNaNAsNull(); } #region ClosingStructures Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs =================================================================== diff -u -r86d7adbc07a987a540f1f5142299895af13003a7 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs (.../ClosingStructureEntity.cs) (revision 86d7adbc07a987a540f1f5142299895af13003a7) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs (.../ClosingStructureEntity.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -55,7 +55,7 @@ public Nullable AllowedLevelIncreaseStorageMean { get; set; } public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } + public Nullable WidthFlowAperturesStandardDeviation { get; set; } public Nullable LevelCrestStructureNotClosingMean { get; set; } public Nullable LevelCrestStructureNotClosingStandardDeviation { get; set; } public Nullable InsideWaterLevelMean { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs =================================================================== diff -u -r86d7adbc07a987a540f1f5142299895af13003a7 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision 86d7adbc07a987a540f1f5142299895af13003a7) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -78,6 +78,8 @@ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresSectionResultEntities { get; set; } + public Nullable WidthFlowAperturesStandardDeviation { get; set; } + public byte UseBreakWater { get; set; } public byte BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } @@ -88,7 +90,6 @@ public Nullable AllowedLevelIncreaseStorageMean { get; set; } public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable CriticalOvertoppingDischargeMean { get; set; } public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } public Nullable FlowWidthAtBottomProtectionMean { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -recc0b8f859a1116b4b876f19aa31928b74caec70 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision ecc0b8f859a1116b4b876f19aa31928b74caec70) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -265,7 +265,7 @@ 'AllowedLevelIncreaseStorageMean' REAL, 'AllowedLevelIncreaseStorageStandardDeviation' REAL, 'WidthFlowAperturesMean' REAL, - 'WidthFlowAperturesCoefficientOfVariation' REAL, + 'WidthFlowAperturesStandardDeviation' REAL, 'InsideWaterLevelMean' REAL, 'InsideWaterLevelStandardDeviation' REAL, 'ThresholdHeightOpenWeirMean' REAL, @@ -296,7 +296,6 @@ 'LevellingCount' INT (4) NOT NULL, 'ProbabilityCollisionSecondaryStructure' REAL NOT NULL, 'FlowVelocityStructureClosableMean' REAL, - 'FlowVelocityStructureClosableStandardDeviation' REAL, 'StabilityLinearLoadModelMean' REAL, 'StabilityLinearLoadModelCoefficientOfVariation' REAL, 'StabilityQuadraticLoadModelMean' REAL, @@ -1023,7 +1022,7 @@ 'CriticalOvertoppingDischargeMean' REAL, 'CriticalOvertoppingDischargeCoefficientOfVariation' REAL, 'WidthFlowAperturesMean' REAL, - 'WidthFlowAperturesCoefficientOfVariation' REAL, + 'WidthFlowAperturesStandardDeviation' REAL, 'FailureProbabilityStructureWithErosion' REAL, 'StorageStructureAreaMean' REAL, 'StorageStructureAreaCoefficientOfVariation' REAL, @@ -1055,7 +1054,7 @@ 'CriticalOvertoppingDischargeCoefficientOfVariation' REAL, 'FailureProbabilityStructureWithErosion' REAL NOT NULL, 'WidthFlowAperturesMean' REAL, - 'WidthFlowAperturesCoefficientOfVariation' REAL, + 'WidthFlowAperturesStandardDeviation' REAL, 'StormDurationMean' REAL, 'LevelCrestStructureMean' REAL, 'LevelCrestStructureStandardDeviation' REAL, @@ -1086,7 +1085,7 @@ 'AllowedLevelIncreaseStorageMean' REAL, 'AllowedLevelIncreaseStorageStandardDeviation' REAL, 'WidthFlowAperturesMean' REAL, - 'WidthFlowAperturesCoefficientOfVariation' REAL, + 'WidthFlowAperturesStandardDeviation' REAL, 'LevelCrestStructureNotClosingMean' REAL, 'LevelCrestStructureNotClosingStandardDeviation' REAL, 'InsideWaterLevelMean' REAL, @@ -1129,7 +1128,7 @@ 'AllowedLevelIncreaseStorageMean' REAL, 'AllowedLevelIncreaseStorageStandardDeviation' REAL, 'WidthFlowAperturesMean' REAL, - 'WidthFlowAperturesCoefficientOfVariation' REAL, + 'WidthFlowAperturesStandardDeviation' REAL, 'LevelCrestStructureNotClosingMean' REAL, 'LevelCrestStructureNotClosingStandardDeviation' REAL, 'InsideWaterLevelMean' REAL, @@ -1189,7 +1188,7 @@ 'AllowedLevelIncreaseStorageMean' REAL, 'AllowedLevelIncreaseStorageStandardDeviation' REAL, 'WidthFlowAperturesMean' REAL, - 'WidthFlowAperturesCoefficientOfVariation' REAL, + 'WidthFlowAperturesStandardDeviation' REAL, 'InsideWaterLevelMean' REAL, 'InsideWaterLevelStandardDeviation' REAL, 'ThresholdHeightOpenWeirMean' REAL, @@ -1220,7 +1219,6 @@ 'LevellingCount' INT (4) NOT NULL, 'ProbabilityCollisionSecondaryStructure' REAL, 'FlowVelocityStructureClosableMean' REAL, - 'FlowVelocityStructureClosableStandardDeviation' REAL, 'StabilityLinearLoadModelMean' REAL, 'StabilityLinearLoadModelCoefficientOfVariation' REAL, 'StabilityQuadraticLoadModelMean' REAL, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs =================================================================== diff -u -r86d7adbc07a987a540f1f5142299895af13003a7 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (.../HeightStructureEntity.cs) (revision 86d7adbc07a987a540f1f5142299895af13003a7) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (.../HeightStructureEntity.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -57,7 +57,7 @@ public Nullable CriticalOvertoppingDischargeMean { get; set; } public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } + public Nullable WidthFlowAperturesStandardDeviation { get; set; } public Nullable FailureProbabilityStructureWithErosion { get; set; } public Nullable StorageStructureAreaMean { get; set; } public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs =================================================================== diff -u -r86d7adbc07a987a540f1f5142299895af13003a7 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision 86d7adbc07a987a540f1f5142299895af13003a7) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -64,6 +64,8 @@ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresSectionResultEntities { get; set; } + public Nullable WidthFlowAperturesStandardDeviation { get; set; } + public Nullable ModelFactorSuperCriticalFlowMean { get; set; } public Nullable StructureNormalOrientation { get; set; } public Nullable AllowedLevelIncreaseStorageMean { get; set; } @@ -76,7 +78,6 @@ public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } public double FailureProbabilityStructureWithErosion { get; set; } public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable StormDurationMean { get; set; } public byte UseBreakWater { get; set; } public byte UseForeshore { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresCalculationEntity.cs =================================================================== diff -u -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresCalculationEntity.cs (.../IStructuresCalculationEntity.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresCalculationEntity.cs (.../IStructuresCalculationEntity.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -38,7 +38,7 @@ double? CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } double FailureProbabilityStructureWithErosion { get; set; } double? WidthFlowAperturesMean { get; set; } - double? WidthFlowAperturesCoefficientOfVariation { get; set; } + double? WidthFlowAperturesStandardDeviation { get; set; } double? StormDurationMean { get; set; } byte UseBreakWater { get; set; } byte UseForeshore { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -58,7 +58,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -442,7 +442,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -712,7 +712,6 @@ - @@ -743,7 +742,7 @@ - + @@ -774,7 +773,6 @@ - @@ -2912,7 +2910,7 @@ - + @@ -2965,7 +2963,7 @@ - + @@ -3347,7 +3345,7 @@ - + @@ -3380,7 +3378,7 @@ - + @@ -3657,7 +3655,7 @@ - + @@ -3688,7 +3686,6 @@ - @@ -3721,7 +3718,7 @@ - + @@ -3752,7 +3749,6 @@ - @@ -5098,7 +5094,7 @@ - + @@ -5150,7 +5146,7 @@ - + @@ -5460,7 +5456,7 @@ - + @@ -5490,7 +5486,7 @@ - + @@ -5753,7 +5749,6 @@ - @@ -5784,7 +5779,7 @@ - + @@ -5818,7 +5813,6 @@ - @@ -5849,7 +5843,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -5,69 +5,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructureEntity.cs =================================================================== diff -u -r86d7adbc07a987a540f1f5142299895af13003a7 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructureEntity.cs (.../StabilityPointStructureEntity.cs) (revision 86d7adbc07a987a540f1f5142299895af13003a7) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructureEntity.cs (.../StabilityPointStructureEntity.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -55,7 +55,7 @@ public Nullable AllowedLevelIncreaseStorageMean { get; set; } public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } + public Nullable WidthFlowAperturesStandardDeviation { get; set; } public Nullable InsideWaterLevelMean { get; set; } public Nullable InsideWaterLevelStandardDeviation { get; set; } public Nullable ThresholdHeightOpenWeirMean { get; set; } @@ -86,7 +86,6 @@ public int LevellingCount { get; set; } public Nullable ProbabilityCollisionSecondaryStructure { get; set; } public Nullable FlowVelocityStructureClosableMean { get; set; } - public Nullable FlowVelocityStructureClosableStandardDeviation { get; set; } public Nullable StabilityLinearLoadModelMean { get; set; } public Nullable StabilityLinearLoadModelCoefficientOfVariation { get; set; } public Nullable StabilityQuadraticLoadModelMean { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs =================================================================== diff -u -r86d7adbc07a987a540f1f5142299895af13003a7 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 86d7adbc07a987a540f1f5142299895af13003a7) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -77,7 +77,6 @@ public int LevellingCount { get; set; } public double ProbabilityCollisionSecondaryStructure { get; set; } public Nullable FlowVelocityStructureClosableMean { get; set; } - public Nullable FlowVelocityStructureClosableStandardDeviation { get; set; } public Nullable StabilityLinearLoadModelMean { get; set; } public Nullable StabilityLinearLoadModelCoefficientOfVariation { get; set; } public Nullable StabilityQuadraticLoadModelMean { get; set; } @@ -99,6 +98,8 @@ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresSectionResultEntities { get; set; } + public Nullable WidthFlowAperturesStandardDeviation { get; set; } + public byte UseBreakWater { get; set; } public byte BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } @@ -109,7 +110,6 @@ public Nullable AllowedLevelIncreaseStorageMean { get; set; } public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable CriticalOvertoppingDischargeMean { get; set; } public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } public Nullable FlowWidthAtBottomProtectionMean { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructureEntityReadExtensions.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructureEntityReadExtensions.cs (.../ClosingStructureEntityReadExtensions.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructureEntityReadExtensions.cs (.../ClosingStructureEntityReadExtensions.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -71,7 +71,7 @@ WidthFlowApertures = { Mean = (RoundedDouble) entity.WidthFlowAperturesMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble) entity.WidthFlowAperturesCoefficientOfVariation.ToNullAsNaN() + StandardDeviation = (RoundedDouble) entity.WidthFlowAperturesStandardDeviation.ToNullAsNaN() }, LevelCrestStructureNotClosing = { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructureEntityReadExtensions.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructureEntityReadExtensions.cs (.../HeightStructureEntityReadExtensions.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructureEntityReadExtensions.cs (.../HeightStructureEntityReadExtensions.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -76,7 +76,7 @@ WidthFlowApertures = { Mean = (RoundedDouble) entity.WidthFlowAperturesMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble) entity.WidthFlowAperturesCoefficientOfVariation.ToNullAsNaN() + StandardDeviation = (RoundedDouble) entity.WidthFlowAperturesStandardDeviation.ToNullAsNaN() }, FailureProbabilityStructureWithErosion = entity.FailureProbabilityStructureWithErosion.ToNullAsNaN(), StorageStructureArea = Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IStructureCalculationEntityReadExtensions.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IStructureCalculationEntityReadExtensions.cs (.../IStructureCalculationEntityReadExtensions.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IStructureCalculationEntityReadExtensions.cs (.../IStructureCalculationEntityReadExtensions.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -78,7 +78,7 @@ inputToUpdate.CriticalOvertoppingDischarge.CoefficientOfVariation = (RoundedDouble) entity.CriticalOvertoppingDischargeCoefficientOfVariation.ToNullAsNaN(); inputToUpdate.FailureProbabilityStructureWithErosion = entity.FailureProbabilityStructureWithErosion; inputToUpdate.WidthFlowApertures.Mean = (RoundedDouble) entity.WidthFlowAperturesMean.ToNullAsNaN(); - inputToUpdate.WidthFlowApertures.StandardDeviation = (RoundedDouble) entity.WidthFlowAperturesCoefficientOfVariation.ToNullAsNaN(); + inputToUpdate.WidthFlowApertures.StandardDeviation = (RoundedDouble) entity.WidthFlowAperturesStandardDeviation.ToNullAsNaN(); inputToUpdate.StormDuration.Mean = (RoundedDouble) entity.StormDurationMean.ToNullAsNaN(); inputToUpdate.UseBreakWater = Convert.ToBoolean(entity.UseBreakWater); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs (.../StabilityPointStructureEntityReadExtensions.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs (.../StabilityPointStructureEntityReadExtensions.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -91,7 +91,7 @@ WidthFlowApertures = { Mean = (RoundedDouble) entity.WidthFlowAperturesMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble) entity.WidthFlowAperturesCoefficientOfVariation.ToNullAsNaN() + StandardDeviation = (RoundedDouble) entity.WidthFlowAperturesStandardDeviation.ToNullAsNaN() }, ConstructiveStrengthLinearLoadModel = { @@ -140,8 +140,7 @@ ProbabilityCollisionSecondaryStructure = entity.ProbabilityCollisionSecondaryStructure.ToNullAsNaN(), FlowVelocityStructureClosable = { - Mean = (RoundedDouble) entity.FlowVelocityStructureClosableMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble) entity.FlowVelocityStructureClosableStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.FlowVelocityStructureClosableMean.ToNullAsNaN() }, StabilityLinearLoadModel = { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructureCreateExtensionsTest.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructureCreateExtensionsTest.cs (.../ClosingStructureCreateExtensionsTest.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructureCreateExtensionsTest.cs (.../ClosingStructureCreateExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -74,7 +74,7 @@ Assert.AreEqual(structure.AllowedLevelIncreaseStorage.Mean.Value, entity.AllowedLevelIncreaseStorageMean); Assert.AreEqual(structure.AllowedLevelIncreaseStorage.StandardDeviation.Value, entity.AllowedLevelIncreaseStorageStandardDeviation); Assert.AreEqual(structure.WidthFlowApertures.Mean.Value, entity.WidthFlowAperturesMean); - Assert.AreEqual(structure.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesCoefficientOfVariation); + Assert.AreEqual(structure.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesStandardDeviation); Assert.AreEqual(structure.LevelCrestStructureNotClosing.Mean.Value, entity.LevelCrestStructureNotClosingMean); Assert.AreEqual(structure.LevelCrestStructureNotClosing.StandardDeviation.Value, entity.LevelCrestStructureNotClosingStandardDeviation); Assert.AreEqual(structure.InsideWaterLevel.Mean.Value, entity.InsideWaterLevelMean); @@ -170,7 +170,7 @@ Assert.IsNull(entity.AllowedLevelIncreaseStorageMean); Assert.IsNull(entity.AllowedLevelIncreaseStorageStandardDeviation); Assert.IsNull(entity.WidthFlowAperturesMean); - Assert.IsNull(entity.WidthFlowAperturesCoefficientOfVariation); + Assert.IsNull(entity.WidthFlowAperturesStandardDeviation); Assert.IsNull(entity.LevelCrestStructureNotClosingMean); Assert.IsNull(entity.LevelCrestStructureNotClosingStandardDeviation); Assert.IsNull(entity.InsideWaterLevelMean); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructureCreateExtensionsTest.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructureCreateExtensionsTest.cs (.../HeightStructureCreateExtensionsTest.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructureCreateExtensionsTest.cs (.../HeightStructureCreateExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -80,7 +80,7 @@ Assert.AreEqual(structure.StorageStructureArea.Mean.Value, entity.StorageStructureAreaMean); Assert.AreEqual(structure.StorageStructureArea.CoefficientOfVariation.Value, entity.StorageStructureAreaCoefficientOfVariation); Assert.AreEqual(structure.WidthFlowApertures.Mean.Value, entity.WidthFlowAperturesMean); - Assert.AreEqual(structure.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesCoefficientOfVariation); + Assert.AreEqual(structure.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesStandardDeviation); Assert.AreEqual(order, entity.Order); Assert.IsTrue(registry.Contains(structure)); @@ -149,7 +149,7 @@ Assert.IsNull(entity.StorageStructureAreaMean); Assert.IsNull(entity.StorageStructureAreaCoefficientOfVariation); Assert.IsNull(entity.WidthFlowAperturesMean); - Assert.IsNull(entity.WidthFlowAperturesCoefficientOfVariation); + Assert.IsNull(entity.WidthFlowAperturesStandardDeviation); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructureCreateExtensionsTest.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructureCreateExtensionsTest.cs (.../StabilityPointStructureCreateExtensionsTest.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructureCreateExtensionsTest.cs (.../StabilityPointStructureCreateExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -74,7 +74,7 @@ Assert.AreEqual(structure.AllowedLevelIncreaseStorage.Mean.Value, entity.AllowedLevelIncreaseStorageMean); Assert.AreEqual(structure.AllowedLevelIncreaseStorage.StandardDeviation.Value, entity.AllowedLevelIncreaseStorageStandardDeviation); Assert.AreEqual(structure.WidthFlowApertures.Mean.Value, entity.WidthFlowAperturesMean); - Assert.AreEqual(structure.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesCoefficientOfVariation); + Assert.AreEqual(structure.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesStandardDeviation); Assert.AreEqual(structure.InsideWaterLevel.Mean.Value, entity.InsideWaterLevelMean); Assert.AreEqual(structure.InsideWaterLevel.StandardDeviation.Value, entity.InsideWaterLevelStandardDeviation); Assert.AreEqual(structure.ThresholdHeightOpenWeir.Mean.Value, entity.ThresholdHeightOpenWeirMean); @@ -105,7 +105,6 @@ Assert.AreEqual(structure.LevellingCount, entity.LevellingCount); Assert.AreEqual(structure.ProbabilityCollisionSecondaryStructure, entity.ProbabilityCollisionSecondaryStructure); Assert.AreEqual(structure.FlowVelocityStructureClosable.Mean.Value, entity.FlowVelocityStructureClosableMean); - Assert.AreEqual(structure.FlowVelocityStructureClosable.CoefficientOfVariation.Value, entity.FlowVelocityStructureClosableStandardDeviation); Assert.AreEqual(structure.StabilityLinearLoadModel.Mean.Value, entity.StabilityLinearLoadModelMean); Assert.AreEqual(structure.StabilityLinearLoadModel.CoefficientOfVariation.Value, entity.StabilityLinearLoadModelCoefficientOfVariation); Assert.AreEqual(structure.StabilityQuadraticLoadModel.Mean.Value, entity.StabilityQuadraticLoadModelMean); @@ -243,7 +242,7 @@ Assert.IsNull(entity.AllowedLevelIncreaseStorageMean); Assert.IsNull(entity.AllowedLevelIncreaseStorageStandardDeviation); Assert.IsNull(entity.WidthFlowAperturesMean); - Assert.IsNull(entity.WidthFlowAperturesCoefficientOfVariation); + Assert.IsNull(entity.WidthFlowAperturesStandardDeviation); Assert.IsNull(entity.InsideWaterLevelMean); Assert.IsNull(entity.InsideWaterLevelStandardDeviation); Assert.IsNull(entity.ThresholdHeightOpenWeirMean); @@ -273,7 +272,6 @@ Assert.IsNull(entity.ShipVelocityCoefficientOfVariation); Assert.IsNull(entity.ProbabilityCollisionSecondaryStructure); Assert.IsNull(entity.FlowVelocityStructureClosableMean); - Assert.IsNull(entity.FlowVelocityStructureClosableStandardDeviation); Assert.IsNull(entity.StabilityLinearLoadModelMean); Assert.IsNull(entity.StabilityLinearLoadModelCoefficientOfVariation); Assert.IsNull(entity.StabilityQuadraticLoadModelMean); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs =================================================================== diff -u -rb7bf375a1f563f055df1d09eb16e44a25106606b -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision b7bf375a1f563f055df1d09eb16e44a25106606b) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -152,7 +152,7 @@ Assert.AreEqual(input.CriticalOvertoppingDischarge.CoefficientOfVariation.Value, entity.CriticalOvertoppingDischargeCoefficientOfVariation); Assert.AreEqual(input.FailureProbabilityStructureWithErosion, entity.FailureProbabilityStructureWithErosion); Assert.AreEqual(input.WidthFlowApertures.Mean.Value, entity.WidthFlowAperturesMean); - Assert.AreEqual(input.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesCoefficientOfVariation); + Assert.AreEqual(input.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesStandardDeviation); Assert.AreEqual(input.StormDuration.Mean.Value, entity.StormDurationMean); Assert.AreEqual(input.LevelCrestStructure.Mean.Value, entity.LevelCrestStructureMean); @@ -244,7 +244,7 @@ Assert.IsNull(entity.CriticalOvertoppingDischargeMean); Assert.IsNull(entity.CriticalOvertoppingDischargeCoefficientOfVariation); Assert.IsNull(entity.WidthFlowAperturesMean); - Assert.IsNull(entity.WidthFlowAperturesCoefficientOfVariation); + Assert.IsNull(entity.WidthFlowAperturesStandardDeviation); Assert.IsNull(entity.StormDurationMean); Assert.IsNull(entity.DeviationWaveDirection); Assert.IsNull(entity.LevelCrestStructureMean); @@ -516,7 +516,7 @@ Assert.AreEqual(inputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation.Value, entity.CriticalOvertoppingDischargeCoefficientOfVariation); Assert.AreEqual(inputParameters.ModelFactorSuperCriticalFlow.Mean.Value, entity.ModelFactorSuperCriticalFlowMean); Assert.AreEqual(inputParameters.WidthFlowApertures.Mean.Value, entity.WidthFlowAperturesMean); - Assert.AreEqual(inputParameters.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesCoefficientOfVariation); + Assert.AreEqual(inputParameters.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesStandardDeviation); Assert.AreEqual(Convert.ToByte(inputParameters.InflowModelType), entity.InflowModelType); Assert.AreEqual(inputParameters.InsideWaterLevel.Mean.Value, entity.InsideWaterLevelMean); Assert.AreEqual(inputParameters.InsideWaterLevel.StandardDeviation.Value, entity.InsideWaterLevelStandardDeviation); @@ -634,7 +634,7 @@ Assert.IsNull(entity.CriticalOvertoppingDischargeCoefficientOfVariation); Assert.IsNull(entity.ModelFactorSuperCriticalFlowMean); Assert.IsNull(entity.WidthFlowAperturesMean); - Assert.IsNull(entity.WidthFlowAperturesCoefficientOfVariation); + Assert.IsNull(entity.WidthFlowAperturesStandardDeviation); Assert.IsNull(entity.InsideWaterLevelMean); Assert.IsNull(entity.InsideWaterLevelStandardDeviation); Assert.IsNull(entity.DeviationWaveDirection); @@ -933,7 +933,7 @@ Assert.AreEqual(inputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation.Value, entity.CriticalOvertoppingDischargeCoefficientOfVariation); Assert.AreEqual(inputParameters.ModelFactorSuperCriticalFlow.Mean.Value, entity.ModelFactorSuperCriticalFlowMean); Assert.AreEqual(inputParameters.WidthFlowApertures.Mean.Value, entity.WidthFlowAperturesMean); - Assert.AreEqual(inputParameters.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesCoefficientOfVariation); + Assert.AreEqual(inputParameters.WidthFlowApertures.StandardDeviation.Value, entity.WidthFlowAperturesStandardDeviation); Assert.AreEqual(inputParameters.InsideWaterLevel.Mean.Value, entity.InsideWaterLevelMean); Assert.AreEqual(inputParameters.InsideWaterLevel.StandardDeviation.Value, entity.InsideWaterLevelStandardDeviation); @@ -1126,7 +1126,7 @@ Assert.IsNull(entity.CriticalOvertoppingDischargeCoefficientOfVariation); Assert.IsNull(entity.ModelFactorSuperCriticalFlowMean); Assert.IsNull(entity.WidthFlowAperturesMean); - Assert.IsNull(entity.WidthFlowAperturesCoefficientOfVariation); + Assert.IsNull(entity.WidthFlowAperturesStandardDeviation); Assert.IsNull(entity.InsideWaterLevelMean); Assert.IsNull(entity.InsideWaterLevelStandardDeviation); @@ -1151,7 +1151,6 @@ Assert.IsNull(entity.ShipVelocityMean); Assert.IsNull(entity.ShipVelocityCoefficientOfVariation); Assert.IsNull(entity.FlowVelocityStructureClosableMean); - Assert.IsNull(entity.FlowVelocityStructureClosableStandardDeviation); Assert.IsNull(entity.StabilityLinearLoadModelMean); Assert.IsNull(entity.StabilityLinearLoadModelCoefficientOfVariation); Assert.IsNull(entity.StabilityQuadraticLoadModelMean); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructureEntityReadExtensionsTest.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructureEntityReadExtensionsTest.cs (.../ClosingStructureEntityReadExtensionsTest.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructureEntityReadExtensionsTest.cs (.../ClosingStructureEntityReadExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -85,7 +85,7 @@ AllowedLevelIncreaseStorageMean = 6.6, AllowedLevelIncreaseStorageStandardDeviation = 7.7, WidthFlowAperturesMean = 8.8, - WidthFlowAperturesCoefficientOfVariation = 9.9, + WidthFlowAperturesStandardDeviation = 9.9, LevelCrestStructureNotClosingMean = 10.10, LevelCrestStructureNotClosingStandardDeviation = 11.11, InsideWaterLevelMean = 12.12, @@ -121,7 +121,7 @@ Assert.AreEqual(entity.AllowedLevelIncreaseStorageMean, structure.AllowedLevelIncreaseStorage.Mean.Value); Assert.AreEqual(entity.AllowedLevelIncreaseStorageStandardDeviation, structure.AllowedLevelIncreaseStorage.StandardDeviation.Value); Assert.AreEqual(entity.WidthFlowAperturesMean, structure.WidthFlowApertures.Mean.Value); - Assert.AreEqual(entity.WidthFlowAperturesCoefficientOfVariation, structure.WidthFlowApertures.StandardDeviation.Value); + Assert.AreEqual(entity.WidthFlowAperturesStandardDeviation, structure.WidthFlowApertures.StandardDeviation.Value); Assert.AreEqual(entity.LevelCrestStructureNotClosingMean, structure.LevelCrestStructureNotClosing.Mean.Value); Assert.AreEqual(entity.LevelCrestStructureNotClosingStandardDeviation, structure.LevelCrestStructureNotClosing.StandardDeviation.Value); Assert.AreEqual(entity.InsideWaterLevelMean, structure.InsideWaterLevel.Mean.Value); @@ -159,7 +159,7 @@ AllowedLevelIncreaseStorageMean = null, AllowedLevelIncreaseStorageStandardDeviation = null, WidthFlowAperturesMean = null, - WidthFlowAperturesCoefficientOfVariation = null, + WidthFlowAperturesStandardDeviation = null, LevelCrestStructureNotClosingMean = null, LevelCrestStructureNotClosingStandardDeviation = null, InsideWaterLevelMean = null, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs (.../ClosingStructuresCalculationEntityReadExtensionsTest.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs (.../ClosingStructuresCalculationEntityReadExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -89,7 +89,7 @@ CriticalOvertoppingDischargeCoefficientOfVariation = 10.10, FailureProbabilityStructureWithErosion = 0.11, WidthFlowAperturesMean = 12.12, - WidthFlowAperturesCoefficientOfVariation = 13.13, + WidthFlowAperturesStandardDeviation = 13.13, StormDurationMean = 14.14, UseBreakWater = Convert.ToByte(true), BreakWaterType = Convert.ToByte(BreakWaterType.Wall), @@ -137,7 +137,7 @@ Assert.AreEqual(entity.CriticalOvertoppingDischargeCoefficientOfVariation, inputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation.Value); Assert.AreEqual(entity.FailureProbabilityStructureWithErosion, inputParameters.FailureProbabilityStructureWithErosion); Assert.AreEqual(entity.WidthFlowAperturesMean, inputParameters.WidthFlowApertures.Mean.Value); - Assert.AreEqual(entity.WidthFlowAperturesCoefficientOfVariation, inputParameters.WidthFlowApertures.StandardDeviation.Value); + Assert.AreEqual(entity.WidthFlowAperturesStandardDeviation, inputParameters.WidthFlowApertures.StandardDeviation.Value); Assert.AreEqual(entity.StormDurationMean, inputParameters.StormDuration.Mean.Value); Assert.AreEqual(Convert.ToBoolean(entity.UseBreakWater), inputParameters.UseBreakWater); Assert.AreEqual((BreakWaterType) entity.BreakWaterType, inputParameters.BreakWater.Type); @@ -180,7 +180,7 @@ CriticalOvertoppingDischargeMean = null, CriticalOvertoppingDischargeCoefficientOfVariation = null, WidthFlowAperturesMean = null, - WidthFlowAperturesCoefficientOfVariation = null, + WidthFlowAperturesStandardDeviation = null, StormDurationMean = null, BreakWaterHeight = null, InsideWaterLevelMean = null, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructureEntityReadExtensionsTest.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructureEntityReadExtensionsTest.cs (.../HeightStructureEntityReadExtensionsTest.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructureEntityReadExtensionsTest.cs (.../HeightStructureEntityReadExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -87,7 +87,7 @@ CriticalOvertoppingDischargeMean = 8.8, CriticalOvertoppingDischargeCoefficientOfVariation = 9.9, WidthFlowAperturesMean = 10.10, - WidthFlowAperturesCoefficientOfVariation = 11.11, + WidthFlowAperturesStandardDeviation = 11.11, FailureProbabilityStructureWithErosion = 12.12, StorageStructureAreaMean = 13.13, StorageStructureAreaCoefficientOfVariation = 14.14, @@ -114,7 +114,7 @@ Assert.AreEqual(entity.CriticalOvertoppingDischargeMean, structure.CriticalOvertoppingDischarge.Mean.Value); Assert.AreEqual(entity.CriticalOvertoppingDischargeCoefficientOfVariation, structure.CriticalOvertoppingDischarge.CoefficientOfVariation.Value); Assert.AreEqual(entity.WidthFlowAperturesMean, structure.WidthFlowApertures.Mean.Value); - Assert.AreEqual(entity.WidthFlowAperturesCoefficientOfVariation, structure.WidthFlowApertures.StandardDeviation.Value); + Assert.AreEqual(entity.WidthFlowAperturesStandardDeviation, structure.WidthFlowApertures.StandardDeviation.Value); Assert.AreEqual(entity.FailureProbabilityStructureWithErosion, structure.FailureProbabilityStructureWithErosion); Assert.AreEqual(entity.StorageStructureAreaMean, structure.StorageStructureArea.Mean.Value); Assert.AreEqual(entity.StorageStructureAreaCoefficientOfVariation, structure.StorageStructureArea.CoefficientOfVariation.Value); @@ -140,7 +140,7 @@ CriticalOvertoppingDischargeMean = null, CriticalOvertoppingDischargeCoefficientOfVariation = null, WidthFlowAperturesMean = null, - WidthFlowAperturesCoefficientOfVariation = null, + WidthFlowAperturesStandardDeviation = null, FailureProbabilityStructureWithErosion = null, StorageStructureAreaMean = null, StorageStructureAreaCoefficientOfVariation = null, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs (.../HeightStructuresCalculationEntityReadExtensionsTest.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs (.../HeightStructuresCalculationEntityReadExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -94,7 +94,7 @@ CriticalOvertoppingDischargeCoefficientOfVariation = random.GetFromRange(1e-6, 9999.9999), FailureProbabilityStructureWithErosion = random.NextDouble(), WidthFlowAperturesMean = random.GetFromRange(1e-6, 9999.9999), - WidthFlowAperturesCoefficientOfVariation = random.GetFromRange(1e-6, 9999.9999), + WidthFlowAperturesStandardDeviation = random.GetFromRange(1e-6, 9999.9999), StormDurationMean = random.GetFromRange(1e-6, 9999.9999), LevelCrestStructureMean = random.GetFromRange(1e-6, 9999.9999), LevelCrestStructureStandardDeviation = random.GetFromRange(1e-6, 9999.9999), @@ -124,7 +124,7 @@ AssertRoundedDouble(entity.CriticalOvertoppingDischargeCoefficientOfVariation, input.CriticalOvertoppingDischarge.CoefficientOfVariation); Assert.AreEqual(entity.FailureProbabilityStructureWithErosion, input.FailureProbabilityStructureWithErosion); AssertRoundedDouble(entity.WidthFlowAperturesMean, input.WidthFlowApertures.Mean); - AssertRoundedDouble(entity.WidthFlowAperturesCoefficientOfVariation, input.WidthFlowApertures.StandardDeviation); + AssertRoundedDouble(entity.WidthFlowAperturesStandardDeviation, input.WidthFlowApertures.StandardDeviation); AssertRoundedDouble(entity.StormDurationMean, input.StormDuration.Mean); AssertRoundedDouble(entity.LevelCrestStructureMean, input.LevelCrestStructure.Mean); AssertRoundedDouble(entity.LevelCrestStructureStandardDeviation, input.LevelCrestStructure.StandardDeviation); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IStructureCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IStructureCalculationEntityReadExtensionsTest.cs (.../IStructureCalculationEntityReadExtensionsTest.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IStructureCalculationEntityReadExtensionsTest.cs (.../IStructureCalculationEntityReadExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -94,7 +94,7 @@ entity.CriticalOvertoppingDischargeCoefficientOfVariation = random.GetFromRange(1e-6, 9999.9999); entity.FailureProbabilityStructureWithErosion = random.NextDouble(); entity.WidthFlowAperturesMean = random.GetFromRange(1e-6, 9999.9999); - entity.WidthFlowAperturesCoefficientOfVariation = random.GetFromRange(1e-6, 9999.9999); + entity.WidthFlowAperturesStandardDeviation = random.GetFromRange(1e-6, 9999.9999); entity.StormDurationMean = random.GetFromRange(1e-6, 9999.9999); entity.UseForeshore = 1; entity.UseBreakWater = 1; @@ -120,7 +120,7 @@ AssertRoundedDouble(entity.CriticalOvertoppingDischargeCoefficientOfVariation, inputToUpdate.CriticalOvertoppingDischarge.CoefficientOfVariation); Assert.AreEqual(entity.FailureProbabilityStructureWithErosion, inputToUpdate.FailureProbabilityStructureWithErosion); AssertRoundedDouble(entity.WidthFlowAperturesMean, inputToUpdate.WidthFlowApertures.Mean); - AssertRoundedDouble(entity.WidthFlowAperturesCoefficientOfVariation, inputToUpdate.WidthFlowApertures.StandardDeviation); + AssertRoundedDouble(entity.WidthFlowAperturesStandardDeviation, inputToUpdate.WidthFlowApertures.StandardDeviation); AssertRoundedDouble(entity.StormDurationMean, inputToUpdate.StormDuration.Mean); Assert.IsEmpty(inputToUpdate.ForeshoreGeometry); @@ -145,7 +145,7 @@ entity.CriticalOvertoppingDischargeMean = null; entity.CriticalOvertoppingDischargeCoefficientOfVariation = null; entity.WidthFlowAperturesMean = null; - entity.WidthFlowAperturesCoefficientOfVariation = null; + entity.WidthFlowAperturesStandardDeviation = null; entity.StormDurationMean = null; mocks.ReplayAll(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensionsTest.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensionsTest.cs (.../StabilityPointStructureEntityReadExtensionsTest.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensionsTest.cs (.../StabilityPointStructureEntityReadExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -85,7 +85,7 @@ AllowedLevelIncreaseStorageMean = 6.6, AllowedLevelIncreaseStorageStandardDeviation = 7.7, WidthFlowAperturesMean = 8.8, - WidthFlowAperturesCoefficientOfVariation = 9.9, + WidthFlowAperturesStandardDeviation = 9.9, InsideWaterLevelMean = 10.10, InsideWaterLevelStandardDeviation = 11.11, ThresholdHeightOpenWeirMean = 12.12, @@ -116,7 +116,6 @@ LevellingCount = 37, ProbabilityCollisionSecondaryStructure = 38.38, FlowVelocityStructureClosableMean = 39.39, - FlowVelocityStructureClosableStandardDeviation = 40.40, StabilityLinearLoadModelMean = 41.41, StabilityLinearLoadModelCoefficientOfVariation = 42.42, StabilityQuadraticLoadModelMean = 43.43, @@ -143,7 +142,7 @@ Assert.AreEqual(entity.AllowedLevelIncreaseStorageMean, structure.AllowedLevelIncreaseStorage.Mean.Value); Assert.AreEqual(entity.AllowedLevelIncreaseStorageStandardDeviation, structure.AllowedLevelIncreaseStorage.StandardDeviation.Value); Assert.AreEqual(entity.WidthFlowAperturesMean, structure.WidthFlowApertures.Mean.Value); - Assert.AreEqual(entity.WidthFlowAperturesCoefficientOfVariation, structure.WidthFlowApertures.StandardDeviation.Value); + Assert.AreEqual(entity.WidthFlowAperturesStandardDeviation, structure.WidthFlowApertures.StandardDeviation.Value); Assert.AreEqual(entity.InsideWaterLevelMean, structure.InsideWaterLevel.Mean.Value); Assert.AreEqual(entity.InsideWaterLevelStandardDeviation, structure.InsideWaterLevel.StandardDeviation.Value); Assert.AreEqual(entity.ThresholdHeightOpenWeirMean, structure.ThresholdHeightOpenWeir.Mean.Value); @@ -174,7 +173,6 @@ Assert.AreEqual(entity.LevellingCount, structure.LevellingCount); Assert.AreEqual(entity.ProbabilityCollisionSecondaryStructure, structure.ProbabilityCollisionSecondaryStructure); Assert.AreEqual(entity.FlowVelocityStructureClosableMean, structure.FlowVelocityStructureClosable.Mean.Value); - Assert.AreEqual(entity.FlowVelocityStructureClosableStandardDeviation, structure.FlowVelocityStructureClosable.CoefficientOfVariation.Value); Assert.AreEqual(entity.StabilityLinearLoadModelMean, structure.StabilityLinearLoadModel.Mean.Value); Assert.AreEqual(entity.StabilityLinearLoadModelCoefficientOfVariation, structure.StabilityLinearLoadModel.CoefficientOfVariation.Value); Assert.AreEqual(entity.StabilityQuadraticLoadModelMean, structure.StabilityQuadraticLoadModel.Mean.Value); @@ -200,7 +198,7 @@ AllowedLevelIncreaseStorageMean = null, AllowedLevelIncreaseStorageStandardDeviation = null, WidthFlowAperturesMean = null, - WidthFlowAperturesCoefficientOfVariation = null, + WidthFlowAperturesStandardDeviation = null, InsideWaterLevelMean = null, InsideWaterLevelStandardDeviation = null, ThresholdHeightOpenWeirMean = null, @@ -230,7 +228,6 @@ ShipVelocityCoefficientOfVariation = null, ProbabilityCollisionSecondaryStructure = null, FlowVelocityStructureClosableMean = null, - FlowVelocityStructureClosableStandardDeviation = null, StabilityLinearLoadModelMean = null, StabilityLinearLoadModelCoefficientOfVariation = null, AreaFlowAperturesMean = null, @@ -282,7 +279,6 @@ Assert.IsNaN(structure.ShipVelocity.CoefficientOfVariation); Assert.IsNaN(structure.ProbabilityCollisionSecondaryStructure); Assert.IsNaN(structure.FlowVelocityStructureClosable.Mean); - Assert.IsNaN(structure.FlowVelocityStructureClosable.CoefficientOfVariation); Assert.IsNaN(structure.StabilityLinearLoadModel.Mean); Assert.IsNaN(structure.StabilityLinearLoadModel.CoefficientOfVariation); Assert.IsNaN(structure.StabilityQuadraticLoadModel.Mean); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rb7bf375a1f563f055df1d09eb16e44a25106606b -r5604c90a34d62f567560c2264964faa20bce8e0d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs (.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs) (revision b7bf375a1f563f055df1d09eb16e44a25106606b) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs (.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -89,7 +89,7 @@ CriticalOvertoppingDischargeCoefficientOfVariation = 10.10, FailureProbabilityStructureWithErosion = 0.11, WidthFlowAperturesMean = 12.12, - WidthFlowAperturesCoefficientOfVariation = 13.13, + WidthFlowAperturesStandardDeviation = 13.13, StormDurationMean = 14.14, UseBreakWater = Convert.ToByte(true), BreakWaterType = Convert.ToByte(BreakWaterType.Wall), @@ -121,7 +121,6 @@ LevellingCount = 39, ProbabilityCollisionSecondaryStructure = 0.40, FlowVelocityStructureClosableMean = 41.41, - FlowVelocityStructureClosableStandardDeviation = 42.42, StabilityLinearLoadModelMean = 43.43, StabilityLinearLoadModelCoefficientOfVariation = 44.44, StabilityQuadraticLoadModelMean = 45.45, @@ -159,7 +158,7 @@ Assert.AreEqual(entity.CriticalOvertoppingDischargeCoefficientOfVariation, inputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation.Value); Assert.AreEqual(entity.FailureProbabilityStructureWithErosion, inputParameters.FailureProbabilityStructureWithErosion); Assert.AreEqual(entity.WidthFlowAperturesMean, inputParameters.WidthFlowApertures.Mean.Value); - Assert.AreEqual(entity.WidthFlowAperturesCoefficientOfVariation, inputParameters.WidthFlowApertures.StandardDeviation.Value); + Assert.AreEqual(entity.WidthFlowAperturesStandardDeviation, inputParameters.WidthFlowApertures.StandardDeviation.Value); Assert.AreEqual(entity.StormDurationMean, inputParameters.StormDuration.Mean.Value); Assert.AreEqual(Convert.ToBoolean(entity.UseBreakWater), inputParameters.UseBreakWater); Assert.AreEqual((BreakWaterType) entity.BreakWaterType, inputParameters.BreakWater.Type); @@ -223,7 +222,7 @@ CriticalOvertoppingDischargeMean = null, CriticalOvertoppingDischargeCoefficientOfVariation = null, WidthFlowAperturesMean = null, - WidthFlowAperturesCoefficientOfVariation = null, + WidthFlowAperturesStandardDeviation = null, StormDurationMean = null, BreakWaterHeight = null, InsideWaterLevelMean = null, @@ -249,7 +248,6 @@ ShipVelocityMean = null, ShipVelocityCoefficientOfVariation = null, FlowVelocityStructureClosableMean = null, - FlowVelocityStructureClosableStandardDeviation = null, StabilityLinearLoadModelMean = null, StabilityLinearLoadModelCoefficientOfVariation = null, StabilityQuadraticLoadModelMean = null, Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -r5604c90a34d62f567560c2264964faa20bce8e0d --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -124,7 +124,7 @@ FlowVelocityStructureClosable = new VariationCoefficientNormalDistribution(2) { Mean = constructionProperties.FlowVelocityStructureClosable.Mean, - CoefficientOfVariation = constructionProperties.FlowVelocityStructureClosable.CoefficientOfVariation + CoefficientOfVariation = (RoundedDouble) 0.2 }; StabilityLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) { Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -r5604c90a34d62f567560c2264964faa20bce8e0d --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision 5604c90a34d62f567560c2264964faa20bce8e0d) @@ -126,7 +126,7 @@ FlowVelocityStructureClosable = { Mean = (RoundedDouble) 678.901, - CoefficientOfVariation = (RoundedDouble) 0.678 + CoefficientOfVariation = (RoundedDouble) 0.2 }, StabilityLinearLoadModel = { @@ -257,7 +257,7 @@ Assert.AreEqual(2, flowVelocityStructureClosable.Mean.NumberOfDecimalPlaces); Assert.AreEqual(678.90, flowVelocityStructureClosable.Mean, flowVelocityStructureClosable.Mean.GetAccuracy()); Assert.AreEqual(2, flowVelocityStructureClosable.CoefficientOfVariation.NumberOfDecimalPlaces); - Assert.AreEqual(0.68, flowVelocityStructureClosable.CoefficientOfVariation, flowVelocityStructureClosable.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(0.2, flowVelocityStructureClosable.CoefficientOfVariation, flowVelocityStructureClosable.CoefficientOfVariation.GetAccuracy()); VariationCoefficientLogNormalDistribution stabilityLinearLoadModel = structure.StabilityLinearLoadModel; Assert.AreEqual(2, stabilityLinearLoadModel.Mean.NumberOfDecimalPlaces);