Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml
===================================================================
diff -u -r613 -r669
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml	(.../InputFile.xml)	(revision 613)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml	(.../InputFile.xml)	(revision 669)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="2" PipingModelType="Bligh" AnalysisType="AdaptGeometry">
   <Locations>
-    <Location SurfaceLineName="SurfaceLine 0" SegmentName="Segment 0">
+    <Location SurfaceLineName="SurfaceLine 0" SegmentName="Segment 0" Name="Location 1">
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="0.11" HeadPl2="0.24" HeadPl3="0.25" HeadPl4="0.21" DampingFactorPL3="0.12" DampingFactorPL4="0.13" PenetrationLength="0.14" SlopeDampingFactor="0.19" Pl1BelowCrestRiverside="0.2" Pl1BelowCrestPolderside="0.21" Pl1BelowShoulderCrestPolderside="0.22" Pl1BelowToeDikePolderside="0.23" Pl1BelowCrestMiddle="0.15" Pl1FactorBelowShoulderCrest="0.16" DryPl1BelowCrestMiddle="0.17" DryPl1FactorBelowShoulderCrest="0.18" IntrusionVerticalWaterPressure="Standard" />
       <DesignScenarios>
-        <DesignScenario RiverLevel="1.51" RiverLevelLow="1.52" DikeTableHeight="1.53" PlLineOffsetBelowDikeTopAtRiver="1.54" PlLineOffsetBelowDikeTopAtPolder="1.55" PlLineOffsetBelowShoulderBaseInside="1.56" PlLineOffsetBelowDikeToeAtPolder="1.5699999999999998" PlLineOffsetBelowDikeCrestMiddle="1.58" PlLineOffsetFactorBelowShoulderCrest="1.5899999999999999" HeadPl3="1.6" HeadPl4="1.6099999999999999" UpliftCriterionStability="1.62" UpliftCriterionPiping="1.63" RequiredSafetyFactorStabilityInnerSlope="1.6400000000000001" RequiredSafetyFactorStabilityOuterSlope="1.65" RequiredSafetyFactorPiping="1.6600000000000001" />
-        <DesignScenario RiverLevel="2.51" RiverLevelLow="2.52" DikeTableHeight="2.5300000000000002" PlLineOffsetBelowDikeTopAtRiver="2.54" PlLineOffsetBelowDikeTopAtPolder="2.55" PlLineOffsetBelowShoulderBaseInside="2.56" PlLineOffsetBelowDikeToeAtPolder="2.57" PlLineOffsetBelowDikeCrestMiddle="2.58" PlLineOffsetFactorBelowShoulderCrest="2.59" HeadPl3="2.6" HeadPl4="2.61" UpliftCriterionStability="2.62" UpliftCriterionPiping="2.63" RequiredSafetyFactorStabilityInnerSlope="2.64" RequiredSafetyFactorStabilityOuterSlope="2.65" RequiredSafetyFactorPiping="2.66" />
-        <DesignScenario RiverLevel="3.51" RiverLevelLow="3.52" DikeTableHeight="3.5300000000000002" PlLineOffsetBelowDikeTopAtRiver="3.54" PlLineOffsetBelowDikeTopAtPolder="3.55" PlLineOffsetBelowShoulderBaseInside="3.56" PlLineOffsetBelowDikeToeAtPolder="3.57" PlLineOffsetBelowDikeCrestMiddle="3.58" PlLineOffsetFactorBelowShoulderCrest="3.59" HeadPl3="3.6" HeadPl4="3.61" UpliftCriterionStability="3.62" UpliftCriterionPiping="3.63" RequiredSafetyFactorStabilityInnerSlope="3.64" RequiredSafetyFactorStabilityOuterSlope="3.65" RequiredSafetyFactorPiping="3.66" />
+        <DesignScenario Id="0" RiverLevel="1.51" RiverLevelLow="1.52" DikeTableHeight="1.53" PlLineOffsetBelowDikeTopAtRiver="1.54" PlLineOffsetBelowDikeTopAtPolder="1.55" PlLineOffsetBelowShoulderBaseInside="1.56" PlLineOffsetBelowDikeToeAtPolder="1.5699999999999998" PlLineOffsetBelowDikeCrestMiddle="1.58" PlLineOffsetFactorBelowShoulderCrest="1.5899999999999999" HeadPl3="1.6" HeadPl4="1.6099999999999999" UpliftCriterionStability="1.62" UpliftCriterionPiping="1.63" RequiredSafetyFactorStabilityInnerSlope="1.6400000000000001" RequiredSafetyFactorStabilityOuterSlope="1.65" RequiredSafetyFactorPiping="1.6600000000000001" />
+        <DesignScenario Id="1" RiverLevel="2.51" RiverLevelLow="2.52" DikeTableHeight="2.5300000000000002" PlLineOffsetBelowDikeTopAtRiver="2.54" PlLineOffsetBelowDikeTopAtPolder="2.55" PlLineOffsetBelowShoulderBaseInside="2.56" PlLineOffsetBelowDikeToeAtPolder="2.57" PlLineOffsetBelowDikeCrestMiddle="2.58" PlLineOffsetFactorBelowShoulderCrest="2.59" HeadPl3="2.6" HeadPl4="2.61" UpliftCriterionStability="2.62" UpliftCriterionPiping="2.63" RequiredSafetyFactorStabilityInnerSlope="2.64" RequiredSafetyFactorStabilityOuterSlope="2.65" RequiredSafetyFactorPiping="2.66" />
+        <DesignScenario Id="2" RiverLevel="3.51" RiverLevelLow="3.52" DikeTableHeight="3.5300000000000002" PlLineOffsetBelowDikeTopAtRiver="3.54" PlLineOffsetBelowDikeTopAtPolder="3.55" PlLineOffsetBelowShoulderBaseInside="3.56" PlLineOffsetBelowDikeToeAtPolder="3.57" PlLineOffsetBelowDikeCrestMiddle="3.58" PlLineOffsetFactorBelowShoulderCrest="3.59" HeadPl3="3.6" HeadPl4="3.61" UpliftCriterionStability="3.62" UpliftCriterionPiping="3.63" RequiredSafetyFactorStabilityInnerSlope="3.64" RequiredSafetyFactorStabilityOuterSlope="3.65" RequiredSafetyFactorPiping="3.66" />
       </DesignScenarios>
     </Location>
-    <Location SurfaceLineName="SurfaceLine 1" SegmentName="Segment 1">
+    <Location SurfaceLineName="SurfaceLine 1" SegmentName="Segment 1" Name="Location 2">
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeLinearInDike" PolderLevel="1.11" HeadPl2="1.24" HeadPl3="1.25" HeadPl4="1.21" DampingFactorPL3="1.12" DampingFactorPL4="1.13" PenetrationLength="1.1400000000000001" SlopeDampingFactor="1.19" Pl1BelowCrestRiverside="1.2" Pl1BelowCrestPolderside="1.21" Pl1BelowShoulderCrestPolderside="1.22" Pl1BelowToeDikePolderside="1.23" Pl1BelowCrestMiddle="1.15" Pl1FactorBelowShoulderCrest="1.16" DryPl1BelowCrestMiddle="1.17" DryPl1FactorBelowShoulderCrest="1.18" IntrusionVerticalWaterPressure="Linear" />
       <DesignScenarios>
-        <DesignScenario RiverLevel="2.51" RiverLevelLow="2.52" DikeTableHeight="2.5300000000000002" PlLineOffsetBelowDikeTopAtRiver="2.54" PlLineOffsetBelowDikeTopAtPolder="2.55" PlLineOffsetBelowShoulderBaseInside="2.56" PlLineOffsetBelowDikeToeAtPolder="2.57" PlLineOffsetBelowDikeCrestMiddle="2.58" PlLineOffsetFactorBelowShoulderCrest="2.59" HeadPl3="2.6" HeadPl4="2.61" UpliftCriterionStability="2.62" UpliftCriterionPiping="2.63" RequiredSafetyFactorStabilityInnerSlope="2.64" RequiredSafetyFactorStabilityOuterSlope="2.65" RequiredSafetyFactorPiping="2.66" />
-        <DesignScenario RiverLevel="4.51" RiverLevelLow="4.52" DikeTableHeight="4.53" PlLineOffsetBelowDikeTopAtRiver="4.54" PlLineOffsetBelowDikeTopAtPolder="4.55" PlLineOffsetBelowShoulderBaseInside="4.5600000000000005" PlLineOffsetBelowDikeToeAtPolder="4.57" PlLineOffsetBelowDikeCrestMiddle="4.58" PlLineOffsetFactorBelowShoulderCrest="4.59" HeadPl3="4.6" HeadPl4="4.61" UpliftCriterionStability="4.62" UpliftCriterionPiping="4.63" RequiredSafetyFactorStabilityInnerSlope="4.64" RequiredSafetyFactorStabilityOuterSlope="4.65" RequiredSafetyFactorPiping="4.66" />
-        <DesignScenario RiverLevel="6.51" RiverLevelLow="6.52" DikeTableHeight="6.53" PlLineOffsetBelowDikeTopAtRiver="6.54" PlLineOffsetBelowDikeTopAtPolder="6.55" PlLineOffsetBelowShoulderBaseInside="6.5600000000000005" PlLineOffsetBelowDikeToeAtPolder="6.57" PlLineOffsetBelowDikeCrestMiddle="6.58" PlLineOffsetFactorBelowShoulderCrest="6.59" HeadPl3="6.6" HeadPl4="6.61" UpliftCriterionStability="6.62" UpliftCriterionPiping="6.63" RequiredSafetyFactorStabilityInnerSlope="6.64" RequiredSafetyFactorStabilityOuterSlope="6.65" RequiredSafetyFactorPiping="6.66" />
+        <DesignScenario Id="0" RiverLevel="2.51" RiverLevelLow="2.52" DikeTableHeight="2.5300000000000002" PlLineOffsetBelowDikeTopAtRiver="2.54" PlLineOffsetBelowDikeTopAtPolder="2.55" PlLineOffsetBelowShoulderBaseInside="2.56" PlLineOffsetBelowDikeToeAtPolder="2.57" PlLineOffsetBelowDikeCrestMiddle="2.58" PlLineOffsetFactorBelowShoulderCrest="2.59" HeadPl3="2.6" HeadPl4="2.61" UpliftCriterionStability="2.62" UpliftCriterionPiping="2.63" RequiredSafetyFactorStabilityInnerSlope="2.64" RequiredSafetyFactorStabilityOuterSlope="2.65" RequiredSafetyFactorPiping="2.66" />
+        <DesignScenario Id="1" RiverLevel="4.51" RiverLevelLow="4.52" DikeTableHeight="4.53" PlLineOffsetBelowDikeTopAtRiver="4.54" PlLineOffsetBelowDikeTopAtPolder="4.55" PlLineOffsetBelowShoulderBaseInside="4.5600000000000005" PlLineOffsetBelowDikeToeAtPolder="4.57" PlLineOffsetBelowDikeCrestMiddle="4.58" PlLineOffsetFactorBelowShoulderCrest="4.59" HeadPl3="4.6" HeadPl4="4.61" UpliftCriterionStability="4.62" UpliftCriterionPiping="4.63" RequiredSafetyFactorStabilityInnerSlope="4.64" RequiredSafetyFactorStabilityOuterSlope="4.65" RequiredSafetyFactorPiping="4.66" />
+        <DesignScenario Id="2" RiverLevel="6.51" RiverLevelLow="6.52" DikeTableHeight="6.53" PlLineOffsetBelowDikeTopAtRiver="6.54" PlLineOffsetBelowDikeTopAtPolder="6.55" PlLineOffsetBelowShoulderBaseInside="6.5600000000000005" PlLineOffsetBelowDikeToeAtPolder="6.57" PlLineOffsetBelowDikeCrestMiddle="6.58" PlLineOffsetFactorBelowShoulderCrest="6.59" HeadPl3="6.6" HeadPl4="6.61" UpliftCriterionStability="6.62" UpliftCriterionPiping="6.63" RequiredSafetyFactorStabilityInnerSlope="6.64" RequiredSafetyFactorStabilityOuterSlope="6.65" RequiredSafetyFactorPiping="6.66" />
       </DesignScenarios>
     </Location>
-    <Location SurfaceLineName="SurfaceLine 2" SegmentName="Segment 0">
+    <Location SurfaceLineName="SurfaceLine 2" SegmentName="Segment 0" Name="Location 3">
       <WaternetOptions PhreaticLineCreationMethod="GaugesWithFallbackToExpertKnowledgeRRD" PolderLevel="2.11" HeadPl2="2.24" HeadPl3="2.25" HeadPl4="2.21" DampingFactorPL3="2.12" DampingFactorPL4="2.13" PenetrationLength="2.14" SlopeDampingFactor="2.19" Pl1BelowCrestRiverside="2.2" Pl1BelowCrestPolderside="2.21" Pl1BelowShoulderCrestPolderside="2.22" Pl1BelowToeDikePolderside="2.23" Pl1BelowCrestMiddle="2.15" Pl1FactorBelowShoulderCrest="2.16" DryPl1BelowCrestMiddle="2.17" DryPl1FactorBelowShoulderCrest="2.18" IntrusionVerticalWaterPressure="FullHydroStatic" />
       <DesignScenarios>
-        <DesignScenario RiverLevel="3.51" RiverLevelLow="3.52" DikeTableHeight="3.5300000000000002" PlLineOffsetBelowDikeTopAtRiver="3.54" PlLineOffsetBelowDikeTopAtPolder="3.55" PlLineOffsetBelowShoulderBaseInside="3.56" PlLineOffsetBelowDikeToeAtPolder="3.57" PlLineOffsetBelowDikeCrestMiddle="3.58" PlLineOffsetFactorBelowShoulderCrest="3.59" HeadPl3="3.6" HeadPl4="3.61" UpliftCriterionStability="3.62" UpliftCriterionPiping="3.63" RequiredSafetyFactorStabilityInnerSlope="3.64" RequiredSafetyFactorStabilityOuterSlope="3.65" RequiredSafetyFactorPiping="3.66" />
-        <DesignScenario RiverLevel="6.51" RiverLevelLow="6.52" DikeTableHeight="6.53" PlLineOffsetBelowDikeTopAtRiver="6.54" PlLineOffsetBelowDikeTopAtPolder="6.55" PlLineOffsetBelowShoulderBaseInside="6.5600000000000005" PlLineOffsetBelowDikeToeAtPolder="6.57" PlLineOffsetBelowDikeCrestMiddle="6.58" PlLineOffsetFactorBelowShoulderCrest="6.59" HeadPl3="6.6" HeadPl4="6.61" UpliftCriterionStability="6.62" UpliftCriterionPiping="6.63" RequiredSafetyFactorStabilityInnerSlope="6.64" RequiredSafetyFactorStabilityOuterSlope="6.65" RequiredSafetyFactorPiping="6.66" />
-        <DesignScenario RiverLevel="9.51" RiverLevelLow="9.52" DikeTableHeight="9.53" PlLineOffsetBelowDikeTopAtRiver="9.54" PlLineOffsetBelowDikeTopAtPolder="9.55" PlLineOffsetBelowShoulderBaseInside="9.56" PlLineOffsetBelowDikeToeAtPolder="9.57" PlLineOffsetBelowDikeCrestMiddle="9.58" PlLineOffsetFactorBelowShoulderCrest="9.59" HeadPl3="9.6" HeadPl4="9.61" UpliftCriterionStability="9.62" UpliftCriterionPiping="9.63" RequiredSafetyFactorStabilityInnerSlope="9.64" RequiredSafetyFactorStabilityOuterSlope="9.65" RequiredSafetyFactorPiping="9.66" />
+        <DesignScenario Id="0" RiverLevel="3.51" RiverLevelLow="3.52" DikeTableHeight="3.5300000000000002" PlLineOffsetBelowDikeTopAtRiver="3.54" PlLineOffsetBelowDikeTopAtPolder="3.55" PlLineOffsetBelowShoulderBaseInside="3.56" PlLineOffsetBelowDikeToeAtPolder="3.57" PlLineOffsetBelowDikeCrestMiddle="3.58" PlLineOffsetFactorBelowShoulderCrest="3.59" HeadPl3="3.6" HeadPl4="3.61" UpliftCriterionStability="3.62" UpliftCriterionPiping="3.63" RequiredSafetyFactorStabilityInnerSlope="3.64" RequiredSafetyFactorStabilityOuterSlope="3.65" RequiredSafetyFactorPiping="3.66" />
+        <DesignScenario Id="1" RiverLevel="6.51" RiverLevelLow="6.52" DikeTableHeight="6.53" PlLineOffsetBelowDikeTopAtRiver="6.54" PlLineOffsetBelowDikeTopAtPolder="6.55" PlLineOffsetBelowShoulderBaseInside="6.5600000000000005" PlLineOffsetBelowDikeToeAtPolder="6.57" PlLineOffsetBelowDikeCrestMiddle="6.58" PlLineOffsetFactorBelowShoulderCrest="6.59" HeadPl3="6.6" HeadPl4="6.61" UpliftCriterionStability="6.62" UpliftCriterionPiping="6.63" RequiredSafetyFactorStabilityInnerSlope="6.64" RequiredSafetyFactorStabilityOuterSlope="6.65" RequiredSafetyFactorPiping="6.66" />
+        <DesignScenario Id="2" RiverLevel="9.51" RiverLevelLow="9.52" DikeTableHeight="9.53" PlLineOffsetBelowDikeTopAtRiver="9.54" PlLineOffsetBelowDikeTopAtPolder="9.55" PlLineOffsetBelowShoulderBaseInside="9.56" PlLineOffsetBelowDikeToeAtPolder="9.57" PlLineOffsetBelowDikeCrestMiddle="9.58" PlLineOffsetFactorBelowShoulderCrest="9.59" HeadPl3="9.6" HeadPl4="9.61" UpliftCriterionStability="9.62" UpliftCriterionPiping="9.63" RequiredSafetyFactorStabilityInnerSlope="9.64" RequiredSafetyFactorStabilityOuterSlope="9.65" RequiredSafetyFactorPiping="9.66" />
       </DesignScenarios>
     </Location>
   </Locations>