Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfile1D.cs
===================================================================
diff -u -r1974 -r3079
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfile1D.cs	(.../SoilProfile1D.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfile1D.cs	(.../SoilProfile1D.cs)	(revision 3079)
@@ -48,18 +48,18 @@
     /// </summary>
     public class SoilProfile1D : SoilProfile
     {
-        private const double defaultBottomLayerHeight = 20.0;
+        private const double DefaultBottomLayerHeight = 20.0;
 
         private readonly DelegatedList<SoilLayer1D> layers = new DelegatedList<SoilLayer1D>();
         private double bottomLevel = double.NaN;
-        private SoilLayer1D infiltrationLayer = null;
+        private SoilLayer1D infiltrationLayer;
 
         /// <summary>
         /// Default constructor
         /// </summary>
         public SoilProfile1D()
         {
-            Name = LocalizationManager.GetTranslatedText(this, "DefaultNameSoilProfile1D");
+            base.Name = LocalizationManager.GetTranslatedText(this, "DefaultNameSoilProfile1D");
             layers.AddMethod = AddLayer;
         }
 
@@ -76,16 +76,33 @@
             layers.Add(new SoilLayer1D(soil, topLevel));
         }
 
+        /// <summary>
+        /// Assigns the specified profile.
+        /// </summary>
+        /// <param name="profile">The profile.</param>
         public void Assign(SoilProfile1D profile)
         {
-            this.Assign((SoilProfile)profile);
-            this.Layers.Clear();
-            foreach (SoilLayer1D layer in (IEnumerable<SoilLayer1D>)profile.Layers)
-                this.Layers.Add((SoilLayer1D)layer.Clone());
-            this.BottomLevel = profile.BottomLevel;
+            Assign((SoilProfile)profile);
+            Layers.Clear();
+            foreach (SoilLayer1D layer in profile.Layers)
+                Layers.Add((SoilLayer1D)layer.Clone());
+            BottomLevel = profile.BottomLevel;
         }
 
         /// <summary>
+        /// Creates a new object that is a copy of the current instance.
+        /// </summary>
+        /// <returns>
+        /// A new object that is a copy of this instance.
+        /// </returns>
+        public object Clone()
+        {
+            var cloneSoilProfile = new SoilProfile1D();
+            cloneSoilProfile.Assign(this);
+            return cloneSoilProfile;
+        }
+
+        /// <summary>
         /// Gets the soil layer collection for this profile
         /// </summary>
         public IList<SoilLayer1D> Layers
@@ -122,7 +139,7 @@
             {
                 if (double.IsNaN(bottomLevel) && layers.Count > 0)
                 {
-                    bottomLevel = Layers.Last().TopLevel - defaultBottomLayerHeight;
+                    bottomLevel = Layers.Last().TopLevel - DefaultBottomLayerHeight;
                 }
 
                 return bottomLevel;
@@ -171,34 +188,15 @@
         /// <returns></returns>
         public SoilLayer1D GetLayerWithName(string name)
         {
-            return this.layers.FirstOrDefault<SoilLayer1D>((Func<SoilLayer1D, bool>)(layer =>
+            return layers.FirstOrDefault(layer =>
             {
                 if (layer.Name != null)
                     return layer.Name.Equals(name);
                 return false;
-            }));
+            });
         }
 
         /// <summary>
-        /// This method makes sure all names are unique
-        /// </summary>
-        public void EnsureUniqueLayerNames()
-        {
-            if (AreAllLayerNamesUnique())
-            {
-                return;
-            }
-            foreach (var layer in Layers)
-            {
-                layer.Name = null;
-            }
-            foreach (var layer in Layers)
-            {
-                layer.Name = GetNewUniqueLayerName();
-            }
-        }
-
-        /// <summary>
         /// Checks weather all layer names are unique.
         /// </summary>
         /// <value>
@@ -245,31 +243,6 @@
         }
 
         /// <summary>
-        /// The highest aquifer layer, can be null if not aquifer is present
-        /// </summary>
-        [Validate]
-        public SoilLayer1D TopAquiferLayer
-        {
-            get
-            {
-                IList<SoilLayer1D> sortedLayers = Layers.OrderByDescending(l => l.TopLevel).ToList();
-                SoilLayer1D aquiferLayer = null;
-
-                // Search the highest aquifer layer
-                for (int layerIndex = 0; layerIndex < sortedLayers.Count; layerIndex++)
-                {
-                    var layer = sortedLayers[layerIndex];
-                    if (IsAquiferLayer(layer))
-                    {
-                        aquiferLayer = layer;
-                        break;
-                    }
-                }
-                return aquiferLayer;
-            }
-        }
-
-        /// <summary>
         /// Gets the toppest aquifer layer of the deepest cluster of aquifers 
         /// </summary>
         /// <value>
@@ -352,62 +325,6 @@
         }
 
         /// <summary>
-        /// Gets the lowest layer in the highest cluster of in-between aquifers
-        /// </summary>
-        /// <value>
-        /// The lowest layer in the highest cluster of in-between aquifers
-        /// </value>
-        public SoilLayer1D BottomLayerOfInBetweenAquiferCluster
-        {
-            get
-            {
-                IList<SoilLayer1D> sortedLayers = Layers.OrderByDescending(l => l.TopLevel).ToList();
-                SoilLayer1D highestAquiferLayer = null;
-                SoilLayer1D aquiferLayer = null;
-                int indexHighestAquifer = -1;
-
-                // Search the index of the highest aquifer layer
-                for (int layerIndex = 1; layerIndex < sortedLayers.Count; layerIndex++)
-                {
-                    var previousLayer = sortedLayers[layerIndex - 1]; 
-                    var layer = sortedLayers[layerIndex];
-                    if (IsAquiferLayer(layer) && !IsAquiferLayer(previousLayer))
-                    {
-                        highestAquiferLayer = layer;
-                        indexHighestAquifer = layerIndex;
-                        break;
-                    }
-                }
-
-                // If highest aquifer layer is bottom aquifer layer, there is no in between aquiferlayer
-                if (highestAquiferLayer == BottomAquiferLayer)
-                {
-                    return null;
-                }
-
-                // in-between aquifers cluster may consists of more then 1 connected (aquifer) layers.
-                // Search all layers below the found highest aquifer to find bottom aquifer layer.
-                if (indexHighestAquifer >= 0)
-                {
-                    for (int layerIndex = indexHighestAquifer; layerIndex < sortedLayers.Count; layerIndex++)
-                    {
-                        var layer = sortedLayers[layerIndex];
-
-                        if (IsAquiferLayer(layer))
-                        {
-                            aquiferLayer = layer;
-                        }
-                        else
-                        {
-                            break;
-                        }
-                    }
-                }
-                return aquiferLayer;
-            }
-        }
-
-        /// <summary>
         /// Gets (calculates) the height for a given layer in the profile
         /// </summary>
         /// <param name="soilLayer">The layer to process</param>
@@ -428,7 +345,7 @@
             var bottomLayer = Layers.Last();
             if (bottomLayer.Height.IsZero())
             {
-                BottomLevel -= defaultBottomLayerHeight;
+                BottomLevel -= DefaultBottomLayerHeight;
             }
         }
 
@@ -669,6 +586,16 @@
         }
 
         /// <summary>
+        /// Gets the layer at a given z coordinate.
+        /// </summary>
+        /// <param name="z">The z.</param>
+        /// <returns>the found layer</returns>
+        public SoilLayer1D GetLayerAt(double z)
+        {
+            return Layers.FirstOrDefault(soilLayer => soilLayer.BottomLevel < z && soilLayer.TopLevel >= z);
+        }
+
+        /// <summary>
         /// Gets the layer below the given layer.
         /// </summary>
         /// <param name="layer">The given layer.</param>
@@ -719,78 +646,6 @@
         }
 
         /// <summary>
-        /// Gets the total soil pressure, including the eventual free water on surface
-        /// </summary>
-        /// <param name="z">The level for wich the total pressure is calculated</param>
-        /// <param name="phreaticLevel">The phreatic level</param>
-        /// <param name="unitWeightWater">Unit weight of the water</param>
-        /// <returns>The soil pressure</returns>
-        public double GetTotalPressure(double z, double phreaticLevel, double unitWeightWater)
-        {
-            double pressure = 0;
-
-            // see if free water is at surface
-            double surfaceLevel = Layers[0].TopLevel;
-            if (z > surfaceLevel)
-            {
-                return Math.Max(0, (phreaticLevel - z)*unitWeightWater);
-            }
-
-            if (phreaticLevel > surfaceLevel)
-            {
-                if (z < phreaticLevel)
-                {
-                    pressure += (phreaticLevel - Math.Max(Layers[0].TopLevel, z))*unitWeightWater;
-                }
-            }
-
-            foreach (var layer in Layers)
-            {
-                if (layer.Height > 0 && layer.Soil != null)
-                {
-                    if (z >= layer.TopLevel)
-                    {
-                        continue;                        
-                    }
-                    if (z <= layer.BottomLevel)
-                    {
-                        if (phreaticLevel <= layer.BottomLevel)
-                        {
-                            pressure += layer.Height*layer.Soil.AbovePhreaticLevel;
-                        }
-                        else if (phreaticLevel >= layer.TopLevel)
-                        {
-                            pressure += layer.Height*layer.Soil.BelowPhreaticLevel;
-                        }
-                        else
-                        {
-                            pressure += (phreaticLevel - layer.BottomLevel)*layer.Soil.BelowPhreaticLevel;
-                            pressure += (layer.TopLevel - phreaticLevel)*layer.Soil.AbovePhreaticLevel;
-                        }
-                    }
-                    else
-                    {
-                        if (phreaticLevel <= z)
-                        {
-                            pressure += (layer.TopLevel - z)*layer.Soil.AbovePhreaticLevel;
-                        }
-                        else if (phreaticLevel >= layer.TopLevel)
-                        {
-                            pressure += (layer.TopLevel - z)*layer.Soil.BelowPhreaticLevel;
-                        }
-                        else
-                        {
-                            pressure += (layer.TopLevel - phreaticLevel)*layer.Soil.AbovePhreaticLevel;
-                            pressure += (phreaticLevel - z)*layer.Soil.BelowPhreaticLevel;
-                        }
-                    }
-                }
-            }
-
-            return pressure;
-        }
-
-        /// <summary>
         /// Returns a <see cref="System.String" /> that represents this instance.
         /// </summary>
         /// <returns>