Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/soilmaterials.mdb
===================================================================
diff -u
Binary files differ
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/Databronbestand.damx
===================================================================
diff -u
--- DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/Databronbestand.damx (revision 0)
+++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/Databronbestand.damx (revision 3317)
@@ -0,0 +1,3414 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/Databronbestand.defx
===================================================================
diff -u
--- DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/Databronbestand.defx (revision 0)
+++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/Databronbestand.defx (revision 3317)
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/Invoergegevens - StabilityInwards-NoAdaptation.xls
===================================================================
diff -u
Binary files differ
Index: DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs
===================================================================
diff -u -r3128 -r3317
--- DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 3128)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 3317)
@@ -45,10 +45,11 @@
/// Compute project
///
///
+ ///
///
///
private static List ComputeStabilityInsideProjectUsingClassic(string projectFilename,
- int expectedLocations)
+ MStabModelType modelType, int expectedLocations)
{
using (DamProjectData damProjectData =
ProjectLoader.LoadProjectData(projectFilename))
@@ -59,7 +60,7 @@
// Specify calculation
damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType =
- MStabModelType.Bishop;
+ modelType;
damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab
.MStabParameters.GridPosition = MStabGridPosition.Right;
damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType =
@@ -98,7 +99,7 @@
{
string cFolderName =
@"..\..\..\data\Dam\\Benchmarks\4 Validatie opdrijfberekeningen\01 Situatie zonder opdrijven (1D)\Databronbestand.damx";
- List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, 1);
+ List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
Assert.AreEqual(1.024077029, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -117,7 +118,7 @@
{
string cFolderName =
@"..\..\..\data\Dam\\Benchmarks\4 Validatie opdrijfberekeningen\02 Situatie met opdrijven (1D)\Databronbestand.damx";
- List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, 1);
+ List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
Assert.AreEqual(0.905914295, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -136,7 +137,7 @@
{
string cFolderName =
@"..\..\..\data\Dam\\Benchmarks\4 Validatie opdrijfberekeningen\03 Situatie met een labiel evenwicht (1D)\Databronbestand.damx";
- List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, 1);
+ List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
Assert.AreEqual(1.0, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -155,7 +156,7 @@
{
string cFolderName =
@"..\..\..\data\Dam\Benchmarks\4 Validatie opdrijfberekeningen\04 Situatie met een schuine slootbodem en opdrijven op 1 locatie (1D)\Databronbestand.damx";
- List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, 1);
+ List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
Assert.AreEqual(0.969283045, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -174,7 +175,7 @@
{
string cFolderName =
@"..\..\..\data\Dam\\Benchmarks\4 Validatie opdrijfberekeningen\05 Situatie met grondlagen boven en onder het freatisch vlak (1D)\Databronbestand.damx";
- List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, 1);
+ List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
Assert.IsFalse(allCalculationResults[0].IsUplift.Value);
Assert.AreEqual(1.512062521, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -191,7 +192,7 @@
{
string cFolderName =
@"..\..\..\data\Dam\Benchmarks\4 Validatie opdrijfberekeningen\06 Situatie met verschillende opdrijflocaties (1D)\Databronbestand.damx";
- List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, 1);
+ List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
// Values at bottom ditch dikeside
@@ -208,13 +209,28 @@
public void Dijkring13NormalStabilityCalculation()
{
const string cDikeFolder = @"..\..\..\data\Dam\Benchmarks\4 Validatie opdrijfberekeningen\Dijkring13-Sec1\Databronbestand.damx";
- List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cDikeFolder, 1);
+ List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cDikeFolder, MStabModelType.Bishop, 1);
// Following values are just taken from the Geo Stability calculation and not manually calculated
Assert.AreEqual(0.822, allCalculationResults[0].StabilitySafetyFactor.Value, cTolerance);
Assert.AreEqual(1.048, allCalculationResults[1].StabilitySafetyFactor.Value, cTolerance);
Assert.AreEqual(1.154, allCalculationResults[2].StabilitySafetyFactor.Value, cTolerance);
}
+
+ ///
+ /// Performs test BMStabilityInwardsNoAdaptation
+ ///
+ [Test]
+ [Category("Slow")]
+ public void BMStabilityInwardsNoAdaptation()
+ {
+ string cFolderName =
+ @"..\..\..\data\Dam\\Benchmarks\Validatie UpliftVan\StabilityInwards-NoAdaptation\Databronbestand.damx";
+ List allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.UpliftVan, 1);
+
+ Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
+ Assert.AreEqual(0.902, allCalculationResults[0].StabilitySafetyFactor.Value, cTolerance);
+ }
#endregion Uplift
}
}
\ No newline at end of file
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/characteristicpoints.csv
===================================================================
diff -u
--- DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/characteristicpoints.csv (revision 0)
+++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/characteristicpoints.csv (revision 3317)
@@ -0,0 +1,2 @@
+Profielnaam;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek_sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;Volgnummer
+Test1;105;0;-2,1;54,1;0;-2,1;51,1;0;-3,7;49,1;0;-3,7;46,1;0;-2,1;43;0;-2,1;-1;-1;-1;-1;-1;-1;27,7;0;3;27,2;0;3;24,7;0;3;24,7;0;3;-1;-1;-1;-1;-1;-1;14,2;0;0,1;0;0;-1,5;24,7;0;3;0
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/segments.csv
===================================================================
diff -u
--- DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/segments.csv (revision 0)
+++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/segments.csv (revision 3317)
@@ -0,0 +1,2 @@
+segment_id;soilprofile_id;probability;calculation_type
+1;segment1_Test1;1;Stability
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/modelparameters.csv
===================================================================
diff -u
--- DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/modelparameters.csv (revision 0)
+++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/modelparameters.csv (revision 3317)
@@ -0,0 +1,2 @@
+indringingslengte;verkeersbelasting;dempingsfactor_pl3;dempingsfactor_pl4;safety_factor_stability_inner_slope;safety_factor_piping;pl_line_creation_method;level_reduction_inside;level_reduction_outside;map_for_soilgeometries2D
+1;13;0;0;1,05;1,2;ExpertKnowledgeRRD;0,5;0,5;.\Geometries
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/soilprofiles.csv
===================================================================
diff -u
--- DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/soilprofiles.csv (revision 0)
+++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/soilprofiles.csv (revision 3317)
@@ -0,0 +1,6 @@
+soilprofile_id;top_level;soil_name
+segment1_Test1;60;dijksmateriaal_klei
+segment1_Test1;-2,1;klei1
+segment1_Test1;-4;klei2
+segment1_Test1;-5,5;veen2
+segment1_Test1;-6;pleistoceen
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/locations.csv
===================================================================
diff -u
--- DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/locations.csv (revision 0)
+++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/locations.csv (revision 3317)
@@ -0,0 +1,2 @@
+location_id;surfaceline_id;segment_id;geo_x;geo_y;polderlevel;polderlevellow;head_pl2;head_pl3;grass_quality;direction;x_soilgeometry2D_origin;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;PLLineCreationMethod;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;materiaaltypedijk;baggerdiepte;bp_tp;bp_hbp;bp_ldp;minimal_circle_depth;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;distance_to_entry_point;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_piping;probability_of_failure_stability_outerslope;uplift_criterion_piping;uplift_criterion_stability
+Test1;Test1;1;27,7;0;-2,45;-2,55;-0,8;-0,8;0;1;0;ophoogmateriaaldijk;ophoogmateriaalberm;0;0;14,2;0;0,1;3;False;1;13;ExpertKnowledgeRRD;0,4;0,5;0,2;0,2;0,3333;1;2;klei;-1,8;2;1,5;1;2;0,5;0,5;LogNormal;0,4;0,3;1,2;1,05;1,05;0,001;0,0011;0,0012;1,2;1,2
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/scenarios.csv
===================================================================
diff -u
--- DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/scenarios.csv (revision 0)
+++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/scenarios.csv (revision 3317)
@@ -0,0 +1,2 @@
+location_id;location_scenario_id;water_height;dike_table_height;safety_factor_stability_inner_slope
+Test1;1;2;3;1,05
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/Databronbestand0.soilmaterials.mdb
===================================================================
diff -u
Binary files differ
Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/surfacelines.csv
===================================================================
diff -u
--- DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/surfacelines.csv (revision 0)
+++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Validatie UpliftVan/StabilityInwards-NoAdaptation/DAM invoerfiles/surfacelines.csv (revision 3317)
@@ -0,0 +1,2 @@
+Profielnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)
+Test1;0;22,9;27,7;0;0;0;-1,5;5;0;-1,5;12;0;-0,4;14,2;0;0,1;15;0;0,4;17,8;0;1,4;24,7;0;3;27,2;0;3;27,7;0;3;31,6;0;1,8;33,4;0;1,2;43;0;-2,1;46,1;0;-2,1;49,1;0;-3,7;51,1;0;-3,7;54,1;0;-2,1;65;0;-2,1;75;0;-2,1;105;0;-2,1