Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs =================================================================== diff -u -r5527 -r5600 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs (.../IssuesTests.cs) (revision 5527) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs (.../IssuesTests.cs) (revision 5600) @@ -38,9 +38,9 @@ [Test] [TestCase("DWP_2", 1,15, 97, 83, 1.393)] - [TestCase("DWP_8", 7,26, 129, 104, 1.110)] - [TestCase("DWP_16", 15,26, 117, 92, 0.766)] - [TestCase("DWP_20", 19,23, 113, 91, 1.568)] + [TestCase("DWP_8", 7,26, 129, 104, 1.051)] + [TestCase("DWP_16", 15,26, 117, 92, 0.749)] + [TestCase("DWP_20", 19,23, 113, 91, 1.523)] public void TestGeometryAndResultForIssueWithDwpsFromTutorial(string location, int segmentIndex, int surfaceCount, int curveCount, int pointCount, double safetyFactor) { string inputString = File.ReadAllText(tutorialStability2D); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r5558 -r5600 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5558) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5600) @@ -70,7 +70,7 @@ Assert.Multiple(() => { - Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.163).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.156).Within(tolerance)); // NumberOfIterations=0 Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0)); @@ -129,7 +129,7 @@ DesignResult result = output.Results.CalculationResults[0]; Assert.Multiple(() => { - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.256).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.247).Within(tolerance)); Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null); }); Assert.Multiple(() => @@ -142,7 +142,7 @@ result = output.Results.CalculationResults[1]; Assert.Multiple(() => { - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.163).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.156).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_stix)")); @@ -151,7 +151,7 @@ result = output.Results.CalculationResults[2]; Assert.Multiple(() => { - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.163).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.156).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_stix)")); @@ -190,7 +190,7 @@ DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults; Assert.Multiple(() => { - Assert.That(result.SafetyFactor, Is.EqualTo(1.114).Within(tolerance)); + Assert.That(result.SafetyFactor, Is.EqualTo(1.072).Within(tolerance)); Assert.That(result.UpliftSituation, Is.Not.Null); }); Assert.Multiple(() => @@ -210,7 +210,7 @@ result = output.Results.CalculationResults[2].StabilityDesignResults; Assert.Multiple(() => { - Assert.That(result.SafetyFactor, Is.EqualTo(1.114).Within(tolerance)); + Assert.That(result.SafetyFactor, Is.EqualTo(1.0722).Within(tolerance)); Assert.That(result.UpliftSituation, Is.Not.Null); Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); }); @@ -251,7 +251,7 @@ Assert.Multiple(() => { Assert.That(result.SafetyFactorSpecified, Is.True); - Assert.That(result.SafetyFactor, Is.EqualTo(1.402).Within(tolerance)); + Assert.That(result.SafetyFactor, Is.EqualTo(1.372).Within(tolerance)); Assert.That(result.UpliftSituation, Is.Not.Null); }); Assert.Multiple(() => @@ -272,7 +272,7 @@ Assert.Multiple(() => { Assert.That(result.SafetyFactorSpecified, Is.True); - Assert.That(result.SafetyFactor, Is.EqualTo(1.402).Within(tolerance)); + Assert.That(result.SafetyFactor, Is.EqualTo(1.372).Within(tolerance)); Assert.That(result.UpliftSituation, Is.Not.Null); Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); }); @@ -315,7 +315,7 @@ Assert.Multiple(() => { // No Zone - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.363).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.359).Within(tolerance)); Assert.That(result.LocationName, Is.EqualTo("DWP_10_1")); Assert.That(result.ProfileName, Is.EqualTo("DWP_10.stix")); Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); @@ -325,7 +325,7 @@ Assert.Multiple(() => { // Forbidden Zone, factor = 0.2 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.895).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.789).Within(tolerance)); Assert.That(result.LocationName, Is.EqualTo("DWP_10_4")); Assert.That(result.ProfileName, Is.EqualTo("DWP_10.stix")); Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); @@ -485,7 +485,7 @@ Output output = GetOutputStringForProject(analysisType, true); Assert.That(output.Results.CalculationResults, Is.Not.Null, "No results available"); - Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.253).Within(0.0005)); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.202).Within(0.0005)); } [Test] @@ -538,8 +538,7 @@ Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("6-4-1-A-1-F_3_s")); DesignResult result = output.Results.CalculationResults[0]; - // SafetyFactor=1.682 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.682).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.678).Within(tolerance)); // skip testing some of the results like uplift etc. @@ -548,11 +547,9 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; - // SafetyFactor=1.644 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.624).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.619).Within(tolerance)); result = output.Results.CalculationResults[2]; - // SafetyFactor=1.682 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.682).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.678).Within(tolerance)); // Stix file var fileList = new List @@ -572,7 +569,7 @@ [Test, Category(Categories.Slow)] [TestCase(MStabSearchMethod.BeeSwarm, 4, 1.612, 1.536)] - [TestCase(MStabSearchMethod.Grid, 2, 1.611, 1.536)] + [TestCase(MStabSearchMethod.Grid, 2, 1.610, 1.535)] public void TestRunMacroStabilityDeltaDijkUpliftVanWith1DProducesStixFiles(MStabSearchMethod searchMethod, int expectedStixFileCount, double expectedSafetyFactor1, double expectedSafetyFactor2) { // Expected results are taken as is from the first run with the new kernel @@ -651,7 +648,7 @@ [Test, Category(Categories.Slow)] [TestCase(MStabSearchMethod.BeeSwarm, 10, 1.612, 1.536)] - [TestCase(MStabSearchMethod.Grid, 8, 1.611, 1.536)] + [TestCase(MStabSearchMethod.Grid, 8, 1.610, 1.535)] public void TestRunMacroStabilityDeltaDijkBishopUpliftVanWith1DWithUpliftProducesStixFiles(MStabSearchMethod searchMethod, int expectedStixFileCount, double expectedSafetyFactor1, double expectedSafetyFactor2) { // Expected results are taken as is from the first run with the new kernel @@ -683,7 +680,7 @@ { CheckCalculationResults( output.Results.CalculationResults[0], "6-4-1-A-1-F", "6-4-1-A-1-F_1_s", - DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.682, true, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.678, true, CalculationResult.Succeeded); CheckCalculationResults( output.Results.CalculationResults[1], "6-4-1-A-1-F", "6-4-1-A-1-F_1_s", DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, expectedSafetyFactor1, true, CalculationResult.Succeeded); @@ -693,7 +690,7 @@ CheckCalculationResults( output.Results.CalculationResults[3], "6-4-1-A-1-F", "6-4-1-A-1-F_2_s", - DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.624, true, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.619, true, CalculationResult.Succeeded); CheckCalculationResults( output.Results.CalculationResults[4], "6-4-1-A-1-F", "6-4-1-A-1-F_2_s", DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, expectedSafetyFactor2, true, CalculationResult.Succeeded); @@ -703,13 +700,13 @@ CheckCalculationResults( output.Results.CalculationResults[6], "6-4-1-A-1-F", "6-4-1-A-1-F_3_s", - DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.682, false, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.678, false, CalculationResult.Succeeded); CheckCalculationResults( output.Results.CalculationResults[7], "6-4-1-A-1-F", "6-4-1-A-1-F_3_s", DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, 0, false, CalculationResult.NoRun); CheckCalculationResults( output.Results.CalculationResults[8], "6-4-1-A-1-F", "6-4-1-A-1-F_3_s", - DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.682, false, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.678, false, CalculationResult.Succeeded); }); // Stix file @@ -769,33 +766,33 @@ { CheckCalculationResults( output.Results.CalculationResults[0], "6-4-1-A-1-F", "6-4-1-A-1-F_1_s", - DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.682, false, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.678, false, CalculationResult.Succeeded); CheckCalculationResults( output.Results.CalculationResults[1], "6-4-1-A-1-F", "6-4-1-A-1-F_1_s", DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, 0, false, CalculationResult.NoRun); CheckCalculationResults( output.Results.CalculationResults[2], "6-4-1-A-1-F", "6-4-1-A-1-F_1_s", - DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.682, false, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.678, false, CalculationResult.Succeeded); CheckCalculationResults( output.Results.CalculationResults[3], "6-4-1-A-1-F", "6-4-1-A-1-F_2_s", - DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.624, false, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.619, false, CalculationResult.Succeeded); CheckCalculationResults( output.Results.CalculationResults[4], "6-4-1-A-1-F", "6-4-1-A-1-F_2_s", DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, 0, false, CalculationResult.NoRun); CheckCalculationResults( output.Results.CalculationResults[5], "6-4-1-A-1-F", "6-4-1-A-1-F_2_s", - DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.624, false, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.619, false, CalculationResult.Succeeded); CheckCalculationResults( output.Results.CalculationResults[6], "6-4-1-A-1-F", "6-4-1-A-1-F_3_s", - DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.682, false, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.678, false, CalculationResult.Succeeded); CheckCalculationResults( output.Results.CalculationResults[7], "6-4-1-A-1-F", "6-4-1-A-1-F_3_s", DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, 0, false, CalculationResult.NoRun); CheckCalculationResults( output.Results.CalculationResults[8], "6-4-1-A-1-F", "6-4-1-A-1-F_3_s", - DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.682, false, CalculationResult.Succeeded); + DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.678, false, CalculationResult.Succeeded); }); // Stix file @@ -837,10 +834,10 @@ /// /// [Test] - [TestCase(double.NaN, 1.256)] // DoC is unchanged - [TestCase(0, 1.256)] - [TestCase(50, 1.283)] - [TestCase(100, 1.309)] + [TestCase(double.NaN, 1.247)] // DoC is unchanged + [TestCase(0, 1.247)] + [TestCase(50, 1.275)] + [TestCase(100, 1.304)] public void GivenStabilityDesignTutorial_WhenCalculatingWithDifferentDegreeOfConsolidation_ThenReturnsADifferentSafetyFactor(double trafficLoadDegreeOfConsolidation, double expectedSafetyFactor) { const string calcDir = "TestEffectOfTrafficLoadDegreeOfConsolidation"; @@ -902,7 +899,7 @@ Assert.Multiple(() => { - Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.256).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.247).Within(tolerance)); // NumberOfIterations=0 Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0)); @@ -934,11 +931,11 @@ }); } - [TestCase("DWP_1", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.Succeeded, 1.4, 1.539, 5)] - [TestCase("DWP_1", "OptimizedSlopeAndShoulderAdaption",CalculationResult.Succeeded, 1.4, 1.589, 4)] + [TestCase("DWP_1", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.Succeeded, 1.4, 1.534, 5)] + [TestCase("DWP_1", "OptimizedSlopeAndShoulderAdaption",CalculationResult.Succeeded, 1.4, 1.584, 4)] [TestCase("DWP_2", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.RunFailed, 1.5, 1.364, 14)] - [TestCase("DWP_2", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 1.114, 17)] - [TestCase("DWP_13", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 0.976, 23, "The characteristic points of the surfaceline are not ascending in X-direction.")] + [TestCase("DWP_2", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 1.109, 17)] + [TestCase("DWP_13", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 0.943, 23, "The characteristic points of the surfaceline are not ascending in X-direction.")] public void GivenTutorialDesign_WhenSpecifiedLocationRunWithGeometryAdaption_ThenGivesExpectedResults(string locationId, string designMethod, CalculationResult calculationResult, double requiredSafetyFactor, double actualSafetyFactor, int iterationCount, string errorMessage= "") {