Index: dam engine/trunk/Xsds Liquid/DamSoil.xsd =================================================================== diff -u -r486 -r601 --- dam engine/trunk/Xsds Liquid/DamSoil.xsd (.../DamSoil.xsd) (revision 486) +++ dam engine/trunk/Xsds Liquid/DamSoil.xsd (.../DamSoil.xsd) (revision 601) @@ -8,5 +8,8 @@ + + + \ No newline at end of file Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r597 -r601 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 597) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 601) @@ -97,9 +97,9 @@ Soil soil = new Soil() {Name = String.Format("Soil {0}", i)}; //soil.SoilType = SoilType.Loam; - //soil.AbovePhreaticLevel = 10 + 0.1 * i; - //soil.BelowPhreaticLevel = 10 + 0.1 * i; - //soil.DryUnitWeight = 10 + 0.1 * i; + soil.AbovePhreaticLevel = 7 + 0.1 * i; + soil.BelowPhreaticLevel = 8 + 0.1 * i; + soil.DryUnitWeight = 9 + 0.1 * i; //soil.ShearStrengthModel = ShearStrengthModel.CuMeasured; @@ -133,6 +133,7 @@ surfaceLine.Name = String.Format("SurfaceLine {0}", i); surfaceLine.CharacteristicPoints.Geometry = surfaceLine.Geometry; AddPointsToSurfaceLines(surfaceLine); + surfaceLine.Geometry.SyncCalcPoints(); dike.SurfaceLines2.Add(surfaceLine); } } Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r597 -r601 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 597) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 601) @@ -115,6 +115,12 @@ var soil = soils[i]; var inputSoil = new Soil(); inputSoil.Name = soil.Name; + inputSoil.AbovePhreaticLevelSpecified = !Double.IsNaN(soil.AbovePhreaticLevel); + inputSoil.AbovePhreaticLevel = soil.AbovePhreaticLevel; + inputSoil.BelowPhreaticLevelSpecified = !Double.IsNaN(soil.BelowPhreaticLevel); + inputSoil.BelowPhreaticLevel = soil.BelowPhreaticLevel; + inputSoil.DryUnitWeightSpecified = !Double.IsNaN(soil.DryUnitWeight); + inputSoil.DryUnitWeight = soil.DryUnitWeight; inputSoil.BeddingAngleSpecified = !Double.IsNaN(soil.BeddingAngle); inputSoil.BeddingAngle = soil.BeddingAngle; inputSoil.DiameterD70Specified = !Double.IsNaN(soil.DiameterD70); Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml =================================================================== diff -u -r597 -r601 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml (.../InputFile.xml) (revision 597) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml (.../InputFile.xml) (revision 601) @@ -65,9 +65,9 @@ - - - + + + Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r600 -r601 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 600) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 601) @@ -138,6 +138,9 @@ 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; Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r580 -r601 --- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 580) +++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 601) @@ -905,6 +905,18 @@ private bool diameterD90FieldSpecified; + private double abovePhreaticLevelField; + + private bool abovePhreaticLevelFieldSpecified; + + private double belowPhreaticLevelField; + + private bool belowPhreaticLevelFieldSpecified; + + private double dryUnitWeightField; + + private bool dryUnitWeightFieldSpecified; + /// [System.Xml.Serialization.XmlAttributeAttribute()] public string Name { @@ -1025,6 +1037,72 @@ this.diameterD90FieldSpecified = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double AbovePhreaticLevel { + get { + return this.abovePhreaticLevelField; + } + set { + this.abovePhreaticLevelField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool AbovePhreaticLevelSpecified { + get { + return this.abovePhreaticLevelFieldSpecified; + } + set { + this.abovePhreaticLevelFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double BelowPhreaticLevel { + get { + return this.belowPhreaticLevelField; + } + set { + this.belowPhreaticLevelField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool BelowPhreaticLevelSpecified { + get { + return this.belowPhreaticLevelFieldSpecified; + } + set { + this.belowPhreaticLevelFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DryUnitWeight { + get { + return this.dryUnitWeightField; + } + set { + this.dryUnitWeightField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DryUnitWeightSpecified { + get { + return this.dryUnitWeightFieldSpecified; + } + set { + this.dryUnitWeightFieldSpecified = value; + } + } } ///