Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/CSharpWrapperConverters.cs =================================================================== diff -u -r6391 -r6393 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/CSharpWrapperConverters.cs (.../CSharpWrapperConverters.cs) (revision 6391) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/CSharpWrapperConverters.cs (.../CSharpWrapperConverters.cs) (revision 6393) @@ -47,20 +47,15 @@ Grid = new CalculationGrid(), TangentLines = new List() }; + // Transfer grid bishopCalculationCircle.Grid.GridXLeft = inputBishopCalculationGrid.GridXLeft; bishopCalculationCircle.Grid.GridXRight = inputBishopCalculationGrid.GridXRight; bishopCalculationCircle.Grid.GridXNumber = inputBishopCalculationGrid.GridXCount; bishopCalculationCircle.Grid.GridZTop = inputBishopCalculationGrid.GridZTop; bishopCalculationCircle.Grid.GridZBottom = inputBishopCalculationGrid.GridZBottom; bishopCalculationCircle.Grid.GridZNumber = inputBishopCalculationGrid.GridZCount; - double currentTangentLevel = inputBishopCalculationGrid.TangentLineZTop; - double tangentIncrement = (inputBishopCalculationGrid.TangentLineZTop - inputBishopCalculationGrid.TangentLineZBottom) / - (inputBishopCalculationGrid.TangentLineCount - 1); - for (var i = 0; i < inputBishopCalculationGrid.TangentLineCount; i++) - { - bishopCalculationCircle.TangentLines.Add(currentTangentLevel); - currentTangentLevel -= tangentIncrement; - } + // Transfer tangent lines + bishopCalculationCircle.TangentLines = inputBishopCalculationGrid.TangentLineLevels; return bishopCalculationCircle; } @@ -98,14 +93,7 @@ upliftVanCalculationGrid.RightGrid.GridZBottom = inputUpliftVanCalculationGrid.RightGridZBottom; upliftVanCalculationGrid.RightGrid.GridZNumber = inputUpliftVanCalculationGrid.RightGridZCount; // Transfer tangent lines - double currentTangentLevel = inputUpliftVanCalculationGrid.TangentLineZTop; - double tangentIncrement = (inputUpliftVanCalculationGrid.TangentLineZTop - inputUpliftVanCalculationGrid.TangentLineZBottom) / - (inputUpliftVanCalculationGrid.TangentLineCount - 1); - for (var i = 0; i < inputUpliftVanCalculationGrid.TangentLineCount; i++) - { - upliftVanCalculationGrid.TangentLines.Add(currentTangentLevel); - currentTangentLevel -= tangentIncrement; - } + upliftVanCalculationGrid.TangentLines = inputUpliftVanCalculationGrid.TangentLineLevels; return upliftVanCalculationGrid; } @@ -122,6 +110,7 @@ return null; } + // Transfer grid var bishopCalculationGrid = new BishopCalculationGrid { GridXLeft = inputBishopCalculationCircle.Grid.GridXLeft, @@ -134,6 +123,8 @@ TangentLineZBottom = inputBishopCalculationCircle.TangentLines.Last(), TangentLineCount = inputBishopCalculationCircle.TangentLines.Count }; + // Transfer tangent lines + bishopCalculationGrid.TangentLineLevels = inputBishopCalculationCircle.TangentLines.ToList(); return bishopCalculationGrid; } @@ -149,6 +140,7 @@ return null; } + // Transfer grids var upliftVanCalculationGrid = new UpliftVanCalculationGrid { LeftGridXLeft = inputUpliftVanCalculationGrid.LeftGrid.GridXLeft, @@ -167,6 +159,9 @@ TangentLineZBottom = inputUpliftVanCalculationGrid.TangentLines.Last(), TangentLineCount = inputUpliftVanCalculationGrid.TangentLines.Count }; + // Transfer tangent lines + upliftVanCalculationGrid.TangentLineLevels = inputUpliftVanCalculationGrid.TangentLines.ToList(); + return upliftVanCalculationGrid; } } \ No newline at end of file