Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 4000) @@ -33,16 +33,15 @@ { // Stability properties private string name = ""; - + /// /// Initializes a new instance of the class. /// public Soil() { - Name = LocalizationManager.GetTranslatedText(this, "DefaultNameSoilMaterial"); + Name = LocalizationManager.GetTranslatedText(this, "DefaultNameSoilMaterial"); } - /// /// Initializes a new instance of the class. /// @@ -62,9 +61,36 @@ /// The name. public Soil(string name) : this() { - Name = name; + Name = name; } + /// + /// Assigns the specified a soil. + /// + /// a soil. + public void Assign(Soil aSoil) + { + name = aSoil.Name; + 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; + } + #region property Name /// @@ -78,7 +104,7 @@ } set { - name = value; + name = value; } } @@ -106,44 +132,51 @@ /// Unit Weight above the phreatic level (kN/m3) /// public double AbovePhreaticLevel { get; set; } = double.NaN; + #endregion #region Piping + /// /// Bedding Angle (degree). /// /// /// The bedding angle. /// - public double BeddingAngle { get; set; } = double.NaN; + public double BeddingAngle { get; set; } = double.NaN; + /// /// Diameter D70 (micrometer). /// /// /// The diameter D70. /// public double DiameterD70 { get; set; } = double.NaN; + /// /// Horizontal permeability (m/s) /// /// /// The permeab kx. /// public double PermeabKx { get; set; } = double.NaN; + /// /// Whites constant (-). /// /// /// The whites constant. /// public double WhitesConstant { get; set; } = double.NaN; + /// /// Diameter D90 (micrometer). /// /// /// The diameter D90. /// public double DiameterD90 { get; set; } = double.NaN; + #endregion #region Macrostability @@ -192,12 +225,12 @@ /// /// Use POP for shear strength model /// - public bool UsePop { get; set; } = false; - + public bool UsePop { get; set; } + /// /// Dilatancy (shear thickening) type /// - public DilatancyType? DilatancyType { get; set; } = null; + public DilatancyType? DilatancyType { get; set; } /// Gets or sets the RRatio. /// The RRatio. @@ -210,7 +243,7 @@ /// /// Shear strength model to use /// - public ShearStrengthModel? ShearStrengthModel { get; set; } = null; + public ShearStrengthModel? ShearStrengthModel { get; set; } /// /// Gets or sets a value indicating whether to use the default shear strength model. @@ -229,33 +262,5 @@ public double SlopeRestProfile { get; set; } = double.NaN; #endregion - - - /// - /// Assigns the specified a soil. - /// - /// a soil. - public void Assign(Soil aSoil) - { - name = aSoil.Name; - 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