Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml
===================================================================
diff -u -r5708 -r6197
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml	(.../MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml)	(revision 5708)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml	(.../MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml)	(revision 6197)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="0" StabilityModelType="Bishop" AnalysisType="AdaptGeometry" ProjectPath="D:\src\dam\DamClients\DamUI\trunk\data\Tutorials\DAMDesign\Stability" CalculationMap="DAM Tutorial Design.Calc" MaxCalculationCores="1">
+<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="StabilityInside" StabilityModelType="Bishop" AnalysisType="AdaptGeometry" ProjectPath="D:\src\dam\DamClients\DamUI\trunk\data\Tutorials\DAMDesign\Stability" CalculationMap="DAM Tutorial Design.Calc" MaxCalculationCores="1">
   <Locations>
     <Location SurfaceLineName="DWP_1" SegmentName="DWP_1" Name="DWP_1" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="-8.42" DistanceToEntryPoint="0">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" NewMinDistanceDikeToeStartDitch="3" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" DampingFactorPl3="0" DampingFactorPl4="0" PenetrationLength="0" SlopeDampingFactor="0" IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="4.4" RiverLevelLow="0" DikeTableHeight="4.9" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.2" PlLineOffsetBelowDikeToeAtPolder="0.2" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="1.4" RequiredSafetyFactorStabilityOuterSlope="1.17" RequiredSafetyFactorPiping="1.2" PolderLevel="1.6" HeadPl2="0" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="DAM Tutorial Design.geometries2D.0\" SoilDatabaseName="" ZoneType="0" ForbiddenZoneFactor="1" TrafficLoad="13" MinimumCircleDepth="1.5" />
+      <StabilityOptions MapForSoilgeometries2D="DAM Tutorial Design.geometries2D.0\" SoilDatabaseName="" ZoneType="NoZones" ForbiddenZoneFactor="1" TrafficLoad="13" MinimumCircleDepth="1.5" />
     </Location>
   </Locations>
   <SurfaceLines>
@@ -255,73 +255,73 @@
   </Soils>
   <Segments>
     <Segment Name="DWP_1">
-      <SoilGeometryProbability SoilProfileName="DWP_1.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_1.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_2">
-      <SoilGeometryProbability SoilProfileName="DWP_2.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_2.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_3">
-      <SoilGeometryProbability SoilProfileName="DWP_3.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_3.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_4">
-      <SoilGeometryProbability SoilProfileName="DWP_4.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_4.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_5">
-      <SoilGeometryProbability SoilProfileName="DWP_5.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_5.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_6">
-      <SoilGeometryProbability SoilProfileName="DWP_6.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_6.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_7">
-      <SoilGeometryProbability SoilProfileName="DWP_7.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_7.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_8">
-      <SoilGeometryProbability SoilProfileName="DWP_8.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_8.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_9">
-      <SoilGeometryProbability SoilProfileName="DWP_9.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_9.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_10">
-      <SoilGeometryProbability SoilProfileName="DWP_10.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_10.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_11">
-      <SoilGeometryProbability SoilProfileName="DWP_11.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_11.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_12">
-      <SoilGeometryProbability SoilProfileName="DWP_12.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_12.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_13">
-      <SoilGeometryProbability SoilProfileName="DWP_13.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_13.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_14">
-      <SoilGeometryProbability SoilProfileName="DWP_14.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_14.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_15">
-      <SoilGeometryProbability SoilProfileName="DWP_15.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_15.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_16">
-      <SoilGeometryProbability SoilProfileName="DWP_16.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_16.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_17">
-      <SoilGeometryProbability SoilProfileName="DWP_17.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_17.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_18">
-      <SoilGeometryProbability SoilProfileName="DWP_18.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_18.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_19">
-      <SoilGeometryProbability SoilProfileName="DWP_19.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_19.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_20">
-      <SoilGeometryProbability SoilProfileName="DWP_20.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_20.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_21">
-      <SoilGeometryProbability SoilProfileName="DWP_21.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_21.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_22">
-      <SoilGeometryProbability SoilProfileName="DWP_22.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_22.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="DWP_23">
-      <SoilGeometryProbability SoilProfileName="DWP_23.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="DWP_23.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
   </Segments>
   <SoilProfiles1D />
@@ -506,7 +506,7 @@
       <PreconsolidationStresses />
     </SoilProfile2D>
   </SoilProfiles2D>
-  <StabilityParameters SearchMethod="0" UpliftVanGridDetermination="0" BishopSearchAreaDetermination="0" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10" BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10" BishopGridHorizontalPointsDistance="2.5" UpliftVanGridLeftVerticalPointsCount="36" UpliftVanGridLeftVerticalPointsDistance="2" UpliftVanGridLeftHorizontalPointsCount="14" UpliftVanGridLeftHorizontalPointsDistance="2" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2" UpliftVanTangentLinesDefinition="1" UpliftVanTangentLinesDistance="0.25" />
+  <StabilityParameters SearchMethod="CalculationGrid" UpliftVanGridDetermination="Automatic" BishopSearchAreaDetermination="Automatic" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10" BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10" BishopGridHorizontalPointsDistance="2.5" UpliftVanGridLeftVerticalPointsCount="36" UpliftVanGridLeftVerticalPointsDistance="2" UpliftVanGridLeftHorizontalPointsCount="14" UpliftVanGridLeftHorizontalPointsDistance="2" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2" UpliftVanTangentLinesDefinition="Specified" UpliftVanTangentLinesDistance="0.25" />
   <AquiferSoils xsi:nil="true" />
   <OperationalInputTimeSeries xsi:nil="true" />
   <SensorData xsi:nil="true" />