Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/TestFiles/Bka16CoreDam_Run1NewDGS0.soilmaterials.mdb
===================================================================
diff -u
Binary files differ
Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r4280 -r4281
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 4280)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 4281)
@@ -60,6 +60,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="TestFiles\Bka16CoreDam_Run1NewDGS0.soilmaterials.mdb" />
     <Content Include="TestFiles\DAM Tutorial Design0.soilmaterials.mdb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r4280 -r4281
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4280)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4281)
@@ -170,8 +170,14 @@
             string inputString = File.ReadAllText(fullInputFilename);
             var engineInterface = new EngineInterface(inputString);
             engineInterface.DamProjectData.MaxCalculationCores = maxCores;
-            engineInterface.DamProjectData.CalculationMap = engineInterface.DamProjectData.CalculationMap + "_Cores_" + maxCores;
+            var calcDir = engineInterface.DamProjectData.CalculationMap + "_Cores_" + maxCores; 
+            engineInterface.DamProjectData.CalculationMap = calcDir;
             Assert.IsNotNull(engineInterface.DamProjectData);
+            calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir;
+            if (Directory.Exists(calcDir))
+            {
+                Directory.Delete(calcDir, true); // delete previous results
+            }   //                                                                            C:\Dam\DamEngine\branches\DamEngine 19.3\src\bin\Debug\Bka16CoreDam_Run1NewDGS.Calc_Cores_16
             string result = engineInterface.Validate();
             Assert.IsTrue(result == null, "Validation must succeed but does not, see output xml in debugger");
             string outputString = engineInterface.Run();
Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputFileMultiCoreTestForScenario.xml
===================================================================
diff -u -r4280 -r4281
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputFileMultiCoreTestForScenario.xml	(.../InputFileMultiCoreTestForScenario.xml)	(revision 4280)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputFileMultiCoreTestForScenario.xml	(.../InputFileMultiCoreTestForScenario.xml)	(revision 4281)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="0" StabilityModelType="Bishop" AnalysisType="NoAdaption" ProjectPath="D:\DAM 19.3 Probleem WF\stabiliteit_droog1" CalculationMap="Bka16CoreDam_Run1NewDGS.Calc" MaxCalculationCores="16">
+<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="" CalculationMap="Bka16CoreDam_Run1NewDGS.Calc" MaxCalculationCores="16">
   <Locations>
     <Location SurfaceLineName="KR093_0013" SegmentName="Segment 627-KR093_0013" Name="KR093_0013" DikeEmbankmentMaterial="Klei" XSoilGeometry2DOrigin="0" DistanceToEntryPoint="0">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="Klei" StabilityShoulderGrowSlope="0.333333333333333" StabilityShoulderGrowDeltaX="2" StabilitySlopeAdaptionDeltaX="2" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
@@ -8,7 +8,7 @@
         <DesignScenario Id="3" RiverLevel="-0.37" DikeTableHeight="-0.04" PlLineOffsetBelowDikeTopAtRiver="0.2" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.4" PlLineOffsetBelowDikeToeAtPolder="0" HeadPl3="-0.94" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="0.9" RequiredSafetyFactorStabilityOuterSlope="1" RequiredSafetyFactorPiping="1.2" />
         <DesignScenario Id="4" RiverLevel="-0.37" DikeTableHeight="-0.04" PlLineOffsetBelowDikeTopAtRiver="0.2" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.4" PlLineOffsetBelowDikeToeAtPolder="0" HeadPl3="-0.37" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="0.9" RequiredSafetyFactorStabilityOuterSlope="1" RequiredSafetyFactorPiping="1.2" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="D:\DAM 19.3 Probleem WF\stabiliteit_droog1\Bka16CoreDam_Run1NewDGS0.soilmaterials.mdb" ZoneType="2" ForbiddenZoneFactor="0.5" ZoneAreaRestSlopeCrestWidth="4.5" TrafficLoad="0" MinimumCircleDepth="1" />
+      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="TestFiles\Bka16CoreDam_Run1NewDGS0.soilmaterials.mdb" ZoneType="2" ForbiddenZoneFactor="0.5" ZoneAreaRestSlopeCrestWidth="4.5" TrafficLoad="0" MinimumCircleDepth="1" />
     </Location>
     <Location SurfaceLineName="KR093_0018" SegmentName="Segment 629-KR093_0018" Name="KR093_0018" DikeEmbankmentMaterial="Klei" XSoilGeometry2DOrigin="0" DistanceToEntryPoint="0">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="Klei" StabilityShoulderGrowSlope="0.333333333333333" StabilityShoulderGrowDeltaX="2" StabilitySlopeAdaptionDeltaX="2" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
@@ -17,7 +17,7 @@
         <DesignScenario Id="3" RiverLevel="-0.37" DikeTableHeight="-0.04" PlLineOffsetBelowDikeTopAtRiver="0.2" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.4" PlLineOffsetBelowDikeToeAtPolder="0" HeadPl3="-1" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="0.9" RequiredSafetyFactorStabilityOuterSlope="1" RequiredSafetyFactorPiping="1.2" />
         <DesignScenario Id="4" RiverLevel="-0.37" DikeTableHeight="-0.04" PlLineOffsetBelowDikeTopAtRiver="0.2" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.4" PlLineOffsetBelowDikeToeAtPolder="0" HeadPl3="-0.37" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="0.9" RequiredSafetyFactorStabilityOuterSlope="1" RequiredSafetyFactorPiping="1.2" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="D:\DAM 19.3 Probleem WF\stabiliteit_droog1\Bka16CoreDam_Run1NewDGS0.soilmaterials.mdb" ZoneType="2" ForbiddenZoneFactor="0.5" ZoneAreaRestSlopeCrestWidth="4.5" TrafficLoad="0" MinimumCircleDepth="1" />
+      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="TestFiles\Bka16CoreDam_Run1NewDGS0.soilmaterials.mdb" ZoneType="2" ForbiddenZoneFactor="0.5" ZoneAreaRestSlopeCrestWidth="4.5" TrafficLoad="0" MinimumCircleDepth="1" />
     </Location>
     <Location SurfaceLineName="KR093_0019" SegmentName="Segment 629-KR093_0019" Name="KR093_0019" DikeEmbankmentMaterial="Klei" XSoilGeometry2DOrigin="0" DistanceToEntryPoint="0">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="Klei" StabilityShoulderGrowSlope="0.333333333333333" StabilityShoulderGrowDeltaX="2" StabilitySlopeAdaptionDeltaX="2" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
@@ -26,7 +26,7 @@
         <DesignScenario Id="3" RiverLevel="-0.37" DikeTableHeight="-0.04" PlLineOffsetBelowDikeTopAtRiver="0.2" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.4" PlLineOffsetBelowDikeToeAtPolder="0" HeadPl3="-1.03" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="0.9" RequiredSafetyFactorStabilityOuterSlope="1" RequiredSafetyFactorPiping="1.2" />
         <DesignScenario Id="4" RiverLevel="-0.37" DikeTableHeight="-0.04" PlLineOffsetBelowDikeTopAtRiver="0.2" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.4" PlLineOffsetBelowDikeToeAtPolder="0" HeadPl3="-0.37" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="0.9" RequiredSafetyFactorStabilityOuterSlope="1" RequiredSafetyFactorPiping="1.2" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="D:\DAM 19.3 Probleem WF\stabiliteit_droog1\Bka16CoreDam_Run1NewDGS0.soilmaterials.mdb" ZoneType="2" ForbiddenZoneFactor="0.5" ZoneAreaRestSlopeCrestWidth="4.5" TrafficLoad="5" MinimumCircleDepth="1" />
+      <StabilityOptions MapForSoilgeometries2D="" SoilDatabaseName="TestFiles\Bka16CoreDam_Run1NewDGS0.soilmaterials.mdb" ZoneType="2" ForbiddenZoneFactor="0.5" ZoneAreaRestSlopeCrestWidth="4.5" TrafficLoad="5" MinimumCircleDepth="1" />
     </Location>
   </Locations>
   <SurfaceLines>