Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -rc5c98a50c4c7661fc5055a09c8dd117f5bb5e816 -r2eb043597395258407d9acc1c14e36cd92a82f47 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs) (revision c5c98a50c4c7661fc5055a09c8dd117f5bb5e816) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs) (revision 2eb043597395258407d9acc1c14e36cd92a82f47) @@ -70,7 +70,7 @@ } private static void SetInputParameters(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, - FailureMechanismCategoryWaveConditionsInput calculationInput, + GrassCoverErosionOutwardsWaveConditionsInput calculationInput, PersistenceRegistry registry) { HydraulicBoundaryLocation hydraulicBoundaryLocation = calculationInput.HydraulicBoundaryLocation; @@ -95,6 +95,7 @@ entity.LowerBoundaryWaterLevels = calculationInput.LowerBoundaryWaterLevels.ToNaNAsNull(); entity.StepSize = Convert.ToByte(calculationInput.StepSize); entity.CategoryType = Convert.ToByte(calculationInput.CategoryType); + entity.CalculationType = Convert.ToByte(calculationInput.CalculationType); } private static void SetOutputEntities(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs =================================================================== diff -u -rca92282be7ef20e40da013ba6503de4cf0811ba9 -r2eb043597395258407d9acc1c14e36cd92a82f47 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs) (revision ca92282be7ef20e40da013ba6503de4cf0811ba9) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs) (revision 2eb043597395258407d9acc1c14e36cd92a82f47) @@ -74,7 +74,7 @@ return calculation; } - private static void ReadCalculationInputs(FailureMechanismCategoryWaveConditionsInput inputParameters, + private static void ReadCalculationInputs(GrassCoverErosionOutwardsWaveConditionsInput inputParameters, GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, ReadConversionCollector collector) { @@ -91,6 +91,7 @@ inputParameters.LowerBoundaryWaterLevels = (RoundedDouble) entity.LowerBoundaryWaterLevels.ToNullAsNaN(); inputParameters.StepSize = (WaveConditionsInputStepSize) entity.StepSize; inputParameters.CategoryType = (FailureMechanismCategoryType) entity.CategoryType; + inputParameters.CalculationType = (GrassCoverErosionOutwardsWaveConditionsCalculationType) entity.CalculationType; } private static void ReadCalculationOutputs(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs =================================================================== diff -u -rc5c98a50c4c7661fc5055a09c8dd117f5bb5e816 -r2eb043597395258407d9acc1c14e36cd92a82f47 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs) (revision c5c98a50c4c7661fc5055a09c8dd117f5bb5e816) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs) (revision 2eb043597395258407d9acc1c14e36cd92a82f47) @@ -85,7 +85,8 @@ UpperBoundaryWaterLevels = (RoundedDouble) 5.88, LowerBoundaryWaterLevels = (RoundedDouble) 3.40, StepSize = random.NextEnumValue(), - CategoryType = random.NextEnumValue() + CategoryType = random.NextEnumValue(), + CalculationType = random.NextEnumValue() } }; @@ -95,7 +96,7 @@ GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity = calculation.Create(registry, order); // Assert - FailureMechanismCategoryWaveConditionsInput input = calculation.InputParameters; + GrassCoverErosionOutwardsWaveConditionsInput input = calculation.InputParameters; Assert.AreEqual(input.Orientation, entity.Orientation, input.Orientation.GetAccuracy()); Assert.AreEqual(Convert.ToByte(input.UseBreakWater), entity.UseBreakWater); Assert.AreEqual(Convert.ToByte(input.UseForeshore), entity.UseForeshore); @@ -105,6 +106,7 @@ Assert.AreEqual(input.LowerBoundaryWaterLevels, entity.LowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels.GetAccuracy()); Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize); Assert.AreEqual(Convert.ToByte(input.CategoryType), entity.CategoryType); + Assert.AreEqual(Convert.ToByte(input.CalculationType), entity.CalculationType); Assert.AreEqual(order, entity.Order); Assert.IsNull(entity.CalculationGroupEntity); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rca92282be7ef20e40da013ba6503de4cf0811ba9 -r2eb043597395258407d9acc1c14e36cd92a82f47 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision ca92282be7ef20e40da013ba6503de4cf0811ba9) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 2eb043597395258407d9acc1c14e36cd92a82f47) @@ -86,6 +86,7 @@ const double upperBoundaryWaterLevels = 5.88; var stepSize = random.NextEnumValue(); var categoryType = random.NextEnumValue(); + var calculationType = random.NextEnumValue(); var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { @@ -101,7 +102,8 @@ UpperBoundaryWaterLevels = upperBoundaryWaterLevels, LowerBoundaryWaterLevels = lowerBoundaryWaterLevels, StepSize = Convert.ToByte(stepSize), - CategoryType = Convert.ToByte(categoryType) + CategoryType = Convert.ToByte(categoryType), + CalculationType = Convert.ToByte(calculationType) }; var collector = new ReadConversionCollector(); @@ -113,7 +115,7 @@ Assert.AreEqual(name, calculation.Name); Assert.AreEqual(comments, calculation.Comments.Body); - FailureMechanismCategoryWaveConditionsInput calculationInput = calculation.InputParameters; + GrassCoverErosionOutwardsWaveConditionsInput calculationInput = calculation.InputParameters; Assert.AreEqual(useBreakWater, calculationInput.UseBreakWater); Assert.AreEqual(breakWaterType, calculationInput.BreakWater.Type); AssertRoundedDouble(breakWaterHeight, calculationInput.BreakWater.Height); @@ -125,6 +127,7 @@ AssertRoundedDouble(lowerBoundaryWaterLevels, calculationInput.LowerBoundaryWaterLevels); Assert.AreEqual(stepSize, calculationInput.StepSize); Assert.AreEqual(categoryType, calculationInput.CategoryType); + Assert.AreEqual(calculationType, calculationInput.CalculationType); Assert.IsNull(calculationInput.HydraulicBoundaryLocation); Assert.IsNull(calculationInput.ForeshoreProfile);