Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs =================================================================== diff -u -r512177cc50d892bede45024499342a94ae867cfb -rda446197cc450be1a44ab272366db2c8c1df61bb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision da446197cc450be1a44ab272366db2c8c1df61bb) @@ -39,49 +39,48 @@ HydraRingSection section = new HydraRingSection(1, double.NaN, double.NaN); const double gravitationalAcceleration = 9.81; - const double modelFactorOvertoppingMean = 0.09; - const double modelFactorOvertoppingStandardDeviation = 0.06; - const double levelOfCrestOfStructureStandardDeviation = 0.05; - const double modelFactorOvertoppingSuperCriticalFlowMean = 1.1; - const double modelFactorOvertoppingSuperCriticalFlowStandardDeviation = 0.03; - const double allowableIncreaseOfLevelForStorageStandardDeviation = 0.1; - const double modelFactorForStorageVolumeMean = 1.0; - const double modelFactorForStorageVolumeStandardDeviation = 0.2; - const double storageStructureAreaStandardDeviation = 0.1; - const double modelFactorForIncomingFlowVolume = 1; - const double flowWidthAtBottomProtectionStandardDeviation = 0.05; - const double criticalOvertoppingDischargeMeanStandardDeviation = 0.15; - const double widthOfFlowAperturesStandardDeviation = 0.05; - const double stormDurationMean = 7.5; - const double stormDurationStandardDeviation = 0.25; - - const double levelOfCrestOfStructureMean = 1.1; - const double orientationOfTheNormalOfTheStructure = 2.2; - const double allowableIncreaseOfLevelForStorageMean = 3.3; + const double modelFactorOvertoppingFlowMean = 0.09; + const double modelFactorOvertoppingFlowStandardDeviation = 0.06; + const double levelCrestStructureMean = 1.1; + const double levelCrestStructureStandardDeviation = 0.05; + const double structureNormalOrientation = 2.2; + const double modelFactorSuperCriticalFlowMean = 1.1; + const double modelFactorSuperCriticalFlowStandardDeviation = 0.03; + const double allowedLevelIncreaseStorageMean = 3.3; + const double allowedLevelIncreaseStorageStandardDeviation = 0.1; + const double modelFactorStorageVolumeMean = 1.0; + const double modelFactorStorageVolumeStandardDeviation = 0.2; const double storageStructureAreaMean = 4.4; + const double storageStructureAreaVariation = 0.1; + const double modelFactorInflowVolume = 1; const double flowWidthAtBottomProtectionMean = 5.5; + const double flowWidthAtBottomProtectionStandardDeviation = 0.05; const double criticalOvertoppingDischargeMean = 6.6; - const double failureProbabilityOfStructureGivenErosion = 7.7; - const double widthOfFlowAperturesMean = 8.8; - const double deviationOfTheWaveDirection = 9.9; + const double criticalOvertoppingDischargeVariation = 0.15; + const double failureProbabilityStructureWithErosion = 7.7; + const double widthFlowAperturesMean = 8.8; + const double widthFlowAperturesVariation = 0.05; + const double deviationWaveDirection = 9.9; + const double stormDurationMean = 7.5; + const double stormDurationVariation = 0.25; // Call var structuresOvertoppingCalculationInput = new StructuresOvertoppingCalculationInput(hydraulicBoundaryLocationId, section, gravitationalAcceleration, - modelFactorOvertoppingMean, modelFactorOvertoppingStandardDeviation, - levelOfCrestOfStructureMean, levelOfCrestOfStructureStandardDeviation, - orientationOfTheNormalOfTheStructure, - modelFactorOvertoppingSuperCriticalFlowMean, modelFactorOvertoppingSuperCriticalFlowStandardDeviation, - allowableIncreaseOfLevelForStorageMean, allowableIncreaseOfLevelForStorageStandardDeviation, - modelFactorForStorageVolumeMean, modelFactorForStorageVolumeStandardDeviation, - storageStructureAreaMean, storageStructureAreaStandardDeviation, - modelFactorForIncomingFlowVolume, + modelFactorOvertoppingFlowMean, modelFactorOvertoppingFlowStandardDeviation, + levelCrestStructureMean, levelCrestStructureStandardDeviation, + structureNormalOrientation, + modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, + allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation, + modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation, + storageStructureAreaMean, storageStructureAreaVariation, + modelFactorInflowVolume, flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation, - criticalOvertoppingDischargeMean, criticalOvertoppingDischargeMeanStandardDeviation, - failureProbabilityOfStructureGivenErosion, - widthOfFlowAperturesMean, widthOfFlowAperturesStandardDeviation, - deviationOfTheWaveDirection, - stormDurationMean, stormDurationStandardDeviation); + criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, + failureProbabilityStructureWithErosion, + widthFlowAperturesMean, widthFlowAperturesVariation, + deviationWaveDirection, + stormDurationMean, stormDurationVariation); // Assert const int expectedCalculationTypeId = 1;