Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r1159 -r1180 --- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1159) +++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1180) @@ -428,6 +428,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: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlOutputFromDamUi.cs =================================================================== diff -u -r875 -r1180 --- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 1180) @@ -20,7 +20,6 @@ // All rights reserved. using System.Collections.Generic; -using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Io.XmlOutput; namespace Deltares.Dam.Data.DamEngineIo Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r1025 -r1180 --- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 1025) +++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 1180) @@ -20,14 +20,12 @@ // All rights reserved. using System.Collections.Generic; -using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Io.XmlOutput; using Deltares.Geometry; using Deltares.Geotechnics.GeotechnicalGeometry; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Standard.EventPublisher; -using LogMessageType = Deltares.Standard.Logging.LogMessageType; using SurfaceLine = Deltares.DamEngine.Io.XmlOutput.SurfaceLine; namespace Deltares.Dam.Data.DamEngineIo @@ -229,6 +227,7 @@ if (designResult.StabilityDesignResults.Zone2EntryPointXSpecified) desResult.LocalZone2EntryPointX = designResult.StabilityDesignResults.Zone2EntryPointX; if (designResult.StabilityDesignResults.Zone2ExitPointXSpecified) desResult.LocalZone2ExitPointX = designResult.StabilityDesignResults.Zone2ExitPointX; if (designResult.StabilityDesignResults.NumberOfIterationsSpecified) desResult.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; + if (designResult.StabilityDesignResults.SafetyFactorSpecified) desResult.StabilityModel = ConversionHelper.ConvertToStabilityModelType(designResult.StabilityDesignResults.StabilityModelType); if (designResult.StabilityDesignResults.UpliftSituation != null) { Index: DamClients/DamUI/trunk/src/Dam/Data/MStabResults.cs =================================================================== diff -u -r875 -r1180 --- DamClients/DamUI/trunk/src/Dam/Data/MStabResults.cs (.../MStabResults.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Data/MStabResults.cs (.../MStabResults.cs) (revision 1180) @@ -30,6 +30,7 @@ public string CalculationName; public string CalculationSubDir; public int IterationNumber; + public MStabModelType MStabModelType; public void Init() { Index: DamClients/DamUI/trunk/src/Dam/Data/CsvExportData.cs =================================================================== diff -u -r1025 -r1180 --- DamClients/DamUI/trunk/src/Dam/Data/CsvExportData.cs (.../CsvExportData.cs) (revision 1025) +++ DamClients/DamUI/trunk/src/Dam/Data/CsvExportData.cs (.../CsvExportData.cs) (revision 1180) @@ -92,6 +92,7 @@ private CalculationResult calculationResult = CalculationResult.NoRun; private string resultMessage = ""; private int numberOfIterations; + private MStabModelType? stabilityModel; private ResultEvaluation resultEvaluation = ResultEvaluation.NotEvaluated; private string notes = ""; @@ -1625,15 +1626,18 @@ { get { - switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) + if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || + damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) { - case FailureMechanismSystemType.StabilityOutside: - case FailureMechanismSystemType.StabilityInside: - return damFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.MStabParameters.Model; - default: - return null; - } + var mstabResults = scenario.GetMStabResults(soilProfile, soilGeometry2DName); + if (mstabResults != null) + { + stabilityModel = mstabResults.Value.MStabModelType; + } + } + return stabilityModel; } + set { stabilityModel = value; } } [Label("SafetyFactor")]