Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r765a93eb01cea4448d1dad2bbd6a4145b07b2d18 -rb610d57f72acd9222a40ad4a3215c4f0072bfcb1 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 765a93eb01cea4448d1dad2bbd6a4145b07b2d18) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision b610d57f72acd9222a40ad4a3215c4f0072bfcb1) @@ -110,7 +110,7 @@ entity.ReadPipingMechanismSectionResults(failureMechanism, collector); - ReadRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.CalculationsGroup, + ReadPipingRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.CalculationsGroup, failureMechanism.GeneralInput, collector); } @@ -133,11 +133,11 @@ } } - private static void ReadRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, + private static void ReadPipingRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, CalculationGroup targetRootCalculationGroup, GeneralPipingInput generalPipingInput, ReadConversionCollector collector) { - CalculationGroup rootCalculationGroup = rootCalculationGroupEntity.ReadPipingCalculationGroup(collector, generalPipingInput); + CalculationGroup rootCalculationGroup = rootCalculationGroupEntity.ReadAsPipingCalculationGroup(collector, generalPipingInput); foreach (ICalculationBase calculationBase in rootCalculationGroup.Children) { targetRootCalculationGroup.Children.Add(calculationBase); @@ -159,7 +159,7 @@ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadGeneralGrassCoverErosionInwardsCalculationInput(failureMechanism.GeneralInput); entity.ReadDikeProfiles(failureMechanism.DikeProfiles, collector); - ReadRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.CalculationsGroup, collector); + ReadGrassCoverErosionInwardsRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.CalculationsGroup, collector); entity.ReadGrassCoverErosionInwardsMechanismSectionResults(failureMechanism, collector); } @@ -187,7 +187,7 @@ } } - private static void ReadRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, + private static void ReadGrassCoverErosionInwardsRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, CalculationGroup targetRootCalculationGroup, ReadConversionCollector collector) { @@ -429,6 +429,8 @@ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadGeneralGrassCoverErosionOutwardsCalculationInput(failureMechanism.GeneralInput); entity.ReadGrassCoverErosionOutwardsMechanismSectionResults(failureMechanism, collector); + + ReadGrassCoverErosionOutwardsWaveConditionsRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.WaveConditionsCalculationGroup, collector); } private static void ReadGeneralGrassCoverErosionOutwardsCalculationInput(this FailureMechanismEntity entity, GeneralGrassCoverErosionOutwardsInput input) @@ -447,6 +449,16 @@ } } + + private static void ReadGrassCoverErosionOutwardsWaveConditionsRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, + CalculationGroup targetRootCalculationGroup, ReadConversionCollector collector) + { + CalculationGroup rootCalculationGroup = rootCalculationGroupEntity.ReadAsGrassCoverErosionOutwardsWaveConditionsCalculationGroup(collector); + foreach (ICalculationBase calculationBase in rootCalculationGroup.Children) + { + targetRootCalculationGroup.Children.Add(calculationBase); + } + } #endregion #region Grass Cover Slip Off Inwards