Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r1060 -r1102 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 1060) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 1102) @@ -450,7 +450,6 @@ designResult.StabilityDesignResults.Zone2SafetyFactor = zone2.SafetyFactor; designResult.StabilityDesignResults.LocalZone2EntryPointX = zone2.CircleSurfacePointLeftXCoordinate; designResult.StabilityDesignResults.LocalZone2ExitPointX = zone2.CircleSurfacePointRightXCoordinate; - designResult.StabilityDesignResults.SafetyFactor = Math.Min(damMacroStabilityOutputItem.Zone1Results.SafetyFactor, zone2.SafetyFactor); } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs =================================================================== diff -u -r1066 -r1102 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs (.../MacroStabilityTests.cs) (revision 1066) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs (.../MacroStabilityTests.cs) (revision 1102) @@ -380,6 +380,7 @@ // In this test the location is calculated with 2 profiles. // For one case safety factor of zone 1 is lower than for zone 2 // For the other one safety factor of zone 1 is higher than for zone 2 + // But the overall safety factor should always be the one of zone 1 const string calcDir = "TestOutStabZone2Bishop"; if (Directory.Exists(calcDir)) { @@ -414,16 +415,16 @@ Assert.AreEqual(2.138, result.StabilityDesignResults.Zone1SafetyFactor, tolerance); // Zone2SafetyFactor=2.155 Assert.AreEqual(2.155, result.StabilityDesignResults.Zone2SafetyFactor, tolerance); - // SafetyFactor=2.138 (lowest of zone 1 and 2) + // SafetyFactor=2.138 (same as zone 1) Assert.AreEqual(2.138, result.StabilityDesignResults.SafetyFactor, tolerance); result = output.Results.CalculationResults.DesignResults[1]; // Zone1SafetyFactor=2.009 Assert.AreEqual(2.009, result.StabilityDesignResults.Zone1SafetyFactor, tolerance); // Zone2SafetyFactor=1.974 Assert.AreEqual(1.974, result.StabilityDesignResults.Zone2SafetyFactor, tolerance); - // SafetyFactor=1.974 (lowest of zone 1 and 2) - Assert.AreEqual(1.974, result.StabilityDesignResults.SafetyFactor, tolerance); + // SafetyFactor=2.009 (same as zone 1) + Assert.AreEqual(2.009, result.StabilityDesignResults.SafetyFactor, tolerance); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult));