Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs =================================================================== diff -u -r4915 -r5088 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 4915) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 5088) @@ -112,7 +112,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(0.974).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[1].SafetyFactor, Is.EqualTo(1.148).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)); @@ -151,15 +151,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(0.974).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[4].SafetyFactor, Is.EqualTo(1.148).Within(tolerance3Decimals)); Assert.That(allCalculationResults[8].ProfileName, Is.EqualTo("Segment_1_1D9")); - Assert.That(allCalculationResults[8].SafetyFactor, Is.EqualTo(0.927).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[8].SafetyFactor, Is.EqualTo(1.069).Within(tolerance3Decimals)); Assert.That(allCalculationResults[10].ProfileName, Is.EqualTo("Segment_1_1D11")); - Assert.That(allCalculationResults[10].SafetyFactor, Is.EqualTo(0.947).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[10].SafetyFactor, Is.EqualTo(1.132).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[12].ProfileName, Is.EqualTo("Segment_1_1D13")); - Assert.That(allCalculationResults[12].SafetyFactor, Is.EqualTo(0.947).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[12].SafetyFactor, Is.EqualTo(1.132).Within(tolerance3Decimals)); }); } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs =================================================================== diff -u -r5047 -r5088 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 5047) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 5088) @@ -92,15 +92,15 @@ Assert.That(allCalculationResults[1].ProfileName, Is.EqualTo("ShansepMaterial")); Assert.That(allCalculationResults[1].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); }); - Assert.That(logMessages, Has.Count.EqualTo(17)); + Assert.That(logMessages, Has.Count.EqualTo(9)); Assert.Multiple(() => { - Assert.That(logMessages[7].MessageType, Is.EqualTo(LogMessageType.Error)); - Assert.That(logMessages[7].Message, Is.EqualTo("Validation failed for location 'Comparison Mohr-Coulomb SigmaTau and SHANSEP', subsoil scenario 'SigmaTauMaterial', design scenario '1'")); - Assert.That(logMessages[8].MessageType, Is.EqualTo(LogMessageType.Error)); - Assert.That(logMessages[8].Message, Is.EqualTo("The first sigma value must be 0 for sigma/tau table ")); - Assert.That(logMessages[9].MessageType, Is.EqualTo(LogMessageType.Error)); - Assert.That(logMessages[9].Message, Is.EqualTo("The first sigma value must be 0 for sigma/tau table ")); + Assert.That(logMessages[3].MessageType, Is.EqualTo(LogMessageType.Error)); + Assert.That(logMessages[3].Message, Is.EqualTo("Validation failed for location 'Comparison Mohr-Coulomb SigmaTau and SHANSEP', subsoil scenario 'SigmaTauMaterial', design scenario '1'")); + Assert.That(logMessages[4].MessageType, Is.EqualTo(LogMessageType.Error)); + Assert.That(logMessages[4].Message, Is.EqualTo("The first sigma value must be 0 for sigma/tau table ")); + Assert.That(logMessages[5].MessageType, Is.EqualTo(LogMessageType.Error)); + Assert.That(logMessages[5].Message, Is.EqualTo("The first sigma value must be 0 for sigma/tau table ")); }); } }