Fisheye: Tag 2636 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTHWithNoAdaption.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTH.xml =================================================================== diff -u --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTH.xml (revision 0) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTH.xml (revision 2636) @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r2633 -r2636 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 2633) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 2636) @@ -38,7 +38,7 @@ [TestFixture] public class MacroStabilityInwardsTests { - private const double tolerance = 0.0005; + private const double Tolerance = 0.0005; ///

Test for different segmentFailureMechanismType

/// The soilprobabilities are set tot the specified segmentFailureMechanismType @@ -78,21 +78,21 @@ Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.IsNotNull(output.Results.CalculationResults, "No results available"); - Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Tolerance); // Zone1SafetyFactor=1.282 - Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, tolerance); + Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, Tolerance); // Zone1EntryPointX Local =38.818 Global=47.238 - Assert.AreEqual(38.818, output.Results.CalculationResults[0].StabilityDesignResults.Zone1EntryPointX, tolerance); + Assert.AreEqual(38.818, output.Results.CalculationResults[0].StabilityDesignResults.Zone1EntryPointX, Tolerance); // Zone1ExitPointX Local=64.262 Global=72.682 - Assert.AreEqual(64.262, output.Results.CalculationResults[0].StabilityDesignResults.Zone1ExitPointX, tolerance); + Assert.AreEqual(64.262, output.Results.CalculationResults[0].StabilityDesignResults.Zone1ExitPointX, Tolerance); // Zone2SafetyFactor null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2SafetyFactor, tolerance); + Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2SafetyFactor, Tolerance); // Zone2EntryPointX null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2EntryPointX, tolerance); + Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2EntryPointX, Tolerance); // Zone2ExitPointX null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2ExitPointX, tolerance); + Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2ExitPointX, Tolerance); // NumberOfIterations=0 Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations); @@ -109,12 +109,12 @@ var upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation; Assert.IsNotNull(upliftSituation); Assert.AreEqual(true, upliftSituation.IsUplift); - Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, tolerance); - Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, tolerance); - Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, tolerance); + Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, Tolerance); + Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, Tolerance); + Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, Tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, Tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, Tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, Tolerance); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); @@ -146,21 +146,21 @@ Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Tolerance); // Zone1SafetyFactor=1.115 - Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, tolerance); + Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, Tolerance); // Zone1EntryPointX Local =39.3 Global=47.72 - Assert.AreEqual(39.3, output.Results.CalculationResults[0].StabilityDesignResults.Zone1EntryPointX, tolerance); + Assert.AreEqual(39.3, output.Results.CalculationResults[0].StabilityDesignResults.Zone1EntryPointX, Tolerance); // Zone1ExitPointX Local=64.442 Global=72.682 - Assert.AreEqual(64.442, output.Results.CalculationResults[0].StabilityDesignResults.Zone1ExitPointX, tolerance); + Assert.AreEqual(64.442, output.Results.CalculationResults[0].StabilityDesignResults.Zone1ExitPointX, Tolerance); // Zone2SafetyFactor null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2SafetyFactor, tolerance); + Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2SafetyFactor, Tolerance); // Zone2EntryPointX null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2EntryPointX, tolerance); + Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2EntryPointX, Tolerance); // Zone2ExitPointX null, is set to default reading from output.xml - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2ExitPointX, tolerance); + Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2ExitPointX, Tolerance); // NumberOfIterations=0 Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations); @@ -177,12 +177,12 @@ var upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation; Assert.IsNotNull(upliftSituation); Assert.AreEqual(true, upliftSituation.IsUplift); - Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, tolerance); - Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, tolerance); - Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, tolerance); + Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, Tolerance); + Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, Tolerance); + Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, Tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, Tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, Tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, Tolerance); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); @@ -216,20 +216,20 @@ var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); // Bishop var result = output.Results.CalculationResults[0]; - Assert.AreEqual(1.282, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.282, result.StabilityDesignResults.SafetyFactor, Tolerance); Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); Assert.IsTrue(result.StabilityDesignResults.UpliftSituation.IsUplift); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityDesignResults.StabilityModelType); Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName); // Uplift Van result = output.Results.CalculationResults[1]; - Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, Tolerance); Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityDesignResults.StabilityModelType); Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2]; - Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, Tolerance); Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityDesignResults.StabilityModelType); Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName); @@ -268,18 +268,18 @@ var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); // Bishop var result = output.Results.CalculationResults[0].StabilityDesignResults; - Assert.AreEqual(0.452, result.SafetyFactor, tolerance); + Assert.AreEqual(0.452, result.SafetyFactor, Tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.IsTrue(result.UpliftSituation.IsUplift); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType); // Uplift Van result = output.Results.CalculationResults[1].StabilityDesignResults; - Assert.AreEqual(0.574, result.SafetyFactor, tolerance); + Assert.AreEqual(0.574, result.SafetyFactor, Tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityModelType); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2].StabilityDesignResults; - Assert.AreEqual(0.452, result.SafetyFactor, tolerance); + Assert.AreEqual(0.452, result.SafetyFactor, Tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType); @@ -318,7 +318,7 @@ // Bishop var result = output.Results.CalculationResults[0].StabilityDesignResults; Assert.IsTrue(result.SafetyFactorSpecified); - Assert.AreEqual(1.458, result.SafetyFactor, tolerance); + Assert.AreEqual(1.458, result.SafetyFactor, Tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.IsFalse(result.UpliftSituation.IsUplift); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType); @@ -330,7 +330,7 @@ // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2].StabilityDesignResults; Assert.IsTrue(result.SafetyFactorSpecified); - Assert.AreEqual(1.458, result.SafetyFactor, tolerance); + Assert.AreEqual(1.458, result.SafetyFactor, Tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType); @@ -383,21 +383,21 @@ var result = output.Results.CalculationResults[0]; // SafetyFactor=1.621 (lowest of zone 1 and 2) - Assert.AreEqual(1.621, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.621, result.StabilityDesignResults.SafetyFactor, Tolerance); // Zone1SafetyFactor=1.621 - Assert.AreEqual(1.621, result.StabilityDesignResults.Zone1SafetyFactor, tolerance); + Assert.AreEqual(1.621, result.StabilityDesignResults.Zone1SafetyFactor, Tolerance); // Zone1EntryPointX=26.653 - Assert.AreEqual(26.653, result.StabilityDesignResults.Zone1EntryPointX, tolerance); + Assert.AreEqual(26.653, result.StabilityDesignResults.Zone1EntryPointX, Tolerance); // Zone1ExitPointX=32.807 - Assert.AreEqual(32.807, result.StabilityDesignResults.Zone1ExitPointX, tolerance); + Assert.AreEqual(32.807, result.StabilityDesignResults.Zone1ExitPointX, Tolerance); // Zone2SafetyFactor=1.644 - Assert.AreEqual(1.644, result.StabilityDesignResults.Zone2SafetyFactor, tolerance); + Assert.AreEqual(1.644, result.StabilityDesignResults.Zone2SafetyFactor, Tolerance); // Zone2EntryPointX=27.196 - Assert.AreEqual(27.196, result.StabilityDesignResults.Zone2EntryPointX, tolerance); + Assert.AreEqual(27.196, result.StabilityDesignResults.Zone2EntryPointX, Tolerance); // Zone2ExitPointX=32.783 - Assert.AreEqual(32.783, result.StabilityDesignResults.Zone2ExitPointX, tolerance); + Assert.AreEqual(32.783, result.StabilityDesignResults.Zone2ExitPointX, Tolerance); // skip testing some of the results like uplift etc. @@ -407,10 +407,10 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.620 - Assert.AreEqual(1.620, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.620, result.StabilityDesignResults.SafetyFactor, Tolerance); result = output.Results.CalculationResults[2]; // SafetyFactor=1.621 - Assert.AreEqual(1.621, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.621, result.StabilityDesignResults.SafetyFactor, Tolerance); } [Test, Category("Slow")] @@ -457,19 +457,19 @@ var result = output.Results.CalculationResults[0]; // Zone1SafetyFactor=2.138 - Assert.AreEqual(2.138, result.StabilityDesignResults.Zone1SafetyFactor, tolerance); + Assert.AreEqual(2.138, result.StabilityDesignResults.Zone1SafetyFactor, Tolerance); // Zone2SafetyFactor=2.155 - Assert.AreEqual(2.155, result.StabilityDesignResults.Zone2SafetyFactor, tolerance); + Assert.AreEqual(2.155, result.StabilityDesignResults.Zone2SafetyFactor, Tolerance); // SafetyFactor=2.138 (same as zone 1) - Assert.AreEqual(2.138, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(2.138, result.StabilityDesignResults.SafetyFactor, Tolerance); result = output.Results.CalculationResults[1]; // Zone1SafetyFactor=2.009 - Assert.AreEqual(2.009, result.StabilityDesignResults.Zone1SafetyFactor, tolerance); + Assert.AreEqual(2.009, result.StabilityDesignResults.Zone1SafetyFactor, Tolerance); // Zone2SafetyFactor=1.974 - Assert.AreEqual(1.974, result.StabilityDesignResults.Zone2SafetyFactor, tolerance); + Assert.AreEqual(1.974, result.StabilityDesignResults.Zone2SafetyFactor, Tolerance); // SafetyFactor=2.009 (same as zone 1) - Assert.AreEqual(2.009, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(2.009, result.StabilityDesignResults.SafetyFactor, Tolerance); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); @@ -519,21 +519,21 @@ var result = output.Results.CalculationResults[0]; // SafetyFactor=1.032 (lowest of zone 1 and 2) - Assert.AreEqual(1.032, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.032, result.StabilityDesignResults.SafetyFactor, Tolerance); // Zone1SafetyFactor=1.032 - Assert.AreEqual(1.032, result.StabilityDesignResults.Zone1SafetyFactor, tolerance); + Assert.AreEqual(1.032, result.StabilityDesignResults.Zone1SafetyFactor, Tolerance); // Zone1EntryPointX=29.779 - Assert.AreEqual(29.779, result.StabilityDesignResults.Zone1EntryPointX, tolerance); + Assert.AreEqual(29.779, result.StabilityDesignResults.Zone1EntryPointX, Tolerance); // Zone1ExitPointX72.599= - Assert.AreEqual(72.599, result.StabilityDesignResults.Zone1ExitPointX, tolerance); + Assert.AreEqual(72.599, result.StabilityDesignResults.Zone1ExitPointX, Tolerance); // Zone2SafetyFactor=2.332 - Assert.AreEqual(2.332, result.StabilityDesignResults.Zone2SafetyFactor, tolerance); + Assert.AreEqual(2.332, result.StabilityDesignResults.Zone2SafetyFactor, Tolerance); // Zone2EntryPointX=27.1 - Assert.AreEqual(27.1, result.StabilityDesignResults.Zone2EntryPointX, tolerance); + Assert.AreEqual(27.1, result.StabilityDesignResults.Zone2EntryPointX, Tolerance); // Zone2ExitPointX=72.524 - Assert.AreEqual(72.524, result.StabilityDesignResults.Zone2ExitPointX, tolerance); + Assert.AreEqual(72.524, result.StabilityDesignResults.Zone2ExitPointX, Tolerance); // skip testing some of the results like uplift etc. @@ -543,10 +543,10 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.901 - Assert.AreEqual(1.901, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.901, result.StabilityDesignResults.SafetyFactor, Tolerance); result = output.Results.CalculationResults[2]; // SafetyFactor=1.670 - Assert.AreEqual(1.670, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.670, result.StabilityDesignResults.SafetyFactor, Tolerance); } [Test, Category("Slow")] @@ -585,14 +585,14 @@ var result = output.Results.CalculationResults[0]; // SafetyFactor=1.972 (Zone Areas) - Assert.AreEqual(1.972, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.972, result.StabilityDesignResults.SafetyFactor, Tolerance); Assert.AreEqual("DWP_10_2", result.LocationName); Assert.AreEqual("DWP_10.sti", result.ProfileName); Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); result = output.Results.CalculationResults[1]; // SafetyFactor=2.034 (Forbidden Zone) - Assert.AreEqual(2.034, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(2.034, result.StabilityDesignResults.SafetyFactor, Tolerance); Assert.AreEqual("DWP_10_6", result.LocationName); Assert.AreEqual("DWP_10.sti", result.ProfileName); Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); @@ -638,7 +638,7 @@ // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor=2.533 - Assert.AreEqual(2.533, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(2.533, result.StabilityDesignResults.SafetyFactor, Tolerance); result = output.Results.CalculationResults[1]; Assert.AreEqual("6-4-3-A-1-C", result.LocationName); @@ -654,15 +654,15 @@ // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor=2.594 - Assert.AreEqual(2.594, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(2.594, result.StabilityDesignResults.SafetyFactor, Tolerance); result = output.Results.CalculationResults[3]; Assert.AreEqual("6-4-3-B-1-D", result.LocationName); Assert.AreEqual("6-4-3-B-1-D_2_s", result.ProfileName); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor=3.315 - Assert.AreEqual(3.315, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(3.315, result.StabilityDesignResults.SafetyFactor, Tolerance); } [Test, Category("Slow")] @@ -706,7 +706,7 @@ // Bishop Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor=2.219 - Assert.AreEqual(2.219, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(2.219, result.StabilityDesignResults.SafetyFactor, Tolerance); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityDesignResults.StabilityModelType); result = output.Results.CalculationResults[4]; @@ -849,20 +849,20 @@ output.Results.CalculationResults[0].CalculationResult)); var stabilityDesignResults = output.Results.CalculationResults[0].StabilityDesignResults; - Assert.AreEqual(expectedSafetyFactor, stabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual(expectedSafetyFactor, stabilityDesignResults.Zone1SafetyFactor, tolerance); - Assert.AreEqual(expectedZone1EntryPointX, stabilityDesignResults.Zone1EntryPointX, tolerance); - Assert.AreEqual(expectedZone1ExitPointX, stabilityDesignResults.Zone1ExitPointX, tolerance); + Assert.AreEqual(expectedSafetyFactor, stabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(expectedSafetyFactor, stabilityDesignResults.Zone1SafetyFactor, Tolerance); + Assert.AreEqual(expectedZone1EntryPointX, stabilityDesignResults.Zone1EntryPointX, Tolerance); + Assert.AreEqual(expectedZone1ExitPointX, stabilityDesignResults.Zone1ExitPointX, Tolerance); Assert.AreEqual(expectedNumberOfIterations, stabilityDesignResults.NumberOfIterations); Assert.AreEqual(expectedResultMessage, stabilityDesignResults.ResultMessage); SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].StabilityDesignResults.RedesignedSurfaceLine; if (redesignedSurfaceLine != null) { - Assert.AreEqual(expectedDikeLength, redesignedSurfaceLine.GetDikeLength(), tolerance); + Assert.AreEqual(expectedDikeLength, redesignedSurfaceLine.GetDikeLength(), Tolerance); GeometryPoint pointShoulderBaseInside = redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); if (pointShoulderBaseInside != null) { - Assert.AreEqual(expectedShoulderHeight, pointShoulderBaseInside.Z, tolerance); + Assert.AreEqual(expectedShoulderHeight, pointShoulderBaseInside.Z, Tolerance); } } } @@ -903,42 +903,31 @@ [Test] public void TestDesignWithRiverLevelAboveDikeTopButBelowDthCanCalculate() { + var analysisType = "AdaptGeometry"; // Test just to see if calculation works in this case as it should do, result itself is irrelevant so just taken as is. - const string calcDir = "TestStabInwardsBishop"; - if (Directory.Exists(calcDir)) - { - Directory.Delete(calcDir, true); // delete previous results - } + var outputString = GetOutputStringForProject(analysisType); - Directory.CreateDirectory(calcDir); - - - const string fileName = @"TestFiles\DesignInputFileWithRiverLevelAboveDikeTopButBelowDTHWithAdaption.xml"; - string inputString = File.ReadAllText(fileName); - 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", - ConversionHelper.InputSegmentFailureMechanismStability.ToString()); - EngineInterface engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); - - string outputString = engineInterface.Run(); - Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.IsNotNull(output.Results.CalculationResults, "No results available"); - Assert.AreEqual(1.255, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(1.255, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Tolerance); } [Test] - public void TestNoDesignWithRiverLevelAboveDikeTopButBelowDthCanNOTCalculate() + public void TestNoDesignWithRiverLevelAboveDikeTopButBelowDthCanNotCalculate() { + var analysisType = "NoAdaption"; // Test to see if calculation does NOT work in this case as it must fail with water level above dike top. + var outputString = GetOutputStringForProject(analysisType); + + Assert.IsNotNull(outputString); + var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); + Assert.IsNull(output.Results.CalculationResults, "Should have results available"); + Assert.AreEqual(1, output.Results.CalculationMessages.Length, Tolerance); + } + + private static string GetOutputStringForProject(string analysisType) + { const string calcDir = "TestStabInwardsBishop"; if (Directory.Exists(calcDir)) { @@ -948,7 +937,7 @@ Directory.CreateDirectory(calcDir); - const string fileName = @"TestFiles\DesignInputFileWithRiverLevelAboveDikeTopButBelowDTHWithNoAdaption.xml"; + const string fileName = @"TestFiles\DesignInputFileWithRiverLevelAboveDikeTopButBelowDTH.xml"; string inputString = File.ReadAllText(fileName); inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = @@ -959,15 +948,15 @@ @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb"); inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", ConversionHelper.InputSegmentFailureMechanismStability.ToString()); + + inputString = XmlAdapter.ChangeValueInXml(inputString, "AnalysisType", + analysisType); + EngineInterface engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); string outputString = engineInterface.Run(); - - Assert.IsNotNull(outputString); - var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - Assert.IsNull(output.Results.CalculationResults, "Should have results available"); - Assert.AreEqual(1, output.Results.CalculationMessages.Length, tolerance); + return outputString; } private string ChangeInputModel(string input, InputStabilityModelType modelType) Fisheye: Tag 2636 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTHWithAdaption.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj =================================================================== diff -u -r2633 -r2636 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 2633) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 2636) @@ -77,12 +77,9 @@ PreserveNewest - + PreserveNewest - - PreserveNewest - PreserveNewest