Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs =================================================================== diff -u -r1212 -r1230 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs (.../RegionalScenariosCalculationTests.cs) (revision 1212) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs (.../RegionalScenariosCalculationTests.cs) (revision 1230) @@ -20,7 +20,6 @@ // All rights reserved. using System.IO; -using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Interface; using Deltares.DamEngine.Io; using Deltares.DamEngine.TestHelpers; @@ -33,18 +32,27 @@ { private const double tolerance = 0.0005; + [Test] + public void TestScenario3And7And8And10SingleCore() + { + TestScenario3And7And8And10(1); + } + [Test, Category("Work_In_Progress")] - public void Test() + public void TestScenario3And7And8And10MultiCore() { + TestScenario3And7And8And10(7); + } + + private void TestScenario3And7And8And10(int numberOfCores) + { const string calcDir = "TestOutAssessment"; if (Directory.Exists(calcDir)) { Directory.Delete(calcDir, true); // delete previous results } - Directory.CreateDirectory(calcDir); - const string fileName = @"TestFiles\RegionalAssessment.xml"; string inputString = File.ReadAllText(fileName); inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used @@ -54,7 +62,7 @@ var engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); - engineInterface.DamProjectData.MaxCalculationCores = 1; + engineInterface.DamProjectData.MaxCalculationCores = numberOfCores; string outputString = engineInterface.Run(); Assert.IsNotNull(outputString);