Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r1171 -r1183 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1171) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1183) @@ -279,8 +279,6 @@ private LocationAssesmentRegionalOptions assesmentRegionalOptionsField; - private object assesmentOptionsField; - private object operationalOptionsField; private LocationDesignOptions designOptionsField; @@ -320,16 +318,6 @@ } /// - public object AssesmentOptions { - get { - return this.assesmentOptionsField; - } - set { - this.assesmentOptionsField = value; - } - } - - /// public object OperationalOptions { get { return this.operationalOptionsField; @@ -486,8 +474,10 @@ [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public partial class LocationAssesmentRegionalOptions { - private LocationAssesmentRegionalOptionsDikeMaterialType dikeMaterialTypeField; + private int dikeSoilTypeField; + private bool dikeSoilTypeFieldSpecified; + private double boezemLevelLbpField; private double boezemLevelTpField; @@ -500,19 +490,25 @@ private double regionalBankProtectionBottomLevelField; - public LocationAssesmentRegionalOptions() { - this.dikeMaterialTypeField = LocationAssesmentRegionalOptionsDikeMaterialType.Clay; + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int DikeSoilType { + get { + return this.dikeSoilTypeField; + } + set { + this.dikeSoilTypeField = value; + } } /// - [System.Xml.Serialization.XmlAttributeAttribute()] - [System.ComponentModel.DefaultValueAttribute(LocationAssesmentRegionalOptionsDikeMaterialType.Clay)] - public LocationAssesmentRegionalOptionsDikeMaterialType DikeMaterialType { + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DikeSoilTypeSpecified { get { - return this.dikeMaterialTypeField; + return this.dikeSoilTypeFieldSpecified; } set { - this.dikeMaterialTypeField = value; + this.dikeSoilTypeFieldSpecified = value; } } @@ -586,28 +582,6 @@ /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public enum LocationAssesmentRegionalOptionsDikeMaterialType { - - /// - Sand, - - /// - Peat, - - /// - Loam, - - /// - Clay, - - /// - Gravel, - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class StabilityParameters { @@ -1626,6 +1600,10 @@ private bool dilatancyTypeFieldSpecified; + private int soilTypeField; + + private bool soilTypeFieldSpecified; + /// [System.Xml.Serialization.XmlAttributeAttribute()] public string Name { @@ -1966,6 +1944,28 @@ this.dilatancyTypeFieldSpecified = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int SoilType { + get { + return this.soilTypeField; + } + set { + this.soilTypeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool SoilTypeSpecified { + get { + return this.soilTypeFieldSpecified; + } + set { + this.soilTypeFieldSpecified = value; + } + } } /// Index: DamEngine/trunk/xsd/DamSoil.xsd =================================================================== diff -u -r972 -r1183 --- DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 972) +++ DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 1183) @@ -40,5 +40,12 @@ + + + + + + + \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r1156 -r1183 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1156) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1183) @@ -556,25 +556,25 @@ } [Test] - [TestCase(SoilType.Clay, LocationAssesmentRegionalOptionsDikeMaterialType.Clay)] - [TestCase(SoilType.Gravel, LocationAssesmentRegionalOptionsDikeMaterialType.Gravel)] - [TestCase(SoilType.Loam, LocationAssesmentRegionalOptionsDikeMaterialType.Loam)] - [TestCase(SoilType.Peat, LocationAssesmentRegionalOptionsDikeMaterialType.Peat)] - [TestCase(SoilType.Sand, LocationAssesmentRegionalOptionsDikeMaterialType.Sand)] - public void CanConvertToSoilType(LocationAssesmentRegionalOptionsDikeMaterialType dikeMaterialType, SoilType soilType) + [TestCase(ConversionHelper.SoilTypeClay, SoilType.Clay)] + [TestCase(ConversionHelper.SoilTypeGravel, SoilType.Gravel)] + [TestCase(ConversionHelper.SoilTypeLoam, SoilType.Loam)] + [TestCase(ConversionHelper.SoilTypePeat, SoilType.Peat)] + [TestCase(ConversionHelper.SoilTypeSand, SoilType.Sand)] + public void CanConvertToSoilType(int dikeSoilType, SoilType soilType) { - Assert.AreEqual(soilType, ConversionHelper.ConvertToSoilType(dikeMaterialType)); + Assert.AreEqual(soilType, ConversionHelper.ConvertToSoilType(dikeSoilType)); } [Test] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Clay, SoilType.Clay)] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Gravel, SoilType.Gravel)] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Loam, SoilType.Loam)] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Peat, SoilType.Peat)] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Sand, SoilType.Sand)] - public void CanConvertToDikeMaterialType(SoilType soilType, LocationAssesmentRegionalOptionsDikeMaterialType dikeMaterialType) + [TestCase(SoilType.Clay, ConversionHelper.SoilTypeClay)] + [TestCase(SoilType.Gravel, ConversionHelper.SoilTypeGravel)] + [TestCase(SoilType.Loam, ConversionHelper.SoilTypeLoam)] + [TestCase(SoilType.Peat, ConversionHelper.SoilTypePeat)] + [TestCase(SoilType.Sand, ConversionHelper.SoilTypeSand)] + public void CanConvertToDikeMaterialType(SoilType soilType, int dikeSoilType) { - Assert.AreEqual(dikeMaterialType, ConversionHelper.ConvertToInputSoilType(soilType)); + Assert.AreEqual(dikeSoilType, ConversionHelper.ConvertToInputSoilType(soilType)); } } } Index: DamEngine/trunk/xsd/DamLocation.xsd =================================================================== diff -u -r1172 -r1183 --- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 1172) +++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 1183) @@ -5,9 +5,9 @@ - + - + Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r1175 -r1183 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1175) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1183) @@ -1089,20 +1089,26 @@ return translationTable[regionalResultType]; } + public const int SoilTypeClay = 0; + public const int SoilTypeGravel = 1; + public const int SoilTypeLoam = 2; + public const int SoilTypePeat = 3; + public const int SoilTypeSand = 4; + /// /// Converts the input dikeMaterialType to SoilType. /// /// Type of the dike material. /// - public static SoilType ConvertToSoilType(LocationAssesmentRegionalOptionsDikeMaterialType dikeMaterialType) + public static SoilType ConvertToSoilType(int dikeMaterialType) { - var translationTable = new Dictionary() + var translationTable = new Dictionary() { - {LocationAssesmentRegionalOptionsDikeMaterialType.Clay, SoilType.Clay}, - {LocationAssesmentRegionalOptionsDikeMaterialType.Gravel, SoilType.Gravel}, - {LocationAssesmentRegionalOptionsDikeMaterialType.Loam, SoilType.Loam}, - {LocationAssesmentRegionalOptionsDikeMaterialType.Peat, SoilType.Peat}, - {LocationAssesmentRegionalOptionsDikeMaterialType.Sand, SoilType.Sand} + {SoilTypeClay, SoilType.Clay}, + {SoilTypeGravel, SoilType.Gravel}, + {SoilTypeLoam, SoilType.Loam}, + {SoilTypePeat, SoilType.Peat}, + {SoilTypeSand, SoilType.Sand} }; return translationTable[dikeMaterialType]; } @@ -1111,15 +1117,15 @@ /// /// Type of the soil. /// - public static LocationAssesmentRegionalOptionsDikeMaterialType ConvertToInputSoilType(SoilType soilType) + public static int ConvertToInputSoilType(SoilType soilType) { - var translationTable = new Dictionary() + var translationTable = new Dictionary() { - {SoilType.Clay, LocationAssesmentRegionalOptionsDikeMaterialType.Clay}, - {SoilType.Gravel, LocationAssesmentRegionalOptionsDikeMaterialType.Gravel}, - {SoilType.Loam, LocationAssesmentRegionalOptionsDikeMaterialType.Loam}, - {SoilType.Peat, LocationAssesmentRegionalOptionsDikeMaterialType.Peat}, - {SoilType.Sand, LocationAssesmentRegionalOptionsDikeMaterialType.Sand} + {SoilType.Clay, SoilTypeClay}, + {SoilType.Gravel, SoilTypeGravel}, + {SoilType.Loam, SoilTypeLoam}, + {SoilType.Peat, SoilTypePeat}, + {SoilType.Sand, SoilTypeSand} }; return translationTable[soilType]; } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r1165 -r1183 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1165) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1183) @@ -329,7 +329,7 @@ assesmentRegionalOptions.RegionalBankProtectionBottomLevel = location.RwBankProtectionBottomLevel; assesmentRegionalOptions.DredgingDepth = location.DredgingDepth; assesmentRegionalOptions.DetrimentFactor = location.DetrimentFactor; - assesmentRegionalOptions.DikeMaterialType = ConversionHelper.ConvertToInputSoilType(location.DikeMaterialType); + assesmentRegionalOptions.DikeSoilType = ConversionHelper.ConvertToInputSoilType(location.DikeMaterialType); inputLocation.AssesmentRegionalOptions = assesmentRegionalOptions; // Design options Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r1181 -r1183 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1181) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1183) @@ -372,7 +372,7 @@ location.RwBankProtectionBottomLevel = assesmentRegionalOptions.RegionalBankProtectionBottomLevel; location.DredgingDepth = assesmentRegionalOptions.DredgingDepth; location.DetrimentFactor = assesmentRegionalOptions.DetrimentFactor; - location.DikeMaterialType = ConversionHelper.ConvertToSoilType(assesmentRegionalOptions.DikeMaterialType); + location.DikeMaterialType = ConversionHelper.ConvertToSoilType(assesmentRegionalOptions.DikeSoilType); } // Design options var designOptions = inputLocation.DesignOptions;