Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r5504 -r5598 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 5504) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 5598) @@ -493,7 +493,7 @@ var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; Assert.Multiple(() => { - Assert.That(messages, Has.Count.EqualTo(11)); + Assert.That(messages, Has.Count.EqualTo(26)); Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); Assert.That(messages[0].Message, Does.Contain("A slice is beyond the geometry at x")); }); @@ -534,7 +534,7 @@ Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); Assert.That(macroStabilityOutput.StabilityOutputItems, Has.Count.EqualTo(1)); }); - Assert.That(macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, Is.EqualTo(1.5212).Within(tolerance4Decimals)); // ToDo replace by actual value when calculation is done and output is parsed + Assert.That(macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, Is.EqualTo(1.5076).Within(tolerance4Decimals)); // ToDo replace by actual value when calculation is done and output is parsed // Fill the design results var designScenario = new DesignScenario @@ -551,53 +551,53 @@ Assert.That(result.BaseFileName, Is.EqualTo("Loc(TestLocation)_Sce(1)_Pro(DefaultNameSoilProfile1D)")); Assert.That(result.CalculationSubDir, Is.EqualTo("..\\Test\\Stability\\UpliftVan")); Assert.That(result.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.5212).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ActiveCenterPoint.X, Is.EqualTo(50.5).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ActiveCenterPoint.Z, Is.EqualTo(12).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ActiveCenterPointRadius, Is.EqualTo(22).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.PassiveCenterPoint.X, Is.EqualTo(50.5)); - Assert.That(result.StabilityDesignResults.PassiveCenterPoint.Z, Is.EqualTo(2.2)); - Assert.That(result.StabilityDesignResults.PassiveCenterPointRadius, Is.EqualTo(12.2)); - Assert.That(result.StabilityDesignResults.ResultSlices, Has.Count.EqualTo(40)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.5076).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ActiveCenterPoint.X, Is.EqualTo(50.75).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ActiveCenterPoint.Z, Is.EqualTo(12.25).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ActiveCenterPointRadius, Is.EqualTo(21).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.PassiveCenterPoint.X, Is.EqualTo(50.75)); + Assert.That(result.StabilityDesignResults.PassiveCenterPoint.Z, Is.EqualTo(1.95)); + Assert.That(result.StabilityDesignResults.PassiveCenterPointRadius, Is.EqualTo(10.7)); + Assert.That(result.StabilityDesignResults.ResultSlices, Has.Count.EqualTo(36)); }); Assert.Multiple(() => { Assert.That(result.StabilityDesignResults.ResultSlices[0].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].EffectiveStress, Is.EqualTo(15.8181).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].EffectiveStress, Is.EqualTo(17.1930).Within(tolerance4Decimals)); Assert.That(result.StabilityDesignResults.ResultSlices[0].FrictionAngleInput, Is.EqualTo(31).Within(tolerance4Decimals)); Assert.That(result.StabilityDesignResults.ResultSlices[0].OCR, Is.EqualTo(double.NaN).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].NormalStress, Is.EqualTo(8.8711).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.X, Is.EqualTo(29.9769).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.Z, Is.EqualTo(4.0751).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].Width, Is.EqualTo(0.6947).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].Weight, Is.EqualTo(10.9881).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].NormalStress, Is.EqualTo(9.8692).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.X, Is.EqualTo(31.2948).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.Z, Is.EqualTo(4.3446).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Width, Is.EqualTo(0.7994).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Weight, Is.EqualTo(13.7446).Within(tolerance4Decimals)); }); var index = 21; Assert.Multiple(() => { Assert.That(result.StabilityDesignResults.ResultSlices[index].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].EffectiveStress, Is.EqualTo(116.6794).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].EffectiveStress, Is.EqualTo(91.9128).Within(tolerance4Decimals)); Assert.That(result.StabilityDesignResults.ResultSlices[index].FrictionAngleInput, Is.EqualTo(10).Within(tolerance4Decimals)); Assert.That(result.StabilityDesignResults.ResultSlices[index].OCR, Is.EqualTo(double.NaN).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].NormalStress, Is.EqualTo(114.2974).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, Is.EqualTo(46.8636).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.Z, Is.EqualTo(1.8182).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].NormalStress, Is.EqualTo(90.8542).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, Is.EqualTo(48.6818).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.Z, Is.EqualTo(0.9091).Within(tolerance4Decimals)); Assert.That(result.StabilityDesignResults.ResultSlices[index].Width, Is.EqualTo(0.9091).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].Weight, Is.EqualTo(193.1480).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].Weight, Is.EqualTo(160.9932).Within(tolerance4Decimals)); }); index = result.StabilityDesignResults.ResultSlices.Count - 1; Assert.Multiple(() => { Assert.That(result.StabilityDesignResults.ResultSlices[index].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].EffectiveStress, Is.EqualTo(5.5186).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].EffectiveStress, Is.EqualTo(5.1450).Within(tolerance4Decimals)); Assert.That(result.StabilityDesignResults.ResultSlices[index].FrictionAngleInput, Is.EqualTo(31).Within(tolerance4Decimals)); Assert.That(result.StabilityDesignResults.ResultSlices[index].OCR, Is.EqualTo(double.NaN).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].NormalStress, Is.EqualTo(7.2892).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, Is.EqualTo(61.5363).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.Z, Is.EqualTo(-1.9274).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].Width, Is.EqualTo(0.9637).Within(tolerance4Decimals)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].Weight, Is.EqualTo(10.3884).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].NormalStress, Is.EqualTo(6.8085).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, Is.EqualTo(60.2362).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.Z, Is.EqualTo(-2.0000).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].Width, Is.EqualTo(0.4580).Within(tolerance4Decimals)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].Weight, Is.EqualTo(4.6034).Within(tolerance4Decimals)); }); } } @@ -673,7 +673,7 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface); - Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.6107).Within(tolerance4Decimals)); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.6099).Within(tolerance4Decimals)); } [Test]