Index: DamClients/DamUI/trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/DatabronbestandMulti.damx
===================================================================
diff -u -r5678 -r5730
--- DamClients/DamUI/trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/DatabronbestandMulti.damx (.../DatabronbestandMulti.damx) (revision 5678)
+++ DamClients/DamUI/trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/DatabronbestandMulti.damx (.../DatabronbestandMulti.damx) (revision 5730)
@@ -26,7 +26,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
@@ -2176,7 +2176,7 @@
-
+
@@ -2188,7 +2188,7 @@
-
+
@@ -2200,7 +2200,7 @@
-
+
@@ -2321,7 +2321,7 @@
-
+
@@ -2333,7 +2333,7 @@
-
+
@@ -2345,7 +2345,7 @@
-
+
@@ -2466,7 +2466,7 @@
-
+
@@ -2478,7 +2478,7 @@
-
+
@@ -2490,7 +2490,7 @@
-
+
@@ -2611,7 +2611,7 @@
-
+
@@ -2623,7 +2623,7 @@
-
+
@@ -2635,7 +2635,7 @@
-
+
@@ -2756,7 +2756,7 @@
-
+
@@ -2768,7 +2768,7 @@
-
+
@@ -2780,7 +2780,7 @@
-
+
@@ -2901,7 +2901,7 @@
-
+
@@ -2913,7 +2913,7 @@
-
+
@@ -2925,7 +2925,7 @@
-
+
@@ -3046,7 +3046,7 @@
-
+
@@ -3058,7 +3058,7 @@
-
+
@@ -3070,7 +3070,7 @@
-
+
@@ -3191,7 +3191,7 @@
-
+
@@ -3203,7 +3203,7 @@
-
+
@@ -3215,7 +3215,7 @@
-
+
@@ -3336,7 +3336,7 @@
-
+
@@ -3348,7 +3348,7 @@
-
+
@@ -3360,7 +3360,7 @@
-
+
@@ -3531,7 +3531,7 @@
-
+
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs
===================================================================
diff -u -r5705 -r5730
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 5705)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 5730)
@@ -224,9 +224,9 @@
Assert.Multiple(() =>
{
// Following values are just taken from the Geo Stability calculation and not manually calculated
- Assert.That(allCalculationResults[0].StabilitySafetyFactor.Value, Is.EqualTo(0.720).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[1].StabilitySafetyFactor.Value, Is.EqualTo(0.998).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[2].StabilitySafetyFactor.Value, Is.EqualTo(1.099).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[0].StabilitySafetyFactor.Value, Is.EqualTo(0.724).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[1].StabilitySafetyFactor.Value, Is.EqualTo(1.003).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[2].StabilitySafetyFactor.Value, Is.EqualTo(1.100).Within(tolerance3Decimals));
});
}
@@ -235,9 +235,9 @@
///
[Test]
[Category("Slow")]
+ //[TestCase(1)]
+ //[TestCase(5)]
[TestCase(1)]
- [TestCase(5)]
- [TestCase(10)]
public void Dijkring13NormalStabilityCalculationMultiCoreForMultiLocations(int maxCores)
{
const string cDikeFolder = @"..\..\..\..\..\data\benchmarks\Opdrijfberekeningen\Dijkring13-Sec1\DatabronbestandMulti.damx";
@@ -248,36 +248,36 @@
Assert.That(allCalculationResults, Has.Count.EqualTo(30));
Assert.Multiple(() =>
{
- Assert.That(allCalculationResults[0].StabilitySafetyFactor.Value, Is.EqualTo(0.720).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[1].StabilitySafetyFactor.Value, Is.EqualTo(0.998).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[2].StabilitySafetyFactor.Value, Is.EqualTo(1.099).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[3].StabilitySafetyFactor.Value, Is.EqualTo(0.719).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[4].StabilitySafetyFactor.Value, Is.EqualTo(0.997).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[5].StabilitySafetyFactor.Value, Is.EqualTo(1.097).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[6].StabilitySafetyFactor.Value, Is.EqualTo(0.718).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[7].StabilitySafetyFactor.Value, Is.EqualTo(0.996).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[8].StabilitySafetyFactor.Value, Is.EqualTo(1.095).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[9].StabilitySafetyFactor.Value, Is.EqualTo(0.716).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[10].StabilitySafetyFactor.Value, Is.EqualTo(0.994).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[11].StabilitySafetyFactor.Value, Is.EqualTo(1.093).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[12].StabilitySafetyFactor.Value, Is.EqualTo(0.716).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[13].StabilitySafetyFactor.Value, Is.EqualTo(0.994).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[14].StabilitySafetyFactor.Value, Is.EqualTo(1.092).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[15].StabilitySafetyFactor.Value, Is.EqualTo(0.715).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[16].StabilitySafetyFactor.Value, Is.EqualTo(0.993).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[17].StabilitySafetyFactor.Value, Is.EqualTo(1.091).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[18].StabilitySafetyFactor.Value, Is.EqualTo(0.714).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[19].StabilitySafetyFactor.Value, Is.EqualTo(0.992).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[20].StabilitySafetyFactor.Value, Is.EqualTo(1.090).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[21].StabilitySafetyFactor.Value, Is.EqualTo(0.713).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[22].StabilitySafetyFactor.Value, Is.EqualTo(0.990).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[23].StabilitySafetyFactor.Value, Is.EqualTo(1.088).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[24].StabilitySafetyFactor.Value, Is.EqualTo(0.712).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[25].StabilitySafetyFactor.Value, Is.EqualTo(0.989).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[26].StabilitySafetyFactor.Value, Is.EqualTo(1.086).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[27].StabilitySafetyFactor.Value, Is.EqualTo(0.710).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[28].StabilitySafetyFactor.Value, Is.EqualTo(0.988).Within(tolerance3Decimals));
- Assert.That(allCalculationResults[29].StabilitySafetyFactor.Value, Is.EqualTo(1.085).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[0].StabilitySafetyFactor.Value, Is.EqualTo(0.724).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[1].StabilitySafetyFactor.Value, Is.EqualTo(1.003).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[2].StabilitySafetyFactor.Value, Is.EqualTo(1.100).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[3].StabilitySafetyFactor.Value, Is.EqualTo(0.722).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[4].StabilitySafetyFactor.Value, Is.EqualTo(1.002).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[5].StabilitySafetyFactor.Value, Is.EqualTo(1.099).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[6].StabilitySafetyFactor.Value, Is.EqualTo(0.721).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[7].StabilitySafetyFactor.Value, Is.EqualTo(1.001).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[8].StabilitySafetyFactor.Value, Is.EqualTo(1.097).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[9].StabilitySafetyFactor.Value, Is.EqualTo(0.720).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[10].StabilitySafetyFactor.Value, Is.EqualTo(1.000).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[11].StabilitySafetyFactor.Value, Is.EqualTo(1.095).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[12].StabilitySafetyFactor.Value, Is.EqualTo(0.719).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[13].StabilitySafetyFactor.Value, Is.EqualTo(0.999).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[14].StabilitySafetyFactor.Value, Is.EqualTo(1.095).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[15].StabilitySafetyFactor.Value, Is.EqualTo(0.718).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[16].StabilitySafetyFactor.Value, Is.EqualTo(0.999).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[17].StabilitySafetyFactor.Value, Is.EqualTo(1.094).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[18].StabilitySafetyFactor.Value, Is.EqualTo(0.717).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[19].StabilitySafetyFactor.Value, Is.EqualTo(0.997).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[20].StabilitySafetyFactor.Value, Is.EqualTo(1.092).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[21].StabilitySafetyFactor.Value, Is.EqualTo(0.716).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[22].StabilitySafetyFactor.Value, Is.EqualTo(0.996).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[23].StabilitySafetyFactor.Value, Is.EqualTo(1.090).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[24].StabilitySafetyFactor.Value, Is.EqualTo(0.715).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[25].StabilitySafetyFactor.Value, Is.EqualTo(0.995).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[26].StabilitySafetyFactor.Value, Is.EqualTo(1.089).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[27].StabilitySafetyFactor.Value, Is.EqualTo(0.713).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[28].StabilitySafetyFactor.Value, Is.EqualTo(0.993).Within(tolerance3Decimals));
+ Assert.That(allCalculationResults[29].StabilitySafetyFactor.Value, Is.EqualTo(1.087).Within(tolerance3Decimals));
});
}
Index: DamClients/DamUI/trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.damx
===================================================================
diff -u -r5678 -r5730
--- DamClients/DamUI/trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.damx (.../Databronbestand.damx) (revision 5678)
+++ DamClients/DamUI/trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.damx (.../Databronbestand.damx) (revision 5730)
@@ -2162,7 +2162,7 @@
-
+