Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs =================================================================== diff -u -r3412 -r3413 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 3412) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 3413) @@ -316,13 +316,14 @@ var output = CreateTestOutput(); for (int i = 0; i < 4; i++) { - var surfaceline = CreateSurfaceLine(); + var surfaceLine = CreateSurfaceLine(); var upliftSituation = CreateUpliftSituation(i); - var stabilityResults = CreateDesignResultStability(i, surfaceline, upliftSituation, mStabModelType); + var stabilityResults = CreateDesignResultStability(i, surfaceLine, upliftSituation, mStabModelType); output.Results.CalculationResults[i].StabilityDesignResults = stabilityResults; } return output; } + private Output CreateTestOutput() { var output = new Output(); @@ -391,8 +392,9 @@ NumberOfIterations = 1 * i, RedesignedSurfaceLine = surfaceline, UpliftSituation = upliftSituation, + StabilityModelTypeSpecified = true, StabilityModelType = ConversionHelper.ConvertToOutputStabilityModelType(mStabModelType) - }; + }; switch (mStabModelType) { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r3412 -r3413 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 3412) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 3413) @@ -289,9 +289,12 @@ var surfaceLine = ConvertXmlSurfaceLineToSurfaceLine2(designResult.StabilityDesignResults.RedesignedSurfaceLine); desResult.RedesignedSurfaceLine2 = surfaceLine; } - if (designResult.StabilityDesignResults.SafetyFactorSpecified) desResult.StabilitySafetyFactor = designResult.StabilityDesignResults.SafetyFactor; - if (designResult.StabilityDesignResults.NumberOfIterationsSpecified) desResult.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; - if (designResult.StabilityDesignResults.SafetyFactorSpecified || designResult.StabilityDesignResults.SlipCircleDefinition != null) desResult.StabilityModel = ConversionHelper.ConvertToStabilityModelType(designResult.StabilityDesignResults.StabilityModelType); + if (designResult.StabilityDesignResults.SafetyFactorSpecified) + desResult.StabilitySafetyFactor = designResult.StabilityDesignResults.SafetyFactor; + if (designResult.StabilityDesignResults.NumberOfIterationsSpecified) + desResult.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; + if (designResult.StabilityDesignResults.StabilityModelTypeSpecified) + desResult.StabilityModel = ConversionHelper.ConvertToStabilityModelType(designResult.StabilityDesignResults.StabilityModelType); if (designResult.StabilityDesignResults.UpliftSituation != null) {