Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r6194 -r6216 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6194) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6216) @@ -355,8 +355,6 @@ location.ModelParametersForPlLines.DampingFactorPl3 = 1.0 * i + 0.13; location.ModelParametersForPlLines.PenetrationLength = 1.0 * i + 0.14; location.SlopeDampingPiezometricHeightPolderSide = 1.0 * i + 0.19; - location.DikeSoilScenario = (DikeSoilScenario) i; - location.SurfaceLine = dike.SurfaceLines2[i]; location.Segment = segments[i % 2]; // alternate between the 2 available segments for (var j = 0; j < 3; j++) Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r6196 -r6216 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6196) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6216) @@ -523,7 +523,6 @@ location.ModelParametersForPlLines.DampingFactorPl3 = waternetOptions.DampingFactorPl3; location.ModelParametersForPlLines.DampingFactorPl4 = waternetOptions.DampingFactorPl4; location.ModelParametersForPlLines.PenetrationLength = waternetOptions.PenetrationLength; - location.DikeSoilScenario = ConversionHelper.ConvertToDikeSoilScenario(waternetOptions.DikeSoilScenario); location.SlopeDampingPiezometricHeightPolderSide = waternetOptions.SlopeDampingFactor; // Design options Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r6196 -r6216 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6196) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6216) @@ -520,22 +520,4 @@ { Assert.That(ConversionHelper.ConvertToInputDataSourceTypeSensors(dataSourceTypeSensors), Is.EqualTo(inputdataSourceTypeSensors)); } - - [TestCase(LocationWaternetOptionsDikeSoilScenario.ClayDikeOnClay, DikeSoilScenario.ClayDikeOnClay)] - [TestCase(LocationWaternetOptionsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)] - [TestCase(LocationWaternetOptionsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)] - [TestCase(LocationWaternetOptionsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)] - public void CanConvertToDikeSoilScenarioType(LocationWaternetOptionsDikeSoilScenario locationWaternetOptionsDikeSoilScenario, DikeSoilScenario dikeSoilScenario) - { - Assert.That(ConversionHelper.ConvertToDikeSoilScenario(locationWaternetOptionsDikeSoilScenario), Is.EqualTo(dikeSoilScenario)); - } - - [TestCase(DikeSoilScenario.ClayDikeOnClay, LocationWaternetOptionsDikeSoilScenario.ClayDikeOnClay)] - [TestCase(DikeSoilScenario.ClayDikeOnSand, LocationWaternetOptionsDikeSoilScenario.ClayDikeOnSand)] - [TestCase(DikeSoilScenario.SandDikeOnClay, LocationWaternetOptionsDikeSoilScenario.SandDikeOnClay)] - [TestCase(DikeSoilScenario.SandDikeOnSand, LocationWaternetOptionsDikeSoilScenario.SandDikeOnSand)] - public void CanConvertToInputDikeSoilScenarioType(DikeSoilScenario dikeSoilScenario, LocationWaternetOptionsDikeSoilScenario locationWaternetOptionsDikeSoilScenario) - { - Assert.That(ConversionHelper.ConvertToInputDikeSoilScenario(dikeSoilScenario), Is.EqualTo(locationWaternetOptionsDikeSoilScenario)); - } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r6191 -r6216 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 6191) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 6216) @@ -540,14 +540,6 @@ #region PlLine creation parameters /// - /// Gets or sets the dike soil scenario. - /// - /// - /// The dike soil scenario. - /// - public DikeSoilScenario DikeSoilScenario { get; set; } - - /// /// Gets or sets the intrusion vertical water pressure. /// /// Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r6196 -r6216 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6196) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6216) @@ -1336,56 +1336,6 @@ }; return translationTable[dataSourceTypeSensors]; } - - /// - /// Converts to DikeSoilScenario type. - /// - /// Theinput DikeSoilScenario type. - /// - public static DikeSoilScenario ConvertToDikeSoilScenario(LocationWaternetOptionsDikeSoilScenario waternetOptionsDikeSoilScenario) - { - var translationTable = new Dictionary - { - { - LocationWaternetOptionsDikeSoilScenario.ClayDikeOnClay, DikeSoilScenario.ClayDikeOnClay - }, - { - LocationWaternetOptionsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand - }, - { - LocationWaternetOptionsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay - }, - { - LocationWaternetOptionsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand - } - }; - return translationTable[waternetOptionsDikeSoilScenario]; - } - - /// - /// Converts to input DikeSoilScenario type. - /// - /// The DikeSoilScenario type. - /// - public static LocationWaternetOptionsDikeSoilScenario ConvertToInputDikeSoilScenario(DikeSoilScenario waternetOptionsDikeSoilScenario) - { - var translationTable = new Dictionary - { - { - DikeSoilScenario.ClayDikeOnClay, LocationWaternetOptionsDikeSoilScenario.ClayDikeOnClay - }, - { - DikeSoilScenario.ClayDikeOnSand, LocationWaternetOptionsDikeSoilScenario.ClayDikeOnSand - }, - { - DikeSoilScenario.SandDikeOnClay, LocationWaternetOptionsDikeSoilScenario.SandDikeOnClay - }, - { - DikeSoilScenario.SandDikeOnSand, LocationWaternetOptionsDikeSoilScenario.SandDikeOnSand - } - }; - return translationTable[waternetOptionsDikeSoilScenario]; - } /// /// Converts the type FailureMechanismSystemType from Dam Engine type to output object type. Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLineEnumerations.cs =================================================================== diff -u -r4540 -r6216 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLineEnumerations.cs (.../PlLineEnumerations.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLineEnumerations.cs (.../PlLineEnumerations.cs) (revision 6216) @@ -22,15 +22,6 @@ namespace Deltares.DamEngine.Data.General; /// -/// Types of PlLine Assignments -/// -public enum PlLineAssignment -{ - NoPlLines, - ExpertKnowledge -} - -/// /// PlLineType /// public enum PlLineType @@ -51,31 +42,4 @@ GaugesWithFallbackToExpertKnowledgeRRD, Sensors, None -} - -/// -/// Dike soil scenario for the automatic creation of the waternet - 4 possibilities. -/// This is used in the wti stability kernel -/// -public enum DikeSoilScenario -{ - /// - /// Clay dike on clay subsoil - /// - ClayDikeOnClay, - - /// - /// Sand dike on clay subsoil - /// - SandDikeOnClay, - - /// - /// Clay dike on sand subsoil - /// - ClayDikeOnSand, - - /// - /// Sand dike on sand subsoil - /// - SandDikeOnSand } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r6196 -r6216 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6196) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6216) @@ -526,7 +526,6 @@ waternetOptions.DampingFactorPl3 = location.ModelParametersForPlLines.DampingFactorPl3; waternetOptions.DampingFactorPl4 = location.ModelParametersForPlLines.DampingFactorPl4; waternetOptions.PenetrationLength = location.ModelParametersForPlLines.PenetrationLength; - waternetOptions.DikeSoilScenario = ConversionHelper.ConvertToInputDikeSoilScenario(location.DikeSoilScenario); waternetOptions.SlopeDampingFactor = location.SlopeDampingPiezometricHeightPolderSide; inputLocation.WaternetOptions = waternetOptions; Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r6196 -r6216 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6196) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6216) @@ -2998,8 +2998,6 @@ private LocationWaternetOptionsIntrusionVerticalWaterPressure intrusionVerticalWaterPressureField; - private LocationWaternetOptionsDikeSoilScenario dikeSoilScenarioField; - /// [System.Xml.Serialization.XmlAttributeAttribute()] public LocationWaternetOptionsPhreaticLineCreationMethod PhreaticLineCreationMethod { @@ -3065,17 +3063,6 @@ this.intrusionVerticalWaterPressureField = value; } } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public LocationWaternetOptionsDikeSoilScenario DikeSoilScenario { - get { - return this.dikeSoilScenarioField; - } - set { - this.dikeSoilScenarioField = value; - } - } } /// @@ -3125,25 +3112,6 @@ /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public enum LocationWaternetOptionsDikeSoilScenario { - - /// - ClayDikeOnClay, - - /// - SandDikeOnClay, - - /// - ClayDikeOnSand, - - /// - SandDikeOnSand, - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]