Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
===================================================================
diff -u -r1474 -r1493
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj	(.../Deltares.DamEngine.Interface.Tests.csproj)	(revision 1474)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj	(.../Deltares.DamEngine.Interface.Tests.csproj)	(revision 1493)
@@ -131,6 +131,9 @@
     <None Include="TestFiles\DeltaDijk normal.geometries2D.0\DeltaDijk normal.defx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="TestFiles\SlopeAdaption.geometries2D.0\Databronbestand.defx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="TestFiles\ZoneType.geometries2D.0\DWP_10.sti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -218,10 +221,20 @@
     <Content Include="TestFiles\Rechter Diezedijk_BlighInputFile.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestFiles\SlopeAdaption.geometries2D.0\SlopeAdaption0.soilmaterials.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="TestFiles\SlopeAdaption0.soilmaterials.mdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="TestFiles\ValidatieSlopeAdaption.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestFiles\ZoneType0.soilmaterials.mdb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/ValidatieSlopeAdaption.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/ValidatieSlopeAdaption.xml	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/ValidatieSlopeAdaption.xml	(revision 1493)
@@ -0,0 +1,90 @@
+<?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\Dam\Benchmarks\Validatie SlopeAdaption" CalculationMap="WhatEver.Calc" MaxCalculationCores="1">
+  <Locations>
+    <Location SurfaceLineName="Test1" SegmentName="1" Name="Test1" DikeEmbankmentMaterial="ophoogmateriaaldijk" XSoilGeometry2DOrigin="0" DikeTableHeight="0">
+      <AssesmentRegionalOptions DikeSoilType="0" BoezemLevelLbp="-987654321" BoezemLevelTp="2" BoezemLevelHbp="1.5" DetrimentFactor="0.95" DredgingDepth="-1.8" RegionalBankProtectionBottomLevel="0" />
+      <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="ophoogmateriaalberm" StabilityShoulderGrowSlope="0.3333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="2" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="SlopeAdaptionBeforeShoulderAdaption" />
+      <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="-2.45" PolderLevelLow="-2.55" HeadPl2="-1.4" HeadPl3="-1.4" DampingFactorPl3="0" DampingFactorPl4="0" PenetrationLength="1" SlopeDampingFactor="0" Pl1BelowCrestRiverside="0.4" Pl1BelowCrestPolderside="0.5" Pl1BelowShoulderCrestPolderside="0.2" Pl1BelowToeDikePolderside="0.2" DryPl1BelowDikeTopAtRiver="0.5" DryPl1DryBelowDikeTopAtPolder="1.5" DryPl1BelowShoulderBaseInside="0.1" DryPl1DryBelowDikeToeAtPolder="0.1" IntrusionVerticalWaterPressure="Standard" />
+      <DesignScenarios>
+        <DesignScenario Id="1" RiverLevel="2" RiverLevelLow="2" DikeTableHeight="3" PlLineOffsetBelowDikeTopAtRiver="0.4" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.2" PlLineOffsetBelowDikeToeAtPolder="0.2" HeadPl3="-1.4" HeadPl4="2" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="3" RequiredSafetyFactorStabilityOuterSlope="1" RequiredSafetyFactorPiping="1" />
+      </DesignScenarios>
+      <StabilityOptions MapForSoilgeometries2D="WhatEver.geometries2D.0\" SoilDatabaseName="D:\src\dam\DamClients\DamUI\trunk\data\Dam\Benchmarks\Validatie SlopeAdaption\WhatEver0.soilmaterials.mdb" ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13" MinimumCircleDepth="2" />
+      <ModelFactors RequiredSafetyFactorStabilityInnerSlope="1.05" RequiredSafetyFactorStabilityOuterSlope="1.05" RequiredSafetyFactorPiping="1.2" UpliftCriterionPiping="1.2" UpliftCriterionStability="1.2" />
+    </Location>
+  </Locations>
+  <SurfaceLines>
+    <SurfaceLine Name="Test1">
+      <Points>
+        <Point X="0" Z="-1.5" PointType="1" />
+        <Point X="5" Z="-1.5" PointType="0" />
+        <Point X="12" Z="-0.4" PointType="0" />
+        <Point X="14.2" Z="0.1" PointType="5" />
+        <Point X="15" Z="0.4" PointType="0" />
+        <Point X="17.8" Z="1.4" PointType="0" />
+        <Point X="24.7" Z="3" PointType="8" />
+        <Point X="24.7" Z="3" PointType="10" />
+        <Point X="27.2" Z="3" PointType="11" />
+        <Point X="27.7" Z="3" PointType="12" />
+        <Point X="31.6" Z="1.8" PointType="0" />
+        <Point X="33.4" Z="1.2" PointType="0" />
+        <Point X="43" Z="-2.1" PointType="15" />
+        <Point X="46.1" Z="-2.1" PointType="16" />
+        <Point X="49.1" Z="-3.7" PointType="17" />
+        <Point X="51.1" Z="-3.7" PointType="18" />
+        <Point X="54.1" Z="-2.1" PointType="19" />
+        <Point X="65" Z="-2.1" PointType="0" />
+        <Point X="75" Z="-2.1" PointType="0" />
+        <Point X="105" Z="-2.1" PointType="25" />
+      </Points>
+    </SurfaceLine>
+  </SurfaceLines>
+  <Soils>
+    <Soil Name="dijksmateriaal_klei" BeddingAngle="37" DiameterD70="1E-08" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="17" BelowPhreaticLevel="17" DryUnitWeight="17" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="2.68" FrictionAngle="21.66" DilatancyType="Phi" SoilType="0" />
+    <Soil Name="klei1" BeddingAngle="37" DiameterD70="1E-08" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="14" BelowPhreaticLevel="14" DryUnitWeight="14" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="1.5" FrictionAngle="21.8" DilatancyType="Phi" SoilType="0" />
+    <Soil Name="klei2" BeddingAngle="37" DiameterD70="1E-08" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="16" BelowPhreaticLevel="16" DryUnitWeight="16" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="1.7" FrictionAngle="24.1" DilatancyType="Phi" SoilType="0" />
+    <Soil Name="veen2" BeddingAngle="37" DiameterD70="1E-08" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="11.5" BelowPhreaticLevel="11.5" DryUnitWeight="4.7" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="1.1" FrictionAngle="24.6" DilatancyType="Phi" SoilType="3" />
+    <Soil Name="pleistoceen" BeddingAngle="37" DiameterD70="0.00027" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="19" BelowPhreaticLevel="20" DryUnitWeight="19" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="0" FrictionAngle="30" DilatancyType="Phi" SoilType="4" />
+    <Soil Name="Undetermined" BeddingAngle="37" DiameterD70="0.00019999999999999998" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="0.01" BelowPhreaticLevel="0.02" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="0" FrictionAngle="0" DilatancyType="Phi" SoilType="2" />
+    <Soil Name="ophoogmateriaaldijk" BeddingAngle="37" DiameterD70="1E-08" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="17" BelowPhreaticLevel="17" DryUnitWeight="17" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="2.68" FrictionAngle="21.66" DilatancyType="Phi" SoilType="0" />
+    <Soil Name="ophoogmateriaalberm" BeddingAngle="37" DiameterD70="1E-08" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="17" BelowPhreaticLevel="17" DryUnitWeight="17" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="2.68" FrictionAngle="21.66" DilatancyType="Phi" SoilType="0" />
+    <Soil Name="dijksmateriaal_veen" BeddingAngle="37" DiameterD70="1E-08" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="11" BelowPhreaticLevel="11" DryUnitWeight="4.5" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="1.7" FrictionAngle="24.1" DilatancyType="Phi" SoilType="3" />
+    <Soil Name="veen1" BeddingAngle="37" DiameterD70="1E-08" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="10.5" BelowPhreaticLevel="10.5" DryUnitWeight="3.5" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="1.7" FrictionAngle="24" DilatancyType="Phi" SoilType="3" />
+    <Soil Name="dijksmateriaal_zand" BeddingAngle="37" DiameterD70="0.00019999999999999998" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="17" BelowPhreaticLevel="18" DryUnitWeight="17" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="0" FrictionAngle="26.7" DilatancyType="Phi" SoilType="4" />
+    <Soil Name="zand1" BeddingAngle="37" DiameterD70="0.00019999999999999998" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="17" BelowPhreaticLevel="18" DryUnitWeight="17" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="0" FrictionAngle="26.7" DilatancyType="Phi" SoilType="4" />
+    <Soil Name="zand2" BeddingAngle="37" DiameterD70="0.00019999999999999998" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="17" BelowPhreaticLevel="18" DryUnitWeight="17" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="0" FrictionAngle="28" DilatancyType="Phi" SoilType="4" />
+    <Soil Name="wl_zand3" BeddingAngle="37" DiameterD70="0.00019999999999999998" WhitesConstant="0.25" DiameterD90="NaN" AbovePhreaticLevel="17" BelowPhreaticLevel="18" DryUnitWeight="17" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="true" Cohesion="0" FrictionAngle="28" DilatancyType="Phi" SoilType="4" />
+  </Soils>
+  <Segments>
+    <Segment Name="1">
+      <SoilGeometryProbability SoilProfileName="segment1_Test1" SoilProfileType="0" FailureMechanismSystemType="0" Probability="1" />
+    </Segment>
+  </Segments>
+  <SoilProfiles1D>
+    <SoilProfile1D Name="segment1_Test1" BottomLevel="-26">
+      <Layers1D>
+        <Layer1D Name="L0" SoilName="dijksmateriaal_klei" TopLevel="60" IsAquifer="false" WaterpressureInterpolationModel="0" />
+        <Layer1D Name="L1" SoilName="klei1" TopLevel="-2.1" IsAquifer="false" WaterpressureInterpolationModel="0" />
+        <Layer1D Name="L2" SoilName="klei2" TopLevel="-4" IsAquifer="false" WaterpressureInterpolationModel="0" />
+        <Layer1D Name="L3" SoilName="veen2" TopLevel="-5.5" IsAquifer="false" WaterpressureInterpolationModel="0" />
+        <Layer1D Name="L4" SoilName="pleistoceen" TopLevel="-6" IsAquifer="true" WaterpressureInterpolationModel="0" />
+      </Layers1D>
+    </SoilProfile1D>
+  </SoilProfiles1D>
+  <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>
+    <AquiferSoil Soilname="dijksmateriaal_klei" IsAquifer="false" />
+    <AquiferSoil Soilname="klei1" IsAquifer="false" />
+    <AquiferSoil Soilname="klei2" IsAquifer="false" />
+    <AquiferSoil Soilname="veen2" IsAquifer="false" />
+    <AquiferSoil Soilname="pleistoceen" IsAquifer="true" />
+    <AquiferSoil Soilname="Undetermined" IsAquifer="false" />
+    <AquiferSoil Soilname="ophoogmateriaaldijk" IsAquifer="false" />
+    <AquiferSoil Soilname="ophoogmateriaalberm" IsAquifer="false" />
+    <AquiferSoil Soilname="dijksmateriaal_veen" IsAquifer="false" />
+    <AquiferSoil Soilname="veen1" IsAquifer="false" />
+    <AquiferSoil Soilname="dijksmateriaal_zand" IsAquifer="false" />
+    <AquiferSoil Soilname="zand1" IsAquifer="false" />
+    <AquiferSoil Soilname="zand2" IsAquifer="false" />
+    <AquiferSoil Soilname="wl_zand3" IsAquifer="true" />
+  </AquiferSoils>
+</Input>
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/SlopeAdaption.geometries2D.0/Databronbestand.defx
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/SlopeAdaption.geometries2D.0/Databronbestand.defx	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/SlopeAdaption.geometries2D.0/Databronbestand.defx	(revision 1493)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DatasourceContainer Key="1">
+  <DataSourceList>
+    <DataSource Key="2" DataSourceType="CsvFiles" DataLocation="DAM invoerfiles\" />
+    <DataSource Key="3" DataSourceType="MSoilBase" DataLocation="DAM invoerfiles\soilmaterials.mdb" />
+  </DataSourceList>
+</DatasourceContainer>
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/SlopeAdaption0.soilmaterials.mdb
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/SlopeAdaption.geometries2D.0/SlopeAdaption0.soilmaterials.mdb
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r1464 -r1493
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1464)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1493)
@@ -657,7 +657,6 @@
             Assert.AreEqual(3.157, result.StabilityDesignResults.SafetyFactor, tolerance);
         }
 
-
         [Test, Category("Slow")]
         public void TestRunMacroStabilityWithErrorBishopUpliftVan()
         {
@@ -722,12 +721,12 @@
         }
 
         [Test, Category("Slow")]
-        public void TestRunFailedExpectCalculationMessage()
+        public void TestRunFailedExpectCalculationMessageInOptimizedSlopeAndShoulderAdaption()
         {
             // Inputfile was created with .\data\DamEngineTestProjects\Invoer2\DAM Tutorial Design\DAM Tutorial Design.damx
             // Select dwp 13
             // Expected: RunFailed
-            const string calcDir = "TestRunFailedExpectCalculationMessage";
+            const string calcDir = "TestRunFailedExpectCalculationMessageInOptimizedSlopeAndShoulderAdaption";
             if (Directory.Exists(calcDir))
             {
                 Directory.Delete(calcDir, true); // delete previous results
@@ -762,9 +761,46 @@
                 output.Results.CalculationMessages[0].Message1);
         }
 
+        [Test, Category("Slow")]
+        public void TestRunFailedExpectCalculationMessageInSlopeAdaptionBeforeShoulderAdaption()
+        {
+            // Inputfile was created with .\data\Dam\Benchmarks\Validatie SlopeAdaption\SlopeAdaption.damx
+            // Expected: RunFailed
+            const string calcDir = "TestRunFailedExpectCalculationMessageInSlopeAdaptionBeforeShoulderAdaption";
+            if (Directory.Exists(calcDir))
+            {
+                Directory.Delete(calcDir, true); // delete previous results
+            }
 
+            Directory.CreateDirectory(calcDir);
 
+            const string fileName = @"TestFiles\ValidatieSlopeAdaption.xml";
+            string inputString = File.ReadAllText(fileName);
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\SlopeAdaption.geometries2D.0\");
+            inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\SlopeAdaption0.soilmaterials.mdb");
+            EngineInterface engineInterface = new EngineInterface(inputString);
+            Assert.IsNotNull(engineInterface.DamProjectData);
 
+            string outputString = engineInterface.Run();
+            Assert.IsNotNull(outputString);
+
+            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Assert.AreEqual(1, output.Results.CalculationResults.DesignResults.Length);
+
+            var result = output.Results.CalculationResults.DesignResults[0];
+            Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(result.CalculationResult));
+
+            Assert.AreEqual("After height adaption ditch does not fit inside surfaceline anymore.",
+                output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.ResultMessage);
+            Assert.AreEqual("Location 'Test1', subsoil scenario 'segment1_Test1', design scenario '1': " +
+                            "The calculation failed with error message " +
+                            "'The design was not successful. " +
+                            "After height adaption ditch does not fit inside surfaceline anymore.'",
+                output.Results.CalculationMessages[0].Message1);
+        }
+
         [Test, Category("Slow")]
         // Expected results are determined by running .\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx
         // with Dam Classic rev.1059