Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_4.sti'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_1.stix =================================================================== diff -u Binary files differ Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_9.sti'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_13.stix =================================================================== diff -u Binary files differ Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_2.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_3.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_11.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_18.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_5.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_8.sti'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile.xml =================================================================== diff -u -r4460 -r5240 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile.xml (.../MacroStabilityTutorialDesignInputFile.xml) (revision 4460) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile.xml (.../MacroStabilityTutorialDesignInputFile.xml) (revision 5240) @@ -1,21 +1,21 @@ - - + + - + - + - + - + @@ -53,361 +53,308 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -416,20 +363,22 @@ - + - - + + - + - + + + @@ -440,277 +389,125 @@ - - - + - - - + + + - + - - - - + + + - + - - - - - - + + + + + + + + + + + + + + - + - - - - + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_6.sti'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r5202 -r5240 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5202) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5240) @@ -70,6 +70,7 @@ } [Test, Category("Slow"), Ignore("This test is not yet implemented, waits on stix implementation")] + //ToDo bka: The profiles that are mentioned in the xml are not available [Category(Categories.WorkInProgress)] public void TestBishopNoAdaptionWith2DGeometriesBasedOnStixFiles() { @@ -95,10 +96,10 @@ ///

Test for different segmentFailureMechanismType

/// The soil probabilities are set tot the specified segmentFailureMechanismType - [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation")] + [Test, Category(Categories.Slow)] [Category(Categories.WorkInProgress)] [TestCase(ConversionHelper.InputSegmentFailureMechanismStability)] - [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)] + //[TestCase(ConversionHelper.InputSegmentFailureMechanismAll)] //ToDo bka: Does not work. Should this be implemented? Or remove it? public void TestRunMacroStabilityTutorialDesignBishop(int segmentFailureMechanismType) { // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx" @@ -121,12 +122,11 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DAM Tutorial Design.geometries2D.0\"); - inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb"); inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString()); Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.282).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.409).Within(tolerance)); // NumberOfIterations=0 Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0)); @@ -137,15 +137,15 @@ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine, Is.Not.Null); // Profile name = DWP_1.sti - Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("DWP_1.sti")); + Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("DWP_1.stix")); // Uplift UpliftSituation upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation; Assert.That(upliftSituation, Is.Not.Null); Assert.That(upliftSituation.IsUplift, Is.EqualTo(true)); - Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(1.141).Within(tolerance)); - Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(4.4).Within(tolerance)); - Assert.That(upliftSituation.Pl3LocationXMinUplift, Is.EqualTo(60.64).Within(tolerance)); + Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(0.902).Within(tolerance)); + Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(3.625).Within(tolerance)); + Assert.That(upliftSituation.Pl3LocationXMinUplift, Is.EqualTo(63.130).Within(tolerance)); Assert.That(upliftSituation.Pl4MinUplift, Is.EqualTo(0.0).Within(tolerance)); Assert.That(upliftSituation.Pl4HeadAdjusted, Is.EqualTo(0.0).Within(tolerance)); Assert.That(upliftSituation.Pl4LocationXMinUplift, Is.EqualTo(0.0).Within(tolerance)); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_18.stix =================================================================== diff -u Binary files differ Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_13.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_7.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_12.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ZoneType.geometries2D.0/DWP_10.sti'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj =================================================================== diff -u -r5151 -r5240 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5151) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5240) @@ -14,9 +14,6 @@ - - PreserveNewest - PreserveNewest @@ -179,48 +176,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -329,6 +284,18 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_1.sti'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_10.stix =================================================================== diff -u Binary files differ Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ZoneType.geometries2D.0/DWP_10.stix =================================================================== diff -u Binary files differ Fisheye: Tag 5240 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design.geometries2D.0/DWP_10.sti'. Fisheye: No comparison available. Pass `N' to diff?