Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r995 -r999 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 995) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 999) @@ -255,8 +255,6 @@ SafetyFactor = results[0].Zone1.SafetyFactor, CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate, CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate, - EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate, - ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate }; stabilityOutputItem.Zone1Results = zone1; if (results[0].Zone2 != null) @@ -266,8 +264,6 @@ SafetyFactor = results[0].Zone1.SafetyFactor, CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate, CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate, - EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate, - ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate }; stabilityOutputItem.Zone2Results = zone2; } @@ -392,16 +388,16 @@ var stabilityDesignResults = new StabilityDesignResults { Zone1SafetyFactor = damMacroStabilityOutputItem.Zone1Results.SafetyFactor, - LocalZone1EntryPointX = damMacroStabilityOutputItem.Zone1Results.EntryPointXCoordinate, - LocalZone1ExitPointX = damMacroStabilityOutputItem.Zone1Results.ExitPointXCoordinate + LocalZone1EntryPointX = damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointLeftXCoordinate, + LocalZone1ExitPointX = damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointRightXCoordinate }; stabilityDesignResults.SafetyFactor = stabilityDesignResults.Zone1SafetyFactor; if (damMacroStabilityOutputItem.Zone2Results != null) { var zone2 = (DamMacroStabilityOutputItem.ResultsSingleZone) damMacroStabilityOutputItem.Zone2Results; stabilityDesignResults.Zone2SafetyFactor = zone2.SafetyFactor; - stabilityDesignResults.LocalZone2EntryPointX = zone2.EntryPointXCoordinate; - stabilityDesignResults.LocalZone2ExitPointX = zone2.ExitPointXCoordinate; + stabilityDesignResults.LocalZone2EntryPointX = zone2.CircleSurfacePointLeftXCoordinate; + stabilityDesignResults.LocalZone2ExitPointX = zone2.CircleSurfacePointRightXCoordinate; stabilityDesignResults.SafetyFactor = Math.Min(damMacroStabilityOutputItem.Zone1Results.SafetyFactor, zone2.SafetyFactor); } designResult.StabilityDesignResults = stabilityDesignResults; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r992 -r999 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 992) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 999) @@ -264,13 +264,13 @@ var zone1 = new DamMacroStabilityOutputItem.ResultsSingleZone(); zone1.SafetyFactor = 1.1; - zone1.EntryPointXCoordinate = 1.2; - zone1.ExitPointXCoordinate = 1.3; + zone1.CircleSurfacePointLeftXCoordinate = 1.2; + zone1.CircleSurfacePointRightXCoordinate = 1.3; outputItem.Zone1Results = zone1; var zone2 = new DamMacroStabilityOutputItem.ResultsSingleZone(); zone2.SafetyFactor = 0.9; - zone2.EntryPointXCoordinate = 2.2; - zone2.ExitPointXCoordinate = 2.3; + zone2.CircleSurfacePointLeftXCoordinate = 2.2; + zone2.CircleSurfacePointRightXCoordinate = 2.3; outputItem.Zone2Results = zone2; DamMacroStabilityOutput output = new DamMacroStabilityOutput(); output.StabilityOutputItems = new List(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs =================================================================== diff -u -r877 -r999 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs (.../DamMacroStabilityOutputItem.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs (.../DamMacroStabilityOutputItem.cs) (revision 999) @@ -53,13 +53,11 @@ public double SafetyFactor; public double CircleSurfacePointLeftXCoordinate; public double CircleSurfacePointRightXCoordinate; - public double EntryPointXCoordinate; - public double ExitPointXCoordinate; public void Init() { SafetyFactor = 0.0; - EntryPointXCoordinate = 0.0; - ExitPointXCoordinate = 0.0; + CircleSurfacePointLeftXCoordinate = 0.0; + CircleSurfacePointRightXCoordinate = 0.0; } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs =================================================================== diff -u -r992 -r999 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 992) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 999) @@ -357,15 +357,15 @@ var zone1 = new DamMacroStabilityOutputItem.ResultsSingleZone { SafetyFactor = 1.1, - EntryPointXCoordinate = 1.2, - ExitPointXCoordinate = 1.3 + CircleSurfacePointLeftXCoordinate = 1.2, + CircleSurfacePointRightXCoordinate = 1.3 }; outputItem.Zone1Results = zone1; var zone2 = new DamMacroStabilityOutputItem.ResultsSingleZone { SafetyFactor = 0.9, - EntryPointXCoordinate = 2.2, - ExitPointXCoordinate = 2.3 + CircleSurfacePointLeftXCoordinate = 2.2, + CircleSurfacePointRightXCoordinate = 2.3 }; outputItem.Zone2Results = zone2; DamMacroStabilityOutput output = new DamMacroStabilityOutput @@ -379,11 +379,11 @@ kernelWrapper.PostProcess(damKernelInput, output, "", out results); Assert.AreEqual(0.9, results[0].StabilityDesignResults.SafetyFactor); Assert.AreEqual(1.1, results[0].StabilityDesignResults.Zone1SafetyFactor); - Assert.AreEqual(1.2, results[0].StabilityDesignResults.LocalZone1EntryPointX); - Assert.AreEqual(1.3, results[0].StabilityDesignResults.LocalZone1ExitPointX); + Assert.AreEqual(1.3, results[0].StabilityDesignResults.LocalZone1EntryPointX); + Assert.AreEqual(1.2, results[0].StabilityDesignResults.LocalZone1ExitPointX); Assert.AreEqual(0.9, results[0].StabilityDesignResults.Zone2SafetyFactor); - Assert.AreEqual(2.2, results[0].StabilityDesignResults.LocalZone2EntryPointX); - Assert.AreEqual(2.3, results[0].StabilityDesignResults.LocalZone2ExitPointX); + Assert.AreEqual(2.3, results[0].StabilityDesignResults.LocalZone2EntryPointX); + Assert.AreEqual(2.2, results[0].StabilityDesignResults.LocalZone2ExitPointX); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs =================================================================== diff -u -r992 -r999 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 992) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 999) @@ -167,8 +167,6 @@ SafetyFactor = results[0].Zone1.SafetyFactor, CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate, CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate, - EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate, - ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate }; damMacroStabilityOutputItem.Zone1Results = zone1; if (results[0].Zone2 != null) @@ -178,8 +176,6 @@ SafetyFactor = results[0].Zone1.SafetyFactor, CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate, CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate, - EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate, - ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate }; damMacroStabilityOutputItem.Zone2Results = zone2; } @@ -270,17 +266,17 @@ var stabilityDesignResults = new StabilityDesignResults { Zone1SafetyFactor = damMacroStabilityOutputItem.Zone1Results.SafetyFactor, - LocalZone1EntryPointX = damMacroStabilityOutputItem.Zone1Results.EntryPointXCoordinate, - LocalZone1ExitPointX = damMacroStabilityOutputItem.Zone1Results.ExitPointXCoordinate + LocalZone1EntryPointX = damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointRightXCoordinate, + LocalZone1ExitPointX = damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointLeftXCoordinate }; stabilityDesignResults.SafetyFactor = stabilityDesignResults.Zone1SafetyFactor; if (damMacroStabilityOutputItem.Zone2Results != null) { var zone2 = (DamMacroStabilityOutputItem.ResultsSingleZone)damMacroStabilityOutputItem.Zone2Results; stabilityDesignResults.Zone2SafetyFactor = zone2.SafetyFactor; - stabilityDesignResults.LocalZone2EntryPointX = zone2.EntryPointXCoordinate; - stabilityDesignResults.LocalZone2ExitPointX = zone2.ExitPointXCoordinate; + stabilityDesignResults.LocalZone2EntryPointX = zone2.CircleSurfacePointRightXCoordinate; + stabilityDesignResults.LocalZone2ExitPointX = zone2.CircleSurfacePointLeftXCoordinate; stabilityDesignResults.SafetyFactor = Math.Min(damMacroStabilityOutputItem.Zone1Results.SafetyFactor, zone2.SafetyFactor); } designResult.StabilityDesignResults = stabilityDesignResults;