Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r5312 -r5338
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5312)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5338)
@@ -77,6 +77,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r5337 -r5338
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5337)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5338)
@@ -279,24 +279,19 @@
});
}
- [Test, Category(Categories.Slow), Ignore("Create test where Bishop is lowest. Not anymore for DWP_13")]
- [Category(Categories.WorkInProgress)]
+ [Test, Category(Categories.Slow)]
public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_BishopLowest()
{
- // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
- // with Dam Classic rev.1059
- // Select 5th location (DWP_13)
- // with Dam Classic rev.833
+ // Based on DAM UI tutorial for stability, for location DWP_22
const string calcDir = "TestStabInwardsBishopUpliftVan_BishopLowest";
if (Directory.Exists(calcDir))
{
Directory.Delete(calcDir, true); // delete previous results
}
- const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile13.xml";
+ const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile22.xml";
string inputString = File.ReadAllText(fileName);
- //inputString = ChangeInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
- inputString = ChangeInputModel(inputString, InputStabilityModelType.Bishop);
+ inputString = ChangeInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
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\");
@@ -307,7 +302,7 @@
DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults;
Assert.Multiple(() =>
{
- Assert.That(result.SafetyFactor, Is.EqualTo(0.452).Within(tolerance));
+ Assert.That(result.SafetyFactor, Is.EqualTo(1.199).Within(tolerance));
Assert.That(result.UpliftSituation, Is.Not.Null);
});
Assert.Multiple(() =>
@@ -319,15 +314,15 @@
result = output.Results.CalculationResults[1].StabilityDesignResults;
Assert.Multiple(() =>
{
- Assert.That(result.SafetyFactor, Is.EqualTo(0.574).Within(tolerance));
+ Assert.That(result.SafetyFactor, Is.EqualTo(1.562).Within(tolerance));
Assert.That(result.UpliftSituation, Is.Not.Null);
Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
});
// Worst of Bishop and Uplift Van
result = output.Results.CalculationResults[2].StabilityDesignResults;
Assert.Multiple(() =>
{
- Assert.That(result.SafetyFactor, Is.EqualTo(0.452).Within(tolerance));
+ Assert.That(result.SafetyFactor, Is.EqualTo(1.199).Within(tolerance));
Assert.That(result.UpliftSituation, Is.Not.Null);
Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
});
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile22.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile22.xml (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile22.xml (revision 5338)
@@ -0,0 +1,433 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file