Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/BishopCalculationGrid.cs =================================================================== diff -u -r4540 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/BishopCalculationGrid.cs (.../BishopCalculationGrid.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/BishopCalculationGrid.cs (.../BishopCalculationGrid.cs) (revision 5702) @@ -26,9 +26,9 @@ /// Parameters for the UpliftVan MacroStability kernel; used for IO public class BishopCalculationGrid { - /// Gets or sets the IsGridsAutomatic option. - /// IsGridsAutomatic. - public bool IsGridsAutomatic { get; set; } + /// Gets or sets the IsSearchAreaAutomatic option. + /// IsSearchAreaAutomatic. + public bool IsSearchAreaAutomatic { get; set; } /// Gets or sets the grid x left. /// The grid x left. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs =================================================================== diff -u -r5684 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 5684) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 5702) @@ -364,7 +364,7 @@ private void TransferBishopSearchAreaSettings(SearchAreaConditions kernelSearchAreaConditions) { kernelSearchAreaConditions.AutoTangentLines = BishopCalculationGrid.IsTangentLinesAutomatic; - kernelSearchAreaConditions.AutoSearchArea = BishopCalculationGrid.IsGridsAutomatic; + kernelSearchAreaConditions.AutoSearchArea = BishopCalculationGrid.IsSearchAreaAutomatic; kernelSearchAreaConditions.TangentLineNumber = BishopCalculationGrid.TangentLineCount; kernelSearchAreaConditions.TangentLineZTop = BishopCalculationGrid.TangentLineZTop; kernelSearchAreaConditions.TangentLineZBottom = BishopCalculationGrid.TangentLineZBottom; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r5671 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 5671) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 5702) @@ -722,7 +722,7 @@ sd.UpliftVanRightGridVerticalPointDistance = 1; sd.UpliftVanTangentLinesDefinition = tangentLinesDefinition; sd.UpliftVanTangentLinesDistance = 1; - sd.GridSizeDetermination = gridSizeDetermination; + sd.UpliftVanGridSizeDetermination = gridSizeDetermination; damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.Model = modelType; damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.SearchMethod = searchMethod; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r5467 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 5467) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 5702) @@ -323,9 +323,8 @@ SlipCircleDefinition slipCircleDefinition = curSpec.FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition; if (slipCircleDefinition != null) { - input.StabilityParameters.GridDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.GridSizeDetermination); - input.StabilityParameters.BishopTangentLinesDefinitionSpecified = true; - input.StabilityParameters.BishopTangentLinesDefinition = ConversionHelper.ConvertToInputTangentLinesDefinition(slipCircleDefinition.BishopTangentLinesDefinition); + input.StabilityParameters.UpliftVanGridDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.UpliftVanGridSizeDetermination); + input.StabilityParameters.BishopSearchAreaDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.BishopSearchAreaDetermination); input.StabilityParameters.BishopTangentLinesDistanceSpecified = true; input.StabilityParameters.BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance; input.StabilityParameters.BishopGridVerticalPointsCountSpecified = true; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/BishopGridCreatorTests.cs =================================================================== diff -u -r5669 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/BishopGridCreatorTests.cs (.../BishopGridCreatorTests.cs) (revision 5669) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/BishopGridCreatorTests.cs (.../BishopGridCreatorTests.cs) (revision 5702) @@ -51,14 +51,14 @@ public void GivenSlipCircleDefinition_WhenDetermineGrid_ThenGridIsAsExpected(MStabGridPosition gridPosition, bool isGridSpecified) { // Given - SlipCircleDefinition slipCircleDefinition = CreateSlipCircleDefinition(isGridSpecified, true); + SlipCircleDefinition slipCircleDefinition = CreateSlipCircleDefinition(isGridSpecified); SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForTestingGrid(10.0, 80.0); // When BishopCalculationGrid bishopCalculationGrid = BishopGridCreator.DetermineGridsFromSettings(gridPosition, slipCircleDefinition, surfaceLine); // Then Assert.Multiple(() => { - Assert.That(bishopCalculationGrid.IsGridsAutomatic, Is.Not.EqualTo(isGridSpecified)); + Assert.That(bishopCalculationGrid.IsSearchAreaAutomatic, Is.Not.EqualTo(isGridSpecified)); CheckValuesGrid(bishopCalculationGrid, surfaceLine, gridPosition); }); } @@ -69,16 +69,17 @@ public void GivenSlipCircleDefinitionAndSoilProfile1D_WhenDetermineTangentLines_ThenTangentLinesAreAsExpected(bool isTangentLinesSpecified) { // Given - SlipCircleDefinition slipCircleDefinition = CreateSlipCircleDefinition(true, isTangentLinesSpecified); + SlipCircleDefinition slipCircleDefinition = CreateSlipCircleDefinition(isTangentLinesSpecified); SoilProfile1D soilProfile1D = FactoryForSoilProfiles.CreateClaySandProfile(out _, surfaceLevelSoilProfile1D, bottomLayerSoilProfile1D); // When var bishopCalculationGrid = new BishopCalculationGrid(); + bishopCalculationGrid.IsSearchAreaAutomatic = !isTangentLinesSpecified; BishopGridCreator.DetermineTangentLines(bishopCalculationGrid, slipCircleDefinition, soilProfile1D); // Then Assert.Multiple(() => { - Assert.That(bishopCalculationGrid.IsTangentLinesAutomatic, Is.Not.EqualTo(isTangentLinesSpecified)); + Assert.That(bishopCalculationGrid.IsTangentLinesAutomatic, Is.False); CheckValuesTangentLines(bishopCalculationGrid); }); } @@ -91,7 +92,7 @@ var expectedZBottom = 0.0; var expectedZTop = 0.0; var expectedZCount = 0; - if (!bishopCalculationGrid.IsGridsAutomatic) + if (!bishopCalculationGrid.IsSearchAreaAutomatic) { GeometryPoint dikeTopAtRiver = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); GeometryPoint dikeTopAtPolder = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); @@ -130,7 +131,7 @@ var expectedZTop = 0.0; var expectedCount = 0; - if (!bishopCalculationGrid.IsTangentLinesAutomatic) + if (!bishopCalculationGrid.IsSearchAreaAutomatic) { expectedZBottom = bottomLayerSoilProfile1D - specifiedTangentDistance; expectedCount = (int) Math.Round((surfaceLevelSoilProfile1D - expectedZBottom) / specifiedTangentDistance) + 1; @@ -146,19 +147,17 @@ }); } - private static SlipCircleDefinition CreateSlipCircleDefinition(bool isGridSpecified, bool isTangentLinesSpecified) -{ - var slipCircleDefinition = new SlipCircleDefinition + private static SlipCircleDefinition CreateSlipCircleDefinition(bool isSearchAreaSpecified) { - GridSizeDetermination = isGridSpecified ? GridSizeDetermination.Specified : GridSizeDetermination.Automatic, - BishopGridVerticalPointCount = specifiedGridZPoints, - BishopGridVerticalPointDistance = specifiedGridHeight / (specifiedGridZPoints - 1), - BishopGridHorizontalPointCount = specifiedGridXPoints, - BishopGridHorizontalPointDistance = specifiedGridWidth / (specifiedGridXPoints - 1), - BishopTangentLinesDefinition = isTangentLinesSpecified ? TangentLinesDefinition.Specified: TangentLinesDefinition.OnBoundaryLines, - BishopTangentLinesDistance = specifiedTangentDistance - }; - return slipCircleDefinition; -} - + var slipCircleDefinition = new SlipCircleDefinition + { + BishopSearchAreaDetermination = isSearchAreaSpecified ? GridSizeDetermination.Specified : GridSizeDetermination.Automatic, + BishopGridVerticalPointCount = specifiedGridZPoints, + BishopGridVerticalPointDistance = specifiedGridHeight / (specifiedGridZPoints - 1), + BishopGridHorizontalPointCount = specifiedGridXPoints, + BishopGridHorizontalPointDistance = specifiedGridWidth / (specifiedGridXPoints - 1), + BishopTangentLinesDistance = specifiedTangentDistance + }; + return slipCircleDefinition; + } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs =================================================================== diff -u -r5669 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 5669) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 5702) @@ -40,8 +40,8 @@ { var bishopCalculationGrid = new BishopCalculationGrid { - IsGridsAutomatic = slipCircleDefinition.GridSizeDetermination == GridSizeDetermination.Automatic, - IsTangentLinesAutomatic = slipCircleDefinition.BishopTangentLinesDefinition == TangentLinesDefinition.OnBoundaryLines, + IsSearchAreaAutomatic = slipCircleDefinition.BishopSearchAreaDetermination == GridSizeDetermination.Automatic, + IsTangentLinesAutomatic = false, GridXLeft = 0, GridXRight = 0, GridXCount = 0, @@ -53,7 +53,7 @@ TangentLineCount = 0 }; - if (slipCircleDefinition.GridSizeDetermination == GridSizeDetermination.Automatic) + if (slipCircleDefinition.BishopSearchAreaDetermination == GridSizeDetermination.Automatic) { return bishopCalculationGrid; } @@ -99,13 +99,14 @@ public static void DetermineTangentLines(BishopCalculationGrid bishopCalculationGrid, SlipCircleDefinition slipCircleDefinition, SoilProfile1D soilProfile1D) { - switch (slipCircleDefinition.BishopTangentLinesDefinition) + switch (slipCircleDefinition.BishopSearchAreaDetermination) { - case TangentLinesDefinition.OnBoundaryLines: - // In the Macrostability kernel, the automatic tangent lines are set to the boundaries, no need to do anything here. - bishopCalculationGrid.IsTangentLinesAutomatic = true; + case GridSizeDetermination.Automatic: + // In the Macrostability kernel, for Bishop, the automatic tangent lines are set by AutoSearchArea = True. + // Setting AutoTangentLines to true will create the automatic tangent lines of Uplift-Van which is not desired. + bishopCalculationGrid.IsTangentLinesAutomatic = false; break; - case TangentLinesDefinition.Specified: + case GridSizeDetermination.Specified: bishopCalculationGrid.IsTangentLinesAutomatic = false; DetermineTangentLinesSpecified(bishopCalculationGrid, soilProfile1D, slipCircleDefinition.BishopTangentLinesDistance); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreator.cs =================================================================== diff -u -r5669 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreator.cs (.../UpliftVanGridCreator.cs) (revision 5669) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreator.cs (.../UpliftVanGridCreator.cs) (revision 5702) @@ -39,7 +39,7 @@ { var upliftVanCalculationGrid = new UpliftVanCalculationGrid { - IsGridsAutomatic = slipCircleDefinition.GridSizeDetermination == GridSizeDetermination.Automatic, + IsGridsAutomatic = slipCircleDefinition.UpliftVanGridSizeDetermination == GridSizeDetermination.Automatic, IsTangentLinesAutomatic = slipCircleDefinition.UpliftVanTangentLinesDefinition == TangentLinesDefinition.OnBoundaryLines, RightGridXLeft = 0, RightGridXRight = 0, @@ -58,7 +58,7 @@ TangentLineCount = 0 }; - if (slipCircleDefinition.GridSizeDetermination == GridSizeDetermination.Automatic) + if (slipCircleDefinition.UpliftVanGridSizeDetermination == GridSizeDetermination.Automatic) { return upliftVanCalculationGrid; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreatorTests.cs =================================================================== diff -u -r5669 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreatorTests.cs (.../UpliftVanGridCreatorTests.cs) (revision 5669) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreatorTests.cs (.../UpliftVanGridCreatorTests.cs) (revision 5702) @@ -210,7 +210,7 @@ { var slipCircleDefinition = new SlipCircleDefinition { - GridSizeDetermination = isGridSpecified ? GridSizeDetermination.Specified : GridSizeDetermination.Automatic, + UpliftVanGridSizeDetermination = isGridSpecified ? GridSizeDetermination.Specified : GridSizeDetermination.Automatic, UpliftVanLeftGridVerticalPointCount = 36, UpliftVanLeftGridVerticalPointDistance = 2, UpliftVanLeftGridHorizontalPointCount = 14, Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs =================================================================== diff -u -r5662 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs (.../FillEngineFromMacroStabilityWrapperInput.cs) (revision 5662) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs (.../FillEngineFromMacroStabilityWrapperInput.cs) (revision 5702) @@ -171,7 +171,7 @@ { SlipCircleDefinition = new SlipCircleDefinition { - GridSizeDetermination = kernelSearchAreaConditions.AutoSearchArea + UpliftVanGridSizeDetermination = kernelSearchAreaConditions.AutoSearchArea ? GridSizeDetermination.Automatic : GridSizeDetermination.Specified }; Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r5467 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 5467) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 5702) @@ -1291,12 +1291,8 @@ private int searchMethodField; - private int gridDeterminationField; + private int bishopSearchAreaDeterminationField; - private int bishopTangentLinesDefinitionField; - - private bool bishopTangentLinesDefinitionFieldSpecified; - private double bishopTangentLinesDistanceField; private bool bishopTangentLinesDistanceFieldSpecified; @@ -1317,6 +1313,8 @@ private bool bishopGridHorizontalPointsDistanceFieldSpecified; + private int upliftVanGridDeterminationField; + private int upliftVanGridLeftVerticalPointsCountField; private bool upliftVanGridLeftVerticalPointsCountFieldSpecified; @@ -1370,39 +1368,17 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int GridDetermination { + public int BishopSearchAreaDetermination { get { - return this.gridDeterminationField; + return this.bishopSearchAreaDeterminationField; } set { - this.gridDeterminationField = value; + this.bishopSearchAreaDeterminationField = value; } } /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int BishopTangentLinesDefinition { - get { - return this.bishopTangentLinesDefinitionField; - } - set { - this.bishopTangentLinesDefinitionField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool BishopTangentLinesDefinitionSpecified { - get { - return this.bishopTangentLinesDefinitionFieldSpecified; - } - set { - this.bishopTangentLinesDefinitionFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public double BishopTangentLinesDistance { get { return this.bishopTangentLinesDistanceField; @@ -1513,6 +1489,17 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] + public int UpliftVanGridDetermination { + get { + return this.upliftVanGridDeterminationField; + } + set { + this.upliftVanGridDeterminationField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] public int UpliftVanGridLeftVerticalPointsCount { get { return this.upliftVanGridLeftVerticalPointsCountField; Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r5476 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 5476) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 5702) @@ -257,12 +257,12 @@ SearchMethod = MStabSearchMethod.Grid, SlipCircleDefinition = new SlipCircleDefinition { - GridSizeDetermination = GridSizeDetermination.Specified, + UpliftVanGridSizeDetermination = GridSizeDetermination.Specified, + BishopSearchAreaDetermination = GridSizeDetermination.Specified, BishopGridHorizontalPointCount = 4, BishopGridHorizontalPointDistance = 1.2, BishopGridVerticalPointCount = 5, BishopGridVerticalPointDistance = 1.1, - BishopTangentLinesDefinition = TangentLinesDefinition.Specified, BishopTangentLinesDistance = 0.25, UpliftVanLeftGridHorizontalPointCount = 6, UpliftVanLeftGridHorizontalPointDistance = 0.7, Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r5476 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 5476) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 5702) @@ -261,7 +261,7 @@ private static void CompareUpliftVanCalculationGridSettings(SlipCircleDefinition expectedSlipCircleDefinition, SlipCircleDefinition actualSlipCircleDefinition) { - Assert.That(actualSlipCircleDefinition.GridSizeDetermination, Is.EqualTo(expectedSlipCircleDefinition.GridSizeDetermination)); + Assert.That(actualSlipCircleDefinition.UpliftVanGridSizeDetermination, Is.EqualTo(expectedSlipCircleDefinition.UpliftVanGridSizeDetermination)); Assert.That(actualSlipCircleDefinition.UpliftVanTangentLinesDefinition, Is.EqualTo(expectedSlipCircleDefinition.UpliftVanTangentLinesDefinition)); // Note: do not test UpliftVanTangentLinesDistance as there is no way to be sure of equal values as determination to and from involves rounding. //Assert.AreEqual(expectedSlipCircleDefinition.UpliftVanTangentLinesDistance, actualSlipCircleDefinition.UpliftVanTangentLinesDistance); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs =================================================================== diff -u -r5593 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5593) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5702) @@ -117,7 +117,7 @@ BishopCalculationGrid bishopCalculationGrid = BishopGridCreator.DetermineGridsFromSettings(gridPosition, slipCircleDefinition, damKernelInput.Location.SurfaceLine); double centerOfLeftGridXCoordinate = (bishopCalculationGrid.GridXLeft + bishopCalculationGrid.GridXRight) * 0.5; - if (bishopCalculationGrid.IsGridsAutomatic) + if (bishopCalculationGrid.IsSearchAreaAutomatic) { if (damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r5539 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 5539) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 5702) @@ -334,13 +334,10 @@ curStabParamas.SlipCircleDefinition = new SlipCircleDefinition(); SlipCircleDefinition slipCircleDefinition = curStabParamas.SlipCircleDefinition; - slipCircleDefinition.GridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.GridDetermination); + slipCircleDefinition.UpliftVanGridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.UpliftVanGridDetermination); + slipCircleDefinition.UpliftVanTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.UpliftVanTangentLinesDefinition); + slipCircleDefinition.BishopSearchAreaDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.BishopSearchAreaDetermination); - if (input.StabilityParameters.BishopTangentLinesDefinitionSpecified) - { - slipCircleDefinition.BishopTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.BishopTangentLinesDefinition); - } - if (input.StabilityParameters.BishopTangentLinesDistanceSpecified) { slipCircleDefinition.BishopTangentLinesDistance = input.StabilityParameters.BishopTangentLinesDistance; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs =================================================================== diff -u -r5687 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs (.../GeometryData.cs) (revision 5687) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs (.../GeometryData.cs) (revision 5702) @@ -145,7 +145,7 @@ /// Deletes the curve if the aValidate is true. /// /// The curve to delete - /// Indocates whether the validation was successful + /// Indicates whether the validation was successful public void DeleteCurve(GeometryCurve geometryCurve, bool validate) { GeometryCurve curve = geometryCurve; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs =================================================================== diff -u -r5627 -r5702 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 5627) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 5702) @@ -80,11 +80,11 @@ public double UpliftVanTangentLinesDistance { get; set; } - public TangentLinesDefinition BishopTangentLinesDefinition { get; set; } + public GridSizeDetermination BishopSearchAreaDetermination { get; set; } public double BishopTangentLinesDistance { get; set; } - public GridSizeDetermination GridSizeDetermination { get; set; } + public GridSizeDetermination UpliftVanGridSizeDetermination { get; set; } public int UpliftVanLeftGridVerticalPointCount { get; set; } @@ -117,9 +117,7 @@ XCoordinateLowestUpliftFactorPoint = slipCircleDefinition.XCoordinateLowestUpliftFactorPoint; UpliftVanTangentLinesDefinition = slipCircleDefinition.UpliftVanTangentLinesDefinition; UpliftVanTangentLinesDistance = slipCircleDefinition.UpliftVanTangentLinesDistance; - BishopTangentLinesDefinition = slipCircleDefinition.BishopTangentLinesDefinition; - BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance; - GridSizeDetermination = slipCircleDefinition.GridSizeDetermination; + UpliftVanGridSizeDetermination = slipCircleDefinition.UpliftVanGridSizeDetermination; UpliftVanLeftGridVerticalPointCount = slipCircleDefinition.UpliftVanLeftGridVerticalPointCount; UpliftVanLeftGridVerticalPointDistance = slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance; UpliftVanLeftGridHorizontalPointCount = slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount; @@ -128,6 +126,8 @@ UpliftVanRightGridVerticalPointDistance = slipCircleDefinition.UpliftVanRightGridVerticalPointDistance; UpliftVanRightGridHorizontalPointCount = slipCircleDefinition.UpliftVanRightGridHorizontalPointCount; UpliftVanRightGridHorizontalPointDistance = slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance; + BishopSearchAreaDetermination = slipCircleDefinition.BishopSearchAreaDetermination; + BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance; BishopGridVerticalPointCount = slipCircleDefinition.BishopGridVerticalPointCount; BishopGridVerticalPointDistance = slipCircleDefinition.BishopGridVerticalPointDistance; BishopGridHorizontalPointCount = slipCircleDefinition.BishopGridHorizontalPointCount;