Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r6873 -r6946
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6873)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6946)
@@ -397,48 +397,46 @@
         if (damProjectData.DamProjectCalculationSpecification != null && damProjectData.DamProjectCalculationSpecification.CurrentSpecification != null)
         {
             DamFailureMechanismeCalculationSpecification curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
-            if (curSpec.StabilityParameters != null && curSpec.StabilityParameters.MStabParameters != null)
+            
+            input.StabilityParameters = new DamEngine.Io.XmlInput.StabilityParameters();
+            input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.SearchMethod);
+            input.StabilityParameters.IsUpliftVanRunOnlyWhenUpliftOccurs =
+                curSpec.IsUpliftVanRunOnlyWhenUpliftOccurs;
+            SlipCircleDefinition slipCircleDefinition = curSpec.SlipCircleDefinition;
+            if (slipCircleDefinition != null)
             {
-                input.StabilityParameters = new DamEngine.Io.XmlInput.StabilityParameters();
-                input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.StabilityParameters.MStabParameters.SearchMethod);
-                input.StabilityParameters.IsUpliftVanRunOnlyWhenUpliftOccurs =
-                    curSpec.StabilityParameters.MStabParameters.IsUpliftVanRunOnlyWhenUpliftOccurs;
-                SlipCircleDefinition slipCircleDefinition = curSpec.StabilityParameters.MStabParameters.SlipCircleDefinition;
-                if (slipCircleDefinition != null)
-                {
-                    input.StabilityParameters.UpliftVanGridDetermination = ConversionHelper.ConvertToInputUpliftVanGridDetermination(slipCircleDefinition.UpliftVanGridSizeDetermination);
-                    input.StabilityParameters.BishopSearchAreaDetermination = ConversionHelper.ConvertToInputBishopSearchAreaDetermination(slipCircleDefinition.BishopSearchAreaDetermination);
-                    input.StabilityParameters.BishopTangentLinesDistanceSpecified = true;
-                    input.StabilityParameters.BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance;
-                    input.StabilityParameters.BishopGridVerticalPointsCountSpecified = true;
-                    input.StabilityParameters.BishopGridVerticalPointsCount = slipCircleDefinition.BishopGridVerticalPointCount;
-                    input.StabilityParameters.BishopGridVerticalPointsDistanceSpecified = true;
-                    input.StabilityParameters.BishopGridVerticalPointsDistance = slipCircleDefinition.BishopGridVerticalPointDistance;
-                    input.StabilityParameters.BishopGridHorizontalPointsCountSpecified = true;
-                    input.StabilityParameters.BishopGridHorizontalPointsCount = slipCircleDefinition.BishopGridHorizontalPointCount;
-                    input.StabilityParameters.BishopGridHorizontalPointsDistanceSpecified = true;
-                    input.StabilityParameters.BishopGridHorizontalPointsDistance = slipCircleDefinition.BishopGridHorizontalPointDistance;
-                    input.StabilityParameters.UpliftVanTangentLinesDefinitionSpecified = true;
-                    input.StabilityParameters.UpliftVanTangentLinesDefinition = ConversionHelper.ConvertToInputTangentLinesDefinition(slipCircleDefinition.UpliftVanTangentLinesDefinition);
-                    input.StabilityParameters.UpliftVanTangentLinesDistanceSpecified = true;
-                    input.StabilityParameters.UpliftVanTangentLinesDistance = slipCircleDefinition.UpliftVanTangentLinesDistance;
-                    input.StabilityParameters.UpliftVanGridLeftVerticalPointsCountSpecified = true;
-                    input.StabilityParameters.UpliftVanGridLeftVerticalPointsCount = slipCircleDefinition.UpliftVanLeftGridVerticalPointCount;
-                    input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistanceSpecified = true;
-                    input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistance = slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance;
-                    input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCountSpecified = true;
-                    input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCount = slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount;
-                    input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistanceSpecified = true;
-                    input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistance = slipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance;
-                    input.StabilityParameters.UpliftVanGridRightVerticalPointsCountSpecified = true;
-                    input.StabilityParameters.UpliftVanGridRightVerticalPointsCount = slipCircleDefinition.UpliftVanRightGridVerticalPointCount;
-                    input.StabilityParameters.UpliftVanGridRightVerticalPointsDistanceSpecified = true;
-                    input.StabilityParameters.UpliftVanGridRightVerticalPointsDistance = slipCircleDefinition.UpliftVanRightGridVerticalPointDistance;
-                    input.StabilityParameters.UpliftVanGridRightHorizontalPointsCountSpecified = true;
-                    input.StabilityParameters.UpliftVanGridRightHorizontalPointsCount = slipCircleDefinition.UpliftVanRightGridHorizontalPointCount;
-                    input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistanceSpecified = true;
-                    input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistance = slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance;
-                }
+                input.StabilityParameters.UpliftVanGridDetermination = ConversionHelper.ConvertToInputUpliftVanGridDetermination(slipCircleDefinition.UpliftVanGridSizeDetermination);
+                input.StabilityParameters.BishopSearchAreaDetermination = ConversionHelper.ConvertToInputBishopSearchAreaDetermination(slipCircleDefinition.BishopSearchAreaDetermination);
+                input.StabilityParameters.BishopTangentLinesDistanceSpecified = true;
+                input.StabilityParameters.BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance;
+                input.StabilityParameters.BishopGridVerticalPointsCountSpecified = true;
+                input.StabilityParameters.BishopGridVerticalPointsCount = slipCircleDefinition.BishopGridVerticalPointCount;
+                input.StabilityParameters.BishopGridVerticalPointsDistanceSpecified = true;
+                input.StabilityParameters.BishopGridVerticalPointsDistance = slipCircleDefinition.BishopGridVerticalPointDistance;
+                input.StabilityParameters.BishopGridHorizontalPointsCountSpecified = true;
+                input.StabilityParameters.BishopGridHorizontalPointsCount = slipCircleDefinition.BishopGridHorizontalPointCount;
+                input.StabilityParameters.BishopGridHorizontalPointsDistanceSpecified = true;
+                input.StabilityParameters.BishopGridHorizontalPointsDistance = slipCircleDefinition.BishopGridHorizontalPointDistance;
+                input.StabilityParameters.UpliftVanTangentLinesDefinitionSpecified = true;
+                input.StabilityParameters.UpliftVanTangentLinesDefinition = ConversionHelper.ConvertToInputTangentLinesDefinition(slipCircleDefinition.UpliftVanTangentLinesDefinition);
+                input.StabilityParameters.UpliftVanTangentLinesDistanceSpecified = true;
+                input.StabilityParameters.UpliftVanTangentLinesDistance = slipCircleDefinition.UpliftVanTangentLinesDistance;
+                input.StabilityParameters.UpliftVanGridLeftVerticalPointsCountSpecified = true;
+                input.StabilityParameters.UpliftVanGridLeftVerticalPointsCount = slipCircleDefinition.UpliftVanLeftGridVerticalPointCount;
+                input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistanceSpecified = true;
+                input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistance = slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance;
+                input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCountSpecified = true;
+                input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCount = slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount;
+                input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistanceSpecified = true;
+                input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistance = slipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance;
+                input.StabilityParameters.UpliftVanGridRightVerticalPointsCountSpecified = true;
+                input.StabilityParameters.UpliftVanGridRightVerticalPointsCount = slipCircleDefinition.UpliftVanRightGridVerticalPointCount;
+                input.StabilityParameters.UpliftVanGridRightVerticalPointsDistanceSpecified = true;
+                input.StabilityParameters.UpliftVanGridRightVerticalPointsDistance = slipCircleDefinition.UpliftVanRightGridVerticalPointDistance;
+                input.StabilityParameters.UpliftVanGridRightHorizontalPointsCountSpecified = true;
+                input.StabilityParameters.UpliftVanGridRightHorizontalPointsCount = slipCircleDefinition.UpliftVanRightGridHorizontalPointCount;
+                input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistanceSpecified = true;
+                input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistance = slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance;
             }
         }
     }