Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs =================================================================== diff -u -r6130 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 6130) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 6953) @@ -77,9 +77,7 @@ Assert.Multiple(() => { Assert.That(runner.DamProjectData, Is.Not.Null); - Assert.That(runner.CalculationParameters, Is.Not.Null); }); - Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); runner.Run(); runner.OutputTimeSeriesCollection.Save("WtiPipingOutputFile" + maxCores + ".xml"); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideUpliftVanGrid/DAMLive.damx =================================================================== diff -u -r6910 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideUpliftVanGrid/DAMLive.damx (.../DAMLive.damx) (revision 6910) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideUpliftVanGrid/DAMLive.damx (.../DAMLive.damx) (revision 6953) @@ -1,8 +1,8 @@  - - - - + + + + @@ -165,9 +165,9 @@ - - - + + + @@ -895,8 +895,8 @@ - - + + @@ -905,7 +905,7 @@ - + @@ -1137,8 +1137,8 @@ - - + + @@ -1147,7 +1147,7 @@ - + @@ -1379,8 +1379,8 @@ - - + + @@ -1389,7 +1389,7 @@ - + @@ -1621,8 +1621,8 @@ - - + + @@ -1631,7 +1631,7 @@ - + @@ -1939,8 +1939,8 @@ - - + + @@ -1949,7 +1949,7 @@ - + @@ -2110,8 +2110,8 @@ - - + + @@ -2120,7 +2120,7 @@ - + @@ -2281,8 +2281,8 @@ - - + + @@ -2291,7 +2291,7 @@ - + @@ -2452,8 +2452,8 @@ - - + + @@ -2508,2017 +2508,2013 @@ - - - + + + - - - - - - + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - - + + + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - - + + + + - - + + - + - + - - - + + + - + - + - + + + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4545,755 +4541,757 @@ - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - + - - - - - + + + + + + + @@ -5360,21 +5358,21 @@ - - - + - + - - + + + - - + + + @@ -5409,37 +5407,35 @@ - - - + - + - + - + - + - + + + - - - + Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs =================================================================== diff -u -r6130 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 6130) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 6953) @@ -83,14 +83,8 @@ Assert.Multiple(() => { Assert.That(runner.DamProjectData, Is.Not.Null); - Assert.That(runner.CalculationParameters, Is.Not.Null); }); - Assert.Multiple(() => - { - Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); - Assert.That(runner.CalculationParameters.StabilityParameters, Is.Not.Null); - }); - + runner.Run(); runner.OutputTimeSeriesCollection.Save("StabilityInsideUpliftVanBeeSwarmOutputFile" + maxCores + ".xml"); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs =================================================================== diff -u -r6561 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs (.../StabilityInside2DTests.cs) (revision 6561) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs (.../StabilityInside2DTests.cs) (revision 6953) @@ -74,13 +74,8 @@ Assert.Multiple(() => { Assert.That(runner.DamProjectData, Is.Not.Null); - Assert.That(runner.CalculationParameters, Is.Not.Null); }); - Assert.Multiple(() => - { - Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); - Assert.That(runner.CalculationParameters.StabilityParameters, Is.Not.Null); - }); + runner.StabilityWorkingPath = Path.GetTempPath(); runner.Run(); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs =================================================================== diff -u -r6818 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 6818) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 6953) @@ -66,14 +66,6 @@ public DamProjectData DamProjectData { get; set; } /// - /// Gets or sets the calculation parameters. - /// - /// - /// The calculation parameters. - /// - public CalculationParameters CalculationParameters { get; set; } - - /// /// Gets or sets the output time series collection. /// /// @@ -289,51 +281,55 @@ OutputTimeSeriesCollection = InputTimeSeriesCollection.GetShallowCopy(); } - - if (CalculationParameters == null && ParametersFile != null) + + //perhaps is some sort of test needed before reading parameters file like + //DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.CalculationModel == null && + //but that depends on what should prevail if both files are present + if (ParametersFile != null) { // Read calculation parameters, if available XmlCalculationParameters xmlCalculationParameters = CalculationParametersXmlSerialization.LoadFromXmlFile(ParametersFile.FullName); - CalculationParameters = FillDomainFromXmlCalculationParameters.CreateCalculationParameters(xmlCalculationParameters); + DamProjectData.DamProjectCalculationSpecification.CurrentSpecification = + FillDomainFromXmlCalculationParameters.CreateCalculationParameters(xmlCalculationParameters); } } private void RunSelectedModels() { - if (CalculationParameters?.CalculationModules == null) + if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification == null) { - Logger.LogError("No calculation modules selected"); + Logger.LogError("No calculation models selected"); return; } - if (CalculationParameters.CalculationModules.StabilityInside) + if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) { RunStability(FailureMechanismSystemType.StabilityInside); } - if (CalculationParameters.CalculationModules.StabilityOutside) + if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) { RunStability(FailureMechanismSystemType.StabilityOutside); } - if (CalculationParameters.CalculationModules.PipingBligh) + if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping && + DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType == PipingModelType.Bligh) { Logger.LogError("Calculation module PipingBligh not implemented yet"); } - if (CalculationParameters.CalculationModules.PipingWti) + if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping && + DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType == PipingModelType.Wti2017) { RunPiping(FailureMechanismSystemType.Piping); } } private void RunStability(FailureMechanismSystemType failureMechanismSystemType) { - ReadUserSettingsSlipCircleDefinition(CalculationParameters.StabilityParameters.SlipCircleDefinition); + ReadUserSettingsSlipCircleDefinition(DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.SlipCircleDefinition); DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = failureMechanismSystemType; - DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityParameters.MStabParameters = - CalculationParameters.StabilityParameters; - + CallDamEngine(); if (DamProjectData.OutputTimeSerieCollection != null && DamProjectData.OutputTimeSerieCollection.Series.Count > 0) { Index: DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_inside/PulauTekong.damx =================================================================== diff -u -r6910 -r6953 --- DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_inside/PulauTekong.damx (.../PulauTekong.damx) (revision 6910) +++ DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_inside/PulauTekong.damx (.../PulauTekong.damx) (revision 6953) @@ -1,8 +1,8 @@  - - - - + + + + @@ -29,9 +29,9 @@ - - - + + + @@ -835,8 +835,8 @@ - - + + @@ -845,7 +845,7 @@ - + @@ -916,8 +916,8 @@ - - + + @@ -926,7 +926,7 @@ - + @@ -1025,8 +1025,8 @@ - - + + @@ -1035,7 +1035,7 @@ - + @@ -1136,8 +1136,8 @@ - - + + @@ -1146,7 +1146,7 @@ - + @@ -1243,8 +1243,8 @@ - - + + @@ -1330,7 +1330,7 @@ - + @@ -1341,1827 +1341,1744 @@ - - + + - - - - - - + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/PipingWti/DAMLive.damx =================================================================== diff -u -r6910 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/PipingWti/DAMLive.damx (.../DAMLive.damx) (revision 6910) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/PipingWti/DAMLive.damx (.../DAMLive.damx) (revision 6953) @@ -1,8 +1,8 @@  - - - - + + + + @@ -165,9 +165,9 @@ - - - + + + @@ -895,8 +895,8 @@ - - + + @@ -905,7 +905,7 @@ - + @@ -1137,8 +1137,8 @@ - - + + @@ -1147,7 +1147,7 @@ - + @@ -1379,8 +1379,8 @@ - - + + @@ -1389,7 +1389,7 @@ - + @@ -1621,8 +1621,8 @@ - - + + @@ -1631,7 +1631,7 @@ - + @@ -1939,8 +1939,8 @@ - - + + @@ -1949,7 +1949,7 @@ - + @@ -2110,8 +2110,8 @@ - - + + @@ -2120,7 +2120,7 @@ - + @@ -2281,8 +2281,8 @@ - - + + @@ -2291,7 +2291,7 @@ - + @@ -2452,8 +2452,8 @@ - - + + @@ -2508,2017 +2508,2013 @@ - - - + + + - - - - - - + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - - + + + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - - + + + + - - + + - + - + - - - + + + - + - + - + + + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4545,726 +4541,728 @@ - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + @@ -5367,24 +5365,22 @@ - - - + - + - - + + - + Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamEngineRunnerTest.cs =================================================================== diff -u -r6070 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamEngineRunnerTest.cs (.../DamEngineRunnerTest.cs) (revision 6070) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamEngineRunnerTest.cs (.../DamEngineRunnerTest.cs) (revision 6953) @@ -46,7 +46,6 @@ damProjectData.Dispose(); damProjectData = new DamProjectData(); - runner.CalculationParameters = null; runner.DamProjectData = damProjectData; runner.InputTimeSeriesCollection = new TimeSerieCollection(); runner.OutputTimeSeriesCollection = new TimeSerieCollection(); @@ -179,11 +178,6 @@ StabilityWorkingPath = "stability", PipingWorkingPath = "piping", WaterLevelOffset = 0, - CalculationParameters = new CalculationParameters - { - CalculationModules = new CalculationModules(), - StabilityParameters = new MStabParameters() - }, FewsInputFile = new FileInfo(inputFile), FewsOutputFile = new FileInfo(outputFile), DamProjectData = damProjectData, Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs =================================================================== diff -u -r6130 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 6130) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 6953) @@ -77,14 +77,8 @@ Assert.Multiple(() => { Assert.That(runner.DamProjectData, Is.Not.Null); - Assert.That(runner.CalculationParameters, Is.Not.Null); }); - Assert.Multiple(() => - { - Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); - Assert.That(runner.CalculationParameters.StabilityParameters, Is.Not.Null); - }); - + runner.Run(); runner.OutputTimeSeriesCollection.Save("StabilityInsideUpliftVanOutputFile" + maxCores + ".xml"); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillDomainFromXmlCalculationParameters.cs =================================================================== diff -u -r5844 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillDomainFromXmlCalculationParameters.cs (.../FillDomainFromXmlCalculationParameters.cs) (revision 5844) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillDomainFromXmlCalculationParameters.cs (.../FillDomainFromXmlCalculationParameters.cs) (revision 6953) @@ -27,60 +27,61 @@ public static class FillDomainFromXmlCalculationParameters { - public static CalculationParameters CreateCalculationParameters(XmlCalculationParameters xmlCalculationParameters) + public static DamFailureMechanismeCalculationSpecification CreateCalculationParameters(XmlCalculationParameters xmlCalculationParameters) { - var calculationParameters = new CalculationParameters(); + var calculationParameters = new DamFailureMechanismeCalculationSpecification(); TransferCalculationModules(xmlCalculationParameters.CalculationModules, calculationParameters); TransferStabilityParameters(xmlCalculationParameters.StabilityParameters, calculationParameters); return calculationParameters; } - private static void TransferCalculationModules(XmlCalculationParametersCalculationModules calculationModulesXml, CalculationParameters calculationParameters) + private static void TransferCalculationModules(XmlCalculationParametersCalculationModules calculationModulesXml, + DamFailureMechanismeCalculationSpecification calculationParameters) { - var calculationModules = new CalculationModules(); if (calculationModulesXml != null) { - if (calculationModulesXml.PipingWtiSpecified) + if (calculationModulesXml.PipingWtiSpecified && calculationModulesXml.PipingWti) { - calculationModules.PipingWti = calculationModulesXml.PipingWti; + // Note: set FailureMechanismSystemType first so that CalculationModel will be set correctly too. + calculationParameters.FailureMechanismSystemType = FailureMechanismSystemType.Piping; + calculationParameters.PipingModelType = PipingModelType.Wti2017; } - if (calculationModulesXml.PipingBlighSpecified) + if (calculationModulesXml.PipingBlighSpecified && calculationModulesXml.PipingBligh) { - calculationModules.PipingBligh = calculationModulesXml.PipingBligh; + // Note: set FailureMechanismSystemType first so that CalculationModel will be set correctly too. + calculationParameters.FailureMechanismSystemType = FailureMechanismSystemType.Piping; + calculationParameters.PipingModelType = PipingModelType.Bligh; } - if (calculationModulesXml.StabilityInsideSpecified) + if (calculationModulesXml.StabilityInsideSpecified && calculationModulesXml.StabilityInside) { - calculationModules.StabilityInside = calculationModulesXml.StabilityInside; + calculationParameters.FailureMechanismSystemType = FailureMechanismSystemType.StabilityInside; } - if (calculationModulesXml.StabilityOutsideSpecified) + if (calculationModulesXml.StabilityOutsideSpecified && calculationModulesXml.StabilityOutside) { - calculationModules.StabilityOutside = calculationModulesXml.StabilityOutside; + calculationParameters.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside; } } - - calculationParameters.CalculationModules = calculationModules; } - private static void TransferStabilityParameters(XmlCalculationParametersStabilityParameters stabilityParametersXml, CalculationParameters calculationParameters) + private static void TransferStabilityParameters(XmlCalculationParametersStabilityParameters stabilityParametersXml, + DamFailureMechanismeCalculationSpecification calculationParameters) { - MStabParameters stabParameters = null; if (stabilityParametersXml.SearchMethodSpecified || stabilityParametersXml.CalculationModelSpecified) { - stabParameters = new MStabParameters(); - if (stabilityParametersXml.CalculationModelSpecified) + if (stabilityParametersXml.CalculationModelSpecified && + (calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || + calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)) { - stabParameters.Model = XmlConversionHelper.ConvertToModelType(stabilityParametersXml.CalculationModel); + calculationParameters.CalculationModel = XmlConversionHelper.ConvertToModelType(stabilityParametersXml.CalculationModel); } if (stabilityParametersXml.SearchMethodSpecified) { - stabParameters.SearchMethod = XmlConversionHelper.ConvertToSearchMethod(stabilityParametersXml.SearchMethod); + calculationParameters.SearchMethod = XmlConversionHelper.ConvertToSearchMethod(stabilityParametersXml.SearchMethod); } } - - calculationParameters.StabilityParameters = stabParameters; } } \ No newline at end of file Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs =================================================================== diff -u -r6881 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs (.../GeneralHelper.cs) (revision 6881) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/GeneralHelper.cs (.../GeneralHelper.cs) (revision 6953) @@ -99,13 +99,7 @@ Assert.Multiple(() => { Assert.That(runner.DamProjectData, Is.Not.Null); - Assert.That(runner.CalculationParameters, Is.Not.Null); }); - Assert.Multiple(() => - { - Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); - Assert.That(runner.CalculationParameters.StabilityParameters, Is.Not.Null); - }); } public static void AssertNoErrors(DamEngineRunner runner) Index: DamClients/DamLive/trunk/data/HHNK Purmer/DAMLive.damx =================================================================== diff -u -r6910 -r6953 --- DamClients/DamLive/trunk/data/HHNK Purmer/DAMLive.damx (.../DAMLive.damx) (revision 6910) +++ DamClients/DamLive/trunk/data/HHNK Purmer/DAMLive.damx (.../DAMLive.damx) (revision 6953) @@ -1,8 +1,8 @@  - - - - + + + + @@ -24,9 +24,9 @@ - - - + + + @@ -894,8 +894,8 @@ - - + + @@ -904,7 +904,7 @@ - + @@ -1136,8 +1136,8 @@ - - + + @@ -1146,7 +1146,7 @@ - + @@ -1378,8 +1378,8 @@ - - + + @@ -1388,7 +1388,7 @@ - + @@ -1620,8 +1620,8 @@ - - + + @@ -1630,7 +1630,7 @@ - + @@ -1938,8 +1938,8 @@ - - + + @@ -1948,7 +1948,7 @@ - + @@ -2109,8 +2109,8 @@ - - + + @@ -2119,7 +2119,7 @@ - + @@ -2280,8 +2280,8 @@ - - + + @@ -2290,7 +2290,7 @@ - + @@ -2451,8 +2451,8 @@ - - + + @@ -2502,7 +2502,7 @@ - + @@ -2512,249 +2512,245 @@ - - + + - - - - - - + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - + - - + + - + - + - - - + + + - + - + - - + + - + - - + + - + - + - - - + + + - + - + - - + + - + - - + + - + - + - - - + + + - + - + - - + + - + - - + + - + - + - - - + + + - + - + @@ -2821,1002 +2817,1004 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + @@ -3919,25 +3917,23 @@ - - - + - + - + - - + + - + Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs =================================================================== diff -u -r6892 -r6953 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 6892) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 6953) @@ -151,5 +151,10 @@ this[DamProjectType.Design, FailureMechanismSystemType.StabilityOutside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available; this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; + + this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available; + this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.UpliftVan] = ConfigurationStatus.Available; + this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityOutside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available; + this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; } } \ No newline at end of file Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Data/CalculationParameters.cs =================================================================== diff -u -r5843 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Data/CalculationParameters.cs (.../CalculationParameters.cs) (revision 5843) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Data/CalculationParameters.cs (.../CalculationParameters.cs) (revision 6953) @@ -72,5 +72,5 @@ /// /// The parameters for the stability calculation. /// - public MStabParameters StabilityParameters { get; set; } + //public MStabParameters StabilityParameters { get; set; } } \ No newline at end of file Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillXmlCalculationParametersFromDomain.cs =================================================================== diff -u -r5844 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillXmlCalculationParametersFromDomain.cs (.../FillXmlCalculationParametersFromDomain.cs) (revision 5844) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillXmlCalculationParametersFromDomain.cs (.../FillXmlCalculationParametersFromDomain.cs) (revision 6953) @@ -27,45 +27,54 @@ public static class FillXmlCalculationParametersFromDomain { - public static XmlCalculationParameters CreateCalculationParameters(CalculationParameters calculationParameters) + public static XmlCalculationParameters CreateCalculationParameters(DamFailureMechanismeCalculationSpecification calculationParameters) { var calculationParametersXml = new XmlCalculationParameters(); - TransferCalculationModules(calculationParameters.CalculationModules, calculationParametersXml); - TransferStabilityParameters(calculationParameters.StabilityParameters, calculationParametersXml); + TransferCalculationModules(calculationParameters, calculationParametersXml); + TransferStabilityParameters(calculationParameters, calculationParametersXml); return calculationParametersXml; } - private static void TransferCalculationModules(CalculationModules calculationModules, XmlCalculationParameters calculationParametersXml) + private static void TransferCalculationModules(DamFailureMechanismeCalculationSpecification calculationParameters, + XmlCalculationParameters calculationParametersXml) { var xmlCalculationParametersCalculationModules = new XmlCalculationParametersCalculationModules(); - if (calculationModules != null) + if (calculationParameters != null) { xmlCalculationParametersCalculationModules.PipingWtiSpecified = true; xmlCalculationParametersCalculationModules.PipingBlighSpecified = true; xmlCalculationParametersCalculationModules.StabilityInsideSpecified = true; xmlCalculationParametersCalculationModules.StabilityOutsideSpecified = true; - xmlCalculationParametersCalculationModules.PipingWti = calculationModules.PipingWti; - xmlCalculationParametersCalculationModules.PipingBligh = calculationModules.PipingBligh; - xmlCalculationParametersCalculationModules.StabilityInside = calculationModules.StabilityInside; - xmlCalculationParametersCalculationModules.StabilityOutside = calculationModules.StabilityOutside; + xmlCalculationParametersCalculationModules.PipingWti = + calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.Piping && + calculationParameters.PipingModelType == PipingModelType.Wti2017; + xmlCalculationParametersCalculationModules.PipingBligh = + calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.Piping && + calculationParameters.PipingModelType == PipingModelType.Bligh; + xmlCalculationParametersCalculationModules.StabilityInside = + calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside; + xmlCalculationParametersCalculationModules.StabilityOutside = + calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside; } calculationParametersXml.CalculationModules = xmlCalculationParametersCalculationModules; } - private static void TransferStabilityParameters(MStabParameters stabilityParameters, XmlCalculationParameters calculationParametersXml) + private static void TransferStabilityParameters(DamFailureMechanismeCalculationSpecification calculationParameters, + XmlCalculationParameters calculationParametersXml) { var xmlCalculationParametersStabilityParameters = new XmlCalculationParametersStabilityParameters(); - if (stabilityParameters != null) + if (calculationParameters != null) { xmlCalculationParametersStabilityParameters.CalculationModelSpecified = true; xmlCalculationParametersStabilityParameters.SearchMethodSpecified = true; - xmlCalculationParametersStabilityParameters.CalculationModel = XmlConversionHelper.ConvertToModelType(stabilityParameters.Model); - xmlCalculationParametersStabilityParameters.SearchMethod = XmlConversionHelper.ConvertToSearchMethod(stabilityParameters.SearchMethod); + xmlCalculationParametersStabilityParameters.CalculationModel = + XmlConversionHelper.ConvertToModelType(calculationParameters.StabilityModelType); + xmlCalculationParametersStabilityParameters.SearchMethod = XmlConversionHelper.ConvertToSearchMethod(calculationParameters.SearchMethod); } calculationParametersXml.StabilityParameters = xmlCalculationParametersStabilityParameters; Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/DAMLive.damx =================================================================== diff -u -r6910 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/DAMLive.damx (.../DAMLive.damx) (revision 6910) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/DAMLive.damx (.../DAMLive.damx) (revision 6953) @@ -1,8 +1,8 @@  - - - - + + + + @@ -14,9 +14,9 @@ - - - + + + @@ -319,8 +319,8 @@ - - + + @@ -329,7 +329,7 @@ - + @@ -467,8 +467,8 @@ - - + + @@ -489,348 +489,346 @@ - + - - + + - - - - - - + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + @@ -883,25 +881,23 @@ - - - + - + - + - - + + - + Index: DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_outside/PulauTekong.damx =================================================================== diff -u -r6910 -r6953 --- DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_outside/PulauTekong.damx (.../PulauTekong.damx) (revision 6910) +++ DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_outside/PulauTekong.damx (.../PulauTekong.damx) (revision 6953) @@ -1,8 +1,8 @@  - - - - + + + + @@ -19,9 +19,9 @@ - - - + + + @@ -841,8 +841,8 @@ - - + + @@ -851,7 +851,7 @@ - + @@ -952,8 +952,8 @@ - - + + @@ -962,7 +962,7 @@ - + @@ -1059,8 +1059,8 @@ - - + + @@ -1210,1862 +1210,1860 @@ - + - - + + - - - - - - + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - - - + + + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + - + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - + - + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + + - + @@ -3080,25 +3078,23 @@ - - - + - + - + - - + + - + Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideBishopGrid/DAMLive.damx =================================================================== diff -u -r6910 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideBishopGrid/DAMLive.damx (.../DAMLive.damx) (revision 6910) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideBishopGrid/DAMLive.damx (.../DAMLive.damx) (revision 6953) @@ -1,8 +1,8 @@  - - - - + + + + @@ -165,9 +165,9 @@ - - - + + + @@ -895,8 +895,8 @@ - - + + @@ -905,7 +905,7 @@ - + @@ -1137,8 +1137,8 @@ - - + + @@ -1147,7 +1147,7 @@ - + @@ -1379,8 +1379,8 @@ - - + + @@ -1389,7 +1389,7 @@ - + @@ -1621,8 +1621,8 @@ - - + + @@ -1631,7 +1631,7 @@ - + @@ -1939,8 +1939,8 @@ - - + + @@ -1949,7 +1949,7 @@ - + @@ -2110,8 +2110,8 @@ - - + + @@ -2120,7 +2120,7 @@ - + @@ -2281,8 +2281,8 @@ - - + + @@ -2291,7 +2291,7 @@ - + @@ -2452,8 +2452,8 @@ - - + + @@ -2508,2017 +2508,2013 @@ - - - + + + - - - - - - + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - - + + + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - - + + + + - - + + - + - + - - - + + + - + - + - + + + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4545,755 +4541,757 @@ - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - + - - - - - + + + + + + + @@ -5360,21 +5358,21 @@ - - - + - + - - + + + - - + + + @@ -5409,37 +5407,35 @@ - - - + - + - + - + - + - + + + - - - + Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs =================================================================== diff -u -r6130 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 6130) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 6953) @@ -78,13 +78,7 @@ Assert.Multiple(() => { Assert.That(runner.DamProjectData, Is.Not.Null); - Assert.That(runner.CalculationParameters, Is.Not.Null); }); - Assert.Multiple(() => - { - Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); - Assert.That(runner.CalculationParameters.StabilityParameters, Is.Not.Null); - }); runner.StabilityWorkingPath = Path.GetTempPath(); runner.Run(); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs =================================================================== diff -u -r6263 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs (.../FillDomainFromXmlCalculationParametersTests.cs) (revision 6263) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs (.../FillDomainFromXmlCalculationParametersTests.cs) (revision 6953) @@ -35,54 +35,39 @@ [Test] [TestCase(FailureMechanismSystemType.Piping, PipingModelType.Bligh)] [TestCase(FailureMechanismSystemType.Piping, PipingModelType.Wti2017)] - [TestCase(FailureMechanismSystemType.StabilityOutside, PipingModelType.Bligh, StabilityModelType.Bishop, StabilitySearchMethod.Grid)] - [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, StabilityModelType.UpliftVan, StabilitySearchMethod.Grid)] - [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, StabilityModelType.UpliftVan, StabilitySearchMethod.BeeSwarm)] - public void CanWriteAndReadCalculationParametersDataToXml(FailureMechanismSystemType mechanismType, PipingModelType pipingModel = PipingModelType.Bligh, StabilityModelType stabModel = StabilityModelType.Bishop, StabilitySearchMethod searchMethod = StabilitySearchMethod.Grid) + [TestCase(FailureMechanismSystemType.StabilityOutside, PipingModelType.Wti2017, StabilityModelType.Bishop, StabilitySearchMethod.Grid)] + [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Wti2017, StabilityModelType.UpliftVan, StabilitySearchMethod.Grid)] + [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Wti2017, StabilityModelType.UpliftVan, StabilitySearchMethod.BeeSwarm)] + public void CanWriteAndReadCalculationParametersDataToXml(FailureMechanismSystemType mechanismType, PipingModelType pipingModel = PipingModelType.Wti2017, StabilityModelType stabModel = StabilityModelType.UpliftVan, StabilitySearchMethod searchMethod = StabilitySearchMethod.BeeSwarm) { const string filename = "CalculationParameters.xml"; - CalculationParameters expectedData = CreateExampleCalculationParameters(mechanismType, pipingModel, stabModel, searchMethod); + DamFailureMechanismeCalculationSpecification expectedData = CreateExampleCalculationParameters(mechanismType, pipingModel, stabModel, searchMethod); // Write file XmlCalculationParameters writeXml = FillXmlCalculationParametersFromDomain.CreateCalculationParameters(expectedData); CalculationParametersXmlSerialization.SaveAsXmlFile(filename, writeXml); // Load file XmlCalculationParameters readXml = CalculationParametersXmlSerialization.LoadFromXmlFile(filename); - CalculationParameters actualData = FillDomainFromXmlCalculationParameters.CreateCalculationParameters(readXml); + DamFailureMechanismeCalculationSpecification actualData = FillDomainFromXmlCalculationParameters.CreateCalculationParameters(readXml); CompareCalculationParametersData(actualData, expectedData); } - private static CalculationParameters CreateExampleCalculationParameters(FailureMechanismSystemType mechanismType, PipingModelType pipingModel, StabilityModelType stabModel, StabilitySearchMethod searchMethod) + private static DamFailureMechanismeCalculationSpecification CreateExampleCalculationParameters(FailureMechanismSystemType mechanismType, + PipingModelType pipingModel, StabilityModelType stabModel, StabilitySearchMethod searchMethod) { - var calculationModules = new CalculationModules + var calculationSpecification = new DamFailureMechanismeCalculationSpecification { - PipingBligh = mechanismType == FailureMechanismSystemType.Piping && pipingModel == PipingModelType.Bligh, - PipingWti = mechanismType == FailureMechanismSystemType.Piping && pipingModel == PipingModelType.Wti2017, - StabilityOutside = mechanismType == FailureMechanismSystemType.StabilityOutside, - StabilityInside = mechanismType == FailureMechanismSystemType.StabilityInside + FailureMechanismSystemType = mechanismType, + PipingModelType = pipingModel, + StabilityModelType = stabModel, + SearchMethod = searchMethod }; - - MStabParameters stabilityParameters = null; - if (mechanismType is FailureMechanismSystemType.StabilityOutside or FailureMechanismSystemType.StabilityInside) - { - stabilityParameters = new MStabParameters - { - Model = stabModel, - SearchMethod = searchMethod - }; - } - - var calculationParameters = new CalculationParameters - { - CalculationModules = calculationModules, - StabilityParameters = stabilityParameters - }; - - return calculationParameters; + return calculationSpecification; } - private static void CompareCalculationParametersData(CalculationParameters actual, CalculationParameters expected) + private static void CompareCalculationParametersData(DamFailureMechanismeCalculationSpecification actual, + DamFailureMechanismeCalculationSpecification expected) { var compare = new CompareLogic { Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideUpliftVanBeeSwarm/DAMLive.damx =================================================================== diff -u -r6910 -r6953 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideUpliftVanBeeSwarm/DAMLive.damx (.../DAMLive.damx) (revision 6910) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideUpliftVanBeeSwarm/DAMLive.damx (.../DAMLive.damx) (revision 6953) @@ -1,8 +1,8 @@  - - - - + + + + @@ -165,9 +165,9 @@ - - - + + + @@ -895,8 +895,8 @@ - - + + @@ -905,7 +905,7 @@ - + @@ -1137,8 +1137,8 @@ - - + + @@ -1147,7 +1147,7 @@ - + @@ -1379,8 +1379,8 @@ - - + + @@ -1389,7 +1389,7 @@ - + @@ -1621,8 +1621,8 @@ - - + + @@ -1631,7 +1631,7 @@ - + @@ -1939,8 +1939,8 @@ - - + + @@ -1949,7 +1949,7 @@ - + @@ -2110,8 +2110,8 @@ - - + + @@ -2120,7 +2120,7 @@ - + @@ -2281,8 +2281,8 @@ - - + + @@ -2291,7 +2291,7 @@ - + @@ -2452,8 +2452,8 @@ - - + + @@ -2508,2017 +2508,2013 @@ - - - + + + - - - - - - + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - - + + + + - - + + - + - + - - - + + + - + - + - - + + - - + + - - - - + + + + - - + + - + - + - - - + + + - + - + - + + + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4545,755 +4541,757 @@ - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - + - - - - - + + + + + + + @@ -5360,21 +5358,21 @@ - - - + - + - - + + + - - + + + @@ -5409,37 +5407,35 @@ - - - + - + - + - + - + - + + + - - - +