Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml
===================================================================
diff -u -r2176 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml	(.../PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml)	(revision 2176)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml	(.../PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml)	(revision 4000)
@@ -1,69 +1,134 @@
 <?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="WtiSellmeijerRevised" AnalysisType="NoAdaption" ProjectPath="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\PipingVoorbeeld1" CalculationMap="PipingWBI.Calc" MaxCalculationCores="1">
-  <Locations>
-    <Location SurfaceLineName="Profiel 1" SegmentName="1" Name="Profiel 1" DikeEmbankmentMaterial="Ophoogmateriaal_dijk" XSoilGeometry2DOrigin="0" DikeTableHeight="0">
-      <AssesmentRegionalOptions DikeSoilType="0" BoezemLevelLbp="-987654321" BoezemLevelTp="-987654321" BoezemLevelHbp="-987654321" DetrimentFactor="0.95" DredgingDepth="0" RegionalBankProtectionBottomLevel="0" />
-      <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="Ophoogmateriaal_berm" StabilityShoulderGrowSlope="0.33" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
-      <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="0" PolderLevelLow="0" HeadPl2="0" HeadPl3="3.6" DampingFactorPl3="0" DampingFactorPl4="0" PenetrationLength="0" SlopeDampingFactor="0" Pl1BelowCrestRiverside="0.5" Pl1BelowCrestPolderside="1" Pl1BelowShoulderCrestPolderside="0" Pl1BelowToeDikePolderside="0" DryPl1BelowDikeTopAtRiver="0.5" DryPl1DryBelowDikeTopAtPolder="1.5" DryPl1BelowShoulderBaseInside="0.1" DryPl1DryBelowDikeToeAtPolder="0.1" IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay" />
-      <DesignScenarios>
-        <DesignScenario Id="1" RiverLevel="3.8" RiverLevelLow="2.5" DikeTableHeight="4" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="1" PlLineOffsetBelowShoulderBaseInside="0" PlLineOffsetBelowDikeToeAtPolder="0" HeadPl3="3.6" HeadPl4="3.8" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="1.22" RequiredSafetyFactorStabilityOuterSlope="1.16" RequiredSafetyFactorPiping="1.2" />
-      </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="PipingVoorbeeld1.geometries2D.0\" SoilDatabaseName="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\PipingVoorbeeld1\PipingWBI0.soilmaterials.mdb" ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3" MinimumCircleDepth="1.5" />
-      <ModelFactors />
-    </Location>
-  </Locations>
-  <SurfaceLines>
-    <SurfaceLine Name="Profiel 1">
-      <Points>
-        <Point X="0" Z="1" PointType="1" />
-        <Point X="10" Z="1" PointType="5" />
-        <Point X="19" Z="4" PointType="8" />
-        <Point X="20.5" Z="4" PointType="10" />
-        <Point X="23" Z="4" PointType="11" />
-        <Point X="23" Z="4" PointType="12" />
-        <Point X="35" Z="0" PointType="15" />
-        <Point X="100" Z="0" PointType="25" />
-      </Points>
-    </SurfaceLine>
-  </SurfaceLines>
-  <Soils>
-    <Soil Name="Dijkmateriaal" BeddingAngle="37" DiameterD70="0.00019999999999999998" PermeabKx="0.0004" WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="17" BelowPhreaticLevel="17" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0.5" FrictionAngle="22" SlopeRestProfile="0" DilatancyType="Phi" SoilType="0" />
-    <Soil Name="Deklaag_klei" BeddingAngle="37" DiameterD70="0.00019999999999999998" PermeabKx="0.001" WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="16" BelowPhreaticLevel="16" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0.5" FrictionAngle="22" SlopeRestProfile="0" DilatancyType="Phi" SoilType="0" />
-    <Soil Name="wl_zand1" BeddingAngle="37" DiameterD70="0.00020999999999999998" PermeabKx="0.0009" WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0" FrictionAngle="32" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4" />
-    <Soil Name="Ophoogmateriaal_dijk" BeddingAngle="37" DiameterD70="0.00019999999999999998" PermeabKx="0.0004" WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="17" BelowPhreaticLevel="17" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0.5" FrictionAngle="22" SlopeRestProfile="0" DilatancyType="Phi" SoilType="0" />
-    <Soil Name="Ophoogmateriaal_berm" BeddingAngle="37" DiameterD70="0.00019999999999999998" PermeabKx="0.0004" WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0.5" FrictionAngle="22" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4" />
-    <Soil Name="wl_zand2" BeddingAngle="37" DiameterD70="0.000215" PermeabKx="0.0008" WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0" FrictionAngle="32" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4" />
-    <Soil Name="wl_zand3" BeddingAngle="37" DiameterD70="0.00021999999999999998" PermeabKx="0.0007" WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0" FrictionAngle="32" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4" />
-    <Soil Name="wl_zand4" BeddingAngle="37" DiameterD70="0.000225" PermeabKx="0.0006" WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0" FrictionAngle="32" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4" />
-    <Soil Name="wl_zand5" BeddingAngle="37" DiameterD70="0.00022999999999999998" PermeabKx="0.0005" WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19" DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0" FrictionAngle="32" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4" />
-  </Soils>
-  <Segments>
-    <Segment Name="1">
-      <SoilGeometryProbability SoilProfileName="soilprofile_01" SoilProfileType="0" SegmentFailureMechanismType="1" Probability="1" />
-      <SoilGeometryProbability SoilProfileName="soilprofile_01" SoilProfileType="0" SegmentFailureMechanismType="2" Probability="1" />
-    </Segment>
-  </Segments>
-  <SoilProfiles1D>
-    <SoilProfile1D Name="soilprofile_01" BottomLevel="-10">
-      <Layers1D>
-        <Layer1D Name="L0" SoilName="Dijkmateriaal" TopLevel="10" IsAquifer="false" WaterpressureInterpolationModel="0" />
-        <Layer1D Name="L1" SoilName="Deklaag_klei" TopLevel="0" IsAquifer="false" WaterpressureInterpolationModel="0" />
-        <Layer1D Name="L2" SoilName="wl_zand1" TopLevel="-2" IsAquifer="true" WaterpressureInterpolationModel="0" />
-      </Layers1D>
-    </SoilProfile1D>
-  </SoilProfiles1D>
-  <StabilityParameters SearchMethod="0" GridDetermination="0" BishopTangentLinesDefinition="0" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="36" BishopGridVerticalPointsDistance="2" BishopGridHorizontalPointsCount="14" BishopGridHorizontalPointsDistance="2" UpliftVanGridLeftVerticalPointsCount="36" UpliftVanGridLeftVerticalPointsDistance="2" UpliftVanGridLeftHorizontalPointsCount="14" UpliftVanGridLeftHorizontalPointsDistance="2" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2" UpliftVanTangentLinesDefinition="0" UpliftVanTangentLinesDistance="0.25" />
-  <AquiferSoils>
-    <AquiferSoil Soilname="Dijkmateriaal" IsAquifer="false" />
-    <AquiferSoil Soilname="Deklaag_klei" IsAquifer="false" />
-    <AquiferSoil Soilname="wl_zand1" IsAquifer="true" />
-    <AquiferSoil Soilname="Ophoogmateriaal_dijk" IsAquifer="false" />
-    <AquiferSoil Soilname="Ophoogmateriaal_berm" IsAquifer="false" />
-    <AquiferSoil Soilname="wl_zand2" IsAquifer="true" />
-    <AquiferSoil Soilname="wl_zand3" IsAquifer="true" />
-    <AquiferSoil Soilname="wl_zand4" IsAquifer="true" />
-    <AquiferSoil Soilname="wl_zand5" IsAquifer="true" />
-  </AquiferSoils>
-  <OperationalInputTimeSeries xsi:nil="true" />
-  <SensorData xsi:nil="true" />
+<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" DamProjectType="Design" FailureMechanismSystemType="2"
+       PipingModelType="WtiSellmeijerRevised" AnalysisType="NoAdaption"
+       ProjectPath="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\PipingVoorbeeld1"
+       CalculationMap="PipingWBI.Calc" MaxCalculationCores="1">
+    <Locations>
+        <Location SurfaceLineName="Profiel 1" SegmentName="1" Name="Profiel 1"
+                  DikeEmbankmentMaterial="Ophoogmateriaal_dijk" XSoilGeometry2DOrigin="0" DikeTableHeight="0">
+            <AssesmentRegionalOptions DikeSoilType="0" BoezemLevelLbp="-987654321" BoezemLevelTp="-987654321"
+                                      BoezemLevelHbp="-987654321" DetrimentFactor="0.95" DredgingDepth="0"
+                                      RegionalBankProtectionBottomLevel="0"/>
+            <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true"
+                           ShoulderEmbankmentMaterial="Ophoogmateriaal_berm" StabilityShoulderGrowSlope="0.33"
+                           StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1"
+                           SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6"
+                           SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false"
+                           StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption"/>
+            <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="0" PolderLevelLow="0"
+                             HeadPl2="0" HeadPl3="3.6" DampingFactorPl3="0" DampingFactorPl4="0" PenetrationLength="0"
+                             SlopeDampingFactor="0" Pl1BelowCrestRiverside="0.5" Pl1BelowCrestPolderside="1"
+                             Pl1BelowShoulderCrestPolderside="0" Pl1BelowToeDikePolderside="0"
+                             DryPl1BelowDikeTopAtRiver="0.5" DryPl1DryBelowDikeTopAtPolder="1.5"
+                             DryPl1BelowShoulderBaseInside="0.1" DryPl1DryBelowDikeToeAtPolder="0.1"
+                             IntrusionVerticalWaterPressure="Standard" DikeSoilScenario="ClayDikeOnClay"/>
+            <DesignScenarios>
+                <DesignScenario Id="1" RiverLevel="3.8" RiverLevelLow="2.5" DikeTableHeight="4"
+                                PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="1"
+                                PlLineOffsetBelowShoulderBaseInside="0" PlLineOffsetBelowDikeToeAtPolder="0"
+                                HeadPl3="3.6" HeadPl4="3.8" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2"
+                                RequiredSafetyFactorStabilityInnerSlope="1.22"
+                                RequiredSafetyFactorStabilityOuterSlope="1.16" RequiredSafetyFactorPiping="1.2"/>
+            </DesignScenarios>
+            <StabilityOptions MapForSoilgeometries2D="PipingVoorbeeld1.geometries2D.0\"
+                              SoilDatabaseName="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\PipingVoorbeeld1\PipingWBI0.soilmaterials.mdb"
+                              ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3"
+                              MinimumCircleDepth="1.5"/>
+            <ModelFactors/>
+        </Location>
+    </Locations>
+    <SurfaceLines>
+        <SurfaceLine Name="Profiel 1">
+            <Points>
+                <Point X="0" Z="1" PointType="1"/>
+                <Point X="10" Z="1" PointType="5"/>
+                <Point X="19" Z="4" PointType="8"/>
+                <Point X="20.5" Z="4" PointType="10"/>
+                <Point X="23" Z="4" PointType="11"/>
+                <Point X="23" Z="4" PointType="12"/>
+                <Point X="35" Z="0" PointType="15"/>
+                <Point X="100" Z="0" PointType="25"/>
+            </Points>
+        </SurfaceLine>
+    </SurfaceLines>
+    <Soils>
+        <Soil Name="Dijkmateriaal" BeddingAngle="37" DiameterD70="0.00019999999999999998" PermeabKx="0.0004"
+              WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="17" BelowPhreaticLevel="17"
+              DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0.5"
+              FrictionAngle="22" SlopeRestProfile="0" DilatancyType="Phi" SoilType="0"/>
+        <Soil Name="Deklaag_klei" BeddingAngle="37" DiameterD70="0.00019999999999999998" PermeabKx="0.001"
+              WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="16" BelowPhreaticLevel="16"
+              DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0.5"
+              FrictionAngle="22" SlopeRestProfile="0" DilatancyType="Phi" SoilType="0"/>
+        <Soil Name="wl_zand1" BeddingAngle="37" DiameterD70="0.00020999999999999998" PermeabKx="0.0009"
+              WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19"
+              DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0"
+              FrictionAngle="32" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4"/>
+        <Soil Name="Ophoogmateriaal_dijk" BeddingAngle="37" DiameterD70="0.00019999999999999998" PermeabKx="0.0004"
+              WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="17" BelowPhreaticLevel="17"
+              DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0.5"
+              FrictionAngle="22" SlopeRestProfile="0" DilatancyType="Phi" SoilType="0"/>
+        <Soil Name="Ophoogmateriaal_berm" BeddingAngle="37" DiameterD70="0.00019999999999999998" PermeabKx="0.0004"
+              WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19"
+              DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0.5"
+              FrictionAngle="22" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4"/>
+        <Soil Name="wl_zand2" BeddingAngle="37" DiameterD70="0.000215" PermeabKx="0.0008" WhitesConstant="0.25"
+              DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19" DryUnitWeight="0.01"
+              ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0" FrictionAngle="32"
+              SlopeRestProfile="0" DilatancyType="Phi" SoilType="4"/>
+        <Soil Name="wl_zand3" BeddingAngle="37" DiameterD70="0.00021999999999999998" PermeabKx="0.0007"
+              WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19"
+              DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0"
+              FrictionAngle="32" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4"/>
+        <Soil Name="wl_zand4" BeddingAngle="37" DiameterD70="0.000225" PermeabKx="0.0006" WhitesConstant="0.25"
+              DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19" DryUnitWeight="0.01"
+              ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0" FrictionAngle="32"
+              SlopeRestProfile="0" DilatancyType="Phi" SoilType="4"/>
+        <Soil Name="wl_zand5" BeddingAngle="37" DiameterD70="0.00022999999999999998" PermeabKx="0.0005"
+              WhitesConstant="0.25" DiameterD90="0.01" AbovePhreaticLevel="18" BelowPhreaticLevel="19"
+              DryUnitWeight="0.01" ShearStrengthModel="CPhi" UseDefaultShearStrengthModel="false" Cohesion="0"
+              FrictionAngle="32" SlopeRestProfile="0" DilatancyType="Phi" SoilType="4"/>
+    </Soils>
+    <Segments>
+        <Segment Name="1">
+            <SoilGeometryProbability SoilProfileName="soilprofile_01" SoilProfileType="0"
+                                     SegmentFailureMechanismType="1" Probability="1"/>
+            <SoilGeometryProbability SoilProfileName="soilprofile_01" SoilProfileType="0"
+                                     SegmentFailureMechanismType="2" Probability="1"/>
+        </Segment>
+    </Segments>
+    <SoilProfiles1D>
+        <SoilProfile1D Name="soilprofile_01" BottomLevel="-10">
+            <Layers1D>
+                <Layer1D Name="L0" SoilName="Dijkmateriaal" TopLevel="10" IsAquifer="false"
+                         WaterpressureInterpolationModel="0"/>
+                <Layer1D Name="L1" SoilName="Deklaag_klei" TopLevel="0" IsAquifer="false"
+                         WaterpressureInterpolationModel="0"/>
+                <Layer1D Name="L2" SoilName="wl_zand1" TopLevel="-2" IsAquifer="true"
+                         WaterpressureInterpolationModel="0"/>
+            </Layers1D>
+        </SoilProfile1D>
+    </SoilProfiles1D>
+    <StabilityParameters SearchMethod="0" GridDetermination="0" BishopTangentLinesDefinition="0"
+                         BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="36"
+                         BishopGridVerticalPointsDistance="2" BishopGridHorizontalPointsCount="14"
+                         BishopGridHorizontalPointsDistance="2" UpliftVanGridLeftVerticalPointsCount="36"
+                         UpliftVanGridLeftVerticalPointsDistance="2" UpliftVanGridLeftHorizontalPointsCount="14"
+                         UpliftVanGridLeftHorizontalPointsDistance="2" UpliftVanGridRightVerticalPointsCount="3"
+                         UpliftVanGridRightVerticalPointsDistance="2" UpliftVanGridRightHorizontalPointsCount="6"
+                         UpliftVanGridRightHorizontalPointsDistance="2" UpliftVanTangentLinesDefinition="0"
+                         UpliftVanTangentLinesDistance="0.25"/>
+    <AquiferSoils>
+        <AquiferSoil Soilname="Dijkmateriaal" IsAquifer="false"/>
+        <AquiferSoil Soilname="Deklaag_klei" IsAquifer="false"/>
+        <AquiferSoil Soilname="wl_zand1" IsAquifer="true"/>
+        <AquiferSoil Soilname="Ophoogmateriaal_dijk" IsAquifer="false"/>
+        <AquiferSoil Soilname="Ophoogmateriaal_berm" IsAquifer="false"/>
+        <AquiferSoil Soilname="wl_zand2" IsAquifer="true"/>
+        <AquiferSoil Soilname="wl_zand3" IsAquifer="true"/>
+        <AquiferSoil Soilname="wl_zand4" IsAquifer="true"/>
+        <AquiferSoil Soilname="wl_zand5" IsAquifer="true"/>
+    </AquiferSoils>
+    <OperationalInputTimeSeries xsi:nil="true"/>
+    <SensorData xsi:nil="true"/>
 </Input>
\ No newline at end of file