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 {