Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CalculationParameters.cs =================================================================== diff -u -r1825 -r1826 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CalculationParameters.cs (.../CalculationParameters.cs) (revision 1825) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CalculationParameters.cs (.../CalculationParameters.cs) (revision 1826) @@ -29,7 +29,7 @@ public class CalculationModules { - public bool Stability { get; set; } + public bool StabilityInside { get; set; } public bool StabilityOutside { get; set; } public bool PipingWti { get; set; } public bool PipingBligh { get; set; } Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/DamLive/Grebbedijk/live.ParametersFile.xml =================================================================== diff -u -r1551 -r1826 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/DamLive/Grebbedijk/live.ParametersFile.xml (.../live.ParametersFile.xml) (revision 1551) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/DamLive/Grebbedijk/live.ParametersFile.xml (.../live.ParametersFile.xml) (revision 1826) @@ -23,7 +23,7 @@ --> - 1 + 1 0 0 0 Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs =================================================================== diff -u -r1825 -r1826 --- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 1825) +++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 1826) @@ -251,7 +251,7 @@ private void RunSelectedModels() { - if (CalculationParameters.CalculationModules.Stability) + if (CalculationParameters.CalculationModules.StabilityInside) { RunStability(FailureMechanismSystemType.StabilityInside); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs =================================================================== diff -u -r1825 -r1826 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs (.../CalculationParametersAssembler.cs) (revision 1825) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs (.../CalculationParametersAssembler.cs) (revision 1826) @@ -45,6 +45,7 @@ public const string XmlCalculationModulesElementName = "CalculationModules"; public const string XmlStabilityElementName = "Stability"; + public const string XmlStabilityInsideElementName = "StabilityInside"; public const string XmlStabilityOutsideElementName = "StabilityOutside"; public const string XmlPipingWtiElementName = "PipingWti"; public const string XmlPipingBlighElementName = "PipingBligh"; @@ -104,9 +105,15 @@ { CalculationModules calculationModules = new CalculationModules(); + // For backward compatibility: + // This line is needed, so old files (with identifier Stability i.s.o. StabilityInside) still can be processed XElement element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityElementName); if (element != null) - calculationModules.Stability = int.Parse(element.Value) != 0; + calculationModules.StabilityInside = int.Parse(element.Value) != 0; + + element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityInsideElementName); + if (element != null) + calculationModules.StabilityInside = int.Parse(element.Value) != 0; element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityOutsideElementName); if (element != null) calculationModules.StabilityOutside = int.Parse(element.Value) != 0; Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs =================================================================== diff -u -r1670 -r1826 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 1670) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 1826) @@ -348,7 +348,7 @@ PipingIJkdijk = false, PipingSellmeijer = false, PipingSellmeijerProbabilistic = false, - Stability = true + StabilityInside = true } }, DamProjectData = damProjectData, Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs =================================================================== diff -u -r1681 -r1826 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs (.../DamLiveGrebbedijkTest.cs) (revision 1681) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs (.../DamLiveGrebbedijkTest.cs) (revision 1826) @@ -193,7 +193,7 @@ { Assert.IsTrue(validParameterIDs.Any(n => n == timeSeries.ParameterId)); Assert.IsTrue(locations.Any(l => l.Name == timeSeries.LocationId)); - // Stability inside check + // StabilityInside check if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString()) { if (timeSeries.LocationId == "grebbedijk1a") Index: DamClients/DamLive/trunk/data/Projects/Pulau Tekong/live.ParametersFile.xml =================================================================== diff -u -r1808 -r1826 --- DamClients/DamLive/trunk/data/Projects/Pulau Tekong/live.ParametersFile.xml (.../live.ParametersFile.xml) (revision 1808) +++ DamClients/DamLive/trunk/data/Projects/Pulau Tekong/live.ParametersFile.xml (.../live.ParametersFile.xml) (revision 1826) @@ -1,7 +1,7 @@  - 0 + 0 1 0 0 Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd =================================================================== diff -u -r1545 -r1826 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd (.../CalculationParametersDefinition.xsd) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd (.../CalculationParametersDefinition.xsd) (revision 1826) @@ -67,6 +67,7 @@ + Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekong.cs =================================================================== diff -u -r1815 -r1826 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekong.cs (.../DamLivePulauTekong.cs) (revision 1815) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekong.cs (.../DamLivePulauTekong.cs) (revision 1826) @@ -190,7 +190,7 @@ { Assert.IsTrue(validParameterIDs.Any(n => n == timeSeries.ParameterId)); Assert.IsTrue(locations.Any(l => l.Name == timeSeries.LocationId)); - // Stability outside check + // StabilityOutside check if (timeSeries.ParameterId == TimeSerieParameters.StabilityOutsideFactor.ToString()) { if (timeSeries.LocationId == "CD CS1 X1")