Fisheye: Tag 2503 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilTypes.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r2405 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2405) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2503) @@ -280,8 +280,7 @@ soil.DiameterD90 = 20 + 0.1 * i; soil.PermeabKx = 21 + 0.1 * i; soil.WhitesConstant = 22 + 0.1 * i; - soil.SoilType = ConversionHelper.ConvertToSoilType(i); - + dike.SoilList.Add(soil); } var dikemat = new Soil Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r2494 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2494) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2503) @@ -2301,10 +2301,6 @@ private bool dilatancyTypeFieldSpecified; - private int soilTypeField; - - private bool soilTypeFieldSpecified; - /// [System.Xml.Serialization.XmlAttributeAttribute()] public string Name { @@ -2645,28 +2641,6 @@ 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/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs =================================================================== diff -u -r1974 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 1974) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 2503) @@ -33,15 +33,13 @@ { // Stability properties private string name = ""; - private SoilType soilType; - + /// /// Initializes a new instance of the class. /// public Soil() { - Name = LocalizationManager.GetTranslatedText(this, "DefaultNameSoilMaterial"); - soilType = SoilType.Sand; + Name = LocalizationManager.GetTranslatedText(this, "DefaultNameSoilMaterial"); } @@ -67,27 +65,6 @@ Name = name; } - /// - /// Gets or sets the type of the soil. - /// - /// - /// The type of the soil. - /// - public virtual SoilType SoilType - { - get - { - return soilType; - } - set - { - if (!soilType.Equals(value)) - { - soilType = value; - } - } - } - #region property Name /// Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r2173 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 2173) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 2503) @@ -1009,49 +1009,7 @@ return translationTable[pipingModelType]; } - 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(int dikeMaterialType) - { - var translationTable = new Dictionary() - { - {SoilTypeClay, SoilType.Clay}, - {SoilTypeGravel, SoilType.Gravel}, - {SoilTypeLoam, SoilType.Loam}, - {SoilTypePeat, SoilType.Peat}, - {SoilTypeSand, SoilType.Sand} - }; - return translationTable[dikeMaterialType]; - } - - /// - /// Converts the SoilType to the input dikeMaterialType. - /// - /// Type of the soil. - /// - public static int ConvertToInputSoilType(SoilType soilType) - { - var translationTable = new Dictionary() - { - {SoilType.Clay, SoilTypeClay}, - {SoilType.Gravel, SoilTypeGravel}, - {SoilType.Loam, SoilTypeLoam}, - {SoilType.Peat, SoilTypePeat}, - {SoilType.Sand, SoilTypeSand} - }; - return translationTable[soilType]; - } - - /// /// Constants for translating to Enums TimeStepUnit /// public const uint TimeStepUnitSecond = 0; Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs =================================================================== diff -u -r1974 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 1974) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 2503) @@ -107,7 +107,6 @@ layer.Soil = new Soil("HW-OBO", 12.0, 10.0); layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; - layer.Soil.SoilType = SoilType.Clay; soilProfile.Layers.Add(layer); layer = new SoilLayer1D() @@ -174,7 +173,6 @@ layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; - layer.Soil.SoilType = SoilType.Clay; layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel - 1.0; soilProfile.Layers.Add(layer); @@ -187,7 +185,6 @@ layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; - layer.Soil.SoilType = SoilType.Sand; layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel - 1.0; soilProfile.Layers.Add(layer); @@ -200,7 +197,6 @@ layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; - layer.Soil.SoilType = SoilType.Clay; layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel - 1.0; soilProfile.Layers.Add(layer); @@ -213,7 +209,6 @@ layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; - layer.Soil.SoilType = SoilType.Sand; layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel - 1.0; soilProfile.Layers.Add(layer); soilProfile.BottomLevel = -10.0; @@ -309,7 +304,6 @@ layer.Soil = new Soil("HW-OBO", 12.0, 10.0); layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; - layer.Soil.SoilType = SoilType.Clay; soilProfile.Layers.Add(layer); layer = new SoilLayer1D() @@ -320,7 +314,6 @@ layer.Soil = new Soil("Alg-zand (0-30)", 10.0, 20.0); layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; - layer.Soil.SoilType = SoilType.Clay; soilProfile.Layers.Add(layer); layer = new SoilLayer1D() @@ -331,7 +324,6 @@ layer.Soil = new Soil("HW-DUN", 16.8, 15.8); layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; - layer.Soil.SoilType = SoilType.Clay; soilProfile.Layers.Add(layer); layer = new SoilLayer1D() @@ -342,7 +334,6 @@ layer.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; - layer.Soil.SoilType = SoilType.Clay; soilProfile.Layers.Add(layer); layer = new SoilLayer1D() @@ -353,7 +344,6 @@ layer.Soil = new Soil("HW-DUN", 16.8, 15.8); layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; - layer.Soil.SoilType = SoilType.Clay; soilProfile.Layers.Add(layer); soilProfile.BottomLevel = -10.0; @@ -632,22 +622,6 @@ return soilProfile; } - ///// - ///// Gammadry and Gammywet are both set to 10.0 for testing purposes - ///// - ///// - //public static SoilProfile1D CreatePipingDesignSellmeijerDesign() - //{ - // SoilProfile1D soilProfile = CreatePipingSellmeijerProfileWithTwoSandlayers(); - // foreach (var layer in soilProfile.Layers) - // { - // layer.Soil.BelowPhreaticLevel = 5.0; - // layer.Soil.AbovePhreaticLevel = 5.0; - // } - // return soilProfile; - //} - - /// /// Creates a test profile. /// @@ -658,20 +632,17 @@ sand.Name = "zand"; sand.AbovePhreaticLevel = 15; sand.BelowPhreaticLevel = 17; - sand.SoilType = SoilType.Sand; - + var clay = new Soil(); clay.Name = "klei"; clay.AbovePhreaticLevel = 18; clay.BelowPhreaticLevel = 20; - clay.SoilType = SoilType.Clay; - + var clay2 = new Soil(); clay2.Name = "klei2"; clay2.AbovePhreaticLevel = 20; clay2.BelowPhreaticLevel = 22; - clay2.SoilType = SoilType.Clay; - + var soilProfile = new SoilProfile1D(); soilProfile.Name = "TestProf"; @@ -709,14 +680,12 @@ sand.Name = "zand"; sand.AbovePhreaticLevel = 15; sand.BelowPhreaticLevel = 17; - sand.SoilType = SoilType.Sand; - + var clay = new Soil(); clay.Name = "klei"; clay.AbovePhreaticLevel = 18; clay.BelowPhreaticLevel = 20; - clay.SoilType = SoilType.Clay; - + var soilProfile = new SoilProfile1D(); soilProfile.Name = "TestProf"; @@ -747,26 +716,22 @@ sandTop.Name = "zandtop"; sandTop.AbovePhreaticLevel = 18; sandTop.BelowPhreaticLevel = 20; - sandTop.SoilType = SoilType.Sand; - + var clay = new Soil(); clay.Name = "klei"; clay.AbovePhreaticLevel = 18; clay.BelowPhreaticLevel = 20; - clay.SoilType = SoilType.Clay; - + var sandBottom = new Soil(); sandBottom.Name = "zandbottom"; sandBottom.AbovePhreaticLevel = 15; sandBottom.BelowPhreaticLevel = 17; - sandBottom.SoilType = SoilType.Sand; - + var peat = new Soil(); peat.Name = "veen"; peat.AbovePhreaticLevel = 5; peat.BelowPhreaticLevel = 10.5; - peat.SoilType = SoilType.Peat; - + var soilProfile = new SoilProfile1D(); soilProfile.Name = "TestProf"; @@ -818,26 +783,22 @@ coverSublayer1.Name = "cover sublayer 1"; coverSublayer1.AbovePhreaticLevel = 15; coverSublayer1.BelowPhreaticLevel = 17; - coverSublayer1.SoilType = SoilType.Clay; - + var coverSublayer2 = new Soil(); coverSublayer2.Name = "cover sublayer 2"; coverSublayer2.AbovePhreaticLevel = 12; coverSublayer2.BelowPhreaticLevel = 14; - coverSublayer2.SoilType = SoilType.Clay; - + var coverSublayer3 = new Soil(); coverSublayer3.Name = "cover sublayer 3"; coverSublayer3.AbovePhreaticLevel = 10; coverSublayer3.BelowPhreaticLevel = 10.5; - coverSublayer3.SoilType = SoilType.Peat; - + var pleistocene = new Soil(); pleistocene.Name = "pleistocene"; pleistocene.AbovePhreaticLevel = 18; pleistocene.BelowPhreaticLevel = 20; - pleistocene.SoilType = SoilType.Sand; - + var soilProfile = new SoilProfile1D(); soilProfile.Name = "TestProfileWithThreeCoverSublayersOneAquifer"; @@ -882,26 +843,22 @@ coverSublayer1.Name = "cover sublayer 1"; coverSublayer1.AbovePhreaticLevel = 15; coverSublayer1.BelowPhreaticLevel = 17; - coverSublayer1.SoilType = SoilType.Clay; - + var coverSublayer2 = new Soil(); coverSublayer2.Name = "cover sublayer 2"; coverSublayer2.AbovePhreaticLevel = 12; coverSublayer2.BelowPhreaticLevel = 14; - coverSublayer2.SoilType = SoilType.Clay; - + var aquifer1 = new Soil(); aquifer1.Name = "aquifer 1"; aquifer1.AbovePhreaticLevel = 10; aquifer1.BelowPhreaticLevel = 10.5; - aquifer1.SoilType = SoilType.Peat; - + var aquifer2 = new Soil(); aquifer2.Name = "aquifer 2"; aquifer2.AbovePhreaticLevel = 18; aquifer2.BelowPhreaticLevel = 20; - aquifer2.SoilType = SoilType.Sand; - + var soilProfile = new SoilProfile1D(); soilProfile.Name = "TestProfileWithTwoCoverSublayersTwoAquifers"; @@ -946,26 +903,22 @@ coverLayer.Name = "cover layer"; coverLayer.AbovePhreaticLevel = 15; coverLayer.BelowPhreaticLevel = 17; - coverLayer.SoilType = SoilType.Clay; - + var inBetweenAquifer = new Soil(); inBetweenAquifer.Name = "in between aquifer"; inBetweenAquifer.AbovePhreaticLevel = 12; inBetweenAquifer.BelowPhreaticLevel = 14; - inBetweenAquifer.SoilType = SoilType.Clay; - + var deepAquitard = new Soil(); deepAquitard.Name = "deep aquitard"; deepAquitard.AbovePhreaticLevel = 10; deepAquitard.BelowPhreaticLevel = 10.5; - deepAquitard.SoilType = SoilType.Peat; - + var deepAquifer = new Soil(); deepAquifer.Name = "deep aquifer"; deepAquifer.AbovePhreaticLevel = 18; deepAquifer.BelowPhreaticLevel = 20; - deepAquifer.SoilType = SoilType.Sand; - + var soilProfile = new SoilProfile1D(); soilProfile.Name = "TestProfileWithOneCoverLayerOneInBetweenAquifer"; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r2405 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2405) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2503) @@ -449,7 +449,6 @@ soil.SlopeRestProfile = inputSoil.SlopeRestProfileSpecified ? inputSoil.SlopeRestProfile : double.NaN; soil.DilatancyType = inputSoil.DilatancyTypeSpecified ? (DilatancyType?)ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : null; - soil.SoilType = inputSoil.SoilTypeSpecified ? ConversionHelper.ConvertToSoilType(inputSoil.SoilType) : SoilType.Clay; soils.Add(soil); } } Index: DamEngine/trunk/xsd/DamSoil.xsd =================================================================== diff -u -r1183 -r2503 --- DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 1183) +++ DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 2503) @@ -40,12 +40,5 @@ - - - - - - - \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs =================================================================== diff -u -r1970 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs (.../SoilVolumeMassCalculatorEffectiveStressTest.cs) (revision 1970) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs (.../SoilVolumeMassCalculatorEffectiveStressTest.cs) (revision 2503) @@ -202,20 +202,17 @@ sand.Name = "zand"; sand.AbovePhreaticLevel = 15; sand.BelowPhreaticLevel = 17; - sand.SoilType = SoilType.Sand; - + var clay = new Soil(); clay.Name = "klei"; clay.AbovePhreaticLevel = 18; clay.BelowPhreaticLevel = 20; - clay.SoilType = SoilType.Clay; - + var clay2 = new Soil(); clay2.Name = "klei2"; clay2.AbovePhreaticLevel = 20; clay2.BelowPhreaticLevel = 22; - clay2.SoilType = SoilType.Clay; - + var soilProfile = new SoilProfile1D(); soilProfile.Name = "TestProf"; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r2173 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2173) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2503) @@ -500,28 +500,6 @@ } [Test] - [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(dikeSoilType)); - } - - [Test] - [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(dikeSoilType, ConversionHelper.ConvertToInputSoilType(soilType)); - } - - [Test] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop)] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)] Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj =================================================================== diff -u -r2227 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 2227) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 2503) @@ -144,7 +144,6 @@ - Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r2405 -r2503 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2405) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2503) @@ -451,8 +451,6 @@ { inputSoil.DilatancyType = ConversionHelper.ConvertToSoilDilatancyType(soil.DilatancyType.Value); } - inputSoil.SoilType = ConversionHelper.ConvertToInputSoilType(soil.SoilType); - inputSoil.SoilTypeSpecified = true; inputSoils[i] = inputSoil; } }