Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs =================================================================== diff -u -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c -rcd0d2898b739d17fd0611fefff0579c658e48615 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs (.../SoilProfileConverter.cs) (revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs (.../SoilProfileConverter.cs) (revision cd0d2898b739d17fd0611fefff0579c658e48615) @@ -23,6 +23,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; +using Core.Common.Base.Geometry; using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input; using Ringtoets.MacroStabilityInwards.Primitives; @@ -73,30 +74,37 @@ /// Thrown when /// /// is a valid value but unsupported. - private static IEnumerable ConvertLayers(IEnumerable layers) + private static IEnumerable ConvertLayers(IEnumerable layers) { return layers.Select(l => { IMacroStabilityInwardsSoilLayerData data = l.Data; - return new SoilLayer(l.OuterRing, l.Holes, new SoilLayer.ConstructionProperties - { - MaterialName = data.MaterialName, - UsePop = data.UsePop, - IsAquifer = data.IsAquifer, - ShearStrengthModel = ConvertShearStrengthModel(data.ShearStrengthModel), - AbovePhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(data).GetDesignValue(), - BelowPhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(data).GetDesignValue(), - Cohesion = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(data).GetDesignValue(), - FrictionAngle = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(data).GetDesignValue(), - ShearStrengthRatio = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetShearStrengthRatio(data).GetDesignValue(), - StrengthIncreaseExponent = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(data).GetDesignValue(), - Pop = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPop(data).GetDesignValue(), - DilatancyType = DilatancyType.Zero, - WaterPressureInterpolationModel = WaterPressureInterpolationModel.Automatic - }); + return new SoilLayer(RingToPoints(l.OuterRing), + l.Holes.Select(RingToPoints).ToArray(), + new SoilLayer.ConstructionProperties + { + MaterialName = data.MaterialName, + UsePop = data.UsePop, + IsAquifer = data.IsAquifer, + ShearStrengthModel = ConvertShearStrengthModel(data.ShearStrengthModel), + AbovePhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(data).GetDesignValue(), + BelowPhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(data).GetDesignValue(), + Cohesion = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(data).GetDesignValue(), + FrictionAngle = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(data).GetDesignValue(), + ShearStrengthRatio = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetShearStrengthRatio(data).GetDesignValue(), + StrengthIncreaseExponent = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(data).GetDesignValue(), + Pop = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPop(data).GetDesignValue(), + DilatancyType = DilatancyType.Zero, + WaterPressureInterpolationModel = WaterPressureInterpolationModel.Automatic + }); }).ToArray(); } + private static Point2D[] RingToPoints(Ring ring) + { + return ring.Points.ToArray(); + } + private static IEnumerable ConvertPreconsolidationStresses( IEnumerable preconsolidationStresses) {