Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs =================================================================== diff -u -r1808 -r1825 --- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 1808) +++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 1825) @@ -253,11 +253,11 @@ { if (CalculationParameters.CalculationModules.Stability) { - RunStabilityInside(); + RunStability(FailureMechanismSystemType.StabilityInside); } if (CalculationParameters.CalculationModules.StabilityOutside) { - RunStabilityOutside(); + RunStability(FailureMechanismSystemType.StabilityInside); } if (CalculationParameters.CalculationModules.Overtopping) { @@ -285,10 +285,10 @@ } } - private void RunStabilityInside() + private void RunStability(FailureMechanismSystemType failureMechanismSystemType) { ReadUserSettingsSlipCircleDefinition(CalculationParameters.MStabParameters.SlipCircleDefinition); - DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityInside; + DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = failureMechanismSystemType; DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab.MStabParameters = CalculationParameters.MStabParameters; foreach (var location in DamProjectData.Locations) @@ -299,19 +299,6 @@ OutputTimeSeriesCollection.Series.AddRange(DamProjectData.OutputTimeSerieCollection.Series); } - private void RunStabilityOutside() - { - ReadUserSettingsSlipCircleDefinition(CalculationParameters.MStabParameters.SlipCircleDefinition); - DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside; - DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab.MStabParameters = - CalculationParameters.MStabParameters; - foreach (var location in DamProjectData.Locations) - { - location.StabilityZoneType = CalculationParameters.MStabParameters.ZonesType; - } - CallDamEngine(); - OutputTimeSeriesCollection.Series.AddRange(DamProjectData.OutputTimeSerieCollection.Series); - } private void CallDamEngine() { DamProjectData.MaxCalculationCores = MaxCalculationCores; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs =================================================================== diff -u -r1545 -r1825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 1825) @@ -20,7 +20,6 @@ // All rights reserved. using Deltares.Geometry; -using Deltares.Geotechnics; using Deltares.Geotechnics.GeotechnicalGeometry; using Deltares.Probabilistic; using Deltares.Standard.Extensions; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CalculationParameters.cs =================================================================== diff -u -r1545 -r1825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CalculationParameters.cs (.../CalculationParameters.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CalculationParameters.cs (.../CalculationParameters.cs) (revision 1825) @@ -26,9 +26,6 @@ namespace Deltares.Dam.Data { using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; public class CalculationModules { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs =================================================================== diff -u -r1545 -r1825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs (.../CalculationParametersAssembler.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs (.../CalculationParametersAssembler.cs) (revision 1825) @@ -21,7 +21,6 @@ using System; using System.IO; -using System.Linq; using System.Reflection; using System.Xml; using System.Xml.Linq;