Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r5748 -r5756 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 5748) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 5756) @@ -57,8 +57,7 @@ [Category(Categories.WorkInProgress)] //Error: The AnalyseType is set to AdaptGeometry in the input, however the geometry was not adapted in any location. Either set the AnalysisType to NoAdaptation or increase the required safety factor. [TestCase(2)] [TestCase(4)] - [TestCase(8)] - [TestCase(18)] + [TestCase(8)] // 8 relevant combinations public void DebugDesignAdaptionWithXmlInputFile(int maxCores) { const string inputFilename = "DesignBishopGrid1Core.xml"; @@ -86,7 +85,7 @@ [Test, Category(Categories.MultiCore)] [TestCase(4)] - [TestCase(16)] + [TestCase(9)] // 9 relevant combinations public void DesignBishopWithScenariosForHeadPl3CalculatesCorrect(int maxCores) { const string inputFilename = "InputFileMultiCoreTestForScenario.xml"; @@ -114,7 +113,7 @@ [Test, Category(Categories.MultiCore)] [TestCase(4)] - [TestCase(16)] + [TestCase(9)] // 9 relevant combinations public void DesignBishopWithOneScenariosForHeadPl3CalculatesCorrect(int maxCores) { const string inputFilename = "InputFileMultiCoreTestForScenario.xml"; @@ -143,7 +142,7 @@ [Test, Category(Categories.MultiCore)] [Category(Categories.WorkInProgress)] //Error: The AnalyseType is set to AdaptGeometry in the input, however the geometry was not adapted in any location. Either set the AnalysisType to NoAdaptation or increase the required safety factor. [TestCase(4)] - [TestCase(16)] + [TestCase(9)] // 9 relevant combinations public void DesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(int maxCores) { const string inputFilename = "InputFileMultiCoreTestForScenarioAdaption.xml"; @@ -172,7 +171,7 @@ [Test, Category(Categories.MultiCore)] [Category(Categories.WorkInProgress)] //Error: The AnalyseType is set to AdaptGeometry in the input, however the geometry was not adapted in any location. Either set the AnalysisType to NoAdaptation or increase the required safety factor. [TestCase(4)] - [TestCase(16)] + [TestCase(9)] // 9 relevant combinations public void DesignBishopAdaptionWithOneScenarioForHeadPl3CalculatesCorrect(int maxCores) { const string inputFilename = "InputFileMultiCoreTestForScenarioAdaption.xml"; @@ -198,9 +197,10 @@ GeneralHelper.RemoveTestWorkingDirectory(workDir); } - [Test, Category("MultiCore")] - [TestCase(16)] - [TestCase(23)] + [Test, Category(Categories.MultiCore)] + [TestCase(4)] + [TestCase(8)] + [TestCase(23)] // 725 relevant combinations public void LargeInsideBishopNoAdaptionGridCalculatesCorrect(int maxCores) { const string inputFilename = "LargeInsideBishopNoAdaptionGrid.xml"; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs =================================================================== diff -u -r5748 -r5756 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 5748) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 5756) @@ -58,8 +58,9 @@ [Test, Category(Categories.MultiCore)] [Category(Categories.WorkInProgress)] // expected real results should be 16, but only 8 are found - [TestCase(10)] - [TestCase(24)] + [TestCase(4)] + [TestCase(8)] + [TestCase(16)] // 16 relevant combinations public void MultiCoreOperationalBeeSwarmWithXmlInputFile(int maxCores) { const string inputFilename = "InputForDebuggingBeeSwarm.xml"; @@ -89,7 +90,7 @@ [TestCase(2)] [TestCase(4)] [TestCase(8)] - [TestCase(18)] + [TestCase(16)] // 16 relevant combinations public void MultiCoreOperationalBishopGridWithXmlInputFile(int maxCores) { const string inputFilename = "OperationalBishopGrid1Core.xml";