Index: DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs
===================================================================
diff -u -r6718 -r6776
--- DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs	(.../DamContext.cs)	(revision 6718)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs	(.../DamContext.cs)	(revision 6776)
@@ -56,7 +56,7 @@
         /// <returns> the flag </returns>
         public override bool? ShouldValidate(object source, string member)
         {
-            if (source is Soil soil)
+            if (source is DamSoil soil)
             {
                 return ShouldValidateSoil(member, soil);
             }
@@ -98,7 +98,7 @@
                 return true;
             }
 
-            var soil = source as Soil;
+            var soil = source as DamSoil;
             if (soil != null)
             {
                 bool? visibleAccordingSoilUserFilter = VisibleAccordingSoilUserFilter(member);
@@ -182,24 +182,24 @@
                 return true;
             }
 
-            if (source is Soil soil)
+            if (source is DamSoil soil)
             {
-                if (member == StaticReflection.GetMemberName<Soil>(s => s.Name) || 
-                    member == StaticReflection.GetMemberName<Soil>(s => s.StressTable) || 
-                    member == StaticReflection.GetMemberName<Soil>(s => s.SuTable))
+                if (member == StaticReflection.GetMemberName<DamSoil>(s => s.Name) || 
+                    member == StaticReflection.GetMemberName<DamSoil>(s => s.StressTable) || 
+                    member == StaticReflection.GetMemberName<DamSoil>(s => s.SuTable))
                 {
                     return false;
                 }
 
-                if (member == StaticReflection.GetMemberName<Soil>(s => s.POP) ||
-                    member == StaticReflection.GetMemberName<Soil>(s => s.RatioCuPc) ||
-                    member == StaticReflection.GetMemberName<Soil>(s => s.StrengthIncreaseExponent))
+                if (member == StaticReflection.GetMemberName<DamSoil>(s => s.POP) ||
+                    member == StaticReflection.GetMemberName<DamSoil>(s => s.RatioCuPc) ||
+                    member == StaticReflection.GetMemberName<DamSoil>(s => s.StrengthIncreaseExponent))
                 {
                     return soil.ShearStrengthModel == ShearStrengthModel.CuCalculated;
                 }
                 
-                if (member == StaticReflection.GetMemberName<Soil>(s => s.Cohesion) ||
-                    member == StaticReflection.GetMemberName<Soil>(s => s.FrictionAngle))
+                if (member == StaticReflection.GetMemberName<DamSoil>(s => s.Cohesion) ||
+                    member == StaticReflection.GetMemberName<DamSoil>(s => s.FrictionAngle))
                 {
                     return soil.ShearStrengthModel == ShearStrengthModel.CPhi;
                 }
@@ -265,7 +265,7 @@
 
         public override ICollection GetDomain(object source, string member)
         {
-            if (source is Soil && member == StaticReflection.GetMemberName<Soil>(s => s.ShearStrengthModel))
+            if (source is DamSoil && member == StaticReflection.GetMemberName<DamSoil>(s => s.ShearStrengthModel))
             {
                 return new List<ShearStrengthModel>
                 {
@@ -281,25 +281,25 @@
 
         public override string GetFormat(Type type, object source, string member)
         {
-            if ((type == typeof(Soil) || source is Soil) && (member == StaticReflection.GetMemberName<Soil>(x => x.PermeabKx)))
+            if ((type == typeof(DamSoil) || source is DamSoil) && (member == StaticReflection.GetMemberName<DamSoil>(x => x.PermeabKx)))
             {
                 return "E3";
             }
 
             return base.GetFormat(type, source, member);
         }
 
-        private static bool ShouldValidateSoil(string member, Soil soil)
+        private static bool ShouldValidateSoil(string member, DamSoil soil)
         {
-            if (member == StaticReflection.GetMemberName<Soil>(s => s.POP) ||
-                member == StaticReflection.GetMemberName<Soil>(s => s.RatioCuPc) ||
-                member == StaticReflection.GetMemberName<Soil>(s => s.StrengthIncreaseExponent))
+            if (member == StaticReflection.GetMemberName<DamSoil>(s => s.POP) ||
+                member == StaticReflection.GetMemberName<DamSoil>(s => s.RatioCuPc) ||
+                member == StaticReflection.GetMemberName<DamSoil>(s => s.StrengthIncreaseExponent))
             {
                 return soil.ShearStrengthModel == ShearStrengthModel.CuCalculated;
             }
             
-            if (member == StaticReflection.GetMemberName<Soil>(s => s.Cohesion) ||
-                member == StaticReflection.GetMemberName<Soil>(s => s.FrictionAngle))
+            if (member == StaticReflection.GetMemberName<DamSoil>(s => s.Cohesion) ||
+                member == StaticReflection.GetMemberName<DamSoil>(s => s.FrictionAngle))
             {
                 return soil.ShearStrengthModel == ShearStrengthModel.CPhi;
             }
@@ -348,31 +348,31 @@
 
         private readonly HashSet<string> alwaysVisibleProperties = new HashSet<string>
         {
-            StaticReflection.GetMemberName<Soil>(s => s.Name),
-            StaticReflection.GetMemberName<Soil>(s => s.Color),
-            StaticReflection.GetMemberName<Soil>(s => s.SoilType)
+            StaticReflection.GetMemberName<DamSoil>(s => s.Name),
+            StaticReflection.GetMemberName<DamSoil>(s => s.Color),
+            StaticReflection.GetMemberName<DamSoil>(s => s.SoilType)
         };
 
         private readonly HashSet<string> macrostabilitySoilProperties = new HashSet<string>
         {
-            StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevel),
-            StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevel),
-            StaticReflection.GetMemberName<Soil>(s => s.ShearStrengthModel),
-            StaticReflection.GetMemberName<Soil>(s => s.Cohesion),
-            StaticReflection.GetMemberName<Soil>(s => s.FrictionAngle),
-            StaticReflection.GetMemberName<Soil>(s => s.POP),
-            StaticReflection.GetMemberName<Soil>(s => s.RatioCuPc),
-            StaticReflection.GetMemberName<Soil>(s => s.StrengthIncreaseExponent),
-            StaticReflection.GetMemberName<Soil>(s => s.StressTable),
-            StaticReflection.GetMemberName<Soil>(s => s.SuTable)
+            StaticReflection.GetMemberName<DamSoil>(s => s.AbovePhreaticLevel),
+            StaticReflection.GetMemberName<DamSoil>(s => s.BelowPhreaticLevel),
+            StaticReflection.GetMemberName<DamSoil>(s => s.ShearStrengthModel),
+            StaticReflection.GetMemberName<DamSoil>(s => s.Cohesion),
+            StaticReflection.GetMemberName<DamSoil>(s => s.FrictionAngle),
+            StaticReflection.GetMemberName<DamSoil>(s => s.POP),
+            StaticReflection.GetMemberName<DamSoil>(s => s.RatioCuPc),
+            StaticReflection.GetMemberName<DamSoil>(s => s.StrengthIncreaseExponent),
+            StaticReflection.GetMemberName<DamSoil>(s => s.StressTable),
+            StaticReflection.GetMemberName<DamSoil>(s => s.TrafficLoadDegreeOfConsolidation)
         };
 
         private readonly HashSet<string> pipingSoilProperties = new HashSet<string>
         {
-            StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevel),
-            StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevel),
-            StaticReflection.GetMemberName<Soil>(s => s.DiameterD70),
-            StaticReflection.GetMemberName<Soil>(s => s.PermeabKx)
+            StaticReflection.GetMemberName<DamSoil>(s => s.AbovePhreaticLevel),
+            StaticReflection.GetMemberName<DamSoil>(s => s.BelowPhreaticLevel),
+            StaticReflection.GetMemberName<DamSoil>(s => s.DiameterD70),
+            StaticReflection.GetMemberName<DamSoil>(s => s.PermeabKx)
         };
 
         private HashSet<string> combinedSoilProperties;