Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r929 -r992 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 929) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 992) @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General; @@ -56,7 +57,8 @@ Dike dike = damProjectData.Dike; - damProjectData.ProjectWorkingPath = input.ProjectWorkingPath; + damProjectData.ProjectPath = input.ProjectPath; + damProjectData.CalculationMap = input.CalculationMap; TransferAnalysisSpecification(input, damProjectData); TransferStabilityParameters(input, damProjectData); @@ -67,7 +69,7 @@ TransferSoilProfiles1D(input.SoilProfiles1D, dike.SoilProfiles, dike.SoilList); TransferSoilProfiles2D(input.SoilProfiles2D, dike.SoilProfiles2D, dike.SoilList); TransferSegments(input.Segments, damProjectData.Segments); - TransferLocations(input.Locations, dike.Locations, dike.SurfaceLines2, damProjectData.Segments); + TransferLocations(input.ProjectPath ,input.Locations, dike.Locations, dike.SurfaceLines2, damProjectData.Segments); PostProcess(damProjectData); return damProjectData; @@ -324,7 +326,8 @@ surfaceLine.Geometry.SyncCalcPoints(); } - private static void TransferLocations(Io.XmlInput.Location[] inputLocations, IList dikeLocations, IList dikeSurfaceLines, IList segments) + private static void TransferLocations(string projectPath, Io.XmlInput.Location[] inputLocations, + IList dikeLocations, IList dikeSurfaceLines, IList segments) { for (int i = 0; i < inputLocations.Length; i++) { @@ -425,9 +428,10 @@ location.DikeEmbankmentMaterial = inputLocation.DikeEmbankmentMaterial; if (inputLocation.StabilityOptions != null) { + var tmpPath = projectPath ?? Directory.GetCurrentDirectory(); location.StabilityOptions = new StabilityOptions { - MapForSoilGeometries2D = inputLocation.StabilityOptions.MapForSoilgeometries2D, + SoilGeometries2DPath = Path.Combine(tmpPath, inputLocation.StabilityOptions.MapForSoilgeometries2D), SoilDatabaseName = inputLocation.StabilityOptions.SoilDatabaseName, StabilityZoneType = ConversionHelper.ConvertToZoneType(inputLocation.StabilityOptions.ZoneType) };