Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs =================================================================== diff -u -r6954 -r6965 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 6954) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 6965) @@ -282,52 +282,52 @@ } //perhaps is some sort of test needed before reading parameters file like - //DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.CalculationModel == null && + //DamProjectData.DamProjectCalculationSpecification.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); - DamProjectData.DamProjectCalculationSpecification.CurrentSpecification = + DamProjectData.DamProjectCalculationSpecification = FillDomainFromXmlCalculationParameters.CreateCalculationParameters(xmlCalculationParameters); } } private void RunSelectedModels() { - if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification == null) + if (DamProjectData.DamProjectCalculationSpecification == null) { Logger.LogError("No calculation models selected"); return; } - if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) + if (DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) { RunStability(FailureMechanismSystemType.StabilityInside); } - if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) + if (DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) { RunStability(FailureMechanismSystemType.StabilityOutside); } - if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping && - DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType == PipingModelType.Bligh) + if (DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping && + DamProjectData.DamProjectCalculationSpecification.PipingModelType == PipingModelType.Bligh) { Logger.LogError("Calculation module PipingBligh not implemented yet"); } - if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping && - DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType == PipingModelType.Wti2017) + if (DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping && + DamProjectData.DamProjectCalculationSpecification.PipingModelType == PipingModelType.Wti2017) { RunPiping(FailureMechanismSystemType.Piping); } } private void RunStability(FailureMechanismSystemType failureMechanismSystemType) { - ReadUserSettingsSlipCircleDefinition(DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.SlipCircleDefinition); - DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = failureMechanismSystemType; + ReadUserSettingsSlipCircleDefinition(DamProjectData.DamProjectCalculationSpecification.DamStabilityParameters.SlipCircleDefinition); + DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType = failureMechanismSystemType; CallDamEngine(); if (DamProjectData.OutputTimeSerieCollection != null && DamProjectData.OutputTimeSerieCollection.Series.Count > 0) @@ -338,7 +338,7 @@ private void RunPiping(FailureMechanismSystemType failureMechanismSystemType) { - DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = failureMechanismSystemType; + DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType = failureMechanismSystemType; CallDamEngine(); if (DamProjectData.OutputTimeSerieCollection != null && DamProjectData.OutputTimeSerieCollection.Series.Count > 0) Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs =================================================================== diff -u -r6954 -r6965 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs (.../FillDomainFromXmlCalculationParametersTests.cs) (revision 6954) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs (.../FillDomainFromXmlCalculationParametersTests.cs) (revision 6965) @@ -40,33 +40,33 @@ public void CanWriteAndReadCalculationParametersDataToXml(FailureMechanismSystemType mechanismType, PipingModelType pipingModel = PipingModelType.Wti2017, StabilityModelType stabModel = StabilityModelType.UpliftVan, StabilitySearchMethod searchMethod = StabilitySearchMethod.BeeSwarm) { const string filename = "CalculationParameters.xml"; - DamFailureMechanismeCalculationSpecification expectedData = CreateExampleCalculationParameters(mechanismType, pipingModel, stabModel, searchMethod); + DamProjectCalculationSpecification expectedData = CreateExampleCalculationParameters(mechanismType, pipingModel, stabModel, searchMethod); // Write file XmlCalculationParameters writeXml = FillXmlCalculationParametersFromDomain.CreateCalculationParameters(expectedData); CalculationParametersXmlSerialization.SaveAsXmlFile(filename, writeXml); // Load file XmlCalculationParameters readXml = CalculationParametersXmlSerialization.LoadFromXmlFile(filename); - DamFailureMechanismeCalculationSpecification actualData = FillDomainFromXmlCalculationParameters.CreateCalculationParameters(readXml); + DamProjectCalculationSpecification actualData = FillDomainFromXmlCalculationParameters.CreateCalculationParameters(readXml); CompareCalculationParametersData(actualData, expectedData); } - private static DamFailureMechanismeCalculationSpecification CreateExampleCalculationParameters(FailureMechanismSystemType mechanismType, - PipingModelType pipingModel, StabilityModelType stabModel, StabilitySearchMethod searchMethod) + private static DamProjectCalculationSpecification CreateExampleCalculationParameters(FailureMechanismSystemType mechanismType, + PipingModelType pipingModel, StabilityModelType stabModel, StabilitySearchMethod searchMethod) { - var calculationSpecification = new DamFailureMechanismeCalculationSpecification + var calculationSpecification = new DamProjectCalculationSpecification { FailureMechanismSystemType = mechanismType, PipingModelType = pipingModel, StabilityModelType = stabModel, - SearchMethod = searchMethod }; + calculationSpecification.DamStabilityParameters.SearchMethod = searchMethod; return calculationSpecification; } - private static void CompareCalculationParametersData(DamFailureMechanismeCalculationSpecification actual, - DamFailureMechanismeCalculationSpecification expected) + private static void CompareCalculationParametersData(DamProjectCalculationSpecification actual, + DamProjectCalculationSpecification expected) { var compare = new CompareLogic { Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillXmlCalculationParametersFromDomain.cs =================================================================== diff -u -r6954 -r6965 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillXmlCalculationParametersFromDomain.cs (.../FillXmlCalculationParametersFromDomain.cs) (revision 6954) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillXmlCalculationParametersFromDomain.cs (.../FillXmlCalculationParametersFromDomain.cs) (revision 6965) @@ -26,7 +26,7 @@ public static class FillXmlCalculationParametersFromDomain { - public static XmlCalculationParameters CreateCalculationParameters(DamFailureMechanismeCalculationSpecification calculationParameters) + public static XmlCalculationParameters CreateCalculationParameters(DamProjectCalculationSpecification calculationParameters) { var calculationParametersXml = new XmlCalculationParameters(); TransferCalculationModules(calculationParameters, calculationParametersXml); @@ -35,7 +35,7 @@ return calculationParametersXml; } - private static void TransferCalculationModules(DamFailureMechanismeCalculationSpecification calculationParameters, + private static void TransferCalculationModules(DamProjectCalculationSpecification calculationParameters, XmlCalculationParameters calculationParametersXml) { var xmlCalculationParametersCalculationModules = new XmlCalculationParametersCalculationModules(); @@ -62,7 +62,7 @@ calculationParametersXml.CalculationModules = xmlCalculationParametersCalculationModules; } - private static void TransferStabilityParameters(DamFailureMechanismeCalculationSpecification calculationParameters, + private static void TransferStabilityParameters(DamProjectCalculationSpecification calculationParameters, XmlCalculationParameters calculationParametersXml) { var xmlCalculationParametersStabilityParameters = new XmlCalculationParametersStabilityParameters(); @@ -73,7 +73,8 @@ xmlCalculationParametersStabilityParameters.CalculationModel = XmlConversionHelper.ConvertToModelType(calculationParameters.StabilityModelType); - xmlCalculationParametersStabilityParameters.SearchMethod = XmlConversionHelper.ConvertToSearchMethod(calculationParameters.SearchMethod); + xmlCalculationParametersStabilityParameters.SearchMethod = + XmlConversionHelper.ConvertToSearchMethod(calculationParameters.DamStabilityParameters.SearchMethod); } calculationParametersXml.StabilityParameters = xmlCalculationParametersStabilityParameters; Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideUpliftVanGrid/DAMLive.damx =================================================================== diff -u -r6953 -r6965 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideUpliftVanGrid/DAMLive.damx (.../DAMLive.damx) (revision 6953) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInsideUpliftVanGrid/DAMLive.damx (.../DAMLive.damx) (revision 6965) @@ -1,5 +1,5 @@  - + @@ -882,173 +882,169 @@ - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + - + - + - - + + - + - - + + - + @@ -1057,7 +1053,7 @@ - + @@ -1070,19 +1066,19 @@ - - - - + + + + - - - - + + + + @@ -1112,183 +1108,172 @@ - - - - - - - - - - + - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + - + - + - - - + + + - + - - + + - + @@ -1299,7 +1284,7 @@ - + @@ -1310,21 +1295,21 @@ - - - - + + + + - - - - + + + + @@ -1352,183 +1337,172 @@ - - - - - - - - - - - - + - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + - + - - + + - + - + - - + + - + @@ -1541,7 +1515,7 @@ - + @@ -1550,10 +1524,10 @@ - - - - + + + + @@ -1563,10 +1537,10 @@ - - - - + + + + @@ -1592,145 +1566,134 @@ - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -1741,13 +1704,13 @@ - + - - - - + + + + @@ -1759,124 +1722,124 @@ - - - - - - - - - - - - - - - - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + - + - + - + - + - + @@ -1887,13 +1850,13 @@ - + - - - - + + + + @@ -1905,161 +1868,157 @@ - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + @@ -2070,167 +2029,156 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + @@ -2239,233 +2187,181 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + - + - + @@ -2512,115 +2408,113 @@ - - - - - - + + + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + @@ -2629,42 +2523,42 @@ - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + @@ -2674,64 +2568,64 @@ - + - + - + - + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + @@ -2741,38 +2635,38 @@ - + - + - + - + - + - - + + - - + + - - - - + + + + @@ -2782,38 +2676,38 @@ - + - + - + - + - + - - + + - - + + - - - - + + + + @@ -2823,1698 +2717,1698 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4541,930 +4435,493 @@ - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillDomainFromXmlCalculationParameters.cs =================================================================== diff -u -r6954 -r6965 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillDomainFromXmlCalculationParameters.cs (.../FillDomainFromXmlCalculationParameters.cs) (revision 6954) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillDomainFromXmlCalculationParameters.cs (.../FillDomainFromXmlCalculationParameters.cs) (revision 6965) @@ -26,16 +26,16 @@ public static class FillDomainFromXmlCalculationParameters { - public static DamFailureMechanismeCalculationSpecification CreateCalculationParameters(XmlCalculationParameters xmlCalculationParameters) + public static DamProjectCalculationSpecification CreateCalculationParameters(XmlCalculationParameters xmlCalculationParameters) { - var calculationParameters = new DamFailureMechanismeCalculationSpecification(); + var calculationParameters = new DamProjectCalculationSpecification(); TransferCalculationModules(xmlCalculationParameters.CalculationModules, calculationParameters); TransferStabilityParameters(xmlCalculationParameters.StabilityParameters, calculationParameters); return calculationParameters; } private static void TransferCalculationModules(XmlCalculationParametersCalculationModules calculationModulesXml, - DamFailureMechanismeCalculationSpecification calculationParameters) + DamProjectCalculationSpecification calculationParameters) { if (calculationModulesXml != null) { @@ -66,7 +66,7 @@ } private static void TransferStabilityParameters(XmlCalculationParametersStabilityParameters stabilityParametersXml, - DamFailureMechanismeCalculationSpecification calculationParameters) + DamProjectCalculationSpecification calculationParameters) { if (stabilityParametersXml.SearchMethodSpecified || stabilityParametersXml.CalculationModelSpecified) { @@ -79,7 +79,9 @@ if (stabilityParametersXml.SearchMethodSpecified) { - calculationParameters.SearchMethod = XmlConversionHelper.ConvertToSearchMethod(stabilityParametersXml.SearchMethod); + calculationParameters.DamStabilityParameters.SearchMethod = + XmlConversionHelper.ConvertToSearchMethod(stabilityParametersXml.SearchMethod); + } } }