Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs =================================================================== diff -u -r5263 -r5602 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 5263) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 5602) @@ -52,7 +52,7 @@ Assert.That(allCalculationResults[0].ProfileName, Is.EqualTo("DWP_1.stix")); Assert.That(allCalculationResults[0].ProfileProbability, Is.EqualTo(100)); Assert.That(allCalculationResults[0].StabilityModel, Is.EqualTo(MStabModelType.Bishop)); - Assert.That(allCalculationResults[0].SafetyFactor, Is.EqualTo(1.652).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].SafetyFactor, Is.EqualTo(1.618).Within(tolerance3Decimals)); Assert.That(allCalculationResults[0].ShoulderHeight, Is.Null); Assert.That(allCalculationResults[0].ToeAtPolderX, Is.Null); Assert.That(allCalculationResults[0].ToeAtPolderZ, Is.Null); @@ -114,7 +114,7 @@ Assert.That(allCalculationResults[1].ProfileProbability, Is.EqualTo(2.43)); Assert.That(allCalculationResults[1].StabilityModel, Is.EqualTo(MStabModelType.Bishop)); // In version 19.2.1, the safety factor was 1.079 - Assert.That(allCalculationResults[1].SafetyFactor, Is.EqualTo(1.148).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[1].SafetyFactor, Is.EqualTo(1.129).Within(tolerance3Decimals)); Assert.That(allCalculationResults[1].ShoulderHeight, Is.EqualTo(null)); Assert.That(allCalculationResults[1].ToeAtPolderX, Is.EqualTo(null)); Assert.That(allCalculationResults[1].ToeAtPolderZ, Is.EqualTo(null)); @@ -153,15 +153,15 @@ // Check safety factors of few other soil profiles // In version 19.2.1, safety factors were: [4]=1.079, [8]=0.967, [10]=1.046, [11]=1.225 [12]=1.046 Assert.That(allCalculationResults[4].ProfileName, Is.EqualTo("Segment_1_1D5")); - Assert.That(allCalculationResults[4].SafetyFactor, Is.EqualTo(1.148).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[4].SafetyFactor, Is.EqualTo(1.129).Within(tolerance3Decimals)); Assert.That(allCalculationResults[8].ProfileName, Is.EqualTo("Segment_1_1D9")); - Assert.That(allCalculationResults[8].SafetyFactor, Is.EqualTo(1.069).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[8].SafetyFactor, Is.EqualTo(1.049).Within(tolerance3Decimals)); Assert.That(allCalculationResults[10].ProfileName, Is.EqualTo("Segment_1_1D11")); - Assert.That(allCalculationResults[10].SafetyFactor, Is.EqualTo(1.132).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[10].SafetyFactor, Is.EqualTo(1.111).Within(tolerance3Decimals)); Assert.That(allCalculationResults[11].ProfileName, Is.EqualTo("Segment_1_1D12")); - Assert.That(allCalculationResults[11].SafetyFactor, Is.EqualTo(1.370).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[11].SafetyFactor, Is.EqualTo(1.253).Within(tolerance3Decimals)); Assert.That(allCalculationResults[12].ProfileName, Is.EqualTo("Segment_1_1D13")); - Assert.That(allCalculationResults[12].SafetyFactor, Is.EqualTo(1.132).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[12].SafetyFactor, Is.EqualTo(1.111).Within(tolerance3Decimals)); }); } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs =================================================================== diff -u -r5088 -r5602 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 5088) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 5602) @@ -65,11 +65,11 @@ Assert.Multiple(() => { Assert.That(allCalculationResults[0].ProfileName, Is.EqualTo("MohrCoulombMaterial")); - Assert.That(allCalculationResults[0].SafetyFactor, Is.EqualTo(3.065599).Within(tolerance6Decimals)); + Assert.That(allCalculationResults[0].SafetyFactor, Is.EqualTo(3.064123).Within(tolerance6Decimals)); Assert.That(allCalculationResults[1].ProfileName, Is.EqualTo("SigmaTauMaterial")); - Assert.That(allCalculationResults[1].SafetyFactor, Is.EqualTo(3.067917).Within(tolerance6Decimals)); + Assert.That(allCalculationResults[1].SafetyFactor, Is.EqualTo(3.066645).Within(tolerance6Decimals)); Assert.That(allCalculationResults[2].ProfileName, Is.EqualTo("ShansepMaterial")); - Assert.That(allCalculationResults[2].SafetyFactor, Is.EqualTo(3.485578).Within(tolerance6Decimals)); + Assert.That(allCalculationResults[2].SafetyFactor, Is.EqualTo(3.484979).Within(tolerance6Decimals)); }); }