Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs =================================================================== diff -u -r5702 -r5770 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 5702) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 5770) @@ -41,7 +41,6 @@ var bishopCalculationGrid = new BishopCalculationGrid { IsSearchAreaAutomatic = slipCircleDefinition.BishopSearchAreaDetermination == GridSizeDetermination.Automatic, - IsTangentLinesAutomatic = false, GridXLeft = 0, GridXRight = 0, GridXCount = 0, @@ -99,18 +98,10 @@ public static void DetermineTangentLines(BishopCalculationGrid bishopCalculationGrid, SlipCircleDefinition slipCircleDefinition, SoilProfile1D soilProfile1D) { - switch (slipCircleDefinition.BishopSearchAreaDetermination) + if (slipCircleDefinition.BishopSearchAreaDetermination == GridSizeDetermination.Specified) { - 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 GridSizeDetermination.Specified: - bishopCalculationGrid.IsTangentLinesAutomatic = false; - DetermineTangentLinesSpecified(bishopCalculationGrid, soilProfile1D, - slipCircleDefinition.BishopTangentLinesDistance); - break; + DetermineTangentLinesSpecified(bishopCalculationGrid, soilProfile1D, + slipCircleDefinition.BishopTangentLinesDistance); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/BishopCalculationGrid.cs =================================================================== diff -u -r5702 -r5770 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/BishopCalculationGrid.cs (.../BishopCalculationGrid.cs) (revision 5702) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/BishopCalculationGrid.cs (.../BishopCalculationGrid.cs) (revision 5770) @@ -56,10 +56,6 @@ /// Gets or sets the tangent line z top. /// The tangent line z top. - /// Gets or sets the tangent line creation automatic or specified. - /// The tangent line creation setting . - public bool IsTangentLinesAutomatic { get; set; } - public double TangentLineZTop { get; set; } /// Gets or sets the tangent line z bottom. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs =================================================================== diff -u -r5720 -r5770 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 5720) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 5770) @@ -363,7 +363,9 @@ private void TransferBishopSearchAreaSettings(SearchAreaConditions kernelSearchAreaConditions) { - kernelSearchAreaConditions.AutoTangentLines = BishopCalculationGrid.IsTangentLinesAutomatic; + // 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. + kernelSearchAreaConditions.AutoTangentLines = false; kernelSearchAreaConditions.AutoSearchArea = BishopCalculationGrid.IsSearchAreaAutomatic; kernelSearchAreaConditions.TangentLineNumber = BishopCalculationGrid.TangentLineCount; kernelSearchAreaConditions.TangentLineZTop = BishopCalculationGrid.TangentLineZTop; @@ -398,7 +400,7 @@ GridZBottom = BishopCalculationGrid.GridZBottom }; - if (!BishopCalculationGrid.IsTangentLinesAutomatic) + if (!BishopCalculationGrid.IsSearchAreaAutomatic) { kernelBishopCalculationCircle.TangentLines = BishopCalculationGrid.TangentLineLevels.ToArray(); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/BishopGridCreatorTests.cs =================================================================== diff -u -r5702 -r5770 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/BishopGridCreatorTests.cs (.../BishopGridCreatorTests.cs) (revision 5702) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/BishopGridCreatorTests.cs (.../BishopGridCreatorTests.cs) (revision 5770) @@ -79,7 +79,6 @@ // Then Assert.Multiple(() => { - Assert.That(bishopCalculationGrid.IsTangentLinesAutomatic, Is.False); CheckValuesTangentLines(bishopCalculationGrid); }); }