Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileShearStrengthModelsComparison.xml
===================================================================
diff -u -r5833 -r6197
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileShearStrengthModelsComparison.xml	(.../InputFileShearStrengthModelsComparison.xml)	(revision 5833)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileShearStrengthModelsComparison.xml	(.../InputFileShearStrengthModelsComparison.xml)	(revision 6197)
@@ -1,21 +1,21 @@
 <?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="NoAdaption" ProjectPath="D:\DAM\DamEngine\trunk\src\Deltares.DamEngine.IntegrationTests\TestFiles\ShearStrengthModelsTests" CalculationMap="ShearStrengthModelsComparison.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="NoAdaption" ProjectPath="D:\DAM\DamEngine\trunk\src\Deltares.DamEngine.IntegrationTests\TestFiles\ShearStrengthModelsTests" CalculationMap="ShearStrengthModelsComparison.Calc" MaxCalculationCores="1">
   <Locations>
     <Location SurfaceLineName="16-1-1-C-3-Z" SegmentName="1033" Name="Comparison models (constant tau)" DikeEmbankmentMaterial="klei" XSoilGeometry2DOrigin="1" DistanceToEntryPoint="2.1">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="klei2" StabilityShoulderGrowSlope="2" StabilityShoulderGrowDeltaX="0.2" StabilitySlopeAdaptionDeltaX="0.5" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" DampingFactorPl3="0.3" DampingFactorPl4="0.4" PenetrationLength="1.3" SlopeDampingFactor="0" IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="3.8" RiverLevelLow="3.7" DikeTableHeight="57" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.6" PlLineOffsetBelowShoulderBaseInside="0.1" PlLineOffsetBelowDikeToeAtPolder="0.2" HeadPl3="0.9" HeadPl4="0.8" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.1" RequiredSafetyFactorStabilityInnerSlope="6.07" RequiredSafetyFactorStabilityOuterSlope="1.4" RequiredSafetyFactorPiping="1.2" PolderLevel="0.9" HeadPl2="13.056" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="" ZoneType="0" ForbiddenZoneFactor="1" TrafficLoad="10" MinimumCircleDepth="1.5" TrafficLoadDegreeOfConsolidation="10.12" />
+      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="" ZoneType="NoZones" ForbiddenZoneFactor="1" TrafficLoad="10" MinimumCircleDepth="1.5" TrafficLoadDegreeOfConsolidation="10.12" />
     </Location>
     <Location SurfaceLineName="16-1-1-C-3-Z" SegmentName="1043" Name="Comparison models (not constant tau)" DikeEmbankmentMaterial="klei" XSoilGeometry2DOrigin="1" DistanceToEntryPoint="2.1">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="klei2" StabilityShoulderGrowSlope="2" StabilityShoulderGrowDeltaX="0.2" StabilitySlopeAdaptionDeltaX="0.5" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" DampingFactorPl3="0.3" DampingFactorPl4="0.4" PenetrationLength="1.3" SlopeDampingFactor="0" IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="3.8" RiverLevelLow="3.7" DikeTableHeight="57" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.6" PlLineOffsetBelowShoulderBaseInside="0.1" PlLineOffsetBelowDikeToeAtPolder="0.2" HeadPl3="0.9" HeadPl4="0.8" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.1" RequiredSafetyFactorStabilityInnerSlope="6.07" RequiredSafetyFactorStabilityOuterSlope="1.4" RequiredSafetyFactorPiping="1.2" PolderLevel="0.9" HeadPl2="13.056" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="" ZoneType="0" ForbiddenZoneFactor="1" TrafficLoad="10" MinimumCircleDepth="1.5" TrafficLoadDegreeOfConsolidation="10.12" />
+      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="" ZoneType="NoZones" ForbiddenZoneFactor="1" TrafficLoad="10" MinimumCircleDepth="1.5" TrafficLoadDegreeOfConsolidation="10.12" />
     </Location>
   </Locations>
   <SurfaceLines>
@@ -71,15 +71,15 @@
   </Soils>
   <Segments>
     <Segment Name="1043">
-      <SoilGeometryProbability SoilProfileName="MohrCoulombPhi45" SoilProfileType="0" SegmentFailureMechanismType="1" Probability="10" />
-      <SoilGeometryProbability SoilProfileName="SigmaTauPhi45" SoilProfileType="0" SegmentFailureMechanismType="1" Probability="20" />
-      <SoilGeometryProbability SoilProfileName="ShansepPhi45" SoilProfileType="0" SegmentFailureMechanismType="1" Probability="30" />
-      <SoilGeometryProbability SoilProfileName="SuTablePhi45" SoilProfileType="0" SegmentFailureMechanismType="1" Probability="40" />
+      <SoilGeometryProbability SoilProfileName="MohrCoulombPhi45" SoilProfileType="ProfileType1D" SegmentFailureMechanismType="Stability" Probability="10" />
+      <SoilGeometryProbability SoilProfileName="SigmaTauPhi45" SoilProfileType="ProfileType1D" SegmentFailureMechanismType="Stability" Probability="20" />
+      <SoilGeometryProbability SoilProfileName="ShansepPhi45" SoilProfileType="ProfileType1D" SegmentFailureMechanismType="Stability" Probability="30" />
+      <SoilGeometryProbability SoilProfileName="SuTablePhi45" SoilProfileType="ProfileType1D" SegmentFailureMechanismType="Stability" Probability="40" />
     </Segment>
     <Segment Name="1033">
-      <SoilGeometryProbability SoilProfileName="MohrCoulombPhi0" SoilProfileType="0" SegmentFailureMechanismType="1" Probability="33.33" />
-      <SoilGeometryProbability SoilProfileName="SigmaTauCsttTau" SoilProfileType="0" SegmentFailureMechanismType="1" Probability="33.33" />
-      <SoilGeometryProbability SoilProfileName="SuTableCsttSu" SoilProfileType="0" SegmentFailureMechanismType="1" Probability="33.34" />
+      <SoilGeometryProbability SoilProfileName="MohrCoulombPhi0" SoilProfileType="ProfileType1D" SegmentFailureMechanismType="Stability" Probability="33.33" />
+      <SoilGeometryProbability SoilProfileName="SigmaTauCsttTau" SoilProfileType="ProfileType1D" SegmentFailureMechanismType="Stability" Probability="33.33" />
+      <SoilGeometryProbability SoilProfileName="SuTableCsttSu" SoilProfileType="ProfileType1D" SegmentFailureMechanismType="Stability" Probability="33.34" />
     </Segment>
   </Segments>
   <SoilProfiles1D>
@@ -127,7 +127,7 @@
     </SoilProfile1D>
   </SoilProfiles1D>
   <SoilProfiles2D />
-  <StabilityParameters SearchMethod="2" BishopSearchAreaDetermination="0" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10" BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10" BishopGridHorizontalPointsDistance="2.5" UpliftVanGridDetermination="0" UpliftVanGridLeftVerticalPointsCount="36" UpliftVanGridLeftVerticalPointsDistance="2" UpliftVanGridLeftHorizontalPointsCount="14" UpliftVanGridLeftHorizontalPointsDistance="2" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2" UpliftVanTangentLinesDefinition="0" UpliftVanTangentLinesDistance="0.25" />
+  <StabilityParameters SearchMethod="BeeSwarm" BishopSearchAreaDetermination="Automatic" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10" BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10" BishopGridHorizontalPointsDistance="2.5" UpliftVanGridDetermination="Automatic" UpliftVanGridLeftVerticalPointsCount="36" UpliftVanGridLeftVerticalPointsDistance="2" UpliftVanGridLeftHorizontalPointsCount="14" UpliftVanGridLeftHorizontalPointsDistance="2" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2" UpliftVanTangentLinesDefinition="OnBoundaryLines" UpliftVanTangentLinesDistance="0.25" />
   <AquiferSoils xsi:nil="true" />
   <TrafficLoadDegreeOfConsolidations>
     <TrafficLoadDegreeOfConsolidation SoilName="coh 5 phi 45" DegreeOfConsolidation="0" />