Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r2109 -r2135
--- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 2109)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 2135)
@@ -43,8 +43,8 @@
     [TestFixture]
     public class FillXmlInputFromDamUiTests
     {
-        const AnalysisType expectedAnalysisType = AnalysisType.AdaptGeometry;
-        const AnalysisType notExpectedAnalysisType = AnalysisType.NoAdaption;
+        const AnalysisType ExpectedAnalysisType = AnalysisType.AdaptGeometry;
+        const AnalysisType NotExpectedAnalysisType = AnalysisType.NoAdaption;
 
         [Test]
         public void CanWriteAndReadDamProjectDataToXmlFile()
@@ -58,7 +58,7 @@
             DamXmlSerialization.SaveInputAsXmlFile(inputFilename, input);
 
             // Init static that is to be loaded with not expected value
-            DamProjectCalculationSpecification.SelectedAnalysisType = notExpectedAnalysisType;
+            DamProjectCalculationSpecification.SelectedAnalysisType = NotExpectedAnalysisType;
 
             // Load input file
             input = DamXmlSerialization.LoadInputFromXmlFile(inputFilename);
@@ -77,7 +77,7 @@
             string inputXml = DamXmlSerialization.SaveInputAsXmlString(input);
 
             // Init static that is to be loaded with not expected value
-            DamProjectCalculationSpecification.SelectedAnalysisType = notExpectedAnalysisType;
+            DamProjectCalculationSpecification.SelectedAnalysisType = NotExpectedAnalysisType;
 
             // Load input string
             input = DamXmlSerialization.LoadInputFromXmlString(inputXml);
@@ -137,7 +137,7 @@
             var sensorGroup1 = new Group()
             {
                 ID = 1,
-                SensorArray = new Data.Sensors.Sensor[] { sensor1, sensor2 }
+                SensorArray = new[] { sensor1, sensor2 }
             };
             sensorData.SensorGroups.Add(sensorGroup1);
             var sensorLocation1 = new Data.Sensors.SensorLocation()
@@ -168,7 +168,7 @@
             var sensorGroup2 = new Group()
             {
                 ID = 2,
-                SensorArray = new Data.Sensors.Sensor[] { sensor3 }
+                SensorArray = new[] { sensor3 }
             };
             sensorData.SensorGroups.Add(sensorGroup2);
             var sensorLocation2 = new Data.Sensors.SensorLocation()
@@ -257,7 +257,7 @@
         {
             damProjectData.DamProjectType = DamProjectType.Design;
             damProjectData.DamProjectCalculationSpecification = new DamProjectCalculationSpecification();
-            DamProjectCalculationSpecification.SelectedAnalysisType = expectedAnalysisType;
+            DamProjectCalculationSpecification.SelectedAnalysisType = ExpectedAnalysisType;
             var calculationSpecification = new DamFailureMechanismeCalculationSpecification();
             calculationSpecification.FailureMechanismSystemType = FailureMechanismSystemType.Piping;
             calculationSpecification.CalculationModel = PipingModelType.Bligh;
@@ -337,36 +337,21 @@
                 location.PLLineCreationMethod = (PLLineCreationMethod) i;
                 location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType) i;
                 location.PolderLevel = 1.0 * i + 0.11;
-                location.PolderLevelLow = 1.0 * i + 0.09;
                 location.DampingFactorPL4 = 1.0 * i + 0.12;
                 location.DampingFactorPL3 = 1.0 * i + 0.13;
                 location.PenetrationLength = 1.0 * i + 0.14;
                 location.PlLineOffsetBelowDikeCrestMiddle = 1.0 * i + 0.15;
                 location.UsePlLineOffsetFactorBelowShoulderCrest = true;
                 location.PlLineOffsetFactorBelowShoulderCrest = 1.0 * i + 0.16;
-                location.PlLineOffsetDryBelowDikeCrestMiddle = 1.0 * i + 0.17;
-                location.UsePlLineOffsetDryFactorBelowShoulderCrest = true;
-                location.PlLineOffsetDryFactorBelowShoulderCrest = 1.0 * i + 0.18;
                 location.SlopeDampingPiezometricHeightPolderSide = 1.0 * i + 0.19;
                 location.PlLineOffsetBelowDikeTopAtRiver = 1.0 * i + 0.20;
                 location.PlLineOffsetBelowDikeTopAtPolder = 1.0 * i + 0.21;
                 location.PlLineOffsetBelowShoulderBaseInside = 1.0 * i + 0.22;
                 location.PlLineOffsetBelowDikeToeAtPolder = 1.0 * i + 0.23;
-                location.PLLineOffsetDryBelowDikeTopAtRiver = 1.0 * i + 0.24;
-                location.PLLineOffsetDryBelowDikeTopAtPolder = 1.0 * i + 0.25;
-                location.PLLineOffsetDryBelowShoulderBaseInside = 1.0 * i + 0.26;
-                location.PLLineOffsetDryBelowDikeToeAtPolder = 1.0 * i + 0.27;
                 location.HeadPL2 = 1.0 * i + 0.28;
                 location.HeadPl3 = 1.0 * i + 0.29;
                 location.HeadPl4 = 1.0 * i + 0.30;
                 location.DikeTableHeight = 1.0 * i + 0.31;
-                location.BoezemLevelHbp = 1.0 * i + 0.32;
-                location.BoezemLevelLbp = 1.0 * i + 0.33;
-                location.BoezemLevelTp = 1.0 * i + 0.34;
-                location.RwBankProtectionBottomLevel = 1.0 * i + 0.35;
-                location.DredgingDepth = 1.0 * i + 0.36;
-                location.DetrimentFactor = 1.0 * i + 0.37;
-                location.DikeMaterialType = SoilType.Loam;
                 location.LocalXZSurfaceLine2 = surfaceLines[i];
                 location.Segment = segments[i % 2]; // alternate between the 2 available segments 
                 for (int j = 0; j < 3; j++)
@@ -385,7 +370,7 @@
 
                 location.RedesignDikeHeight = false;
                 location.RedesignDikeShoulder = false;
-                location.ShoulderEmbankmentMaterial = "ShoulderMat" + (i + 1).ToString(); ;
+                location.ShoulderEmbankmentMaterial = "ShoulderMat" + (i + 1);
                 location.StabilityShoulderGrowSlope = 10.0 * i + 0.50;
                 location.StabilityShoulderGrowDeltaX = 10.0 * i + 0.51;
                 location.StabilitySlopeAdaptionDeltaX = 10.0 * i + 0.52;
@@ -490,7 +475,7 @@
 
         private static void FillSoilProfiles1D(Dike dike)
         {
-            dike.SoilProfiles = new List<Geotechnics.Soils.SoilProfile1D>();
+            dike.SoilProfiles = new List<SoilProfile1D>();
             const int profilesCount = 2;
             for (int i = 0; i < profilesCount; i++)
             {