Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r613 -r629 --- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 613) +++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 629) @@ -1957,6 +1957,8 @@ [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public partial class LocationDesignScenario { + private string idField; + private double riverLevelField; private double riverLevelLowField; @@ -2021,6 +2023,17 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] + public string Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] public double RiverLevel { get { return this.riverLevelField; Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r617 -r629 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 617) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 629) @@ -210,7 +210,7 @@ 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 + var designScenario = FillDesignScenario(i, j); designScenario.Location = location; location.Scenarios.Add(designScenario); } @@ -251,9 +251,12 @@ dike.SoilProfiles.Add(profile); } } - private static DesignScenario FillDesignScenario(int factor) + private static DesignScenario FillDesignScenario(int locationIndex, int scenarioIndex) { + // The parameter factor is used to create unique data for the design scenario + int factor = (locationIndex + 1) * (scenarioIndex + 1); var designScenario = new DesignScenario(); + designScenario.LocationScenarioID = scenarioIndex.ToString(); designScenario.RiverLevel = 1.0 * factor + 0.51; designScenario.RiverLevelLow = 1.0 * factor + 0.52; designScenario.DikeTableHeight = 1.0 * factor + 0.53; Index: dam engine/trunk/Xsds Liquid/DamLocation.xsd =================================================================== diff -u -r541 -r629 --- dam engine/trunk/Xsds Liquid/DamLocation.xsd (.../DamLocation.xsd) (revision 541) +++ dam engine/trunk/Xsds Liquid/DamLocation.xsd (.../DamLocation.xsd) (revision 629) @@ -118,6 +118,7 @@ + Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r614 -r629 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 614) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 629) @@ -230,6 +230,7 @@ var inputDesignScenario = new LocationDesignScenario(); inputDesignScenario.RiverLevel = designScenario.RiverLevel; + inputDesignScenario.Id = designScenario.LocationScenarioID; inputDesignScenario.RiverLevelLowSpecified = designScenario.RiverLevelLow.HasValue; inputDesignScenario.RiverLevelLow = designScenario.RiverLevelLow ?? 0.0; inputDesignScenario.DikeTableHeightSpecified = designScenario.DikeTableHeight.HasValue; Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r614 -r629 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 614) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 629) @@ -248,6 +248,7 @@ { var designScenario = new DesignScenario(); var inputLocationDesignScenario = inputLocation.DesignScenarios[j]; + designScenario.LocationScenarioID = inputLocationDesignScenario.Id; designScenario.RiverLevel = inputLocationDesignScenario.RiverLevel; designScenario.RiverLevelLow = (inputLocationDesignScenario.RiverLevelLowSpecified ? (double?)inputLocationDesignScenario.RiverLevelLow : null); designScenario.DikeTableHeight = (inputLocationDesignScenario.DikeTableHeightSpecified ? (double?)inputLocationDesignScenario.DikeTableHeight : null);