Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStability.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj =================================================================== diff -u -r5882 -r5899 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5882) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5899) @@ -23,9 +23,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -47,12 +44,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -107,63 +98,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs =================================================================== diff -u -r5792 -r5899 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 5792) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 5899) @@ -58,49 +58,19 @@ [Category(Categories.WorkInProgress)] // When running multicore without running single core first, sometimes it gives errors [TestCase(2)] [TestCase(4)] - [TestCase(8)] - [TestCase(16)] // 16 relevant combinations - public static void MultiCoreOperationalBishopGridWithXmlInputFile(int maxCores) + [TestCase(8)] // 8 relevant combinations + public static void MultiCoreOperationalHHNKWithXmlInputFile(int maxCores) { - const string workDir = mapMultiCore + @"BishopGridTests\"; - const string inputFilename = "OperationalBishopGrid1Core.xml"; - TestMultiCoreOperational(maxCores, workDir, inputFilename, 8, 16, 16); + const string workDir = mapMultiCore + @"HHNKTests\"; + // Based on "DamLive\trunk\data\HHNK Purmer\DAMLive.damx" + const string inputFileName = @"Operational\HHNKPurmer\Input.xml"; + TestMultiCoreOperational(maxCores, workDir, inputFileName, 8, 8, 4); } } - public class CompareMultiCoreTo1CoreOperationalBeeSwarmTests - { - private const string workDir = mapCompareMultiCore + @"BeeSwarmTests\"; - - [OneTimeSetUp] - public void Init() - { - GeneralHelper.RemoveTestWorkingDirectory(workDir); - OperationalBeeSwarmWithXmlInputFile(1); - } - - [OneTimeTearDown] - public void Cleanup() - { - GeneralHelper.RemoveTestWorkingDirectory(workDir); - } - - [Test, Category(Categories.MultiCore)] - [TestCase(4)] - [TestCase(8)] - [TestCase(16)] // 16 relevant combinations - public void OperationalBeeSwarmWithXmlInputFile(int maxCores) - { - const string inputFilename = "InputForDebuggingBeeSwarm.xml"; - // Half of the locations (starting with PU0110+20) are not calculated because uplift does not occur. That's why the - // number of real results (8) is half less than the number of calculated locations (16). - TestCompareMultiCoreTo1CoreOperational(maxCores, workDir, inputFilename, 8, 16, 8); - } - } - public class CompareMultiCoreTo1CoreOperationalBishopGridTests { - private const string workDir = mapCompareMultiCore + @"BishopGridTests\"; + private const string workDir = mapCompareMultiCore + @"HHNKTests\"; [OneTimeSetUp] public void Init() @@ -118,12 +88,12 @@ [Test, Category(Categories.MultiCore)] [TestCase(2)] [TestCase(4)] - [TestCase(8)] - [TestCase(16)] // 16 relevant combinations + [TestCase(8)] // 8 relevant combinations public void OperationalBishopGridWithXmlInputFile(int maxCores) { - const string inputFilename = "OperationalBishopGrid1Core.xml"; - TestCompareMultiCoreTo1CoreOperational(maxCores, workDir, inputFilename, 8, 16, 16); + // Based on "DamLive\trunk\data\HHNK Purmer\DAMLive.damx" + const string inputFileName = @"Operational\HHNKPurmer\Input.xml"; + TestCompareMultiCoreTo1CoreOperational(maxCores, workDir, inputFileName, 8, 8, 4); } } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs =================================================================== diff -u -r5767 -r5899 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 5767) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 5899) @@ -22,7 +22,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.Standard; +using Deltares.DamEngine.Interface; using Deltares.DamEngine.Io; using Deltares.DamEngine.Io.XmlOutput; using Deltares.DamEngine.TestHelpers; @@ -131,4 +133,39 @@ ComparisonResult result = compare.Compare(expected, actual); Assert.That(result.Differences, Is.Empty, "Differences found read/write Output object"); } + + [TestCase(PipingModelType.Wti2017)] + [TestCase(PipingModelType.Bligh)] + public void Run_UsingTestFiles_ButWithSupportedPipingModelFailsBecauseNoRelevantSegments(PipingModelType pipingModel) + { + const string calcDir = "TestOperationalPipingFailsNoRelevantSegments"; + if (Directory.Exists(calcDir)) + { + Directory.Delete(calcDir, true); // delete previous results + } + + Directory.CreateDirectory(calcDir); + const string inputFileName = @".\TestFiles\Operational\Profile1DTests\CalculateStabilityInsideBishopGrid1InputFile.xml"; + + string inputString = File.ReadAllText(inputFileName); + inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used + inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used + var engineInterface = new EngineInterface(inputString); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); + engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.Piping; + engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType = pipingModel; + + Output output = GeneralHelper.RunAfterInputValidation(engineInterface, false); + + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2)); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationMessages[0].MessageType, Is.EqualTo(MessageMessageType.Info)); + Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("There are 8 locations with sensor data")); + Assert.That(output.Results.CalculationMessages[1].MessageType, Is.EqualTo(MessageMessageType.Error)); + Assert.That(output.Results.CalculationMessages[1].Message1, Is.EqualTo("No segments with failure mechanism Piping present")); + }); + } + + } \ No newline at end of file Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/OperationalSet2.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/OperationalBishopGrid1Core.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs =================================================================== diff -u -r5876 -r5899 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs (.../OperationalHHNKTests.cs) (revision 5876) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs (.../OperationalHHNKTests.cs) (revision 5899) @@ -20,10 +20,6 @@ // All rights reserved. using System.IO; -using Deltares.DamEngine.Data.Geometry; -using Deltares.DamEngine.Data.GeometryExport; -using Deltares.DamEngine.Data.Geotechnics; -using Deltares.DamEngine.Interface; using Deltares.DamEngine.Io.XmlOutput; using Deltares.DamEngine.TestHelpers; using NUnit.Framework; Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/1ainput_dam_ksl.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/1aoutput_dam.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/3aoutput_dam.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/3ainput_dam.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/live.ParametersFile.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/3ainput_dam_ksl.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/input0.soilmaterials.mdb =================================================================== diff -u -r1741 -r5899 Binary files differ Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/input.Geometries/grebbedijk3a.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/input.damx'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Grebbedijk/input.Geometries/grebbedijk1a.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekongMultiCore/PulauTekong.InputFile.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekongMultiCore/PulauTekong.InputFile-NoValues.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekongMultiCore/PulauTekong0.soilmaterials.mdb =================================================================== diff -u -r5640 -r5899 Binary files differ Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekongMultiCore/PulauTekong.geometries2D.0/SD CS3 10-10.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekongMultiCore/PulauTekong.geometries2D.0/SD CS1 3-3.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekongMultiCore/PulauTekong.geometries2D.0/CD CS2 X3.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekongMultiCore/PulauTekong.geometries2D.0/SD CS2 8-8.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekongMultiCore/PulauTekong.geometries2D.0/CD CS1 X1.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/output.Geometries/1D-34-bishop-binnen.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/output.Geometries/2A-37-bishop-binnen.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5899 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/output.Geometries/1C-31,5-bishop-binnen.sti'. Fisheye: No comparison available. Pass `N' to diff?