Index: dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs
===================================================================
diff -u -r486 -r487
--- dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs	(.../Soil.cs)	(revision 486)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs	(.../Soil.cs)	(revision 487)
@@ -33,20 +33,6 @@
     {
         // Stability properties
         private string name = "";
-        private DilatancyType dilatancyType = DilatancyType.Phi;
-        private ShearStrengthModel shearStrengthModel = ShearStrengthModel.CPhi;
-        private double belowPhreaticLevel = double.NaN;
-        private double abovePhreaticLevel = double.NaN;
-        private double dryUnitWeight = double.NaN;
-        private double cohesion = double.NaN;
-        private double frictionAngle = double.NaN;
-        private double poP = double.NaN;
-        private double ocr = double.NaN;
-        private double ratioCuPc = double.NaN;
-        private double cuTop = double.NaN;
-        private double cuBottom = double.NaN;
-        private bool usePop = true;
-        private double strengthIncreaseExponent = double.NaN;
         private SoilType soilType;
 
         /// <summary>
@@ -132,23 +118,17 @@
 
         #endregion property Name
 
-        
-        #region property BelowPhreaticLevel
+        #region property Weight
 
         /// <summary>
         /// Unit Weight below the phreatic level (kN/m3)
         /// </summary>
-        public double BelowPhreaticLevel
-        {
-            set
-            {
-                belowPhreaticLevel = value;                                
-            }
-            get
-            {
-                return belowPhreaticLevel;                
-            }
-        }
+        public double BelowPhreaticLevel { get; set; } = double.NaN;
+
+        /// <summary>
+        /// Unit Weight above the phreatic level (kN/m3)
+        /// </summary>
+        public double AbovePhreaticLevel { get; set; } = double.NaN;
         #endregion
 
         #region Piping
@@ -189,257 +169,72 @@
         public double DiameterD90 { get; set; } = double.NaN;
         #endregion
 
-        #region property AbovePhreaticLevel
+        #region Macrostability
 
         /// <summary>
-        /// Unit Weight above the phreatic level (kN/m3)
-        /// </summary>
-        public double AbovePhreaticLevel
-        {
-            set
-            {
-                abovePhreaticLevel = value;                
-            }
-            get
-            {
-                return abovePhreaticLevel;
-            }
-        }
-
-        #endregion
-
-        #region property DryUnitWeight
-
-        /// <summary>
         /// Ovendry unit weight [kN/m3]
         /// </summary>
-        public double DryUnitWeight
-        {
-            get
-            {
-                return dryUnitWeight;
-            }
-            set
-            {
-                if (!dryUnitWeight.Equals(value))
-                {
-                    dryUnitWeight = value;
-                }                
-            }
-        }
+        public double DryUnitWeight { get; set; } = double.NaN;
 
-        #endregion property DryUnitWeight
-
-        #region property Cohesion
-
         /// <summary>
         /// Cohesion (the force that holds together molecules or like particles within a soil) [kN/m2]
         /// </summary>
-        public double Cohesion
-        {
-            get
-            {
-                return cohesion;
-            }
-            set
-            {
-                cohesion = value;                
-            }
-        }
-        
-        #endregion
-        
-        #region property FrictionAngle
+        public double Cohesion { get; set; } = double.NaN;
 
         /// <summary>
         /// Critical state friction angle (deg)
         /// </summary>
-        public double FrictionAngle //gedaan
-        {
-            get
-            {
-                return frictionAngle;
-            }
-            set
-            {
-                frictionAngle = value;                
-            }
-        }
-        #endregion property FrictionAngle
+        public double FrictionAngle { get; set; } = double.NaN;
 
-        
-
-        #region property POP
-
         /// <summary>
         /// Pre-overburden pressure (POP) 
         /// Equal to pre-consolidation stress minus effective stress
         /// </summary>
-        public double PoP
-        {
-            get
-            {
-                return poP;
-            }
-            set
-            {
-                poP = value;                
-            }
-        }
-        #endregion property POP
+        public double PoP { get; set; } = double.NaN;
 
-        #region property OCR
-
         /// <summary>
         /// Over-consolidation ratio (OCR)
         /// </summary>
-        public double Ocr
-        {
-            get
-            {
-                return ocr;
-            }
-            set
-            {
-                ocr = value;                
-            }
-        }
-        #endregion property OCR
+        public double Ocr { get; set; } = double.NaN;
 
-        #region property RatioCuPc
-
         /// <summary>
         /// Ratio Cu/Pc
         /// </summary>
-        public double RatioCuPc
-        {
-            get
-            {
-                return ratioCuPc;
-            }
-            set
-            {
-                ratioCuPc = value;                
-            }
-        }
-        #endregion property RatioCuPc
-        
-        
-        
-        #region property CuTop
+        public double RatioCuPc { get; set; } = double.NaN;
 
         /// <summary>
         /// Cu Top
         /// </summary>
-        public double CuTop
-        {
-            get
-            {
-                return cuTop;
-            }
-            set
-            {
-                cuTop = value;                
-            }
-        }
-        #endregion property CuTop
-        
-        #region property CuBottom
+        public double CuTop { get; set; } = double.NaN;
 
         /// <summary>
         /// Cu Bottom
         /// </summary>
-        public double CuBottom
-        {
-            get
-            {
-                return cuBottom;
-            }
-            set
-            {
-                cuBottom = value;                
-            }
-        }
-        #endregion property CuBottom
-        
-        #region property UsePop
+        public double CuBottom { get; set; } = double.NaN;
 
         /// <summary>
         /// Use POP for shear strength model
         /// </summary>
-        public bool UsePop
-        {
-            get
-            {
-                return usePop;
-            }
-            set
-            {
-                usePop = value;                
-            }
-        }
-        #endregion property UsePop
+        public bool UsePop { get; set; } = false;
         
-        #region property DilatancyType
-
         /// <summary>
         /// Dilatancy (shear thickening) type
         /// </summary>
-        public DilatancyType DilatancyType
-        {
-            get
-            {
-                return dilatancyType;
-            }
-            set
-            {
-                if (!dilatancyType.Equals(value))
-                {
-                    dilatancyType = value;                    
-                }                
-            }
-        }
+        public DilatancyType DilatancyType { get; set; } = DilatancyType.Phi;
 
-        #endregion property DilatancyType
-
-        #region property StrengthIncreaseExponent
-
         /// <summary>
         /// Gets or sets the strength increase exponent.
         /// </summary>
         /// <value>
         /// The strength increase exponent.
         /// </value>
-        public double StrengthIncreaseExponent
-        {
-            get
-            {
-                return strengthIncreaseExponent;
-            }
-            set
-            {
-                strengthIncreaseExponent = value;                
-            }
-        }
-        #endregion property StrengthIncreaseExponent
+        public double StrengthIncreaseExponent { get; set; } = double.NaN;
 
-        #region property ShearStrengthModel
-
         /// <summary>
         /// Shear strength model to use
         /// </summary>
-        public ShearStrengthModel ShearStrengthModel
-        {
-            get
-            {
-                return shearStrengthModel;
-            }
-            set
-            {
-                shearStrengthModel = value;                
-            }
-        }
-        #endregion property ShearStrengthModel
+        public ShearStrengthModel ShearStrengthModel { get; set; } = ShearStrengthModel.CPhi;
+        #endregion
 
 
         /// <summary>
@@ -449,19 +244,24 @@
         public void Assign(Soil aSoil)
         {
             name = aSoil.Name;
-            dilatancyType = aSoil.DilatancyType;
-            shearStrengthModel = aSoil.ShearStrengthModel;
-            belowPhreaticLevel = aSoil.BelowPhreaticLevel;
-            abovePhreaticLevel = aSoil.AbovePhreaticLevel;
-            cohesion = aSoil.Cohesion;
-            frictionAngle = aSoil.FrictionAngle;
-            poP = aSoil.PoP;
-            ocr = aSoil.Ocr;
-            ratioCuPc = aSoil.RatioCuPc;
-            cuTop = aSoil.CuTop;
-            cuBottom = aSoil.CuBottom;
-            usePop = aSoil.UsePop;
-            strengthIncreaseExponent = aSoil.StrengthIncreaseExponent;
+            BeddingAngle = aSoil.BeddingAngle;
+            DiameterD70 = aSoil.DiameterD70;
+            PermeabKx = aSoil.PermeabKx;
+            WhitesConstant = aSoil.WhitesConstant;
+            DiameterD90 = aSoil.DiameterD90;
+            DilatancyType = aSoil.DilatancyType;
+            ShearStrengthModel = aSoil.ShearStrengthModel;
+            BelowPhreaticLevel = aSoil.BelowPhreaticLevel;
+            AbovePhreaticLevel = aSoil.AbovePhreaticLevel;
+            Cohesion = aSoil.Cohesion;
+            FrictionAngle = aSoil.FrictionAngle;
+            PoP = aSoil.PoP;
+            Ocr = aSoil.Ocr;
+            RatioCuPc = aSoil.RatioCuPc;
+            CuTop = aSoil.CuTop;
+            CuBottom = aSoil.CuBottom;
+            UsePop = aSoil.UsePop;
+            StrengthIncreaseExponent = aSoil.StrengthIncreaseExponent;
         }
     }
 }
\ No newline at end of file