Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r6157 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6157) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6171) @@ -70,7 +70,6 @@ TransferSurfaceLines(dike.SurfaceLines2, input.SurfaceLines); input.Soils = new Io.XmlInput.Soil[dike.SoilList.Soils.Count]; TransferSoils(dike.SoilList.Soils, input.Soils); - TransferAquiferSoils(dike.SoilList.AquiferDictionary, input); TransferTrafficLoadDegreeOfConsolidation(dike.TrafficLoadDegreeOfConsolidations, input); if (dike.SoilProfiles != null) { @@ -236,31 +235,6 @@ timeSerieIndex++; } } - - private static void TransferAquiferSoils(Dictionary aquiferDictionary, Input input) - { - InputAquiferSoil[] aquiferSoils; - if (aquiferDictionary != null && aquiferDictionary.Count > 0) - { - aquiferSoils = new InputAquiferSoil[aquiferDictionary.Count]; - var soilIndex = 0; - foreach (KeyValuePair keyValuePair in aquiferDictionary) - { - aquiferSoils[soilIndex] = new InputAquiferSoil - { - Soilname = keyValuePair.Key, - IsAquifer = keyValuePair.Value - }; - soilIndex++; - } - } - else - { - aquiferSoils = null; - } - - input.AquiferSoils = aquiferSoils; - } private static void TransferTrafficLoadDegreeOfConsolidation(IList degreeOfConsolidationDictionary, Input input) { @@ -573,8 +547,6 @@ inputLocation.Name = location.Name; inputLocation.DistanceToEntryPoint = location.DistanceToEntryPoint; inputLocation.DistanceToEntryPointSpecified = true; - inputLocation.XSoilGeometry2DOrigin = 0.0; - inputLocation.XSoilGeometry2DOriginSpecified = true; inputLocation.SurfaceLineName = location.SurfaceLine.Name; inputLocation.SegmentName = location.Segment.Name; var waternetOptions = new LocationWaternetOptions(); @@ -660,22 +632,8 @@ inputLocation.DikeEmbankmentMaterial = location.DikeEmbankmentMaterial; if (location.StabilityOptions != null) { - string tmpPath = projectPath ?? Directory.GetCurrentDirectory(); - string tmpMap = location.StabilityOptions.SoilGeometries2DPath; - if (tmpMap.StartsWith(tmpPath)) - { - tmpMap = tmpMap.Remove(0, tmpPath.Length); - } - - if (tmpMap.StartsWith(Path.DirectorySeparatorChar.ToString())) - { - tmpMap = tmpMap.Remove(0, 1); - } - inputLocation.StabilityOptions = new LocationStabilityOptions { - MapForSoilgeometries2D = tmpMap, - SoilDatabaseName = location.StabilityOptions.SoilDatabaseName, ZoneType = ConversionHelper.ConvertToInputZoneType(location.StabilityOptions.StabilityZoneType), ForbiddenZoneFactorSpecified = location.StabilityOptions.ForbiddenZoneFactor.HasValue }; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r5090 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 5090) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 6171) @@ -75,17 +75,6 @@ } [Test] - public void CanAquiferListBeHandledOk() - { - const string inputFileName = @"TestFiles\AquiferListInputFile.xml"; - Input input = DamXmlSerialization.LoadInputFromXmlFile(inputFileName); - Assert.That(input.AquiferSoils.Length, Is.EqualTo(28)); - DamProjectData actualDamProjectData = FillDamFromXmlInput.CreateDamProjectData(input); - Assert.That(actualDamProjectData.Dike.SoilList.AquiferDictionary.Count, Is.EqualTo(11)); - Assert.That(actualDamProjectData.CalculationMessages.Count, Is.EqualTo(7)); - } - - [Test] [TestCase("location_12_2_1D1")] // Between "location_12" and "_2_1D1" there are 2 illegal characters (1F hex) public void GivenDataSetContainingIllegalCharactersWhenWritingXmlThenRaiseExceptionWithClearMessage(string id) { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r6157 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6157) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6171) @@ -77,12 +77,6 @@ TransferSurfaceLines(input.SurfaceLines, dike.SurfaceLines2); dike.SoilList = new SoilList(); TransferSoils(input.Soils, dike.SoilList.Soils); - List messages = TransferAquiferSoils(input.AquiferSoils, dike.SoilList); - if (messages.Count > 0) - { - damProjectData.CalculationMessages = messages; - } - TransferSoilProfiles1D(input.SoilProfiles1D, dike.SoilProfiles, dike.SoilList); TransferSoilProfiles2D(input.SoilProfiles2D, dike.SoilProfiles2D, dike.SoilList); TransferTrafficLoadDegreeOfConsolidation(input.TrafficLoadDegreeOfConsolidations, dike); @@ -253,34 +247,6 @@ } } - private static List TransferAquiferSoils(InputAquiferSoil[] inputAquiferSoils, SoilList soilList) - { - var validationMessages = new List(); - if (inputAquiferSoils != null) - { - soilList.AquiferDictionary.Clear(); - foreach (InputAquiferSoil aquiferSoil in inputAquiferSoils) - { - Data.Geotechnics.Soil soil = soilList.GetSoilByName(aquiferSoil.Soilname); - if (!soilList.AquiferDictionary.ContainsKey(soil.Name)) - { - soilList.AquiferDictionary.Add(soil.Name, aquiferSoil.IsAquifer); - } - else - { - // If a soil is (wrongly) in the list more than once, then prefer aquifer true. - if (aquiferSoil.IsAquifer) - { - validationMessages.Add(new LogMessage(LogMessageType.Warning, aquiferSoil, string.Format(Resources.DoubleAquiferSoil, aquiferSoil.Soilname))); - soilList.AquiferDictionary[soil.Name] = true; - } - } - } - } - - return validationMessages; - } - private static void TransferAnalysisSpecification(Input input, DamProjectData damProjectData) { damProjectData.DamProjectType = ConversionHelper.ConvertToDamProjectType(input.DamProjectType); @@ -717,8 +683,6 @@ string tmpPath = projectPath ?? Directory.GetCurrentDirectory(); location.StabilityOptions = new StabilityOptions { - SoilGeometries2DPath = Path.Combine(tmpPath, inputLocation.StabilityOptions.MapForSoilgeometries2D), - SoilDatabaseName = inputLocation.StabilityOptions.SoilDatabaseName, StabilityZoneType = ConversionHelper.ConvertToZoneType(inputLocation.StabilityOptions.ZoneType) }; if (inputLocation.StabilityOptions.ForbiddenZoneFactorSpecified) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs =================================================================== diff -u -r5960 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 5960) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 6171) @@ -56,13 +56,10 @@ const string testFolder = @"KernelWrappers\Common\TestFiles"; string projectPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); - string soilDbName = Path.Combine(projectPath, "soilMaterials.mdb"); - + Location location = DamEngineDataTestFactory.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1()); location.StabilityOptions = new StabilityOptions(); location.StabilityOptions.TrafficLoad = 10.0; - location.StabilityOptions.SoilGeometries2DPath = projectPath; - location.StabilityOptions.SoilDatabaseName = soilDbName; location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1; var subSoilScenario = new SoilGeometryProbability(); Fisheye: Tag 6171 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/AquiferListInputFile.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilList.cs =================================================================== diff -u -r4540 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilList.cs (.../SoilList.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilList.cs (.../SoilList.cs) (revision 6171) @@ -58,29 +58,6 @@ } /// - /// Gets or sets the aquifer dictionary. - /// This dictionary is used for the backward compatibility issue when aquifers still were part of - /// soil instead of the layer as it is now. - /// - /// - /// The aquifer dictionary. - /// - public Dictionary AquiferDictionary { get; set; } = new Dictionary(); - - /// - /// Gets the index of the soil by its name. - /// - /// Name of the soil. - /// The index when found else -1 - public virtual int GetSoilIndexByName(string soilName) - { - Soil soil = soils.FirstOrDefault(s => s.Name.Equals( - soilName, StringComparison.InvariantCultureIgnoreCase)); - - return soil == null ? -1 : soils.IndexOf(soil); - } - - /// /// Gets the soil by its name. /// /// Name of the soil. @@ -101,26 +78,4 @@ { Soils.Add(soil); } - - /// - /// Removes the specified soil. - /// - /// The soil. - public void Remove(Soil soil) - { - Soils.Remove(soil); - if (AquiferDictionary.ContainsKey(soil.Name)) - { - AquiferDictionary.Remove(soil.Name); - } - } - - /// - /// Clears this instance (soils and AquiferDictionary). - /// - public void Clear() - { - Soils.Clear(); - AquiferDictionary.Clear(); - } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r6157 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6157) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6171) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using System.IO; using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Sensors; @@ -51,12 +50,11 @@ Dike dike = damProjectData.Dike; FillSurfaceLines(dike); FillSoils(dike); - FillAquiferSoils(dike.SoilList); FillSoilProfiles1D(dike); FillSoilProfiles2D(dike); FillSegments(damProjectData); FillTrafficLoadDegreeOfConsolidation(dike); - FillLocations(dike, damProjectData.Segments, damProjectData.ProjectPath); + FillLocations(dike, damProjectData.Segments); FillInputTimeSeries(dike); FillSensorData(damProjectData); @@ -212,15 +210,6 @@ } } - private static void FillAquiferSoils(SoilList soilList) - { - for (var i = 0; i < soilList.Soils.Count; i++) - { - // All even indeces are set to true, all odd indices are set to false - soilList.AquiferDictionary.Add(soilList.Soils[i].Name, (i % 2) == 0); - } - } - private static void FillTrafficLoadDegreeOfConsolidation(Dike dike) { dike.TrafficLoadDegreeOfConsolidations = new List(); @@ -380,7 +369,7 @@ AddPointToSurfaceLine(surfaceLine, 24.0, 1.0, CharacteristicPointType.SurfaceLevelInside); } - private static void FillLocations(Dike dike, IList segments, string projectPath) + private static void FillLocations(Dike dike, IList segments) { const int locationCount = 3; for (var i = 0; i < locationCount; i++) @@ -408,13 +397,11 @@ location.DikeEmbankmentMaterial = "DikeMat"; location.StabilityOptions = new StabilityOptions { - SoilGeometries2DPath = Path.Combine(projectPath, @"Sub\TestMap"), StabilityZoneType = MStabZonesType.ForbiddenZone, ForbiddenZoneFactor = 10.0 * i + 0.42, TrafficLoad = 10.0 * i + 0.44, TrafficLoadDegreeOfConsolidation = 10.0 * i + 0.45, - MinimalCircleDepth = 10.0 * i + 0.46, - SoilDatabaseName = "test.mdb" + MinimalCircleDepth = 10.0 * i + 0.46 }; location.RedesignDikeHeight = false; location.RedesignDikeShoulder = false; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs =================================================================== diff -u -r6157 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs (.../DamEngineDataTestFactory.cs) (revision 6157) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs (.../DamEngineDataTestFactory.cs) (revision 6171) @@ -96,10 +96,6 @@ }; soilList.Soils.Add(s4); - soilList.AquiferDictionary.Add(s1.Name, true); - soilList.AquiferDictionary.Add(s2.Name, false); - soilList.AquiferDictionary.Add(s3.Name, false); - soilList.AquiferDictionary.Add(s4.Name, false); return soilList; } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs =================================================================== diff -u -r5960 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 5960) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 6171) @@ -26,7 +26,6 @@ using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General.Gauges; using Deltares.DamEngine.Data.General.PlLines; -using Deltares.DamEngine.Data.General.Sensors; using Deltares.DamEngine.Data.General.TimeSeries; using Deltares.DamEngine.Data.Geotechnics; using Deltares.DamEngine.Data.Properties; @@ -38,17 +37,6 @@ namespace Deltares.DamEngine.Data.General; /// -/// Class for the dike parameter names -/// -public class DikeParameterNames -{ - /// - /// The map for soilgeometries2d - /// - public const string MapForSoilGeometries2D = "MapForSoilGeometries2D"; -} - -/// /// Class holding all info for a Dike. /// public class Dike @@ -67,8 +55,7 @@ public Dike() { Name = "Dijkring"; - MapForSoilGeometries2D = ""; - + locations = new List(); soilProfiles = new List(); soilProfiles2D = new List(); @@ -77,8 +64,6 @@ soilList = new SoilList(); } - public virtual string MapForSoilGeometries2D { get; set; } - public virtual string Name { get; set; } /// @@ -290,28 +275,9 @@ return logMessages; } - public Dictionary GetParametersAsNameValuePairs() - { - var nameValuePairs = new Dictionary(); - nameValuePairs.Add(DikeParameterNames.MapForSoilGeometries2D, MapForSoilGeometries2D); - return nameValuePairs; - } - - public void SetParameterFromNameValuePair(string parameterName, string parameterValue) - { - if (parameterName.Equals(DikeParameterNames.MapForSoilGeometries2D)) - { - MapForSoilGeometries2D = parameterValue; - } - } - public void UpdateLocation(Location location) { location.SoilList = SoilList; - if (location.StabilityOptions != null) - { - location.StabilityOptions.SoilGeometries2DPath = MapForSoilGeometries2D; - } location.Gauges.Clear(); location.Gauges.AddRange(Gauges); Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r6157 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6157) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6171) @@ -37,8 +37,6 @@ private StabilityParameters stabilityParametersField; - private InputAquiferSoil[] aquiferSoilsField; - private InputTrafficLoadDegreeOfConsolidation[] trafficLoadDegreeOfConsolidationsField; private TimeSerie[] operationalInputTimeSeriesField; @@ -147,18 +145,6 @@ /// [System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)] - [System.Xml.Serialization.XmlArrayItemAttribute("AquiferSoil", IsNullable=false)] - public InputAquiferSoil[] AquiferSoils { - get { - return this.aquiferSoilsField; - } - set { - this.aquiferSoilsField = value; - } - } - - /// - [System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)] [System.Xml.Serialization.XmlArrayItemAttribute("TrafficLoadDegreeOfConsolidation", IsNullable=false)] public InputTrafficLoadDegreeOfConsolidation[] TrafficLoadDegreeOfConsolidations { get { @@ -352,10 +338,6 @@ private string dikeEmbankmentMaterialField; - private double xSoilGeometry2DOriginField; - - private bool xSoilGeometry2DOriginFieldSpecified; - private double distanceToEntryPointField; private bool distanceToEntryPointFieldSpecified; @@ -467,28 +449,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double XSoilGeometry2DOrigin { - get { - return this.xSoilGeometry2DOriginField; - } - set { - this.xSoilGeometry2DOriginField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool XSoilGeometry2DOriginSpecified { - get { - return this.xSoilGeometry2DOriginFieldSpecified; - } - set { - this.xSoilGeometry2DOriginFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public double DistanceToEntryPoint { get { return this.distanceToEntryPointField; @@ -4309,20 +4269,12 @@ [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public partial class LocationStabilityOptions { - private string mapForSoilgeometries2DField; - - private string soilDatabaseNameField; - private int zoneTypeField; private double forbiddenZoneFactorField; private bool forbiddenZoneFactorFieldSpecified; - private double zoneAreaRestSlopeCrestWidthField; - - private bool zoneAreaRestSlopeCrestWidthFieldSpecified; - private double trafficLoadField; private bool trafficLoadFieldSpecified; @@ -4337,28 +4289,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string MapForSoilgeometries2D { - get { - return this.mapForSoilgeometries2DField; - } - set { - this.mapForSoilgeometries2DField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string SoilDatabaseName { - get { - return this.soilDatabaseNameField; - } - set { - this.soilDatabaseNameField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public int ZoneType { get { return this.zoneTypeField; @@ -4392,28 +4322,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double ZoneAreaRestSlopeCrestWidth { - get { - return this.zoneAreaRestSlopeCrestWidthField; - } - set { - this.zoneAreaRestSlopeCrestWidthField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool ZoneAreaRestSlopeCrestWidthSpecified { - get { - return this.zoneAreaRestSlopeCrestWidthFieldSpecified; - } - set { - this.zoneAreaRestSlopeCrestWidthFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public double TrafficLoad { get { return this.trafficLoadField; @@ -4485,41 +4393,6 @@ [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class InputAquiferSoil { - - private string soilnameField; - - private bool isAquiferField; - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Soilname { - get { - return this.soilnameField; - } - set { - this.soilnameField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool IsAquifer { - get { - return this.isAquiferField; - } - set { - this.isAquiferField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public partial class InputTrafficLoadDegreeOfConsolidation { private string soilNameField; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs =================================================================== diff -u -r6002 -r6171 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 6002) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 6171) @@ -24,22 +24,6 @@ public class StabilityOptions { /// - /// Gets or sets the map for soilgeometries2d. - /// - /// - /// The map for soilgeometries2d. - /// - public string SoilGeometries2DPath { get; set; } = ""; - - /// - /// Gets or sets the name of the soil database. - /// - /// - /// The name of the soil database. - /// - public string SoilDatabaseName { get; set; } = ""; - - /// /// Gets or sets the type of the stability zone. /// ///