Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r4628 -r4729 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4628) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4729) @@ -197,17 +197,15 @@ TopAngle = 0, BottomAngle = 12.2, CohesionInput = 14, - Cohesion = 14.5, - CohesionCalculated = 15.5, + CohesionOutput = 15.5, FrictionAngleInput = 30, - FrictionAngle = 30.5, + FrictionAngleOutput = 30.5, YieldStress = 22, OCR = 23, POP = 24, DegreeOfConsolidationPorePressure = 25, PorePressureDueToDegreeOfConsolidationLoad = 26, DilatancyInput = 27, - Dilatancy = 28, ExternalLoad = 29, HydrostaticPorePressure = 30, LeftForce = 31, @@ -224,12 +222,14 @@ PiezometricPorePressure = 42, EffectiveStress = 43, ExcessPorePressure = 44, - ShearStress = 45, + ShearStressInput = 45, + ShearStressOutput = 45.5, SoilStress = 46, TotalPorePressure = 47, TotalStress = 48, Weight = 49, - Su = 50, + SuInput = 50, + SuOutput = 50.5, ShearStrengthModel = ShearStrengthModel.CPhi, HorizontalSoilQuakeStress = 51, StrengthIncreaseExponent = 52, @@ -363,17 +363,15 @@ Assert.That(result.StabilityDesignResults.ResultSlices[0].TopAngle, Is.EqualTo(0)); Assert.That(result.StabilityDesignResults.ResultSlices[0].BottomAngle, Is.EqualTo(12.2)); Assert.That(result.StabilityDesignResults.ResultSlices[0].CohesionInput, Is.EqualTo(14)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].Cohesion, Is.EqualTo(14.5)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].CohesionCalculated, Is.EqualTo(15.5)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].CohesionOutput, Is.EqualTo(15.5)); Assert.That(result.StabilityDesignResults.ResultSlices[0].FrictionAngleInput, Is.EqualTo(30)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].FrictionAngle, Is.EqualTo(30.5)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].FrictionAngleOutput, Is.EqualTo(30.5)); Assert.That(result.StabilityDesignResults.ResultSlices[0].YieldStress, Is.EqualTo(22)); Assert.That(result.StabilityDesignResults.ResultSlices[0].OCR, Is.EqualTo(23)); Assert.That(result.StabilityDesignResults.ResultSlices[0].POP, Is.EqualTo(24)); Assert.That(result.StabilityDesignResults.ResultSlices[0].DegreeOfConsolidationPorePressure, Is.EqualTo(25)); Assert.That(result.StabilityDesignResults.ResultSlices[0].PorePressureDueToDegreeOfConsolidationLoad, Is.EqualTo(26)); Assert.That(result.StabilityDesignResults.ResultSlices[0].DilatancyInput, Is.EqualTo(27)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].Dilatancy, Is.EqualTo(28)); Assert.That(result.StabilityDesignResults.ResultSlices[0].ExternalLoad, Is.EqualTo(29)); Assert.That(result.StabilityDesignResults.ResultSlices[0].HydrostaticPorePressure, Is.EqualTo(30)); Assert.That(result.StabilityDesignResults.ResultSlices[0].LeftForce, Is.EqualTo(31)); @@ -390,12 +388,14 @@ Assert.That(result.StabilityDesignResults.ResultSlices[0].PiezometricPorePressure, Is.EqualTo(42)); Assert.That(result.StabilityDesignResults.ResultSlices[0].EffectiveStress, Is.EqualTo(43)); Assert.That(result.StabilityDesignResults.ResultSlices[0].ExcessPorePressure, Is.EqualTo(44)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].ShearStress, Is.EqualTo(45)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ShearStressInput, Is.EqualTo(45)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ShearStressOutput, Is.EqualTo(45.5)); Assert.That(result.StabilityDesignResults.ResultSlices[0].SoilStress, Is.EqualTo(46)); Assert.That(result.StabilityDesignResults.ResultSlices[0].TotalPorePressure, Is.EqualTo(47)); Assert.That(result.StabilityDesignResults.ResultSlices[0].TotalStress, Is.EqualTo(48)); Assert.That(result.StabilityDesignResults.ResultSlices[0].Weight, Is.EqualTo(49)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].Su, Is.EqualTo(50)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].SuInput, Is.EqualTo(50)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].SuOutput, Is.EqualTo(50.5)); Assert.That(result.StabilityDesignResults.ResultSlices[0].HorizontalSoilQuakeStress, Is.EqualTo(51)); Assert.That(result.StabilityDesignResults.ResultSlices[0].StrengthIncreaseExponent, Is.EqualTo(52)); Assert.That(result.StabilityDesignResults.ResultSlices[0].UpliftFactor, Is.EqualTo(53)); @@ -530,7 +530,7 @@ Assert.That(result.StabilityDesignResults.ResultSlices.Count, Is.EqualTo(40)); Assert.That(result.StabilityDesignResults.ResultSlices[0].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); Assert.That(result.StabilityDesignResults.ResultSlices[0].EffectiveStress, Is.EqualTo(15.8180658).Within(diff)); - Assert.That(result.StabilityDesignResults.ResultSlices[0].FrictionAngle, Is.EqualTo(31).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].FrictionAngleInput, Is.EqualTo(31).Within(diff)); Assert.That(result.StabilityDesignResults.ResultSlices[0].OCR, Is.EqualTo(double.NaN).Within(diff)); Assert.That(result.StabilityDesignResults.ResultSlices[0].NormalStress, Is.EqualTo(8.8710528).Within(diff)); Assert.That(result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.X, Is.EqualTo(29.9769477).Within(diff)); @@ -540,7 +540,7 @@ var index = 21; Assert.That(result.StabilityDesignResults.ResultSlices[index].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); Assert.That(result.StabilityDesignResults.ResultSlices[index].EffectiveStress, Is.EqualTo(116.6794325).Within(diff)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].FrictionAngle, Is.EqualTo(10).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].FrictionAngleInput, Is.EqualTo(10).Within(diff)); Assert.That(result.StabilityDesignResults.ResultSlices[index].OCR, Is.EqualTo(double.NaN).Within(diff)); Assert.That(result.StabilityDesignResults.ResultSlices[index].NormalStress, Is.EqualTo(114.2973685).Within(diff)); Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, Is.EqualTo(46.8636363).Within(diff)); @@ -551,7 +551,7 @@ index = result.StabilityDesignResults.ResultSlices.Count - 1; Assert.That(result.StabilityDesignResults.ResultSlices[index].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); Assert.That(result.StabilityDesignResults.ResultSlices[index].EffectiveStress, Is.EqualTo(5.5185653).Within(diff)); - Assert.That(result.StabilityDesignResults.ResultSlices[index].FrictionAngle, Is.EqualTo(31).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].FrictionAngleInput, Is.EqualTo(31).Within(diff)); Assert.That(result.StabilityDesignResults.ResultSlices[index].OCR, Is.EqualTo(double.NaN).Within(diff)); Assert.That(result.StabilityDesignResults.ResultSlices[index].NormalStress, Is.EqualTo(7.2892231).Within(diff)); Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, Is.EqualTo(61.5363037).Within(diff));