Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs
===================================================================
diff -u -r877 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs	(.../DamPipingSellmeijer4ForcesKernelWrapper.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs	(.../DamPipingSellmeijer4ForcesKernelWrapper.cs)	(revision 909)
@@ -238,16 +238,10 @@
                 throw new NoNullAllowedException(Resources.DamPipingSellmeijer4ForcesKernelWrapper_NoInputObjectDefinedForSellmeijer4Forces);
             }
 
-            string soilProfile2DName = "";
-            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
-            {
-                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
-                PipingModelType = PipingModelType.Sellmeijer4Forces
-            };
-            var designScenario = damKernelInput.DesignScenario;
-            var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
             designResults = new List<DesignResult>();
-            var designResult = new DesignResult(damFailureMechanismeCalculationSpecification, designScenario, soilProfile1D, soilProfile2DName, AnalysisType.NoAdaption)
+            var designResult = new DesignResult(damKernelInput.DamFailureMechanismeCalculationSpecification,
+                damKernelInput.DesignScenario, damKernelInput.SubSoilScenario.SoilProfile1D, null,
+                DamProjectCalculationSpecification.SelectedAnalysisType)
             {
                 CalculationResult = damPipingOutput.CalculationResult
             };
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamKernelInput.cs
===================================================================
diff -u -r877 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamKernelInput.cs	(.../DamKernelInput.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamKernelInput.cs	(.../DamKernelInput.cs)	(revision 909)
@@ -52,5 +52,13 @@
         /// The sub soil scenario.
         /// </value>
         public SoilGeometryProbability SubSoilScenario { get; set; }
+
+        /// <summary>
+        /// Gets or sets the dam failure mechanisme calculation specification.
+        /// </summary>
+        /// <value>
+        /// The dam failure mechanisme calculation specification.
+        /// </value>
+        public DamFailureMechanismeCalculationSpecification DamFailureMechanismeCalculationSpecification { get; set; }
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs
===================================================================
diff -u -r877 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 909)
@@ -70,12 +70,17 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
-
+            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
+            {
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.Sellmeijer4Forces
+            };
             var damKernelInput = new DamKernelInput
             {
                 DesignScenario = designScenario,
                 Location = location,
-                SubSoilScenario = subSoilScenario
+                SubSoilScenario = subSoilScenario,
+                DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification
             };
 
             var kernelWrapper = new DamPipingSellmeijer4ForcesKernelWrapper();
@@ -135,12 +140,17 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
-
+            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
+            {
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.Sellmeijer4Forces
+            };
             var damKernelInput = new DamKernelInput
             {
                 DesignScenario = designScenario,
                 Location = location,
-                SubSoilScenario = subSoilScenario
+                SubSoilScenario = subSoilScenario,
+                DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification
             };
             var kernelWrapper = new DamPipingSellmeijer4ForcesKernelWrapper();
             IKernelDataInput kernelDataInput;
@@ -200,11 +210,17 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
+            {
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.Sellmeijer4Forces
+            };
             var input = new DamKernelInput
             {
                 DesignScenario = new DesignScenario(),
                 Location = new Location(),
-                SubSoilScenario = subSoilScenario
+                SubSoilScenario = subSoilScenario,
+                DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification
             };
             input.DesignScenario.Location = new Location();
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
===================================================================
diff -u -r877 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 909)
@@ -241,19 +241,10 @@
                 throw new NoNullAllowedException(Resources.DamPipingBlighKernelWrapper_NoOutputObjectDefinedForBligh);
             }
 
-            // TODO: for now this only works for 1D profiles
-            string soilProfile2DName = "soilProfile2DName";
-            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
-            {
-                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
-                PipingModelType = PipingModelType.Bligh
-            };
-            var designScenario = damKernelInput.DesignScenario;
-            var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
             designResults = new List<DesignResult>();
-            var designResult = new DesignResult(damFailureMechanismeCalculationSpecification,
-                                                designScenario, soilProfile1D, soilProfile2DName,
-                                                DamProjectCalculationSpecification.SelectedAnalysisType)
+            var designResult = new DesignResult(damKernelInput.DamFailureMechanismeCalculationSpecification, 
+                damKernelInput.DesignScenario, damKernelInput.SubSoilScenario.SoilProfile1D, null, 
+                DamProjectCalculationSpecification.SelectedAnalysisType)
             {
                 CalculationResult = damPipingBlighOutput.CalculationResult
             };
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r877 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 909)
@@ -53,6 +53,7 @@
     <Compile Include="KernelWrappers\DamMacroStabilityCommon\DAMMstabGeometry2DSectionAssemblerTest.cs" />
     <Compile Include="KernelWrappers\DamMacroStabilityCommon\Geometry2DTo1DConverterTest.cs" />
     <Compile Include="KernelWrappers\DamMacroStabilityCommon\MStabXmlDocTests.cs" />
+    <Compile Include="KernelWrappers\DamMacroStabilityOutwards\DamMacroStabilityOutwardsKernelWrapperTests.cs" />
     <Compile Include="KernelWrappers\DamPipingBligh\DamPipingBlighKernelWrapperTests.cs" />
     <Compile Include="KernelWrappers\DamPipingSellmeijer4Forces\DamPipingSellmeijer4ForcesKernelWrapperTests.cs" />
     <Compile Include="KernelWrappers\DamPipingSellmeijerVnk\DamPipingSellmeijerVnkKernelWrapperTests.cs" />
@@ -97,9 +98,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="KernelWrappers\DamMacroStabilityOutwards\" />
-  </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.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs
===================================================================
diff -u -r906 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs	(.../DamPipingSellmeijerVnkKernelWrapper.cs)	(revision 906)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs	(.../DamPipingSellmeijerVnkKernelWrapper.cs)	(revision 909)
@@ -77,16 +77,10 @@
                 throw new NoNullAllowedException(Resources.DamPipingSellmeijerVnkKernelWrapper_NoInputObjectDefinedForSellmeijerVNK);
             }
 
-            string soilProfile2DName = "";
-            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
-            {
-                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
-                PipingModelType = PipingModelType.SellmeijerVnk
-            };
-            var designScenario = damKernelInput.DesignScenario;
-            var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
             designResults = new List<DesignResult>();
-            var designResult = new DesignResult(damFailureMechanismeCalculationSpecification, designScenario, soilProfile1D, soilProfile2DName, AnalysisType.NoAdaption)
+            var designResult = new DesignResult(damKernelInput.DamFailureMechanismeCalculationSpecification, 
+                damKernelInput.DesignScenario, damKernelInput.SubSoilScenario.SoilProfile1D, null, 
+                DamProjectCalculationSpecification.SelectedAnalysisType)
             {
                 CalculationResult = damPipingOutput.CalculationResult
             };
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx
===================================================================
diff -u -r902 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx	(.../Resources.resx)	(revision 902)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx	(.../Resources.resx)	(revision 909)
@@ -153,4 +153,7 @@
   <data name="DamPipingSellmeijerVnkKernelWrapper_NoInputObjectDefinedForSellmeijerVNK" xml:space="preserve">
     <value>No input object defined for Sellmeijer VNK</value>
   </data>
+  <data name="DamMacroStabilityOutwardsKernelWrapper_Prepare_NoRequiredSafetyFactor" xml:space="preserve">
+    <value>Required safety factor must be specified</value>
+  </data>
 </root>
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
===================================================================
diff -u -r902 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision 902)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision 909)
@@ -123,6 +123,9 @@
   <data name="DamMacroStabilityKernelWrapper_StabilityCalculator_NoInputObjectDefinedForMacroStability" xml:space="preserve">
     <value>Geen invoer object gedefinieerd voor Macrostabiliteit</value>
   </data>
+  <data name="DamMacroStabilityOutwardsKernelWrapper_Prepare_NoRequiredSafetyFactor" xml:space="preserve">
+    <value>De vereiste veiligheidsfactor ontbreekt</value>
+  </data>
   <data name="DamPipingBlighKernelWrapper_NoInputObjectDefinedForBligh" xml:space="preserve">
     <value>Geen invoer object gedefinieerd voor Bligh</value>
   </data>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r900 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 900)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 909)
@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Xml.Linq;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
 using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon;
@@ -44,8 +43,6 @@
     /// <seealso cref="Deltares.DamEngine.Calculators.KernelWrappers.Interfaces.IKernelWrapper" />
     public class DamMacroStabilityOutwardsKernelWrapper : IKernelWrapper
     {
-        private const string damMacroStabilityFolder = @".\KernelWrappers\DamMacroStability";
-        private const string dGeoStabilityExe = "DGeoStability.exe";
 
         /// <summary>
         /// Gets or sets the failure mechanisme paramaters for mstab.
@@ -88,7 +85,7 @@
                 
                 var damMacroStabilityInput = new DamMacroStabilityInput()
                 {
-                    DGeoStabilityExePath = Path.Combine(damMacroStabilityFolder, dGeoStabilityExe),
+                    DGeoStabilityExePath = FailureMechanismParametersMStab.DGeoStabilityExePath,
                     DGeoStabilityInputFileName = DamMacroStabilityUtils.GetStabilityInputFileName(damKernelInput, iterationIndex, 
                         FailureMechanismParametersMStab.MStabParameters.Model, FailureMechanismParametersMStab.ProjectWorkingPath),
                     FailureMechanismParametersMStab = FailureMechanismParametersMStab
@@ -182,7 +179,7 @@
             var requiredSafetyFactor = scenario.RequiredSafetyFactorStabilityOuterSlope?? scenario.Location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope;
             if (requiredSafetyFactor == null)
             {
-                throw new MacroStabilityException("Required safety factor must be specified");
+                throw new MacroStabilityException(Resources.DamMacroStabilityOutwardsKernelWrapper_Prepare_NoRequiredSafetyFactor);
             }
             List<LogMessage> errorMessages;
             
@@ -231,21 +228,21 @@
         public void PostProcess(DamKernelInput damKernelInput, IKernelDataOutput kernelDataOutput, string resultMessage, out List<DesignResult> designResults)
         {
             DamMacroStabilityOutput damMacroStabilityOutput = kernelDataOutput as DamMacroStabilityOutput;
+            if (damKernelInput == null)
+            {
+                throw new NoNullAllowedException(Resources.DamMacroStabilityKernelWrapper_StabilityCalculator_NoInputObjectDefinedForMacroStability);
+            }
             if (damMacroStabilityOutput == null)
             {
                 throw new NoNullAllowedException(Resources.DamMacroStabilityKernelWrapper_PostProcess_NoOutputObjectDefinedForMacroStability);
             }
 
-            // TODO: this is just fake data
-            string soilProfile2DName = "soilProfile2DName";
-            var d = new DamFailureMechanismeCalculationSpecification();
-            var s = new DesignScenario
-            {
-                Location = new Location()
-            };
-            var p = new SoilProfile1D();
+            string soilProfile2DName = damKernelInput.SubSoilScenario.ToString();
+            
             designResults = new List<DesignResult>();
-            var designResult = new DesignResult(d, s, p, soilProfile2DName, AnalysisType.NoAdaption)
+            var designResult = new DesignResult(damKernelInput.DamFailureMechanismeCalculationSpecification, 
+                damKernelInput.DesignScenario, damKernelInput.SubSoilScenario.SoilProfile1D, soilProfile2DName, 
+                DamProjectCalculationSpecification.SelectedAnalysisType)
             {
                 CalculationResult = damMacroStabilityOutput.CalculationResult
             };
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs
===================================================================
diff -u -r877 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 909)
@@ -70,7 +70,8 @@
                         damKernelInput.Location = location;
                         damKernelInput.SubSoilScenario = soiProfileProbability;
                         damKernelInput.DesignScenario = location.Scenarios[designScenarioIndex];
-                        
+                        damKernelInput.DamFailureMechanismeCalculationSpecification = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+
                         IKernelDataInput kernelDataInput;
                         IKernelDataOutput kernelDataOutput;
                         PrepareResult prepareResult = kernelWrapper.Prepare(damKernelInput, 0, out kernelDataInput, out kernelDataOutput);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs
===================================================================
diff -u -r877 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 909)
@@ -93,12 +93,17 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
-
+            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
+            {
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.SellmeijerVnk
+            };
             var damKernelInput = new DamKernelInput
             {
                 DesignScenario = designScenario,
                 Location = location,
-                SubSoilScenario = subSoilScenario
+                SubSoilScenario = subSoilScenario,
+                DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification
             };
 
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
@@ -158,12 +163,17 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
-
+            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
+            {
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.SellmeijerVnk
+            };
             var damKernelInput = new DamKernelInput
             {
                 DesignScenario = designScenario,
                 Location = location,
-                SubSoilScenario = subSoilScenario
+                SubSoilScenario = subSoilScenario,
+                DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification
             };
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
             IKernelDataInput kernelDataInput;
@@ -232,11 +242,17 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
+            {
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.SellmeijerVnk
+            };
             var input = new DamKernelInput
             {
                 DesignScenario = new DesignScenario(),
                 Location = new Location(),
-                SubSoilScenario = subSoilScenario
+                SubSoilScenario = subSoilScenario,
+                DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification
             };
             input.DesignScenario.Location = new Location();
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs
===================================================================
diff -u -r877 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 909)
@@ -63,7 +63,11 @@
                     UpliftCriterionPiping = 1.0
                 }
             };
-
+            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
+            {
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.Bligh
+            };
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
@@ -72,7 +76,8 @@
             {
                 DesignScenario = designScenario,
                 Location = location,
-                SubSoilScenario = subSoilScenario
+                SubSoilScenario = subSoilScenario,
+                DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification
             };
 
             var kernelWrapper = new DamPipingBlighKernelWrapper();
@@ -132,12 +137,17 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
-
+            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
+            {
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.Bligh
+            };
             var damKernelInput = new DamKernelInput
             {
                 DesignScenario = designScenario,
                 Location = location,
-                SubSoilScenario = subSoilScenario
+                SubSoilScenario = subSoilScenario,
+                DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification
             };
             var kernelWrapper = new DamPipingBlighKernelWrapper();
             IKernelDataInput kernelDataInput;
@@ -187,11 +197,17 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
+            {
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.Bligh
+            };
             var input = new DamKernelInput
             {
                 DesignScenario = new DesignScenario(),
                 Location = new Location(),
-                SubSoilScenario = subSoilScenario
+                SubSoilScenario = subSoilScenario,
+                DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification
             };
             input.DesignScenario.Location = new Location();
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
===================================================================
diff -u -r902 -r909
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 902)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 909)
@@ -81,6 +81,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Required safety factor must be specified.
+        /// </summary>
+        internal static string DamMacroStabilityOutwardsKernelWrapper_Prepare_NoRequiredSafetyFactor {
+            get {
+                return ResourceManager.GetString("DamMacroStabilityOutwardsKernelWrapper_Prepare_NoRequiredSafetyFactor", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to No input object defined for Bligh.
         /// </summary>
         internal static string DamPipingBlighKernelWrapper_NoInputObjectDefinedForBligh {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs	(revision 909)
@@ -0,0 +1,358 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Data;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using Deltares.DamEngine.Calculators.KernelWrappers.Common;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityOutwards;
+using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
+using Deltares.DamEngine.Calculators.Tests.KernelWrappers.DamMacroStabilityCommon;
+using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.Results;
+using Deltares.DamEngine.Data.Standard.Logging;
+using Deltares.DamEngine.TestHelpers;
+using NUnit.Framework;
+
+namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.DamMacroStabilityOutwards
+{
+    [TestFixture]
+    public class DamMacroStabilityOutwardsKernelWrapperTests
+    {
+        private const string TestFolder = @"..\..\Deltares.DamEngine.Calculators.Tests\KernelWrappers\DamMacroStabilityCommon\TestData";
+
+        [Test]
+        public void TestFullCalculation()
+        {
+            // expected results are based on test CanCalculateStabilitySafetyFactorGeometry2D
+            // in 'https://repos.deltares.nl/repos/dam/dam classic' revision 190
+            const double diff = 0.01;
+            
+            var exeName = @".\KernelWrappers\DamMacroStabilityCommon\DGeoStability.exe";
+
+            var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), TestFolder));
+            var workingDir = Path.Combine(absoluteFolder, "FullOut");
+            // Relative paths in ini file do not work yet in DGeoStability 16.2. This is fixed in 18.1.
+
+            if (Directory.Exists(workingDir))
+            {
+                Directory.Delete(workingDir, true);
+            }
+
+            var damKernelInput = CreateDamKernelInput();
+
+            var failureMechanismeParamatersMStab = new FailureMechanismParametersMStab();
+            failureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
+            failureMechanismeParamatersMStab.MStabParameters.SearchMethod = MStabSearchMethod.Grid;
+            failureMechanismeParamatersMStab.MStabParameters.CalculationOptions.MinimalCircleDepth = 1.0;
+            failureMechanismeParamatersMStab.DGeoStabilityExePath = exeName;
+            failureMechanismeParamatersMStab.ProjectWorkingPath = workingDir;
+
+            var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
+            kernelWrapper.FailureMechanismParametersMStab = failureMechanismeParamatersMStab;
+        
+            // Prepare the wrapper. Result is input for the calculation dll
+            IKernelDataInput damStabilityInput;
+            IKernelDataOutput kernelOutput;
+            kernelWrapper.Prepare(damKernelInput, 0, out damStabilityInput, out kernelOutput);
+
+            // Validate the input
+            List<LogMessage> messages;
+            kernelWrapper.Validate(damStabilityInput, kernelOutput, out messages);
+            Assert.AreEqual(0, messages.Count);
+        
+            // Run the dll
+            kernelWrapper.Execute(damStabilityInput, kernelOutput, out messages);
+            DamMacroStabilityOutput damMacroStabilityOutput = (DamMacroStabilityOutput) kernelOutput;
+            Assert.AreEqual(0, messages.Count);
+            Assert.AreEqual(2.935, damMacroStabilityOutput.StabilityOutputItems[0].Zone1Results.SafetyFactor, diff);
+            Assert.IsNull(damMacroStabilityOutput.StabilityOutputItems[0].Zone2Results);
+
+            // Fill the design results
+            List<DesignResult> results;
+            kernelWrapper.PostProcess(damKernelInput, damMacroStabilityOutput, "", out results);
+            Assert.AreEqual(2.935, results[0].StabilityDesignResults.SafetyFactor, diff);
+        }
+
+        private static DamKernelInput CreateDamKernelInput()
+        {
+            var soilDbName = Path.Combine(TestFolder, "soilmaterials.mdb");
+            var soilGeometry2DName = Path.Combine(TestFolder, "1D1.sti");
+            var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
+            var location = new Location();
+            var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line);
+            scenario.Location.SoildatabaseName = soilDbName;
+            scenario.Location.StabilityOptions = new StabilityOptions();
+            scenario.Location.StabilityOptions.TrafficLoad = 10.0;
+            scenario.Location.StabilityOptions.MapForSoilGeometries2D = TestFolder;
+            scenario.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = 1.1;
+
+            var subSoilScenario = new SoilGeometryProbability();
+            subSoilScenario.StiFileName = soilGeometry2DName;
+            subSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile;
+            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityOutside;
+
+            var damKernelInput = new DamKernelInput();
+            damKernelInput.Location = location;
+            damKernelInput.DesignScenario = scenario;
+            damKernelInput.SubSoilScenario = subSoilScenario;
+            return damKernelInput;
+        }
+
+        public XDocument ModifiedXmlDocument(string stiFileName)
+        {
+            var xmlFileName = Path.Combine(TestFolder, "test.xml");
+            var geometryFileName = Path.Combine(TestFolder, "DWP_1.sti");
+            var soilDbName = Path.Combine(TestFolder, "DAM Tutorial Design0.soilmaterials.mdb");
+            // modify name of output sti file
+            XDocument xDocument = XDocument.Load(xmlFileName);
+            XElement inputElement = (from element in xDocument.Root.Descendants()
+                                     where element.Name.LocalName == DamMStabAssembler.XmlElementNameInput
+                                     select element).Single();
+            XAttribute mstabFileName = inputElement.Attribute(DamMStabAssembler.XmlAttributeMStabFileName);
+            Debug.Assert(mstabFileName != null, "mstabFileName != null");
+            mstabFileName.Value = stiFileName;
+
+            // modify name of Soil DB Name
+            XAttribute dbName = inputElement.Attribute(DamMStabAssembler.XmlAttributeSoilDBName);
+            Debug.Assert(dbName != null, "dbName != null");
+            dbName.Value = soilDbName;
+
+            // modify name of geometry input file
+            XElement geometryOptionsElement = (from element in inputElement.Descendants()
+                                               where element.Name.LocalName == DamMStabAssembler.XmlElementGeometryCreationOptions
+                                               select element).Single();
+            XAttribute geomFileName = geometryOptionsElement.Attribute(DamMStabAssembler.XmlAttributeSoilGeometry2DFilename);
+            Debug.Assert(geomFileName != null, "geomFileName != null");
+            geomFileName.Value = geometryFileName;
+            return xDocument;
+        }
+
+        [Test]
+        public void TestCreateDGeoStabilityInputFile()
+        {
+            var stiFileName = Path.Combine(TestFolder, "test.sti");
+            var expectedStiFileName = Path.Combine(TestFolder, "expectedTest.sti");
+            if (File.Exists(stiFileName))
+            {
+                File.Delete(stiFileName);
+            }
+
+            var xDocument = ModifiedXmlDocument(stiFileName);
+            var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
+            kernelWrapper.CreateStiFile(xDocument);
+            Assert.IsTrue(File.Exists(stiFileName));
+            Assert.AreEqual(ContentOfStiFile(expectedStiFileName), ContentOfStiFile(stiFileName));
+        }
+
+        [Test]
+        [ExpectedException(typeof(MacroStabilityException))]
+        public void TestThrowsExceptionXmlFileNotValid()
+        {
+            var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
+            XDocument xDocument = new XDocument();
+            kernelWrapper.CreateStiFile(xDocument);
+        }
+
+        private string ContentOfStiFile(string stiFileName)
+        {
+            try
+            {
+                StreamReader stream = File.OpenText(stiFileName);
+                for (int i = 1; i <= 7; i++)
+                {
+                    stream.ReadLine(); // skip first 7 lines with date, time and filename
+                }
+                string text = stream.ReadToEnd();
+                stream.Close();
+                return text;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        [Test]
+        public void TestValidate()
+        {
+            var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
+
+            // Validate without setting values. Expected error messages.
+            var damStabilityInput = new DamMacroStabilityInput();
+            List<LogMessage> messages;
+            // Validate is not implemented (yet), returns always true
+            kernelWrapper.Validate(damStabilityInput, null, out messages);
+//            Assert.IsTrue(messages.Count > 0);
+
+            // Validate the input when valid input is provided. Expected no messages.
+            damStabilityInput = new DamMacroStabilityInput
+            {
+                // ToDo zant Fill input
+            };
+            messages.Clear();
+            kernelWrapper.Validate(damStabilityInput, null, out messages);
+            Assert.AreEqual(0, messages.Count);
+        }
+
+        [Test]
+        public void TestPostProcess()
+        {
+            var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
+            var damKernelInput = CreateDamKernelInput();
+            DamMacroStabilityOutputItem outputItem = new DamMacroStabilityOutputItem();
+
+            var zone1 = new DamMacroStabilityOutputItem.ResultsSingleZone();
+            zone1.SafetyFactor = 1.1;
+            zone1.EntryPointXCoordinate = 1.2;
+            zone1.ExitPointXCoordinate = 1.3;
+            outputItem.Zone1Results = zone1;
+            var zone2 = new DamMacroStabilityOutputItem.ResultsSingleZone();
+            zone2.SafetyFactor = 0.9;
+            zone2.EntryPointXCoordinate = 2.2;
+            zone2.ExitPointXCoordinate = 2.3;
+            outputItem.Zone2Results = zone2;
+            DamMacroStabilityOutput output = new DamMacroStabilityOutput();
+            output.StabilityOutputItems = new List<DamMacroStabilityOutputItem>();
+            output.StabilityOutputItems.Add(outputItem);
+            List<DesignResult> results;
+            kernelWrapper.PostProcess(damKernelInput, output, "", out results);
+            Assert.AreEqual(0.9, results[0].StabilityDesignResults.SafetyFactor);
+            Assert.AreEqual(1.1, results[0].StabilityDesignResults.Zone1SafetyFactor);
+            Assert.AreEqual(1.2, results[0].StabilityDesignResults.LocalZone1EntryPointX);
+            Assert.AreEqual(1.3, results[0].StabilityDesignResults.LocalZone1ExitPointX);
+            Assert.AreEqual(0.9, results[0].StabilityDesignResults.Zone2SafetyFactor);
+            Assert.AreEqual(2.2, results[0].StabilityDesignResults.LocalZone2EntryPointX);
+            Assert.AreEqual(2.3, results[0].StabilityDesignResults.LocalZone2ExitPointX);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Macrostabiliteit")]
+        [SetUICulture("nl-NL")]
+        public void TestLanguageNLThrowsExceptionWhenInputIsNull()
+        {
+            DamMacroStabilityOutwardsKernelWrapper.StabilityCalculator(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for Macro Stability")]
+        [SetUICulture("en-US")]
+        public void TestLanguageENThrowsExceptionWhenInputIsNull()
+        {
+            DamMacroStabilityOutwardsKernelWrapper.StabilityCalculator(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for Macro Stability")]
+        [SetUICulture("en-US")]
+        public void PostProcessTestLanguageENThrowsExceptionWhenInputIsNull()
+        {
+            var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
+            List<DesignResult> results;
+            kernelWrapper.PostProcess(null, null, "", out results);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen uitvoer object gedefinieerd voor Macrostabiliteit")]
+        [SetUICulture("nl-NL")]
+        public void PostProcessTestThrowsExceptionWhenOutputIsNull()
+        {
+            var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
+            List<DesignResult> results;
+            var damKernelInput = CreateDamKernelInput();
+            kernelWrapper.PostProcess(damKernelInput, null, "", out results);
+        }
+
+        [Test]
+        [ExpectedException(typeof(MacroStabilityException), ExpectedMessage = "De vereiste veiligheidsfactor ontbreekt")]
+        [SetUICulture("nl-NL")]
+        public void TestThrowsExceptionWhenRequiredSafetyFactorIsMissingNL()
+        {
+            PrepareWithInvalidFile();            
+        }
+
+        [Test]
+        [ExpectedException(typeof(MacroStabilityException), ExpectedMessage = "Required safety factor must be specified")]
+        [SetUICulture("en-US")]
+        public void TestThrowsExceptionWhenRequiredSafetyFactorIsMissingEN()
+        {
+            PrepareWithInvalidFile();
+        }
+
+        private void PrepareWithInvalidFile()
+        {
+            // expected results are based on test CanCalculateStabilitySafetyFactorGeometry2D
+            // in 'https://repos.deltares.nl/repos/dam/dam classic' revision 190
+            const double diff = 0.01;
+            var soilDbName = Path.Combine(TestFolder, "soilmaterials.mdb");
+            var soilGeometry2DName = Path.Combine(TestFolder, "1D1.sti");
+            var exeName = @".\KernelWrappers\DamMacroStabilityCommon\DGeoStability.exe";
+
+            var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), TestFolder));
+            var workingDir = Path.Combine(absoluteFolder, "FullOut");
+            // Relative paths in ini file do not work yet in DGeoStability 16.2. This is fixed in 18.1.
+
+            if (Directory.Exists(workingDir))
+            {
+                Directory.Delete(workingDir, true);
+            }
+
+            var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
+            var location = new Location();
+            var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line);
+            scenario.Location.SoildatabaseName = soilDbName;
+            scenario.Location.StabilityOptions = new StabilityOptions();
+            scenario.Location.StabilityOptions.TrafficLoad = 10.0;
+            scenario.Location.StabilityOptions.MapForSoilGeometries2D = TestFolder;
+            scenario.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1;
+
+            var subSoilScenario = new SoilGeometryProbability();
+            subSoilScenario.StiFileName = soilGeometry2DName;
+            subSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile;
+            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityOutside;
+
+            var failureMechanismeParamatersMStab = new FailureMechanismParametersMStab();
+            failureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
+            failureMechanismeParamatersMStab.MStabParameters.SearchMethod = MStabSearchMethod.GeneticAlgorithm;
+            failureMechanismeParamatersMStab.MStabParameters.CalculationOptions.MinimalCircleDepth = 1.0;
+            failureMechanismeParamatersMStab.DGeoStabilityExePath = exeName;
+            failureMechanismeParamatersMStab.ProjectWorkingPath = workingDir;
+
+            var damKernelInput = new DamKernelInput();
+            damKernelInput.Location = location;
+            damKernelInput.DesignScenario = scenario;
+            damKernelInput.SubSoilScenario = subSoilScenario;
+
+            var kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
+            kernelWrapper.FailureMechanismParametersMStab = failureMechanismeParamatersMStab;
+
+            // Prepare the wrapper. Result is input for the calculation dll
+            IKernelDataInput damStabilityInput;
+            IKernelDataOutput kernelOutput;
+            kernelWrapper.Prepare(damKernelInput, 0, out damStabilityInput, out kernelOutput);
+        }
+    }
+}