Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx =================================================================== diff -u -r4693 -r4935 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx (.../ShearStrengthModelsComparison.damx) (revision 4693) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx (.../ShearStrengthModelsComparison.damx) (revision 4935) @@ -1,5 +1,5 @@  - + @@ -16,11 +16,11 @@ - + - + @@ -32,261 +32,237 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - + + + @@ -295,58 +271,58 @@ - + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + @@ -355,174 +331,168 @@ - + - + - + - + - - - + + + - - - - - - - + + + + + + + - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + @@ -533,715 +503,417 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - - + + + + + + + + - - - - - - - - - - - - - + - - - - + + + + + + + + + + - - + - - - - - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - - + + + + + - + + + + + + - + - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs =================================================================== diff -u -r4889 -r4935 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 4889) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 4935) @@ -75,7 +75,7 @@ string inputXml = DamXmlSerialization.SaveInputAsXmlString(input); // Enable next line for debugging - // DamXmlSerialization.SaveInputAsXmlFile("InputForDebugging.xml", input); + DamXmlSerialization.SaveInputAsXmlFile("InputForDebugging.xml", input); var damEngineInterface = new EngineInterface(inputXml); string validationMessages = damEngineInterface.Validate(); @@ -86,7 +86,7 @@ string outputXml = damEngineInterface.Run(); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputXml); // Enable next line for debugging - // DamXmlSerialization.SaveOutputAsXmlFile("OutputForDebugging.xml", output); + DamXmlSerialization.SaveOutputAsXmlFile("OutputForDebugging.xml", output); FillDamUiFromXmlOutput.AddOutputToDamProjectData(damProjectData, output); } Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r4539 -r4935 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 4935) @@ -738,10 +738,9 @@ { Input input = FillXmlInputFromDamUi.CreateInput(damProject.DamProjectData); -#if DEBUG const string inputFilename = "InputFile.xml"; DamXmlSerialization.SaveInputAsXmlFile(inputFilename, input); -#endif + string inputXml = DamXmlSerialization.SaveInputAsXmlString(input); var damEngineInterface = new EngineInterface(inputXml); @@ -760,10 +759,10 @@ elapsedTime = DateTime.Now - startTimeCalculation; timeMessage = String.Format(LocalizationManager.GetTranslatedText(this, "CalculationTime"), elapsedTime.ToString(@"dd\.hh\:mm\:ss")); LocalizedMessageBox.ShowTranslatedText(openingMessage + paragraphSepatator + timeMessage); -#if DEBUG + const string outputFilename = "OutputFile.xml"; DamXmlSerialization.SaveOutputAsXmlFile(outputFilename, output); -#endif + } else { Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll =================================================================== diff -u -r4916 -r4935 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll =================================================================== diff -u -r4916 -r4935 Binary files differ