Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreator.cs
===================================================================
diff -u -r4540 -r5056
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreator.cs (.../UpliftVanGridCreator.cs) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreator.cs (.../UpliftVanGridCreator.cs) (revision 5056)
@@ -105,9 +105,8 @@
/// The uplift van calculation grid.
/// The slip circle definition.
/// The soil profile1 d.
- /// The minimum circle depth.
public static void DetermineTangentLines(UpliftVanCalculationGrid upliftVanCalculationGrid, SlipCircleDefinition slipCircleDefinition,
- SoilProfile1D soilProfile1D, double minimumCircleDepth)
+ SoilProfile1D soilProfile1D)
{
switch (slipCircleDefinition.UpliftVanTangentLinesDefinition)
{
@@ -117,13 +116,13 @@
break;
case TangentLinesDefinition.Specified:
DetermineTangentLinesSpecified(upliftVanCalculationGrid, soilProfile1D,
- slipCircleDefinition.UpliftVanTangentLinesDistance, minimumCircleDepth);
+ slipCircleDefinition.UpliftVanTangentLinesDistance);
break;
}
}
private static void DetermineTangentLinesSpecified(UpliftVanCalculationGrid upliftVanCalculationGrid,
- SoilProfile1D soilProfile1D, double distance, double minimumCircleDepth)
+ SoilProfile1D soilProfile1D, double distance)
{
if (!(distance > 0))
{
@@ -138,7 +137,7 @@
double surfaceLevel = soilProfile1D.Layers.First().TopLevel;
double bottomTangentLines = topOfBottomLayer - distance;
- bottomTangentLines = Math.Min(bottomTangentLines, surfaceLevel - minimumCircleDepth);
+ bottomTangentLines = Math.Min(bottomTangentLines, surfaceLevel);
double topTangentLines = bottomTangentLines;
var tangentLinesCount = 1;
upliftVanCalculationGrid.TangentLineLevels.Add(topTangentLines);
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs
===================================================================
diff -u -r4540 -r5056
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 5056)
@@ -213,13 +213,10 @@
public class MStabCalculationOptions : IAssignable, ICloneable
{
- public double MinimalCircleDepth { get; set; }
-
public MStabZonesType ZonesType { get; set; }
public void Assign(MStabCalculationOptions mstabCalculationOptions)
{
- MinimalCircleDepth = mstabCalculationOptions.MinimalCircleDepth;
ZonesType = mstabCalculationOptions.ZonesType;
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs
===================================================================
diff -u -r4540 -r5056
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 5056)
@@ -91,9 +91,8 @@
/// The bishop calculation grid.
/// The slip circle definition.
/// The soil profile1 d.
- /// The minimum circle depth.
public static void DetermineTangentLines(BishopCalculationGrid bishopCalculationGrid, SlipCircleDefinition slipCircleDefinition,
- SoilProfile1D soilProfile1D, double minimumCircleDepth)
+ SoilProfile1D soilProfile1D)
{
switch (slipCircleDefinition.BishopTangentLinesDefinition)
{
@@ -103,13 +102,13 @@
break;
case TangentLinesDefinition.Specified:
DetermineTangentLinesSpecified(bishopCalculationGrid, soilProfile1D,
- slipCircleDefinition.BishopTangentLinesDistance, minimumCircleDepth);
+ slipCircleDefinition.BishopTangentLinesDistance);
break;
}
}
private static void DetermineTangentLinesSpecified(BishopCalculationGrid bishopCalculationGrid,
- SoilProfile1D soilProfile1D, double distance, double minimumCircleDepth)
+ SoilProfile1D soilProfile1D, double distance)
{
if (!(distance > 0))
{
@@ -124,7 +123,7 @@
double surfaceLevel = soilProfile1D.Layers.First().TopLevel;
double bottomTangentLines = topOfBottomLayer - distance;
- bottomTangentLines = Math.Min(bottomTangentLines, surfaceLevel - minimumCircleDepth);
+ bottomTangentLines = Math.Min(bottomTangentLines, surfaceLevel);
double topTangentLines = bottomTangentLines;
var tangentLinesCount = 1;
bishopCalculationGrid.TangentLineLevels.Add(topTangentLines);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r5019 -r5056
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5019)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5056)
@@ -109,8 +109,6 @@
{
SlipCircleDefinition slipCircleDefinition = damKernelInput.DamFailureMechanismeCalculationSpecification
.FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition;
- double minimumCircleDepth = damKernelInput.DamFailureMechanismeCalculationSpecification
- .FailureMechanismParametersMStab.MStabParameters.CalculationOptions.MinimalCircleDepth;
MStabGridPosition gridPosition = damKernelInput.DamFailureMechanismeCalculationSpecification
.FailureMechanismParametersMStab.MStabParameters.GridPosition;
BishopCalculationGrid bishopCalculationGrid = BishopGridCreator.DetermineGridsFromSettings(gridPosition,
@@ -135,7 +133,7 @@
damKernelInput.SubSoilScenario.DetermineSoilProfile1DAtX(centerOfLeftGridXCoordinate,
damKernelInput.Location.SurfaceLine, damKernelInput.Location.GetDikeEmbankmentSoil());
BishopGridCreator.DetermineTangentLines(bishopCalculationGrid, slipCircleDefinition,
- soilProfile1DAtCenterOfLeftGridXCoordinate, minimumCircleDepth);
+ soilProfile1DAtCenterOfLeftGridXCoordinate);
return bishopCalculationGrid;
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r5055 -r5056
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 5055)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 5056)
@@ -473,8 +473,6 @@
{
SlipCircleDefinition slipCircleDefinition = damKernelInput.DamFailureMechanismeCalculationSpecification
.FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition;
- double minimumCircleDepth = damKernelInput.DamFailureMechanismeCalculationSpecification
- .FailureMechanismParametersMStab.MStabParameters.CalculationOptions.MinimalCircleDepth;
UpliftVanCalculationGrid upliftVanCalculationGrid = UpliftVanGridCreator.DetermineGridsFromSettings(
slipCircleDefinition, damKernelInput.Location.SurfaceLine);
double centerOfLeftGridXCoordinate =
@@ -484,7 +482,7 @@
damKernelInput.Location.SurfaceLine,
damKernelInput.Location.GetDikeEmbankmentSoil());
UpliftVanGridCreator.DetermineTangentLines(upliftVanCalculationGrid, slipCircleDefinition,
- soilProfile1DAtCenterOfLeftGridXCoordinate, minimumCircleDepth);
+ soilProfile1DAtCenterOfLeftGridXCoordinate);
return upliftVanCalculationGrid;
}