Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStability4Forces.xml
===================================================================
diff -u -r6001 -r6197
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStability4Forces.xml	(.../GrebbedijkStability4Forces.xml)	(revision 6001)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStability4Forces.xml	(.../GrebbedijkStability4Forces.xml)	(revision 6197)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Input DamProjectType="Operational" FailureMechanismSystemType="2" PipingModelType="Sellmeijer4Forces" AnalysisType="NoAdaption"
+<Input DamProjectType="Operational" FailureMechanismSystemType="Piping" PipingModelType="Sellmeijer4Forces" AnalysisType="NoAdaption"
        ProjectPath="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\damLiveWork" CalculationMap="Grebbedijk.Calc"
        MaxCalculationCores="1">
     <Locations>
@@ -22,7 +22,7 @@
             <DesignScenarios/>
             <StabilityOptions MapForSoilgeometries2D="Grebbedijk.geometries2D.0\"
                               SoilDatabaseName="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\damLiveWork\Grebbedijk0.soilmaterials.mdb"
-                              ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
+                              ZoneType="NoZones" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
                               MinimumCircleDepth="1.5"/>
             <ModelFactors RequiredSafetyFactorStabilityInnerSlope="1.3" RequiredSafetyFactorStabilityOuterSlope="0.9"
                           RequiredSafetyFactorPiping="1.2" UpliftCriterionPiping="1.2" UpliftCriterionStability="1.2"/>
@@ -46,7 +46,7 @@
             <DesignScenarios/>
             <StabilityOptions MapForSoilgeometries2D="Grebbedijk.geometries2D.0\"
                               SoilDatabaseName="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\damLiveWork\Grebbedijk0.soilmaterials.mdb"
-                              ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
+                              ZoneType="NoZones" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
                               MinimumCircleDepth="1.5"/>
             <ModelFactors RequiredSafetyFactorStabilityInnerSlope="1.3" RequiredSafetyFactorStabilityOuterSlope="0.9"
                           RequiredSafetyFactorPiping="1.2" UpliftCriterionPiping="1.2" UpliftCriterionStability="1.2"/>
@@ -70,7 +70,7 @@
             <DesignScenarios/>
             <StabilityOptions MapForSoilgeometries2D="Grebbedijk.geometries2D.0\"
                               SoilDatabaseName="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\damLiveWork\Grebbedijk0.soilmaterials.mdb"
-                              ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
+                              ZoneType="NoZones" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
                               MinimumCircleDepth="1.5"/>
             <ModelFactors RequiredSafetyFactorStabilityInnerSlope="1.3" RequiredSafetyFactorStabilityOuterSlope="0.9"
                           RequiredSafetyFactorPiping="1.2" UpliftCriterionPiping="1.2" UpliftCriterionStability="1.2"/>
@@ -94,7 +94,7 @@
             <DesignScenarios/>
             <StabilityOptions MapForSoilgeometries2D="Grebbedijk.geometries2D.0\"
                               SoilDatabaseName="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\damLiveWork\Grebbedijk0.soilmaterials.mdb"
-                              ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
+                              ZoneType="NoZones" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
                               MinimumCircleDepth="1.5"/>
             <ModelFactors RequiredSafetyFactorStabilityInnerSlope="1.3" RequiredSafetyFactorStabilityOuterSlope="0.9"
                           RequiredSafetyFactorPiping="1.2" UpliftCriterionPiping="1.2" UpliftCriterionStability="1.2"/>
@@ -238,22 +238,22 @@
     <Segments>
         <Segment Name="grebbedijk3a">
             <SoilGeometryProbability SoilProfileName="grebbedijk3a.stix" SoilProfileType="2"
-                                     SegmentFailureMechanismType="1" Probability="100"/>
+                                     SegmentFailureMechanismType="Stability" Probability="100"/>
         </Segment>
         <Segment Name="grebbedijk1a">
             <SoilGeometryProbability SoilProfileName="grebbedijk1a.stix" SoilProfileType="2"
-                                     SegmentFailureMechanismType="1" Probability="100"/>
+                                     SegmentFailureMechanismType="Stability" Probability="100"/>
         </Segment>
     </Segments>
     <SoilProfiles1D/>
-    <StabilityParameters SearchMethod="0" GridDetermination="1" BishopTangentLinesDefinition="0"
+    <StabilityParameters SearchMethod="CalculationGrid" GridDetermination="1" BishopTangentLinesDefinition="0"
                          BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10"
                          BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10"
                          BishopGridHorizontalPointsDistance="2.5" UpliftVanGridLeftVerticalPointsCount="10"
                          UpliftVanGridLeftVerticalPointsDistance="2.5" UpliftVanGridLeftHorizontalPointsCount="10"
                          UpliftVanGridLeftHorizontalPointsDistance="2.5" UpliftVanGridRightVerticalPointsCount="3"
                          UpliftVanGridRightVerticalPointsDistance="2.5" UpliftVanGridRightHorizontalPointsCount="6"
-                         UpliftVanGridRightHorizontalPointsDistance="2.5" UpliftVanTangentLinesDefinition="0"
+                         UpliftVanGridRightHorizontalPointsDistance="2.5" UpliftVanTangentLinesDefinition="OnBoundaryLines"
                          UpliftVanTangentLinesDistance="0.25"/>
     <AquiferSoils>
         <AquiferSoil Soilname="Soft Clay" IsAquifer="false"/>