Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/RegionalAssessment.soilmaterials.mdb
===================================================================
diff -u -r1741 -r5283
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile.xml
===================================================================
diff -u -r5240 -r5283
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile.xml (.../MacroStabilityTutorialDesignInputFile.xml) (revision 5240)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile.xml (.../MacroStabilityTutorialDesignInputFile.xml) (revision 5283)
@@ -462,7 +462,7 @@
-
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r5270 -r5283
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5270)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5283)
@@ -14,9 +14,6 @@
-
- PreserveNewest
-
PreserveNewest
@@ -101,9 +98,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -146,36 +140,21 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
PreserveNewest
-
+
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -191,9 +170,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -227,9 +203,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -245,9 +218,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -266,9 +236,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/output0.soilmaterials.mdb
===================================================================
diff -u -r1741 -r5283
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r5274 -r5283
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5274)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5283)
@@ -126,35 +126,41 @@
Output output = GeneralHelper.RunAfterInputValidation(inputString);
- Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.442).Within(tolerance));
+ Assert.Multiple(() =>
+ {
+ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.309).Within(tolerance));
- // NumberOfIterations=0
- Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0));
- // ResultMessage ""
- Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo(""));
+ // NumberOfIterations=0
+ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0));
+ // ResultMessage ""
+ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo(""));
- // Check that a line is specified
- Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine, Is.Not.Null);
+ // Check that a line is specified
+ 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.stix"));
+ // Profile name = 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(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));
+ Assert.Multiple(() =>
+ {
+ Assert.That(upliftSituation.IsUplift, Is.EqualTo(true));
+ Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(1.135).Within(tolerance));
+ Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(4.400).Within(tolerance));
+ Assert.That(upliftSituation.Pl3LocationXMinUplift, Is.EqualTo(60.640).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));
- // Calculation Result
- Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
+ // Calculation Result
+ Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
+ });
}
- [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")]
+ [Test, Category(Categories.Slow)]
[Category(Categories.WorkInProgress)]
public void TestRunMacroStabilityTutorialDesignUpliftVan()
{
@@ -174,39 +180,44 @@
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");
Output output = GeneralHelper.RunAfterInputValidation(inputString);
- Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance));
+ Assert.Multiple(() =>
+ {
+ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.218).Within(tolerance));
- // NumberOfIterations=0
- Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0));
- // ResultMessage ""
- Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo(""));
+ // NumberOfIterations=0
+ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0));
+ // ResultMessage ""
+ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo(""));
- // Check that a line is specified
- Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine, Is.Not.Null);
+ // Check that a line is specified
+ 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"));
+ // Profile name = 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.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));
+ Assert.Multiple(() =>
+ {
+ Assert.That(upliftSituation.IsUplift, Is.EqualTo(true));
+ Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(1.135).Within(tolerance));
+ Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(4.400).Within(tolerance));
+ Assert.That(upliftSituation.Pl3LocationXMinUplift, Is.EqualTo(60.640).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));
- // Calculation Result
- Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
+ // Calculation Result
+ Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
+ });
}
- [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")]
+ [Test, Category(Categories.Slow), Ignore("This test does not succeed, only UpliftVan result in output.")]
[Category(Categories.WorkInProgress)]
public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_UpliftVanLowest()
{
@@ -226,37 +237,36 @@
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");
Output output = GeneralHelper.RunAfterInputValidation(inputString);
// Bishop
DesignResult result = output.Results.CalculationResults[0];
- Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.282).Within(tolerance));
+ Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.309).Within(tolerance));
Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null);
Assert.That(result.StabilityDesignResults.UpliftSituation.IsUplift, Is.True);
Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop));
- Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)"));
+ Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1_stix)"));
// Uplift Van
result = output.Results.CalculationResults[1];
- Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance));
+ Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.218).Within(tolerance));
Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null);
Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
- Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)"));
+ Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1_stix)"));
// Worst of Bishop and Uplift Van
result = output.Results.CalculationResults[2];
- Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance));
+ Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.218).Within(tolerance));
Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null);
Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
- Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)"));
+ Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1_stix)"));
// Calculation Result
Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
}
- [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")]
+ [Test, Category(Categories.Slow), Ignore("Create test where Bishop is lowest. Not anymore for DWP_13")]
[Category(Categories.WorkInProgress)]
public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_BishopLowest()
{
@@ -272,11 +282,11 @@
const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile13.xml";
string inputString = File.ReadAllText(fileName);
- inputString = ChangeInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
+ //inputString = ChangeInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
+ inputString = ChangeInputModel(inputString, InputStabilityModelType.Bishop);
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");
Output output = GeneralHelper.RunAfterInputValidation(inputString);
@@ -303,7 +313,7 @@
Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
}
- [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")]
+ [Test, Category(Categories.Slow), Ignore("This test does not succeed, only Bishop result in output.")]
[Category(Categories.WorkInProgress)]
public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_NoUplift()
{
@@ -323,14 +333,13 @@
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");
Output output = GeneralHelper.RunAfterInputValidation(inputString);
// Bishop
DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults;
Assert.That(result.SafetyFactorSpecified, Is.True);
- Assert.That(result.SafetyFactor, Is.EqualTo(1.458).Within(tolerance));
+ Assert.That(result.SafetyFactor, Is.EqualTo(1.450).Within(tolerance));
Assert.That(result.UpliftSituation, Is.Not.Null);
Assert.That(result.UpliftSituation.IsUplift, Is.False);
Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop));
@@ -342,7 +351,7 @@
// Worst of Bishop and Uplift Van
result = output.Results.CalculationResults[2].StabilityDesignResults;
Assert.That(result.SafetyFactorSpecified, Is.True);
- Assert.That(result.SafetyFactor, Is.EqualTo(1.458).Within(tolerance));
+ Assert.That(result.SafetyFactor, Is.EqualTo(1.450).Within(tolerance));
Assert.That(result.UpliftSituation, Is.Not.Null);
Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
@@ -378,7 +387,6 @@
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\ZoneType.geometries2D.0\");
- inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\ZoneType0.soilmaterials.mdb");
Output output = GeneralHelper.RunAfterInputValidation(inputString);
@@ -536,7 +544,6 @@
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");
Output output = GeneralHelper.RunAfterInputValidation(inputString, false);
@@ -596,7 +603,6 @@
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, "SoilDatabaseName", @"TestFiles\SlopeAdaption0.soilmaterials.mdb");
Output output = GeneralHelper.RunAfterInputValidation(inputString);
@@ -629,7 +635,6 @@
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, "StabilityModelType", stabilityModel);
inputString = XmlAdapter.ChangeValueInXml(inputString, "StabilityDesignMethod", designStrategy);
@@ -734,7 +739,6 @@
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\DeltaDijk normal.geometries2D.0\");
- inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DeltaDijk normal0.soilmaterials.mdb");
Output output = GeneralHelper.RunAfterInputValidation(inputString);
@@ -805,7 +809,6 @@
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\DeltaDijk normal.geometries2D.0\");
- inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DeltaDijk normal0.soilmaterials.mdb");
var engineInterface = new EngineInterface(inputString);
engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismParametersMStab.MStabParameters.SearchMethod = searchMethod;
@@ -884,7 +887,6 @@
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\DeltaDijk normal.geometries2D.0\");
- inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DeltaDijk normal0.soilmaterials.mdb");
var engineInterface = new EngineInterface(inputString);
engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismParametersMStab.MStabParameters.SearchMethod = searchMethod;
@@ -965,7 +967,6 @@
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\DeltaDijk normal.geometries2D.0\");
- inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DeltaDijk normal0.soilmaterials.mdb");
inputString = XmlAdapter.ChangeValueInXml(inputString, "UpliftCriterionStability", @"1.0");
Output output = GeneralHelper.RunAfterInputValidation(inputString);
@@ -1043,8 +1044,6 @@
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());
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DeltaDijk normal0.soilmaterials.mdb
===================================================================
diff -u -r1741 -r5283
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/RegionalAssessment2.soilmaterials.mdb
===================================================================
diff -u -r1741 -r5283
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/RegionalAssessment3.soilmaterials.mdb
===================================================================
diff -u -r1741 -r5283
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/SlopeAdaption0.soilmaterials.mdb
===================================================================
diff -u -r1741 -r5283
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile18.xml
===================================================================
diff -u -r4000 -r5283
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile18.xml (.../MacroStabilityTutorialDesignInputFile18.xml) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile18.xml (.../MacroStabilityTutorialDesignInputFile18.xml) (revision 5283)
@@ -1,981 +1,506 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAM Tutorial Design0.soilmaterials.mdb
===================================================================
diff -u -r1741 -r5283
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ZoneType0.soilmaterials.mdb
===================================================================
diff -u -r1741 -r5283
Binary files differ