Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r629 -r631
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 629)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 631)
@@ -186,6 +186,7 @@
for (int i = 0; i < locationCount; i++)
{
var location = new Data.General.Location();
+ location.Name = "Location " + (i + 1).ToString();
location.ModelParametersForPLLines.PLLineCreationMethod = (PLLineCreationMethod) i;
location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType) i;
location.PolderLevel = 1.0 * i + 0.11;
Index: dam engine/trunk/Xsds Liquid/DamLocation.xsd
===================================================================
diff -u -r629 -r631
--- dam engine/trunk/Xsds Liquid/DamLocation.xsd (.../DamLocation.xsd) (revision 629)
+++ dam engine/trunk/Xsds Liquid/DamLocation.xsd (.../DamLocation.xsd) (revision 631)
@@ -143,5 +143,6 @@
+
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r629 -r631
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 629)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 631)
@@ -235,6 +235,8 @@
private string segmentNameField;
+ private string nameField;
+
///
public LocationAssesmentRegionalOptions AssesmentRegionalOptions {
get {
@@ -347,6 +349,17 @@
this.segmentNameField = value;
}
}
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public string Name {
+ get {
+ return this.nameField;
+ }
+ set {
+ this.nameField = value;
+ }
+ }
}
///
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r629 -r631
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 629)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 631)
@@ -193,6 +193,7 @@
var location = dikeLocations[i];
var inputLocation = new Io.XmlInput.Location();
+ inputLocation.Name = location.Name;
inputLocation.SurfaceLineName = location.SurfaceLine.Name;
inputLocation.SegmentName = location.Segment.Name;
var waternetOptions = new LocationWaternetOptions();
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r629 -r631
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 629)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 631)
@@ -215,6 +215,7 @@
{
var location = new Location();
var inputLocation = inputLocations[i];
+ location.Name = inputLocation.Name;
var waternetOptions = inputLocation.WaternetOptions;
location.ModelParametersForPLLines.PLLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod);
location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure);