Index: DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs =================================================================== diff -u -r2955 -r3128 --- DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 2955) +++ DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 3128) @@ -48,7 +48,6 @@ Assert.AreEqual(1, damProjectData.WaterBoard.Dikes.Count); var dike = damProjectData.WaterBoard.Dikes[0]; Assert.AreEqual(expectedLocations, dike.Locations.Count); - damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityKernelType = StabilityKernelType.DamClassicStability; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.Bishop; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside; Index: DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs =================================================================== diff -u -r2956 -r3128 --- DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 2956) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 3128) @@ -22,15 +22,14 @@ using Deltares.Dam.Data.DamEngineIo; using Deltares.DamEngine.Interface; using Deltares.DamEngine.Io; +using System.Collections.Generic; +using Deltares.Dam.Data; +using Deltares.Standard.TestUtils; +using NUnit.Framework; +using Deltares.Dam.TestHelper; namespace Deltares.Dam.Tests { - using System.Collections.Generic; - using Data; - using Deltares.Standard.TestUtils; - using NUnit.Framework; - using TestHelper; - [TestFixture] public class DamCalculationBenchmarkTest { @@ -59,8 +58,6 @@ Assert.AreEqual(expectedLocations, dike.Locations.Count); // Specify calculation - damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityKernelType = - StabilityKernelType.DamClassicStability; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.Bishop; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r3126 -r3128 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 3126) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 3128) @@ -40,7 +40,6 @@ private Enum calculationModel; private FailureMechanismeParamatersMStab failureMechanismeParamatersMStab; private static DamProjectType damProjectType; - private StabilityKernelType stabilityKernelType = StabilityKernelType.DamClassicStability; private Boolean firstTime = true; public DamFailureMechanismeCalculationSpecification() @@ -161,21 +160,13 @@ } } - [Browsable(false)] - public StabilityKernelType StabilityKernelType - { - get { return stabilityKernelType; } - set { stabilityKernelType = value; } - } - public void Assign(DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculation) { failureMechanismSystemType = damFailureMechanismeCalculation.FailureMechanismSystemType; calculationModel = damFailureMechanismeCalculation.CalculationModel; pipingModelType = damFailureMechanismeCalculation.pipingModelType; failureMechanismeParamatersMStab.Assign(damFailureMechanismeCalculation.FailureMechanismeParamatersMStab); StabilityModelType = damFailureMechanismeCalculation.StabilityModelType; - stabilityKernelType = damFailureMechanismeCalculation.StabilityKernelType; //assign interface } @@ -191,7 +182,6 @@ public override string ToString() { string description = ""; - description += String.Format("{0}", StabilityKernelType); description += String.Format("{0}", this.FailureMechanismSystemType); if ((this.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) || (this.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside))