Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/MStabXmlDocTests.cs =================================================================== diff -u -r715 -r728 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 715) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 728) @@ -232,7 +232,7 @@ soil.BelowPhreaticLevel = 8 + 0.1 * i; soil.DryUnitWeight = 9 + 0.1 * i; - //soil.ShearStrengthModel = ShearStrengthModel.CuMeasured; + //soil.ShearStrengthModel = ShearStrengthModel.SuMeasured; //soil.Cohesion = 10 + 0.1 * i; //soil.CuBottom = 11 + 0.1 * i; Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r718 -r728 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 718) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 728) @@ -274,5 +274,54 @@ { Assert.AreEqual(logMessageType, ConversionHelper.ConvertToMessageType(messageType)); } + + [Test] + [TestCase(ShearStrengthModel.None, SoilShearStrengthModel.None)] + [TestCase(ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi)] + [TestCase(ShearStrengthModel.StressTable, SoilShearStrengthModel.StressTable)] + [TestCase(ShearStrengthModel.PseudoValues, SoilShearStrengthModel.PseudoValues)] + [TestCase(ShearStrengthModel.SuMeasured, SoilShearStrengthModel.SuMeasured)] + [TestCase(ShearStrengthModel.SuCalculated, SoilShearStrengthModel.SuCalculated)] + [TestCase(ShearStrengthModel.SuGradient, SoilShearStrengthModel.SuGradient)] + [TestCase(ShearStrengthModel.SuCalculatedWithYield, SoilShearStrengthModel.SuCalculatedWithYield)] + [TestCase(ShearStrengthModel.CPhiOrSuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated)] + public void CanConvertToSoilShearStrengthModel(ShearStrengthModel shearStrengthModel, SoilShearStrengthModel soilShearStrengthModel) + { + Assert.AreEqual(soilShearStrengthModel, ConversionHelper.ConvertToSoilShearStrengthModel(shearStrengthModel)); + } + + [Test] + [TestCase(SoilShearStrengthModel.None, ShearStrengthModel.None)] + [TestCase(SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi)] + [TestCase(SoilShearStrengthModel.StressTable, ShearStrengthModel.StressTable)] + [TestCase(SoilShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues)] + [TestCase(SoilShearStrengthModel.SuMeasured, ShearStrengthModel.SuMeasured)] + [TestCase(SoilShearStrengthModel.SuCalculated, ShearStrengthModel.SuCalculated)] + [TestCase(SoilShearStrengthModel.SuGradient, ShearStrengthModel.SuGradient)] + [TestCase(SoilShearStrengthModel.SuCalculatedWithYield, ShearStrengthModel.SuCalculatedWithYield)] + [TestCase(SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrSuCalculated)] + public void CanConvertToShearStrengthModel(SoilShearStrengthModel soilShearStrengthModel, ShearStrengthModel shearStrengthModel) + { + Assert.AreEqual(shearStrengthModel, ConversionHelper.ConvertToShearStrengthModel(soilShearStrengthModel)); + } + + [Test] + [TestCase(DilatancyType.Zero, SoilDilatancyType.Zero)] + [TestCase(DilatancyType.Phi, SoilDilatancyType.Phi)] + [TestCase(DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi)] + public void CanConvertToSoilDilatancyType(DilatancyType dilatancyType, SoilDilatancyType soilDilatancyType) + { + Assert.AreEqual(soilDilatancyType, ConversionHelper.ConvertToSoilDilatancyType(dilatancyType)); + } + + [Test] + [TestCase(SoilDilatancyType.Zero, DilatancyType.Zero)] + [TestCase(SoilDilatancyType.Phi, DilatancyType.Phi)] + [TestCase(SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi)] + public void CanConvertToDilatancyType(SoilDilatancyType soilDilatancyType, DilatancyType dilatancyType) + { + Assert.AreEqual(dilatancyType, ConversionHelper.ConvertToDilatancyType(soilDilatancyType)); + } + } } Index: dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs =================================================================== diff -u -r487 -r728 --- dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 487) +++ dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 728) @@ -220,7 +220,7 @@ /// /// Dilatancy (shear thickening) type /// - public DilatancyType DilatancyType { get; set; } = DilatancyType.Phi; + public DilatancyType? DilatancyType { get; set; } = null; /// /// Gets or sets the strength increase exponent. @@ -233,7 +233,24 @@ /// /// Shear strength model to use /// - public ShearStrengthModel ShearStrengthModel { get; set; } = ShearStrengthModel.CPhi; + public ShearStrengthModel? ShearStrengthModel { get; set; } = null; + + /// + /// Gets or sets a value indicating whether to use the default shear strength model. + /// + /// + /// true if default shear strength model must be used; otherwise, false. + /// + public bool? DefaultShearStrengthModel { get; set; } = null; + + /// + /// Gets or sets the slope of the rest profile. + /// + /// + /// The slope of the rest profile. + /// + public double SlopeRestProfile { get; set; } = double.NaN; + #endregion Index: dam engine/trunk/Xsds Liquid/DamSoil.xsd =================================================================== diff -u -r601 -r728 --- dam engine/trunk/Xsds Liquid/DamSoil.xsd (.../DamSoil.xsd) (revision 601) +++ dam engine/trunk/Xsds Liquid/DamSoil.xsd (.../DamSoil.xsd) (revision 728) @@ -11,5 +11,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs =================================================================== diff -u -r452 -r728 --- dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs (.../ShearStrengthModel.cs) (revision 452) +++ dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs (.../ShearStrengthModel.cs) (revision 728) @@ -32,43 +32,43 @@ None = 1, /// - /// The c phi + /// The C Phi model /// CPhi = 2, /// - /// The stress table + /// The stress table model /// StressTable = 3, /// - /// The pseudo values + /// The pseudo values model /// PseudoValues = 4, /// - /// The cu measured + /// The Su measured model /// - CuMeasured = 5, + SuMeasured = 5, /// - /// The cu calculated + /// The Su calculated model /// - CuCalculated = 6, + SuCalculated = 6, /// - /// The cu gradient + /// The Su gradient /// - CuGradient = 7, + SuGradient = 7, /// - /// The cu calculated yield + /// The Su calculated yield model /// - CuCalculatedYield = 8, + SuCalculatedWithYield = 8, /// - /// CPhi or CuCalculated dependent if below or above phreatic line + /// C Phi or Su calculated model dependent if below or above phreatic line /// - CPhiOrCuCalculated = 9 + CPhiOrSuCalculated = 9 } } Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r715 -r728 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 715) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 728) @@ -178,14 +178,24 @@ var soil = new Data.Geotechnics.Soil(); var inputSoil = inputSoils[i]; soil.Name = inputSoil.Name; - soil.AbovePhreaticLevel = inputSoil.AbovePhreaticLevelSpecified ? inputSoil.AbovePhreaticLevel : Double.NaN; - soil.BelowPhreaticLevel = inputSoil.BelowPhreaticLevelSpecified ? inputSoil.BelowPhreaticLevel : Double.NaN; - soil.DryUnitWeight = inputSoil.DryUnitWeightSpecified ? inputSoil.DryUnitWeight : Double.NaN; - soil.BeddingAngle = inputSoil.BeddingAngleSpecified ? inputSoil.BeddingAngle : Double.NaN; - soil.DiameterD70 = inputSoil.DiameterD70Specified ? inputSoil.DiameterD70 : Double.NaN; - soil.DiameterD90 = inputSoil.DiameterD90Specified ? inputSoil.DiameterD90 : Double.NaN; - soil.PermeabKx = inputSoil.PermeabKxSpecified ? inputSoil.PermeabKx : Double.NaN; - soil.WhitesConstant = inputSoil.WhitesConstantSpecified ? inputSoil.WhitesConstant : Double.NaN; + soil.AbovePhreaticLevel = inputSoil.AbovePhreaticLevelSpecified ? inputSoil.AbovePhreaticLevel : double.NaN; + soil.BelowPhreaticLevel = inputSoil.BelowPhreaticLevelSpecified ? inputSoil.BelowPhreaticLevel : double.NaN; + soil.DryUnitWeight = inputSoil.DryUnitWeightSpecified ? inputSoil.DryUnitWeight : double.NaN; + soil.BeddingAngle = inputSoil.BeddingAngleSpecified ? inputSoil.BeddingAngle : double.NaN; + soil.DiameterD70 = inputSoil.DiameterD70Specified ? inputSoil.DiameterD70 : double.NaN; + soil.DiameterD90 = inputSoil.DiameterD90Specified ? inputSoil.DiameterD90 : double.NaN; + soil.PermeabKx = inputSoil.PermeabKxSpecified ? inputSoil.PermeabKx : double.NaN; + soil.WhitesConstant = inputSoil.WhitesConstantSpecified ? inputSoil.WhitesConstant : double.NaN; + soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ? + (ShearStrengthModel?) ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : null; + soil.DefaultShearStrengthModel = inputSoil.DefaultShearStrengthModelSpecified ? + (bool?) inputSoil.DefaultShearStrengthModel : null; + soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : double.NaN; + soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : double.NaN; + soil.Ocr = inputSoil.OcrSpecified ? inputSoil.Ocr : double.NaN; + soil.SlopeRestProfile = inputSoil.SlopeRestProfileSpecified ? inputSoil.SlopeRestProfile : double.NaN; + soil.DilatancyType = inputSoil.DilatancyTypeSpecified ? + (DilatancyType?) ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : null; soils.Add(soil); } } Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r711 -r728 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 711) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 728) @@ -157,22 +157,45 @@ var soil = soils[i]; var inputSoil = new Soil(); inputSoil.Name = soil.Name; - inputSoil.AbovePhreaticLevelSpecified = !Double.IsNaN(soil.AbovePhreaticLevel); + inputSoil.AbovePhreaticLevelSpecified = !double.IsNaN(soil.AbovePhreaticLevel); inputSoil.AbovePhreaticLevel = soil.AbovePhreaticLevel; - inputSoil.BelowPhreaticLevelSpecified = !Double.IsNaN(soil.BelowPhreaticLevel); + inputSoil.BelowPhreaticLevelSpecified = !double.IsNaN(soil.BelowPhreaticLevel); inputSoil.BelowPhreaticLevel = soil.BelowPhreaticLevel; - inputSoil.DryUnitWeightSpecified = !Double.IsNaN(soil.DryUnitWeight); + inputSoil.DryUnitWeightSpecified = !double.IsNaN(soil.DryUnitWeight); inputSoil.DryUnitWeight = soil.DryUnitWeight; - inputSoil.BeddingAngleSpecified = !Double.IsNaN(soil.BeddingAngle); + inputSoil.BeddingAngleSpecified = !double.IsNaN(soil.BeddingAngle); inputSoil.BeddingAngle = soil.BeddingAngle; - inputSoil.DiameterD70Specified = !Double.IsNaN(soil.DiameterD70); + inputSoil.DiameterD70Specified = !double.IsNaN(soil.DiameterD70); inputSoil.DiameterD70 = soil.DiameterD70; - inputSoil.DiameterD90Specified = !Double.IsNaN(soil.DiameterD70); + inputSoil.DiameterD90Specified = !double.IsNaN(soil.DiameterD70); inputSoil.DiameterD90 = soil.DiameterD90; - inputSoil.PermeabKxSpecified = !Double.IsNaN(soil.DiameterD90); + inputSoil.PermeabKxSpecified = !double.IsNaN(soil.DiameterD90); inputSoil.PermeabKx = soil.PermeabKx; - inputSoil.WhitesConstantSpecified = !Double.IsNaN(soil.WhitesConstant); + inputSoil.WhitesConstantSpecified = !double.IsNaN(soil.WhitesConstant); inputSoil.WhitesConstant = soil.WhitesConstant; + inputSoil.ShearStrengthModelSpecified = (soil.ShearStrengthModel != null); + if (inputSoil.ShearStrengthModelSpecified) + { + inputSoil.ShearStrengthModel = ConversionHelper.ConvertToSoilShearStrengthModel(soil.ShearStrengthModel.Value); + } + inputSoil.DefaultShearStrengthModelSpecified = (soil.DefaultShearStrengthModel != null); + if (inputSoil.ShearStrengthModelSpecified) + { + inputSoil.DefaultShearStrengthModel = soil.DefaultShearStrengthModel.Value; + } + inputSoil.CohesionSpecified = !double.IsNaN(soil.Cohesion); + inputSoil.Cohesion = soil.Cohesion; + inputSoil.FrictionAngleSpecified = !double.IsNaN(soil.FrictionAngle); + inputSoil.FrictionAngle = soil.FrictionAngle; + inputSoil.OcrSpecified = !double.IsNaN(soil.Ocr); + inputSoil.Ocr = soil.Ocr; + inputSoil.SlopeRestProfileSpecified = !double.IsNaN(soil.SlopeRestProfile); + inputSoil.SlopeRestProfile = soil.SlopeRestProfile; + inputSoil.DilatancyTypeSpecified = (soil.DilatancyType != null); + if (inputSoil.DilatancyTypeSpecified) + { + inputSoil.DilatancyType = ConversionHelper.ConvertToSoilDilatancyType(soil.DilatancyType.Value); + } inputSoils[i] = inputSoil; } } Index: dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r718 -r728 --- dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 718) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 728) @@ -531,5 +531,82 @@ }; return translationTable[validationResultMessageType]; } + + /// + /// Converts the shear strength model to soil shear strength model. + /// + /// The shear strength model. + /// + public static SoilShearStrengthModel ConvertToSoilShearStrengthModel(ShearStrengthModel shearStrengthModel) + { + var translationTable = new Dictionary() + { + {ShearStrengthModel.None, SoilShearStrengthModel.None}, + {ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi}, + {ShearStrengthModel.StressTable, SoilShearStrengthModel.StressTable}, + {ShearStrengthModel.PseudoValues, SoilShearStrengthModel.PseudoValues}, + {ShearStrengthModel.SuMeasured, SoilShearStrengthModel.SuMeasured}, + {ShearStrengthModel.SuCalculated, SoilShearStrengthModel.SuCalculated}, + {ShearStrengthModel.SuGradient, SoilShearStrengthModel.SuGradient}, + {ShearStrengthModel.SuCalculatedWithYield, SoilShearStrengthModel.SuCalculatedWithYield}, + {ShearStrengthModel.CPhiOrSuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated}, + }; + return translationTable[shearStrengthModel]; + } + + /// + /// Converts the soil shear strength model to shear strength model. + /// + /// The soil shear strength model. + /// + public static ShearStrengthModel ConvertToShearStrengthModel(SoilShearStrengthModel soilShearStrengthModel) + { + var translationTable = new Dictionary() + { + {SoilShearStrengthModel.None, ShearStrengthModel.None}, + {SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi}, + {SoilShearStrengthModel.StressTable, ShearStrengthModel.StressTable}, + {SoilShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues}, + {SoilShearStrengthModel.SuMeasured, ShearStrengthModel.SuMeasured}, + {SoilShearStrengthModel.SuCalculated, ShearStrengthModel.SuCalculated}, + {SoilShearStrengthModel.SuGradient, ShearStrengthModel.SuGradient}, + {SoilShearStrengthModel.SuCalculatedWithYield, ShearStrengthModel.SuCalculatedWithYield}, + {SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrSuCalculated}, + }; + return translationTable[soilShearStrengthModel]; + } + + /// + /// Converts the dilatancy type to soil dilatancy dilatancy. + /// + /// Type of the dilatancy. + /// + public static SoilDilatancyType ConvertToSoilDilatancyType(DilatancyType dilatancyType) + { + var translationTable = new Dictionary() + { + {DilatancyType.Zero, SoilDilatancyType.Zero}, + {DilatancyType.Phi, SoilDilatancyType.Phi}, + {DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi}, + }; + return translationTable[dilatancyType]; + } + + /// + /// Converts the soil dilatancy type to dilatancy type. + /// + /// Type of the soil dilatancy. + /// + public static DilatancyType ConvertToDilatancyType(SoilDilatancyType soilDilatancyType) + { + var translationTable = new Dictionary() + { + {SoilDilatancyType.Zero, DilatancyType.Zero}, + {SoilDilatancyType.Phi, DilatancyType.Phi}, + {SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi}, + }; + return translationTable[soilDilatancyType]; + } + } } \ No newline at end of file Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r715 -r728 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 715) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 728) @@ -131,14 +131,16 @@ soil.BelowPhreaticLevel = 8 + 0.1 * i; soil.DryUnitWeight = 9 + 0.1 * i; - //soil.ShearStrengthModel = ShearStrengthModel.CuMeasured; - - //soil.Cohesion = 10 + 0.1 * i; + soil.ShearStrengthModel = ShearStrengthModel.SuMeasured; + soil.DefaultShearStrengthModel = false; + soil.Cohesion = 10 + 0.1 * i; + soil.FrictionAngle = 13 + 0.1 * i; + soil.Ocr = 14 + 0.1 * i; + soil.SlopeRestProfile = 15 + 0.1 * i; + soil.DilatancyType = DilatancyType.Zero; + //soil.CuBottom = 11 + 0.1 * i; //soil.CuTop = 12 + 0.1 * i; - //soil.DilatancyType = DilatancyType.Zero; - //soil.FrictionAngle = 13 + 0.1 * i; - //soil.Ocr = 14 + 0.1 * i; //soil.PoP = 15 + 0.1 * i; //soil.RatioCuPc = 16 + 0.1 * i; //soil.StrengthIncreaseExponent = 17 + 0.1 * i; Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r711 -r728 --- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 711) +++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 728) @@ -1444,6 +1444,34 @@ private bool dryUnitWeightFieldSpecified; + private SoilShearStrengthModel shearStrengthModelField; + + private bool shearStrengthModelFieldSpecified; + + private bool defaultShearStrengthModelField; + + private bool defaultShearStrengthModelFieldSpecified; + + private double cohesionField; + + private bool cohesionFieldSpecified; + + private double frictionAngleField; + + private bool frictionAngleFieldSpecified; + + private double ocrField; + + private bool ocrFieldSpecified; + + private double slopeRestProfileField; + + private bool slopeRestProfileFieldSpecified; + + private SoilDilatancyType dilatancyTypeField; + + private bool dilatancyTypeFieldSpecified; + /// [System.Xml.Serialization.XmlAttributeAttribute()] public string Name { @@ -1630,11 +1658,215 @@ this.dryUnitWeightFieldSpecified = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public SoilShearStrengthModel ShearStrengthModel { + get { + return this.shearStrengthModelField; + } + set { + this.shearStrengthModelField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ShearStrengthModelSpecified { + get { + return this.shearStrengthModelFieldSpecified; + } + set { + this.shearStrengthModelFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public bool DefaultShearStrengthModel { + get { + return this.defaultShearStrengthModelField; + } + set { + this.defaultShearStrengthModelField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DefaultShearStrengthModelSpecified { + get { + return this.defaultShearStrengthModelFieldSpecified; + } + set { + this.defaultShearStrengthModelFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Cohesion { + get { + return this.cohesionField; + } + set { + this.cohesionField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool CohesionSpecified { + get { + return this.cohesionFieldSpecified; + } + set { + this.cohesionFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double FrictionAngle { + get { + return this.frictionAngleField; + } + set { + this.frictionAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool FrictionAngleSpecified { + get { + return this.frictionAngleFieldSpecified; + } + set { + this.frictionAngleFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Ocr { + get { + return this.ocrField; + } + set { + this.ocrField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool OcrSpecified { + get { + return this.ocrFieldSpecified; + } + set { + this.ocrFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double SlopeRestProfile { + get { + return this.slopeRestProfileField; + } + set { + this.slopeRestProfileField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool SlopeRestProfileSpecified { + get { + return this.slopeRestProfileFieldSpecified; + } + set { + this.slopeRestProfileFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public SoilDilatancyType DilatancyType { + get { + return this.dilatancyTypeField; + } + set { + this.dilatancyTypeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DilatancyTypeSpecified { + get { + return this.dilatancyTypeFieldSpecified; + } + set { + this.dilatancyTypeFieldSpecified = value; + } + } } /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum SoilShearStrengthModel { + + /// + None, + + /// + CPhi, + + /// + StressTable, + + /// + PseudoValues, + + /// + SuMeasured, + + /// + SuCalculated, + + /// + SuGradient, + + /// + SuCalculatedWithYield, + + /// + CPhiOrSuCalculated, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum SoilDilatancyType { + + /// + Phi, + + /// + Zero, + + /// + MinusPhi, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SurfaceLine {