Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r1137 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 1137) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 1175) @@ -221,6 +221,11 @@ }; desResult.StabilityDesignResults.UpliftSituation = situation; } + + if (designResult.StabilityDesignResults.StabilityModelTypeSpecified) + { + desResult.StabilityDesignResults.StabilityModelType = ConversionHelper.ConvertToStabilityModelType(designResult.StabilityDesignResults.StabilityModelType); + } } private static void CreateLocationResultsOutput(Output output, DamProjectData damProjectData) Index: DamEngine/trunk/xsd/DamDesignResult.xsd =================================================================== diff -u -r1012 -r1175 --- DamEngine/trunk/xsd/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 1012) +++ DamEngine/trunk/xsd/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 1175) @@ -20,6 +20,15 @@ + + + + + + + + + Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r1012 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 1012) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 1175) @@ -919,6 +919,10 @@ private bool numberOfIterationsFieldSpecified; + private DesignResultStabilityDesignResultsStabilityModelType stabilityModelTypeField; + + private bool stabilityModelTypeFieldSpecified; + /// public UpliftSituation UpliftSituation { get { @@ -1125,11 +1129,49 @@ this.numberOfIterationsFieldSpecified = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public DesignResultStabilityDesignResultsStabilityModelType StabilityModelType { + get { + return this.stabilityModelTypeField; + } + set { + this.stabilityModelTypeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool StabilityModelTypeSpecified { + get { + return this.stabilityModelTypeFieldSpecified; + } + set { + this.stabilityModelTypeFieldSpecified = value; + } + } } /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum DesignResultStabilityDesignResultsStabilityModelType { + + /// + Bishop, + + /// + UpliftVan, + + /// + BishopUpliftVan, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r1120 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1120) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1175) @@ -252,6 +252,12 @@ desResult.StabilityDesignResults.NumberOfIterationsSpecified = designResult.StabilityDesignResults.NumberOfIterations.HasValue; if (designResult.StabilityDesignResults.NumberOfIterations.HasValue) desResult.StabilityDesignResults.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations.Value; + + desResult.StabilityDesignResults.StabilityModelTypeSpecified = designResult.StabilityDesignResults.StabilityModelType.HasValue; + if (designResult.StabilityDesignResults.StabilityModelType.HasValue) + { + desResult.StabilityDesignResults.StabilityModelType = ConversionHelper.ConvertToOutputStabilityModelType(designResult.StabilityDesignResults.StabilityModelType.Value); + } } private static void CreateLocationResultsOutput(DamProjectData damProjectData, Output output) Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs =================================================================== diff -u -r877 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs (.../StabilityDesignResults.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs (.../StabilityDesignResults.cs) (revision 1175) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.Geotechnics; namespace Deltares.DamEngine.Data.General.Results @@ -40,6 +39,7 @@ private double? localZone2ExitPointX; private UpliftSituation? upliftSituation; private SurfaceLine2 redesignedSurfaceLine; + private MStabModelType? stabilityModelType; /// /// Gets or sets the number of iterations. @@ -237,6 +237,24 @@ { redesignedSurfaceLine = value; } - } + } + /// + /// Gets or sets the type of the stability model. + /// + /// + /// The type of the stability model. + /// + public MStabModelType? StabilityModelType + { + get + { + return stabilityModelType; + } + set + { + stabilityModelType = value; + } + } + } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r1149 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 1149) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 1175) @@ -273,6 +273,7 @@ zone2.CircleSurfacePointLeftXCoordinate = 2.2; zone2.CircleSurfacePointRightXCoordinate = 2.3; outputItem.Zone2Results = zone2; + outputItem.StabilityModelType = MStabModelType.UpliftVan; DamMacroStabilityOutput output = new DamMacroStabilityOutput(); output.StabilityOutputItems = new List(); output.StabilityOutputItems.Add(outputItem); @@ -281,7 +282,7 @@ failureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; failureMechanismParametersMStab.MStabParameters.SearchMethod = MStabSearchMethod.GeneticAlgorithm; failureMechanismParametersMStab.MStabParameters.CalculationOptions.MinimalCircleDepth = 1.0; - failureMechanismParametersMStab.MStabParameters.Model = MStabModelType.Bishop; + failureMechanismParametersMStab.MStabParameters.Model = MStabModelType.Bishop; // not directly used kernelWrapper.FailureMechanismParametersMStab = failureMechanismParametersMStab; DesignScenario designScenario = new DesignScenario { @@ -295,6 +296,7 @@ Assert.AreEqual(0.9, results[0].StabilityDesignResults.Zone2SafetyFactor); Assert.AreEqual(2.2, results[0].StabilityDesignResults.LocalZone2EntryPointX); Assert.AreEqual(2.3, results[0].StabilityDesignResults.LocalZone2ExitPointX); + Assert.AreEqual(MStabModelType.UpliftVan, results[0].StabilityDesignResults.StabilityModelType); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r1174 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 1174) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 1175) @@ -114,7 +114,7 @@ model, FailureMechanismParametersMStab.ProjectWorkingPath); // if not, only Bishop calculation so leave SecondModel empty. } - + kernelDataInput = damMacroStabilityInput; // When BishopUpliftVan is performed, make sure the first one is Bishop @@ -195,7 +195,7 @@ /// The return messages. public void Execute(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages) { - DamMacroStabilityOutput damMacroStabilityOutput = (DamMacroStabilityOutput)kernelDataOutput; + DamMacroStabilityOutput damMacroStabilityOutput = (DamMacroStabilityOutput) kernelDataOutput; messages = new List(); var input = (DamMacroStabilityInput)kernelDataInput; @@ -214,7 +214,7 @@ { damMacroStabilityOutput.StabilityOutputItems.Add(stabilityOutputItem); } - + // now check if second calculation for BishopUpliftVan is needed, if so perform it. if (bishopUpliftVan) { @@ -243,6 +243,7 @@ { // add result that tells that no calculation was made stabilityOutputItem = new DamMacroStabilityOutputItem { CalculationResult = CalculationResult.NoRun }; + stabilityOutputItem.StabilityModelType = input.FailureMechanismParametersMStab.MStabParameters.Model; damMacroStabilityOutput.StabilityOutputItems.Add(stabilityOutputItem); } } @@ -259,6 +260,7 @@ private static DamMacroStabilityOutputItem ExcecuteCalculation(IKernelDataInput kernelDataInput, List messages) { + var input = (DamMacroStabilityInput)kernelDataInput; var calculator = StabilityCalculator(kernelDataInput); try { @@ -269,6 +271,7 @@ if (results.Count > 0) { var stabilityOutputItem = new DamMacroStabilityOutputItem(); + stabilityOutputItem.StabilityModelType = input.FailureMechanismParametersMStab.MStabParameters.Model; var zone1 = new DamMacroStabilityOutputItem.ResultsSingleZone { SafetyFactor = results[0].Zone1.SafetyFactor, @@ -296,7 +299,8 @@ var message = new LogMessage { MessageType = LogMessageType.Info, Message = e.Message }; messages.Add(message); var stabilityOutputItem = - new DamMacroStabilityOutputItem { CalculationResult = CalculationResult.UnexpectedError }; + new DamMacroStabilityOutputItem {CalculationResult = CalculationResult.UnexpectedError}; + stabilityOutputItem.StabilityModelType = input.FailureMechanismParametersMStab.MStabParameters.Model; return stabilityOutputItem; } } @@ -399,34 +403,44 @@ designResults.Add(designResult); } } + int index; // add worst result from Bishop/UpliftVan, but only if both succeeded. if (designResults[0].CalculationResult == CalculationResult.Succeeded && designResults[1].CalculationResult == CalculationResult.Succeeded) { if (designResults[0].StabilityDesignResults.SafetyFactor <= designResults[1].StabilityDesignResults.SafetyFactor) { - designResults.Add(designResults[0]); + index = 0; } else { - designResults.Add(designResults[1]); + index = 1; } } else if (designResults[0].CalculationResult != CalculationResult.Succeeded) { - // There is no reason by Bishop should not have succeeded therefore no end results can be given - designResults.Add(designResults[0]); + // There is no reason why Bishop should not have succeeded therefore no end results can be given + index = 0; } else if (designResults[1].CalculationResult == CalculationResult.NoRun) { // No uplift therefore no UpliftVan calculation was made. Present Bishop result. - designResults.Add(designResults[0]); + index = 0; } else { // UpliftVan calculation failed. No end results can be given - designResults.Add(designResults[1]); + index = 1; } + var macroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[index]; + if (macroStabilityOutputItem != null) + { + var overallResult = NewDesignResult(damKernelInput, designScenario); + FillDesignResult(macroStabilityOutputItem, overallResult); + overallResult.StabilityDesignResults.UpliftSituation = damMacroStabilityOutput.UpliftSituation; + overallResult.StabilityDesignResults.StabilityModelType = MStabModelType.BishopUpliftVan; + designResults.Add(overallResult); + } } } @@ -490,22 +504,23 @@ private static void FillDesignResult(DamMacroStabilityOutputItem damMacroStabilityOutputItem, DesignResult designResult) { designResult.CalculationResult = damMacroStabilityOutputItem.CalculationResult; + designResult.StabilityDesignResults.StabilityModelType = damMacroStabilityOutputItem.StabilityModelType; if (designResult.CalculationResult == CalculationResult.Succeeded) { - designResult.StabilityDesignResults.Zone1SafetyFactor = - damMacroStabilityOutputItem.Zone1Results.SafetyFactor; - designResult.StabilityDesignResults.LocalZone1EntryPointX = - damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointLeftXCoordinate; - designResult.StabilityDesignResults.LocalZone1ExitPointX = - damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointRightXCoordinate; + designResult.StabilityDesignResults.Zone1SafetyFactor = + damMacroStabilityOutputItem.Zone1Results.SafetyFactor; + designResult.StabilityDesignResults.LocalZone1EntryPointX = + damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointLeftXCoordinate; + designResult.StabilityDesignResults.LocalZone1ExitPointX = + damMacroStabilityOutputItem.Zone1Results.CircleSurfacePointRightXCoordinate; - designResult.StabilityDesignResults.SafetyFactor = designResult.StabilityDesignResults.Zone1SafetyFactor; - if (damMacroStabilityOutputItem.Zone2Results != null) - { + designResult.StabilityDesignResults.SafetyFactor = designResult.StabilityDesignResults.Zone1SafetyFactor; + if (damMacroStabilityOutputItem.Zone2Results != null) + { var zone2 = (DamMacroStabilityOutputItem.ResultsSingleZone)damMacroStabilityOutputItem.Zone2Results; - designResult.StabilityDesignResults.Zone2SafetyFactor = zone2.SafetyFactor; - designResult.StabilityDesignResults.LocalZone2EntryPointX = zone2.CircleSurfacePointLeftXCoordinate; - designResult.StabilityDesignResults.LocalZone2ExitPointX = zone2.CircleSurfacePointRightXCoordinate; + designResult.StabilityDesignResults.Zone2SafetyFactor = zone2.SafetyFactor; + designResult.StabilityDesignResults.LocalZone2EntryPointX = zone2.CircleSurfacePointLeftXCoordinate; + designResult.StabilityDesignResults.LocalZone2ExitPointX = zone2.CircleSurfacePointRightXCoordinate; } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r1173 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 1173) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 1175) @@ -21,9 +21,11 @@ using System.IO; using System.Text.RegularExpressions; +using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Io; using Deltares.DamEngine.Io.XmlInput; +using Deltares.DamEngine.Io.XmlOutput; using Deltares.DamEngine.TestHelpers; using NUnit.Framework; @@ -207,14 +209,17 @@ Assert.AreEqual(1.282, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.IsTrue(result.UpliftSituation.IsUplift); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType); // Uplift Van result = output.Results.CalculationResults.DesignResults[1].StabilityDesignResults; Assert.AreEqual(1.062, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityModelType); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults.DesignResults[2].StabilityDesignResults; Assert.AreEqual(1.062, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult)); @@ -253,14 +258,17 @@ Assert.AreEqual(0.452, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.IsTrue(result.UpliftSituation.IsUplift); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType); // Uplift Van result = output.Results.CalculationResults.DesignResults[1].StabilityDesignResults; Assert.AreEqual(0.547, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityModelType); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults.DesignResults[2].StabilityDesignResults; Assert.AreEqual(0.452, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult)); @@ -300,15 +308,18 @@ Assert.AreEqual(1.458, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.IsFalse(result.UpliftSituation.IsUplift); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType); // Uplift Van result = output.Results.CalculationResults.DesignResults[1].StabilityDesignResults; Assert.IsFalse(result.SafetyFactorSpecified); Assert.IsNotNull(result.UpliftSituation); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityModelType); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults.DesignResults[2].StabilityDesignResults; Assert.IsTrue(result.SafetyFactorSpecified); Assert.AreEqual(1.458, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult)); @@ -684,6 +695,7 @@ Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor=2.219 Assert.AreEqual(2.219, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityDesignResults.StabilityModelType); result = output.Results.CalculationResults.DesignResults[4]; Assert.AreEqual("6-4-3-A-1-C", result.LocationName); @@ -692,6 +704,7 @@ Assert.AreEqual(CalculationResult.UnexpectedError, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor not specified Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityDesignResults.StabilityModelType); result = output.Results.CalculationResults.DesignResults[5]; Assert.AreEqual("6-4-3-A-1-C", result.LocationName); @@ -700,6 +713,7 @@ Assert.AreEqual(CalculationResult.UnexpectedError, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor not specified Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified); + Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityDesignResults.StabilityModelType); } public string ChangeInputModel(string input, InputStabilityModelType modelType) Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r1157 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1157) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1175) @@ -439,6 +439,38 @@ } /// + /// Converts the Dam stability model to the output stability model. + /// + /// Type of the stability model. + /// + public static DesignResultStabilityDesignResultsStabilityModelType ConvertToOutputStabilityModelType(MStabModelType stabilityModelType) + { + var translationTable = new Dictionary() + { + {MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop}, + {MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan}, + {MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan} + }; + return translationTable[stabilityModelType]; + } + + /// + /// Converts the output stability model to the Dam stability model. + /// + /// Type of the output stability model. + /// + public static MStabModelType ConvertToStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType) + { + var translationTable = new Dictionary() + { + {DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop}, + {DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan}, + {DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan} + }; + return translationTable[outputStabilityModelType]; + } + + /// /// Converts the Dam analysis type to the input analysis type. /// /// Type of the analysis. Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r1013 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 1013) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 1175) @@ -162,7 +162,8 @@ LocalZone2ExitPointX = (i + 2) * 21.66, NumberOfIterations = (i + 1) * 3, UpliftSituation = situation, - RedesignedSurfaceLine = surfaceline + RedesignedSurfaceLine = surfaceline, + StabilityModelType = MStabModelType.BishopUpliftVan }; damProjectData.DesignCalculations.Add(result); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs =================================================================== diff -u -r1028 -r1175 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs (.../DamMacroStabilityOutputItem.cs) (revision 1028) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs (.../DamMacroStabilityOutputItem.cs) (revision 1175) @@ -68,5 +68,13 @@ /// The zone2. /// public ResultsSingleZone? Zone2Results { get; set; } + + /// + /// Gets or sets the type of the stability model. + /// + /// + /// The type of the stability model. + /// + public MStabModelType StabilityModelType { get; set; } } }