Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r595 -r597
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 595)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 597)
@@ -161,7 +161,7 @@
var inputLocation = new Io.XmlInput.Location();
inputLocation.SurfaceLineName = location.SurfaceLine.Name;
-
+ inputLocation.SegmentName = location.Segment.Name;
var waternetOptions = new LocationWaternetOptions();
waternetOptions.PhreaticLineCreationMethod = ConversionHelper.ConvertToInputPhreaticLineCreationMethod(location.ModelParametersForPLLines.PLLineCreationMethod);
waternetOptions.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(location.IntrusionVerticalWaterPressure ?? IntrusionVerticalWaterPressureType.Standard);
Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml
===================================================================
diff -u -r580 -r597
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml (.../InputFile.xml) (revision 580)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml (.../InputFile.xml) (revision 597)
@@ -1,23 +1,23 @@
-
+
-
+
-
+
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r595 -r597
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 595)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 597)
@@ -59,10 +59,10 @@
TransferSurfaceLines(input.SurfaceLines, dike.SurfaceLines2);
dike.SoilList = new SoilList();
TransferSoils(input.Soils, dike.SoilList.Soils);
- TransferLocations(input.Locations, dike.Locations, dike.SurfaceLines2);
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);
PostProcess(input, damProjectData);
return damProjectData;
@@ -127,6 +127,7 @@
{
designScenario.Location = location;
}
+
}
}
@@ -175,7 +176,7 @@
}
}
- private static void TransferLocations(Io.XmlInput.Location[] inputLocations, IList dikeLocations, IList dikeSurfaceLines)
+ private static void TransferLocations(Io.XmlInput.Location[] inputLocations, IList dikeLocations, IList dikeSurfaceLines, IList segments)
{
for (int i = 0; i < inputLocations.Length; i++)
{
@@ -205,6 +206,8 @@
SurfaceLine2 surfaceLine = dikeSurfaceLines.First(n => n.Name.Equals(inputLocation.SurfaceLineName));
location.SurfaceLine = surfaceLine;
+ Segment segment = segments.First(s => s.Name.Equals(inputLocation.SegmentName));
+ location.Segment = segment;
if (inputLocation.DesignScenarios != null)
{
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r595 -r597
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 595)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 597)
@@ -428,11 +428,6 @@
///
/// Gets or sets the Segment
///
- public virtual string SegmentId { get; set; }
-
- ///
- /// Gets or sets the Segment
- ///
public virtual Segment Segment
{
get
Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r595 -r597
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 595)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 597)
@@ -81,10 +81,10 @@
Dike dike = damProjectData.Dike;
FillSurfaceLines(dike);
FillSoils(dike);
- FillLocations(dike);
FillSoilProfiles1D(dike);
FillSoilProfiles2D(dike);
FillSegments(damProjectData);
+ FillLocations(dike, damProjectData.Segments);
return damProjectData;
}
@@ -149,7 +149,7 @@
AddPointToSurfaceLine(surfaceLine, 24.0, 1.0, CharacteristicPointType.SurfaceLevelInside);
}
- private static void FillLocations(Dike dike)
+ private static void FillLocations(Dike dike, IList segments)
{
const int locationCount = 3;
for (int i = 0; i < locationCount; i++)
@@ -176,6 +176,7 @@
location.HeadPl3 = 1.0 * i + 0.25;
location.HeadPl4 = 1.0 * i + 0.21;
location.SurfaceLine = dike.SurfaceLines2[i];
+ location.Segment = segments[i % 2]; // alternate between the 2 available segments
for (int j = 0; j < 3; j++)
{
var designScenario = FillDesignScenario((i +1) * (j + 1)); // The parameter factor is used to create unique data for the design scenarios