Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Invoer10.xml
===================================================================
diff -u -r5340 -r5346
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Invoer10.xml	(.../Invoer10.xml)	(revision 5340)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Invoer10.xml	(.../Invoer10.xml)	(revision 5346)
@@ -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="UpliftVan" AnalysisType="NoAdaption" ProjectPath="D:\src\dam\DamEngine\trunk\src\Deltares.DamEngine.IntegrationTests\TestFiles\Invoer10" CalculationMap="ZoneType.Calc" MaxCalculationCores="1">
+<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:\src\dam\DamEngine\trunk\src\Deltares.DamEngine.IntegrationTests\TestFiles\Invoer10" CalculationMap="ZoneTypeBishop.Calc" MaxCalculationCores="1">
   <Locations>
     <Location SurfaceLineName="DWP_10" SegmentName="DWP_10" Name="DWP_10_1" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="8.14" DistanceToEntryPoint="0">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" DampingFactorPl3="0" DampingFactorPl4="0" PenetrationLength="0" SlopeDampingFactor="0" IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="1.5" RiverLevelLow="0" DikeTableHeight="3.8" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.2" PlLineOffsetBelowDikeToeAtPolder="0.2" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="1.17" RequiredSafetyFactorStabilityOuterSlope="1.17" RequiredSafetyFactorPiping="1.2" PolderLevel="-1" HeadPl2="0" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="ZoneType.geometries2D.0\" SoilDatabaseName="" ZoneType="0" ForbiddenZoneFactor="0" TrafficLoad="13" MinimumCircleDepth="1.5" />
+      <StabilityOptions MapForSoilgeometries2D="ZoneTypeBishop.geometries2D.0\" SoilDatabaseName="" ZoneType="0" ForbiddenZoneFactor="0" TrafficLoad="13" MinimumCircleDepth="1.5" />
     </Location>
-    <Location SurfaceLineName="DWP_10" SegmentName="DWP_10" Name="DWP_10_5" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="8.14" DistanceToEntryPoint="0">
+    <Location SurfaceLineName="DWP_10" SegmentName="DWP_10" Name="DWP_10_4" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="8.14" DistanceToEntryPoint="0">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" DampingFactorPl3="0" DampingFactorPl4="0" PenetrationLength="0" SlopeDampingFactor="0" IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="1.5" RiverLevelLow="0" DikeTableHeight="3.8" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.2" PlLineOffsetBelowDikeToeAtPolder="0.2" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="1.17" RequiredSafetyFactorStabilityOuterSlope="1.17" RequiredSafetyFactorPiping="1.2" PolderLevel="-1" HeadPl2="0" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="ZoneType.geometries2D.0\" SoilDatabaseName="" ZoneType="2" ForbiddenZoneFactor="0.5" TrafficLoad="13" MinimumCircleDepth="1.5" />
+      <StabilityOptions MapForSoilgeometries2D="ZoneTypeBishop.geometries2D.0\" SoilDatabaseName="" ZoneType="2" ForbiddenZoneFactor="0.2" TrafficLoad="13" MinimumCircleDepth="1.5" />
     </Location>
   </Locations>
   <SurfaceLines>
@@ -426,7 +426,7 @@
       <PreconsolidationStresses />
     </SoilProfile2D>
   </SoilProfiles2D>
-  <StabilityParameters SearchMethod="2" GridDetermination="0" BishopTangentLinesDefinition="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="0" UpliftVanTangentLinesDistance="0.25" />
+  <StabilityParameters SearchMethod="0" GridDetermination="0" BishopTangentLinesDefinition="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="0" UpliftVanTangentLinesDistance="0.25" />
   <AquiferSoils xsi:nil="true" />
   <OperationalInputTimeSeries xsi:nil="true" />
   <SensorData xsi:nil="true" />
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r5344 -r5346
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 5344)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 5346)
@@ -401,7 +401,7 @@
     public void TestRunMacroStabilityInvoer10ForbiddenZoneBishop()
     {
         // xml file is created with Invoer10\ZoneType.defx
-        // Select locations DWP_10_1 and DWP_10_5
+        // Select locations DWP_10_1 and DWP_10_4
         // Analysis type "No adaption"
         // Calculation options: Stability Inside - Bishop
         // This tests the first location with No Zones and the second with Forbidden Zone
@@ -427,7 +427,7 @@
         Assert.Multiple(() =>
         {
             // No Zone
-            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.212).Within(tolerance));
+            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.365).Within(tolerance));
             Assert.That(result.LocationName, Is.EqualTo("DWP_10_1"));
             Assert.That(result.ProfileName, Is.EqualTo("DWP_10.stix"));
             Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
@@ -436,9 +436,9 @@
         result = output.Results.CalculationResults[1];
         Assert.Multiple(() =>
         {
-            // Forbidden Zone, factor = 0.5
-            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.225).Within(tolerance));
-            Assert.That(result.LocationName, Is.EqualTo("DWP_10_5"));
+            // Forbidden Zone, factor = 0.2
+            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.899).Within(tolerance));
+            Assert.That(result.LocationName, Is.EqualTo("DWP_10_4"));
             Assert.That(result.ProfileName, Is.EqualTo("DWP_10.stix"));
             Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
         });