Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Preprocessing.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/libiomp5md.dll =================================================================== diff -u -r3362 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.Geo.Common.Geometry.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r3573 -r3612 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3573) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3612) @@ -300,8 +300,7 @@ } [Test] - [Category(Categories.WorkInProgress)] - public void TestFullCalculationFailsWithBadTangentLines() + public void TestFullCalculationSuceedsWithWarningsWithBadTangentLines() { var kernelWrapper = new MacroStabilityInwardsKernelWrapper(); kernelWrapper.FailureMechanismParametersMStab = new FailureMechanismParametersMStab(); @@ -324,8 +323,8 @@ // Run the dl; the tangent line position is defined in such a way that a circle segment can not be matched to a soil this should fail. kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out messages); MacroStabilityOutput macroStabilityOutput = (MacroStabilityOutput)kernelDataOutput; - Assert.AreEqual(1, messages.Count); - Assert.AreEqual(CalculationResult.UnexpectedError, macroStabilityOutput.CalculationResult); + Assert.AreEqual(51, messages.Count); + Assert.AreEqual(CalculationResult.Succeeded, macroStabilityOutput.CalculationResult); Assert.IsTrue(messages[0].Message.Contains("A slice is beyond the geometry at x")); } Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.WaternetCreator.Creator.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj =================================================================== diff -u -r3510 -r3612 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 3510) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 3612) @@ -32,9 +32,6 @@ MinimumRecommendedRules.ruleset - - ..\..\lib\FailureMechanisms\DamMacroStability\Deltares.DamMacroStability.Calculator.dll - ..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.BlighCalculator.dll Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.Interface.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Probabilistic.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.CSharpWrapper.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.SoilStress.Calculation.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.CSharpWrapper.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Calculation.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.Geo.Common.Standard.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.Io.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/feedbackDLL.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Io.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.SoilStress.Data.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.CSharpWrapper.pdb =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/libmmd.dll =================================================================== diff -u -r3362 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.SearchAlgorithms.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj =================================================================== diff -u -r3444 -r3612 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 3444) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 3612) @@ -32,10 +32,6 @@ MinimumRecommendedRules.ruleset - - False - ..\..\lib\FailureMechanisms\DamMacroStability\Deltares.DamMacroStability.Calculator.dll - False ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.CSharpWrapper.dll Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/probabilisticLib.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Data.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Interface.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/libifcoremd.dll =================================================================== diff -u -r3362 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Kernel.dll =================================================================== diff -u -r3506 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/DamMacroStability/Deltares.DamMacroStability.CalculatorTests.pdb =================================================================== diff -u -r3023 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/DamMacroStability/Deltares.DamMacroStability.Version.dll =================================================================== diff -u -r3023 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/DamMacroStability/DGeoStability.exe =================================================================== diff -u -r3023 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/DamMacroStability/Deltares.DamMacroStability.Version.pdb =================================================================== diff -u -r3023 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/DamMacroStability/Deltares.DamMacroStability.CalculatorTests.dll =================================================================== diff -u -r3023 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/DamMacroStability/Deltares.DamMacroStability.Calculator.dll =================================================================== diff -u -r3023 -r3612 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/DamMacroStability/Deltares.DamMacroStability.Calculator.pdb =================================================================== diff -u -r3023 -r3612 Binary files differ