Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r3033 -r3035 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3033) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3035) @@ -223,6 +223,7 @@ break; } }; + messages.Add(message); } return 1; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r3031 -r3035 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3031) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3035) @@ -188,13 +188,11 @@ // Run the dll kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out messages); MacroStabilityOutput macroStabilityOutput = (MacroStabilityOutput)kernelDataOutput; - // ToDo MWDAM-1356: Input must be set first in Prepare - // start of temporary test code Assert.AreEqual(0, messages.Count); // #Bka: grid ligt niet goed voor een berekening, dus faalt de berekening. OP zich prima test, dus verbouwen en uitbreiden Assert.AreEqual(CalculationResult.Succeeded, macroStabilityOutput.CalculationResult); Assert.AreEqual(1, macroStabilityOutput.StabilityOutputItems.Count); Assert.AreEqual(1.357, macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, diff); // ToDo replace by actual value when calculation is done and output is parsed - // end of temporary test code + // Fill the design results DesignScenario designScenario = new DesignScenario Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs =================================================================== diff -u -r3025 -r3035 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs (.../DamEngineDataTestFactory.cs) (revision 3025) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs (.../DamEngineDataTestFactory.cs) (revision 3035) @@ -92,14 +92,22 @@ { AbovePhreaticLevel = 18.00, BelowPhreaticLevel = 20.00, - ShearStrengthModel = ShearStrengthModel.CPhi + ShearStrengthModel = ShearStrengthModel.CPhi, + FrictionAngle = 30, + Cohesion = 0 }; soilList.Soils.Add(s3); var s4 = new Soil("DKN3"); s4.ShearStrengthModel = ShearStrengthModel.CPhi; soilList.Soils.Add(s4); - var s5 = new Soil("LM"); - s5.ShearStrengthModel = ShearStrengthModel.CPhi; + var s5 = new Soil("LM") + { + AbovePhreaticLevel = 17.00, + BelowPhreaticLevel = 17.50, + ShearStrengthModel = ShearStrengthModel.CPhi, + FrictionAngle = 10, + Cohesion = 5 + }; soilList.Soils.Add(s5); var s6 = new Soil("OB1"); @@ -269,6 +277,7 @@ layer.GeometrySurface.OuterLoop = outerLoop; layer.WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic; layer.IsAquifer = true; + soilProfile2D.Geometry = geometry; soilProfile2D.Surfaces.Add(layer); return soilProfile2D;