Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperOutputFromEngine.cs =================================================================== diff -u -r4540 -r4729 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperOutputFromEngine.cs (.../FillMacroStabilityWrapperOutputFromEngine.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperOutputFromEngine.cs (.../FillMacroStabilityWrapperOutputFromEngine.cs) (revision 4729) @@ -110,17 +110,15 @@ slice.TopAngle = resultSlice.TopAngle; slice.BottomAngle = resultSlice.BottomAngle; slice.CohesionInput = resultSlice.CohesionInput; - slice.Cohesion = resultSlice.Cohesion; - slice.CohesionCalculated = resultSlice.CohesionCalculated; + slice.CohesionOutput = resultSlice.CohesionOutput; slice.FrictionAngleInput = resultSlice.FrictionAngleInput; - slice.FrictionAngle = resultSlice.FrictionAngle; + slice.FrictionAngleOutput = resultSlice.FrictionAngleOutput; slice.YieldStress = resultSlice.YieldStress; slice.OCR = resultSlice.OCR; slice.POP = resultSlice.POP; slice.DegreeOfConsolidationPorePressure = resultSlice.DegreeOfConsolidationPorePressure; slice.PorePressureDueToDegreeOfConsolidationLoad = resultSlice.PorePressureDueToDegreeOfConsolidationLoad; slice.DilatancyInput = resultSlice.DilatancyInput; - slice.Dilatancy = resultSlice.Dilatancy; slice.ExternalLoad = resultSlice.ExternalLoad; slice.HydrostaticPorePressure = resultSlice.HydrostaticPorePressure; slice.LeftForce = resultSlice.LeftForce; @@ -137,12 +135,14 @@ slice.PiezometricPorePressure = resultSlice.PiezometricPorePressure; slice.EffectiveStress = resultSlice.EffectiveStress; slice.ExcessPorePressure = resultSlice.ExcessPorePressure; - slice.ShearStress = resultSlice.ShearStress; + slice.ShearStressInput = resultSlice.ShearStressInput; + slice.ShearStressOutput = resultSlice.ShearStressOutput; slice.SoilStress = resultSlice.SoilStress; slice.TotalPorePressure = resultSlice.TotalPorePressure; slice.TotalStress = resultSlice.TotalStress; slice.Weight = resultSlice.Weight; - slice.Su = resultSlice.Su; + slice.SuInput = resultSlice.SuInput; + slice.SuOutput = resultSlice.SuOutput; slice.ShearStrengthModelType = ConversionHelper.ConvertToMacroStabilityShearStrengthModel(resultSlice.ShearStrengthModel); slice.HorizontalSoilQuakeStress = resultSlice.HorizontalSoilQuakeStress; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityResultSlice.cs =================================================================== diff -u -r4540 -r4729 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityResultSlice.cs (.../StabilityResultSlice.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityResultSlice.cs (.../StabilityResultSlice.cs) (revision 4729) @@ -75,29 +75,24 @@ public double BottomAngle; /// - /// The cohesion input + /// The input cohesion /// public double CohesionInput; /// - /// The cohesion + /// The output cohesion /// - public double Cohesion; + public double CohesionOutput; /// - /// The cohesion calculated + /// The input friction angle /// - public double CohesionCalculated; - - /// - /// The friction angle input - /// public double FrictionAngleInput; /// - /// The friction angle + /// The output friction angle /// - public double FrictionAngle; + public double FrictionAngleOutput; /// /// The yield stress @@ -125,16 +120,11 @@ public double PorePressureDueToDegreeOfConsolidationLoad; /// - /// The dilatancy input + /// The input dilatancy /// public double DilatancyInput; /// - /// The dilatancy - /// - public double Dilatancy; - - /// /// The external load /// public double ExternalLoad; @@ -215,9 +205,14 @@ public double ExcessPorePressure; /// - /// The shear stress + /// The input shear stress /// - public double ShearStress; + public double ShearStressInput; + + /// + /// The output shear stress + /// + public double ShearStressOutput; /// /// The soil stress @@ -240,9 +235,14 @@ public double Weight; /// - /// The su + /// The input su /// - public double Su; + public double SuInput; + + /// + /// The output su + /// + public double SuOutput; /// /// The shear strength model Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj =================================================================== diff -u -r4688 -r4729 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 4688) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 4729) @@ -32,7 +32,7 @@ 24.1.0.63 - 24.1.0.65 + 24.1.0.66 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)); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj =================================================================== diff -u -r4688 -r4729 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 4688) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 4729) @@ -345,7 +345,7 @@ 3.9.0 - 24.1.0.65 + 24.1.0.66 Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj =================================================================== diff -u -r4688 -r4729 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 4688) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 4729) @@ -81,7 +81,7 @@ 3.9.0 - 24.1.0.65 + 24.1.0.66 Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs =================================================================== diff -u -r4540 -r4729 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs (.../FillEngineFromMacroStabilityWrapperOutput.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs (.../FillEngineFromMacroStabilityWrapperOutput.cs) (revision 4729) @@ -162,17 +162,15 @@ resultSlice.TopAngle = slice.TopAngle; resultSlice.BottomAngle = slice.BottomAngle; resultSlice.CohesionInput = slice.CohesionInput; - resultSlice.Cohesion = slice.Cohesion; - resultSlice.CohesionCalculated = slice.CohesionCalculated; + resultSlice.CohesionOutput = slice.CohesionOutput; resultSlice.FrictionAngleInput = slice.FrictionAngleInput; - resultSlice.FrictionAngle = slice.FrictionAngle; + resultSlice.FrictionAngleOutput = slice.FrictionAngleOutput; resultSlice.YieldStress = slice.YieldStress; resultSlice.OCR = slice.OCR; resultSlice.POP = slice.POP; resultSlice.DegreeOfConsolidationPorePressure = slice.DegreeOfConsolidationPorePressure; resultSlice.PorePressureDueToDegreeOfConsolidationLoad = slice.PorePressureDueToDegreeOfConsolidationLoad; resultSlice.DilatancyInput = slice.DilatancyInput; - resultSlice.Dilatancy = slice.Dilatancy; resultSlice.ExternalLoad = slice.ExternalLoad; resultSlice.HydrostaticPorePressure = slice.HydrostaticPorePressure; resultSlice.LeftForce = slice.LeftForce; @@ -189,12 +187,14 @@ resultSlice.PiezometricPorePressure = slice.PiezometricPorePressure; resultSlice.EffectiveStress = slice.EffectiveStress; resultSlice.ExcessPorePressure = slice.ExcessPorePressure; - resultSlice.ShearStress = slice.ShearStress; + resultSlice.ShearStressInput = slice.ShearStressInput; + resultSlice.ShearStressOutput = slice.ShearStressOutput; resultSlice.SoilStress = slice.SoilStress; resultSlice.TotalPorePressure = slice.TotalPorePressure; resultSlice.TotalStress = slice.TotalStress; resultSlice.Weight = slice.Weight; - resultSlice.Su = slice.Su; + resultSlice.SuInput = slice.SuInput; + resultSlice.SuOutput = slice.SuOutput; resultSlice.ShearStrengthModel = ConversionHelper.ConvertToDamShearStrengthModel(slice.ShearStrengthModelType); resultSlice.HorizontalSoilQuakeStress = slice.HorizontalSoilQuakeStress; resultSlice.StrengthIncreaseExponent = slice.StrengthIncreaseExponent;