Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r2918 -r2943 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 2918) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 2943) @@ -98,9 +98,20 @@ var penetrationLength = damKernelInput.Location.ModelParametersForPlLines.PenetrationLength; var waternet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, damKernelInput.SubSoilScenario.SoilProfile1D, penetrationLength, left, right); + TrafficLoad trafficLoad = null; + if (damKernelInput.Location.StabilityOptions.TrafficLoad.HasValue) + { + trafficLoad = new TrafficLoad(); + trafficLoad.Pressure = damKernelInput.Location.StabilityOptions.TrafficLoad.Value; + trafficLoad.XStart = damKernelInput.Location.SurfaceLine + .CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X; + trafficLoad.XEnd = damKernelInput.Location.SurfaceLine + .CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X; + } FillMacroStabilityWrapperInputFromEngine fillMacroStabilityWrapperFromEngine = new FillMacroStabilityWrapperInputFromEngine() { + TrafficLoad = trafficLoad // ToDo MWDAM-1373/1374: fill SoilProfile2D // ToDo MWDAM-1399: add data for calculation grid Uplift Van, connect it to actual engine input // Todo Check if trafficload is really part of engine input and if so connect this to trafficload in mecrostability common, Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r2942 -r2943 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2942) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2943) @@ -102,6 +102,7 @@ CompareSoilModel(expectedSoilList, fillEngineFromMacroStabilityWrapperInput.SoilList); CompareSoilProfile2D(expectedSoilProfile2D, fillEngineFromMacroStabilityWrapperInput.SoilProfile2D); CompareSurfaceLine(expectedSurfaceLine2D, fillEngineFromMacroStabilityWrapperInput.SurfaceLine2); + CompareTrafficLoad(expectedTrafficLoad, fillEngineFromMacroStabilityWrapperInput.TrafficLoad); CompareUpliftVanCalculationGrid(expectedUpliftVanCalculationGrid, fillEngineFromMacroStabilityWrapperInput.UpliftVanCalculationGrid); //Todo : add and or implement comparer per item as these are added to the code @@ -161,19 +162,19 @@ } - // private void CompareTrafficLoad(List expectedUniformLoads, List actualUniformLoads) - // { - // var compare = new CompareLogic { Config = { MaxDifferences = 100 } }; - // compare.Config.MembersToInclude = new List() - // { - // "XEnd", - // "XStart", - // "Pressure" - // }; - // ComparisonResult result; - // result = compare.Compare(expectedUniformLoads, actualUniformLoads); - // Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel Traffic Load"); - // } + private void CompareTrafficLoad(TrafficLoad expectedTrafficLoad, TrafficLoad actualTrafficLoad) + { + var compare = new CompareLogic { Config = { MaxDifferences = 100 } }; + compare.Config.MembersToInclude = new List() + { + "XEnd", + "XStart", + "Pressure" + }; + ComparisonResult result; + result = compare.Compare(expectedTrafficLoad, actualTrafficLoad); + Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel Traffic Load"); + } private void CompareUpliftVanCalculationGrid(UpliftVanCalculationGrid expectedSlipPlaneUpliftVan, UpliftVanCalculationGrid actualSlipPlaneUpliftVan)