Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs
===================================================================
diff -u -r452 -r578
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 452)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 578)
@@ -449,8 +449,8 @@
                             foreach (var nwoResult in scenario.NwoResults)
                             {
                                 var resultMessage = scenario.GetResultMessage(
-                                    nwoResult.SoilProfileProbability.SoilProfile,
-                                    nwoResult.SoilProfileProbability.SoilGeometry2DName);
+                                    nwoResult.SoilProfileProbability.SoilProfile1D,
+                                    nwoResult.SoilProfileProbability.StiFileName);
                                 // The error message can contain "," and ";" and should therefor be surrounded with double quotes, so it will be read correctly as a scv file
                                 damProjectCalculatorLogBuilder.Append(
                                     @"""",
@@ -482,8 +482,8 @@
                             if (scenario.CalculationResult != CalculationResult.NoRun)
                             {
                                 // The error message can contain "," and ";" and should therefor be surrounded with double quotes, so it will be read correctly as a csv file
-                                string resultMessage = scenario.GetResultMessage(soilProfileProbability.SoilProfile,
-                                                                                    soilProfileProbability.SoilGeometry2DName);
+                                string resultMessage = scenario.GetResultMessage(soilProfileProbability.SoilProfile1D,
+                                                                                    soilProfileProbability.StiFileName);
                                 damProjectCalculatorLogBuilder.Append(
                                     @"""",
                                     ++recordIndex,
@@ -501,8 +501,8 @@
                     {
                         // The error message can contain "," and ";" and should therefor be surrounded with double quotes, so it will be read correctly as a scv file
                         var resultMessage = scenario.GetResultMessage(
-                            soilProfileProbability.SoilProfile,
-                            soilProfileProbability.SoilGeometry2DName);
+                            soilProfileProbability.SoilProfile1D,
+                            soilProfileProbability.StiFileName);
 
                         damProjectCalculatorLogBuilder.Append(
                             @"""",
@@ -585,32 +585,42 @@
 
                         if (plLines != null)
                         {
-                            string fullSoilGeometry2DName = (soilProfileProbability.SoilGeometry2DName == null) ? null :
-                                                                Path.Combine(ProjectDataDirectory, Path.Combine(dike.MapForSoilGeometries2D, soilProfileProbability.SoilGeometry2DName));
+                            string fullSoilGeometry2DName = (soilProfileProbability.StiFileName == null) ? null :
+                                                                Path.Combine(ProjectDataDirectory, Path.Combine(dike.MapForSoilGeometries2D, soilProfileProbability.StiFileName));
                             double? upliftFactor = GetLowestUpliftFactor(surfaceLineWithNewHeight,
-                                                                         soilProfileProbability.SoilProfile, fullSoilGeometry2DName, plLines, scenario.Location);
+                                                                         soilProfileProbability.SoilProfile1D, fullSoilGeometry2DName, plLines, scenario.Location);
                             upliftSituation.IsUplift = (upliftFactor < upliftCriterion);
                         }
                         else
                         {
                             upliftSituation.IsUplift = false;
                         }
-                        scenario.SetStabilityUpliftSituation(soilProfileProbability.SoilProfile,
-                                                             soilProfileProbability.SoilGeometry2DName, upliftSituation);
+                        scenario.SetStabilityUpliftSituation(soilProfileProbability.SoilProfile1D,
+                                                             soilProfileProbability.StiFileName, upliftSituation);
                     }
                     catch (Exception exception)
                     {
+                        var soilGeometryName = soilProfileProbability.StiFileName;
+                        switch (soilProfileProbability.SoilProfileType)
+                        {
+                                case SoilProfileType.ProfileType1D:
+                                soilGeometryName = soilProfileProbability.SoilProfile1DName;
+                                break;
+                                case SoilProfileType.ProfileType2D:
+                                soilGeometryName = soilProfileProbability.StiFileName;
+                                break;
+                        }
                         string errorMessage = String.Format("{0} in location '{1}' scenario '{2}' soilprofile '{3}'",
                                                             exception.Message, scenario.Location.Name,
                                                             scenario.LocationScenarioID,
-                                                            soilProfileProbability.SoilGeometryName);
-                        scenario.SetResultMessage(soilProfileProbability.SoilProfile,
-                                                  soilProfileProbability.SoilGeometry2DName, exception.Message);
+                                                            soilGeometryName);
+                        scenario.SetResultMessage(soilProfileProbability.SoilProfile1D,
+                                                  soilProfileProbability.StiFileName, exception.Message);
                         var resultRecord = new DesignResult("Error: " + exception.Message,
                             damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications[0],
                             scenario,
-                            soilProfileProbability.SoilProfile,
-                            soilProfileProbability.SoilGeometry2DName,
+                            soilProfileProbability.SoilProfile1D,
+                            soilProfileProbability.StiFileName,
                             DamProjectCalculationSpecification.SelectedAnalysisType,
                             0);
                         scenario.CalculationResults.Add(resultRecord);
@@ -840,11 +850,11 @@
         {
             var plLinesCreator = new PLLinesCreator();
             // Determine geometry type
-            SoilGeometryType soilGeometryType = soilProfileProbability.SoilGeometryType;
+            SoilProfileType soilProfileType = soilProfileProbability.SoilProfileType;
             string mapForSoilGeometries2D = location.MapForSoilGeometries2D;
-            SoilProfile1D soilProfile = soilProfileProbability.SoilProfile;
-            string soilGeometry2DName = soilProfileProbability.SoilGeometry2DName;
-            if ((soilProfileProbability.SoilGeometry2DName != null) && (mapForSoilGeometries2D != null))
+            SoilProfile1D soilProfile = soilProfileProbability.SoilProfile1D;
+            string soilGeometry2DName = soilProfileProbability.StiFileName;
+            if ((soilProfileProbability.StiFileName != null) && (mapForSoilGeometries2D != null))
             {
                 soilGeometry2DName = Path.Combine(mapForSoilGeometries2D, soilGeometry2DName);
                 soilGeometry2DName = Path.Combine(ProjectDataDirectory, soilGeometry2DName);
@@ -862,7 +872,7 @@
             plLinesCreator.ModelParametersForPLLines = location.ModelParametersForPLLines;
             plLinesCreator.SoilProfile = soilProfile;
             plLinesCreator.SoilGeometry2DName = soilGeometry2DName;
-            plLinesCreator.SoilGeometryType = soilGeometryType;
+            plLinesCreator.SoilProfileType = soilProfileType;
             plLinesCreator.GaugePLLines = location.GaugePLLines;
             plLinesCreator.Gauges = location.Gauges;
             plLinesCreator.GaugeMissVal = location.GaugeMissVal;