Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r5174 -r5249 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 5174) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 5249) @@ -182,17 +182,16 @@ [TestCase(1, true)] [TestCase(4, true)] [TestCase(16, true)] - [TestCase(23, true)] [TestCase(4, false)] [TestCase(16, false)] - [TestCase(23, false)] public void DesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(int maxCores, bool justOneScenario) { const string inputFilename = "InputFileMultiCoreTestForScenarioAdaption.xml"; + const string projectPath = "DAM 19.3 Probleem WF"; string fullInputFilename = Path.Combine(mapTestFiles, inputFilename); Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; string inputString = File.ReadAllText(fullInputFilename); - inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", "DAM 19.3 Probleem WF"); // Current directory will be used + inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", projectPath); var engineInterface = new EngineInterface(inputString) { DamProjectData = @@ -209,7 +208,7 @@ engineInterface.DamProjectData.CalculationMap = calcDir; Assert.That(engineInterface.DamProjectData, Is.Not.Null); - calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir; + calcDir = Directory.GetCurrentDirectory() + "\\" + projectPath + "\\" + calcDir; if (Directory.Exists(calcDir)) { Directory.Delete(calcDir, true); // delete previous results Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj =================================================================== diff -u -r5151 -r5249 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 5151) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 5249) @@ -27,7 +27,7 @@ 24.1.0.73 - 24.1.0.96 + 24.1.0.101 Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj =================================================================== diff -u -r5240 -r5249 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5240) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5249) @@ -302,7 +302,7 @@ 3.9.0 - 24.1.0.96 + 24.1.0.101 Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj =================================================================== diff -u -r5151 -r5249 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 5151) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 5249) @@ -58,7 +58,7 @@ 3.9.0 - 24.1.0.96 + 24.1.0.101 Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs =================================================================== diff -u -r5165 -r5249 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5165) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5249) @@ -364,14 +364,17 @@ /// The calculator. /// The messages. public void PerformStabilityCalculation(MacroStabilityInput input, MacroStabilityOutput macroStabilityOutput, - string fileName, ICalculator calculator, out List messages) + string fileName, Calculator calculator, out List messages) { macroStabilityOutput.CalculationResult = CalculationResult.NoRun; macroStabilityOutput.StabilityOutputItems = new List(); messages = new List(); try { MacroStability.CSharpWrapper.Output.MacroStabilityOutput macroStabilityOutputKernel = calculator.Calculate(); + string outputAsXml = calculator.KernelOutputXml; + string outputFileName = fileName.Replace(".skx", ".out.xml"); + File.WriteAllText(outputFileName, outputAsXml); FillEngineFromMacroStabilityWrapperOutput.FillEngineDataWithResults(macroStabilityOutputKernel, macroStabilityOutput, out messages); }