Index: dam engine/trunk/Xsds Liquid/DamInput.xsd =================================================================== diff -u -r471 -r486 --- dam engine/trunk/Xsds Liquid/DamInput.xsd (.../DamInput.xsd) (revision 471) +++ dam engine/trunk/Xsds Liquid/DamInput.xsd (.../DamInput.xsd) (revision 486) @@ -3,6 +3,7 @@ + @@ -19,6 +20,13 @@ + + + + + + + Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r475 -r486 --- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 475) +++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 486) @@ -26,6 +26,8 @@ private SurfaceLine[] surfaceLinesField; + private InputSoils soilsField; + private InputDamProjectType damProjectTypeField; /// @@ -51,6 +53,16 @@ } /// + public InputSoils Soils { + get { + return this.soilsField; + } + set { + this.soilsField = value; + } + } + + /// [System.Xml.Serialization.XmlAttributeAttribute()] public InputDamProjectType DamProjectType { get { @@ -1025,7 +1037,179 @@ /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public partial class InputSoils { + + private Soil soilField; + + /// + public Soil Soil { + get { + return this.soilField; + } + set { + this.soilField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class Soil { + + private string nameField; + + private double beddingAngleField; + + private bool beddingAngleFieldSpecified; + + private double diameterD70Field; + + private bool diameterD70FieldSpecified; + + private double permeabKxField; + + private bool permeabKxFieldSpecified; + + private double whitesConstantField; + + private bool whitesConstantFieldSpecified; + + private double diameterD90Field; + + private bool diameterD90FieldSpecified; + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double BeddingAngle { + get { + return this.beddingAngleField; + } + set { + this.beddingAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool BeddingAngleSpecified { + get { + return this.beddingAngleFieldSpecified; + } + set { + this.beddingAngleFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DiameterD70 { + get { + return this.diameterD70Field; + } + set { + this.diameterD70Field = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DiameterD70Specified { + get { + return this.diameterD70FieldSpecified; + } + set { + this.diameterD70FieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double PermeabKx { + get { + return this.permeabKxField; + } + set { + this.permeabKxField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool PermeabKxSpecified { + get { + return this.permeabKxFieldSpecified; + } + set { + this.permeabKxFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double WhitesConstant { + get { + return this.whitesConstantField; + } + set { + this.whitesConstantField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool WhitesConstantSpecified { + get { + return this.whitesConstantFieldSpecified; + } + set { + this.whitesConstantFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DiameterD90 { + get { + return this.diameterD90Field; + } + set { + this.diameterD90Field = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DiameterD90Specified { + get { + return this.diameterD90FieldSpecified; + } + set { + this.diameterD90FieldSpecified = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputDamProjectType { /// Index: dam engine/trunk/Xsds Liquid/DamSoil.xsd =================================================================== diff -u --- dam engine/trunk/Xsds Liquid/DamSoil.xsd (revision 0) +++ dam engine/trunk/Xsds Liquid/DamSoil.xsd (revision 486) @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file Index: dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs =================================================================== diff -u -r452 -r486 --- dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 452) +++ dam engine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 486) @@ -151,6 +151,44 @@ } #endregion + #region Piping + /// + /// Bedding Angle (degree). + /// + /// + /// The bedding angle. + /// + 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 property AbovePhreaticLevel ///