Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Test2DGeometryBasedOnStixFiles.xml
===================================================================
diff -u -r5675 -r6197
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Test2DGeometryBasedOnStixFiles.xml	(.../Test2DGeometryBasedOnStixFiles.xml)	(revision 5675)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Test2DGeometryBasedOnStixFiles.xml	(.../Test2DGeometryBasedOnStixFiles.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="C:\Dam\DamClients\DamUI\trunk\src\Dam\Deltares.Dam.Tests\TestData\CSVData\Full2DProject" CalculationMap="TestBka2.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="C:\Dam\DamClients\DamUI\trunk\src\Dam\Deltares.Dam.Tests\TestData\CSVData\Full2DProject" CalculationMap="TestBka2.Calc" MaxCalculationCores="1">
   <Locations>
     <Location SurfaceLineName="dijkring10_dwp09_0" SegmentName="segment_dijkring10_dwp09_0" Name="location_dijkring10_dwp09_0" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="0" DistanceToEntryPoint="0">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.3333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="2" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" DampingFactorPl3="0.5" DampingFactorPl4="0.5" PenetrationLength="0" SlopeDampingFactor="0" IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="3.55" DikeTableHeight="4.05" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.2" PlLineOffsetBelowDikeToeAtPolder="0.2" HeadPl3="3.55" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="1.44" RequiredSafetyFactorStabilityOuterSlope="1.44" RequiredSafetyFactorPiping="1.2" PolderLevel="-0.7" HeadPl2="3.55" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="TestBka2.geometries2D.0\" SoilDatabaseName="" ZoneType="0" ForbiddenZoneFactor="1" TrafficLoad="0" MinimumCircleDepth="2" />
+      <StabilityOptions MapForSoilgeometries2D="TestBka2.geometries2D.0\" SoilDatabaseName="" ZoneType="NoZones" ForbiddenZoneFactor="1" TrafficLoad="0" MinimumCircleDepth="2" />
     </Location>
     <Location SurfaceLineName="dijkring10_dwp10_2" SegmentName="segment_dijkring10_dwp10_2" Name="location_dijkring10_dwp10_2" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="0" DistanceToEntryPoint="0">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.3333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="2" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" DampingFactorPl3="0.5" DampingFactorPl4="0.5" PenetrationLength="0" SlopeDampingFactor="0" IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="3.45" DikeTableHeight="3.95" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.2" PlLineOffsetBelowDikeToeAtPolder="0.2" HeadPl3="3.45" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="1.44" RequiredSafetyFactorStabilityOuterSlope="1.44" RequiredSafetyFactorPiping="1.2" PolderLevel="-0.7" HeadPl2="3.45" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="TestBka2.geometries2D.0\" SoilDatabaseName="" ZoneType="0" ForbiddenZoneFactor="1" TrafficLoad="0" MinimumCircleDepth="2" />
+      <StabilityOptions MapForSoilgeometries2D="TestBka2.geometries2D.0\" SoilDatabaseName="" ZoneType="NoZones" ForbiddenZoneFactor="1" TrafficLoad="0" MinimumCircleDepth="2" />
     </Location>
   </Locations>
   <SurfaceLines>
@@ -307,100 +307,100 @@
   </Soils>
   <Segments>
     <Segment Name="segment_dijkring10_dwp28_6">
-      <SoilGeometryProbability SoilProfileName="10Z_286_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_286_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp31_1">
-      <SoilGeometryProbability SoilProfileName="10Z_311_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_311_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp32_7">
-      <SoilGeometryProbability SoilProfileName="10Z_327_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_327_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp35_2">
-      <SoilGeometryProbability SoilProfileName="10Z_352_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_352_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp35_8">
-      <SoilGeometryProbability SoilProfileName="10Z_358_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_358_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp36_9">
-      <SoilGeometryProbability SoilProfileName="10Z_369_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_369_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp00_5">
-      <SoilGeometryProbability SoilProfileName="10Y_005_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_005_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp02_4">
-      <SoilGeometryProbability SoilProfileName="10Y_024_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_024_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp04_1">
-      <SoilGeometryProbability SoilProfileName="10Y_041_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_041_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp05_4">
-      <SoilGeometryProbability SoilProfileName="10Y_054_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_054_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp06_6">
-      <SoilGeometryProbability SoilProfileName="10Y_066_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_066_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp09_0">
-      <SoilGeometryProbability SoilProfileName="10Y_090_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_090_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp10_2">
-      <SoilGeometryProbability SoilProfileName="10Y_102_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_102_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp11_7">
-      <SoilGeometryProbability SoilProfileName="10Y_117_STBI_dcb_diep.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_117_STBI_dcb_diep.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp13_0">
-      <SoilGeometryProbability SoilProfileName="10Y_130_STBI_dcb.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_130_STBI_dcb.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp14_9">
-      <SoilGeometryProbability SoilProfileName="10Y_149_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Y_149_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp15_7">
-      <SoilGeometryProbability SoilProfileName="10Z_157_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_157_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp16_5">
-      <SoilGeometryProbability SoilProfileName="10Z_165_STBI_dcb.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_165_STBI_dcb.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp18_1">
-      <SoilGeometryProbability SoilProfileName="10Z_181_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_181_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp18_6">
-      <SoilGeometryProbability SoilProfileName="10Z_186_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_186_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp19_9">
-      <SoilGeometryProbability SoilProfileName="10Z_199_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_199_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp22_8">
-      <SoilGeometryProbability SoilProfileName="10Z_228_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_228_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp25_8">
-      <SoilGeometryProbability SoilProfileName="10Z_258_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_258_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp27_5">
-      <SoilGeometryProbability SoilProfileName="10Z_275_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_275_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp28_2">
-      <SoilGeometryProbability SoilProfileName="10Z_282_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_282_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp38_0">
-      <SoilGeometryProbability SoilProfileName="10Z_380_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_380_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp39_0">
-      <SoilGeometryProbability SoilProfileName="10Z_390_STBI_dcb.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_390_STBI_dcb.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp40_0">
-      <SoilGeometryProbability SoilProfileName="10Z_400_STBI_dcb.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_400_STBI_dcb.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp42_1">
-      <SoilGeometryProbability SoilProfileName="10Z_421_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_421_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp43_2">
-      <SoilGeometryProbability SoilProfileName="10Z_432_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_432_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp46_0">
-      <SoilGeometryProbability SoilProfileName="10Z_460_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_460_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
     <Segment Name="segment_dijkring10_dwp47_5">
-      <SoilGeometryProbability SoilProfileName="10Z_475_STBI.stix" SoilProfileType="1" SegmentFailureMechanismType="1" Probability="100" />
+      <SoilGeometryProbability SoilProfileName="10Z_475_STBI.stix" SoilProfileType="ProfileType2D" SegmentFailureMechanismType="Stability" Probability="100" />
     </Segment>
   </Segments>
   <SoilProfiles1D />
@@ -695,7 +695,7 @@
       <PreconsolidationStresses />
     </SoilProfile2D>
   </SoilProfiles2D>
-  <StabilityParameters SearchMethod="0" GridDetermination="0" BishopTangentLinesDefinition="1" 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="0" UpliftVanTangentLinesDistance="0.25" />
+  <StabilityParameters SearchMethod="CalculationGrid" GridDetermination="0" BishopTangentLinesDefinition="1" 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="OnBoundaryLines" UpliftVanTangentLinesDistance="0.25" />
   <AquiferSoils xsi:nil="true" />
   <OperationalInputTimeSeries xsi:nil="true" />
   <SensorData xsi:nil="true" />