Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs =================================================================== diff -u -r2111 -r2166 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 2111) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 2166) @@ -493,7 +493,7 @@ public void CanCreateAndValidateMStabInputXMLWithPLLines() { // Create PL lines - var location = new Location {DamType = DamType.Regional}; + var location = new Location(); Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = soilProfile1; plLineCreator.SurfaceLine = surfaceLine1; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r2131 -r2166 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2131) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2166) @@ -34,15 +34,6 @@ { /// - /// MainType for DAM, determines type of calculations are to be performed - /// - public enum DamType - { - Primary, - Regional - } - - /// /// Types of project for DAM /// public enum DamProjectType @@ -97,7 +88,6 @@ private readonly List scenarios = new List(); private ModelParametersForPlLines modelParametersForPlLines = new ModelParametersForPlLines(); - private DamType damType = DamType.Primary; private string dikeEmbankmentMaterial = ""; private double dikeTableHeight; @@ -395,24 +385,6 @@ } /// - /// Gets or sets the type of the dam. - /// - /// - /// The type of the dam. - /// - public DamType DamType - { - get - { - return damType; - } - set - { - damType = value; - } - } - - /// /// Gets or sets the soil list. /// /// Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r2157 -r2166 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2157) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2166) @@ -3566,8 +3566,6 @@ [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public partial class LocationGeneral { - private LocationGeneralDamType damTypeField; - private string descriptionField; private bool isUseOriginalPLLineAssignmentsField; @@ -3586,24 +3584,8 @@ private bool headPL4FieldSpecified; - public LocationGeneral() { - this.damTypeField = LocationGeneralDamType.Primary; - } - /// [System.Xml.Serialization.XmlAttributeAttribute()] - [System.ComponentModel.DefaultValueAttribute(LocationGeneralDamType.Primary)] - public LocationGeneralDamType DamType { - get { - return this.damTypeField; - } - set { - this.damTypeField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public string Description { get { return this.descriptionField; @@ -3705,19 +3687,6 @@ /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public enum LocationGeneralDamType { - - /// - Primary, - - /// - Regional, - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs =================================================================== diff -u -r1970 -r2166 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 1970) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 2166) @@ -231,7 +231,6 @@ var soilGeometry2DName = "1D1.sti"; var surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var location = DamMacroStabilityTestHelper.CreateLocation(surfaceLine); - location.DamType = DamType.Regional; location.Name = "LocationName"; location.DikeEmbankmentMaterial = "OB1"; location.ShoulderEmbankmentMaterial = "OB2"; Index: DamEngine/trunk/xsd/DamLocation.xsd =================================================================== diff -u -r2157 -r2166 --- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2157) +++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2166) @@ -88,14 +88,6 @@ - - - - - - - - Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs =================================================================== diff -u -r2111 -r2166 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 2111) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 2166) @@ -43,7 +43,7 @@ plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PenetrationLength = 1.5; plLineCreator.IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = false; // for piping this must be set to false - var location = new Location { DamType = DamType.Regional }; + var location = new Location(); return plLineCreator.CreateAllPlLines(location); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs =================================================================== diff -u -r2050 -r2166 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs (.../DamMacroStabilityTestHelper.cs) (revision 2050) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs (.../DamMacroStabilityTestHelper.cs) (revision 2166) @@ -51,7 +51,6 @@ public static Location CreateLocation(SurfaceLine2 surfaceLine) { Location location = new Location(); - location.DamType = DamType.Regional; location.Name = "LocationName"; location.DikeEmbankmentMaterial = "OB1"; location.ShoulderEmbankmentMaterial = "OB2";