Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/ErrorInDGeoStabilityCalculation.xml
===================================================================
diff -u -r1139 -r1169
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/ErrorInDGeoStabilityCalculation.xml (.../ErrorInDGeoStabilityCalculation.xml) (revision 1139)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/ErrorInDGeoStabilityCalculation.xml (.../ErrorInDGeoStabilityCalculation.xml) (revision 1169)
@@ -1,21 +1,25 @@
-
+
-
+
+
-
+
+
-
+
+
-
+
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijkZoneringInwardsZone2.xml
===================================================================
diff -u -r1063 -r1169
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijkZoneringInwardsZone2.xml (.../DeltaDijkZoneringInwardsZone2.xml) (revision 1063)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijkZoneringInwardsZone2.xml (.../DeltaDijkZoneringInwardsZone2.xml) (revision 1169)
@@ -1,13 +1,15 @@
-
+
-
+
+
-
+
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs
===================================================================
diff -u -r1163 -r1169
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs (.../MacroStabilityTests.cs) (revision 1163)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs (.../MacroStabilityTests.cs) (revision 1169)
@@ -38,8 +38,9 @@
public void TestRunMacroStabilityTutorialDesignBishop()
{
// Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
+ // with Dam Classic rev.1059
// Set Analysis type to "No adaption"
- // Select first location (DWP_1)
+ // Select 1st location (DWP_1)
// Set Calculation Options: Stability Inside - Bishop
// Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design
// with Dam Classic rev.833
@@ -110,7 +111,9 @@
[Test]
public void TestRunMacroStabilityTutorialDesignUpliftVan()
{
- // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design
+ // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
+ // with Dam Classic rev.1059
+ // Select 1st location (DWP_1)
// with Dam Classic rev.833
const string calcDir = "TestOutStabUpliftVan";
if (Directory.Exists(calcDir))
@@ -176,7 +179,9 @@
[Test]
public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_UpliftVanLowest()
{
- // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design
+ // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
+ // with Dam Classic rev.1059
+ // Select 1st location (DWP_1)
// with Dam Classic rev.833
const string calcDir = "TestOutStabBishopUpliftVan_UpliftVanLowest";
if (Directory.Exists(calcDir))
@@ -220,7 +225,9 @@
[Test]
public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_BishopLowest()
{
- // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design
+ // 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
const string calcDir = "TestOutStabBishopUpliftVan_BishopLowest";
if (Directory.Exists(calcDir))
@@ -264,7 +271,9 @@
[Test]
public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_NoUplift()
{
- // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design
+ // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
+ // with Dam Classic rev.1059
+ // Select 10th location (DWP_18)
// with Dam Classic rev.833
const string calcDir = "TestOutStabBishopUpliftVan_NoUplift";
if (Directory.Exists(calcDir))
@@ -310,9 +319,12 @@
[Test]
public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1D()
{
- // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI
+ // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
// with Dam Classic rev.1059
// This tests both zone areas and use of 1D profiles
+ // Select first location (6-4-1-A-1-F)
+ // Analysis type "No adaption"
+ // Calculation options: Stability Inside - Bishop
const string calcDir = "TestOutStabZoneBishop";
if (Directory.Exists(calcDir))
{
@@ -380,8 +392,12 @@
[Test]
public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1DZone2()
{
- // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI
+ // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
// with Dam Classic rev.1059
+ // Select last location (6-4-5-A-1-B)
+ // Analysis type "No adaption"
+ // Calculation options: Stability Inside - Bishop
+ //
// In this test the location is calculated with 2 profiles.
// For one case safety factor of zone 1 is lower than for zone 2
// For the other one safety factor of zone 1 is higher than for zone 2
@@ -440,6 +456,9 @@
{
// Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI
// with Dam Classic rev.1059
+ // Select first location (6-4-1-A-1-F)
+ // Analysis type "No adaption"
+ // Calculation options: Stability Inside - Bishop
// This tests both zone areas and use of 1D profiles
const string calcDir = "TestOutStabZoneUpliftVan";
if (Directory.Exists(calcDir))
@@ -555,8 +574,9 @@
[Test]
public void TestRunMacroStabilityWithErrorUpliftVan()
{
- // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI
+ // Expected results are determined by running .\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
// with Dam Classic rev.1059
+ // Select 5th and 6th location (6-4-3-A-1-C and 6-4-3-A-1-D)
// This project has 2 locations with each 2 profiles
// In one the combinations location-profile (1st location, 2nd profile) DGeoStability stops during the calculation.
// Then the kernel tries to read the safety factor, but fails because the dumpfile is not complete.
@@ -622,8 +642,9 @@
[Test]
public void TestRunMacroStabilityWithErrorBishopUpliftVan()
{
- // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI
+ // Expected results are determined by running .\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
// with Dam Classic rev.1059
+ // Select 5th and 6th location (6-4-3-A-1-C and 6-4-3-A-1-D)
// This project has 2 locations with each 2 profiles
// In one the combinations location-profile (1st location, 2nd profile) DGeoStability stops during the calculation.
// Then the kernel tries to read the safety factor, but fails because the dumpfile is not complete.
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijkZoneringInwards.xml
===================================================================
diff -u -r1060 -r1169
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijkZoneringInwards.xml (.../DeltaDijkZoneringInwards.xml) (revision 1060)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijkZoneringInwards.xml (.../DeltaDijkZoneringInwards.xml) (revision 1169)
@@ -1,13 +1,15 @@
-
+
-
+
+
+