Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r6873 -r6946 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6873) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6946) @@ -43,7 +43,6 @@ using Soil = Deltares.Geotechnics.Soils.Soil; using SoilProfile1D = Deltares.Geotechnics.Soils.SoilProfile1D; using SoilProfile2D = Deltares.DamEngine.Io.XmlInput.SoilProfile2D; -using StabilityParameters = Deltares.Dam.Data.StabilityParameters; using TimeSerie = Deltares.Dam.Data.TimeSerie; namespace Deltares.Dam.Tests.DamEngineIo @@ -911,34 +910,29 @@ private static void FillStabilityParameters(DamProjectData damProjectData) { // Note: DamProjectCalculationSpecification created and filled by FillAnalysisSpecification - DamFailureMechanismeCalculationSpecification curspec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification; - curspec.StabilityParameters = new StabilityParameters + DamFailureMechanismeCalculationSpecification currentSpecification = + damProjectData.DamProjectCalculationSpecification.CurrentSpecification; + currentSpecification.SearchMethod = StabilitySearchMethod.Grid; + currentSpecification.IsUpliftVanRunOnlyWhenUpliftOccurs = false; + currentSpecification.SlipCircleDefinition = new SlipCircleDefinition { - MStabParameters = new MStabParameters - { - SearchMethod = StabilitySearchMethod.Grid, - IsUpliftVanRunOnlyWhenUpliftOccurs = false, - SlipCircleDefinition = new SlipCircleDefinition - { - UpliftVanGridSizeDetermination = GridSizeDetermination.Specified, - BishopSearchAreaDetermination = GridSizeDetermination.Specified, - BishopGridHorizontalPointCount = 4, - BishopGridHorizontalPointDistance = 1.2, - BishopGridVerticalPointCount = 5, - BishopGridVerticalPointDistance = 1.1, - BishopTangentLinesDistance = 0.25, - UpliftVanLeftGridHorizontalPointCount = 6, - UpliftVanLeftGridHorizontalPointDistance = 0.7, - UpliftVanLeftGridVerticalPointCount = 3, - UpliftVanLeftGridVerticalPointDistance = 1.3, - UpliftVanRightGridHorizontalPointCount = 8, - UpliftVanRightGridHorizontalPointDistance = 1.76, - UpliftVanRightGridVerticalPointCount = 11, - UpliftVanRightGridVerticalPointDistance = 0.14, - UpliftVanTangentLinesDefinition = TangentLinesDefinition.OnBoundaryLines, - UpliftVanTangentLinesDistance = 0.01 - } - } + UpliftVanGridSizeDetermination = GridSizeDetermination.Specified, + BishopSearchAreaDetermination = GridSizeDetermination.Specified, + BishopGridHorizontalPointCount = 4, + BishopGridHorizontalPointDistance = 1.2, + BishopGridVerticalPointCount = 5, + BishopGridVerticalPointDistance = 1.1, + BishopTangentLinesDistance = 0.25, + UpliftVanLeftGridHorizontalPointCount = 6, + UpliftVanLeftGridHorizontalPointDistance = 0.7, + UpliftVanLeftGridVerticalPointCount = 3, + UpliftVanLeftGridVerticalPointDistance = 1.3, + UpliftVanRightGridHorizontalPointCount = 8, + UpliftVanRightGridHorizontalPointDistance = 1.76, + UpliftVanRightGridVerticalPointCount = 11, + UpliftVanRightGridVerticalPointDistance = 0.14, + UpliftVanTangentLinesDefinition = TangentLinesDefinition.OnBoundaryLines, + UpliftVanTangentLinesDistance = 0.01 }; }