Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r5954 -r6160 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5954) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6160) @@ -1335,52 +1335,8 @@ return translationTable[shearStrengthModel]; } - + /// - /// Converts the dilatancy type to soil dilatancy dilatancy. - /// - /// Type of the dilatancy. - /// - public static SoilDilatancyType ConvertToSoilDilatancyType(DilatancyType dilatancyType) - { - var translationTable = new Dictionary - { - { - DilatancyType.Zero, SoilDilatancyType.Zero - }, - { - DilatancyType.Phi, SoilDilatancyType.Phi - }, - { - DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi - } - }; - return translationTable[dilatancyType]; - } - - /// - /// Converts the soil dilatancy type to dilatancy type. - /// - /// Type of the soil dilatancy. - /// - public static DilatancyType ConvertToDilatancyType(SoilDilatancyType soilDilatancyType) - { - var translationTable = new Dictionary - { - { - SoilDilatancyType.Zero, DilatancyType.Zero - }, - { - SoilDilatancyType.Phi, DilatancyType.Phi - }, - { - SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi - } - }; - return translationTable[soilDilatancyType]; - } - - /// /// Converts the input StabilityDesignMethod to the Dam StabilityDesignMethod. /// /// The stability design method. Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r6098 -r6160 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6098) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6160) @@ -739,7 +739,8 @@ "LocationJobs", "SelectedLocationJobs", "PickSensors", - "MapForSoilGeometries2D" + "MapForSoilGeometries2D", + "UserShearStrengthModel" } } }; @@ -1065,20 +1066,13 @@ soil.AbovePhreaticLevel = 7 + 0.1 * i; soil.BelowPhreaticLevel = 8 + 0.1 * i; - soil.DryUnitWeight = 9 + 0.1 * i; - soil.BeddingAngle = 18 + 0.1 * i; soil.DiameterD70 = 19 + 0.1 * i; - soil.DiameterD90 = 20 + 0.1 * i; soil.PermeabKx = 21 + 0.1 * i; - soil.WhitesConstant = 22 + 0.1 * i; soil.ShearStrengthModel = ShearStrengthModel.CuCalculated; soil.UseDefaultShearStrengthModel = false; soil.Cohesion = 23 + 0.1 * i; soil.FrictionAngle = 24 + 0.1 * i; soil.OCR = 25 + 0.1 * i; - soil.RestSlope = 26 + 0.1 * i; - soil.DilatancyType = DilatancyType.MinusPhi; - soil.RRatio = 27 + 0.1 * i; soil.StrengthIncreaseExponent = 28 + 0.1 * i; soil.RatioCuPc = 29 + 0.1 * i; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r6098 -r6160 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6098) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6160) @@ -383,15 +383,11 @@ var soil = new Geotechnics.Soils.Soil(); Soil inputSoil = inputSoils[i]; soil.Name = inputSoil.Name; - soil.AbovePhreaticLevel = inputSoil.AbovePhreaticLevelSpecified ? inputSoil.AbovePhreaticLevel : Double.NaN; - soil.BelowPhreaticLevel = inputSoil.BelowPhreaticLevelSpecified ? inputSoil.BelowPhreaticLevel : Double.NaN; - soil.DryUnitWeight = inputSoil.DryUnitWeightSpecified ? inputSoil.DryUnitWeight : Double.NaN; - soil.BeddingAngle = inputSoil.BeddingAngleSpecified ? inputSoil.BeddingAngle : Double.NaN; - soil.DiameterD70 = inputSoil.DiameterD70Specified ? inputSoil.DiameterD70 : Double.NaN; - soil.DiameterD90 = inputSoil.DiameterD90Specified ? inputSoil.DiameterD90 : Double.NaN; - soil.PermeabKx = inputSoil.PermeabKxSpecified ? inputSoil.PermeabKx : Double.NaN; - soil.WhitesConstant = inputSoil.WhitesConstantSpecified ? inputSoil.WhitesConstant : Double.NaN; - soil.UseDefaultShearStrengthModel = inputSoil.UseDefaultShearStrengthModelSpecified ? inputSoil.UseDefaultShearStrengthModel : true; + soil.AbovePhreaticLevel = inputSoil.AbovePhreaticLevelSpecified ? inputSoil.AbovePhreaticLevel : double.NaN; + soil.BelowPhreaticLevel = inputSoil.BelowPhreaticLevelSpecified ? inputSoil.BelowPhreaticLevel : double.NaN; + soil.DiameterD70 = inputSoil.DiameterD70Specified ? inputSoil.DiameterD70 : double.NaN; + soil.PermeabKx = inputSoil.PermeabKxSpecified ? inputSoil.PermeabKx : double.NaN; + soil.UseDefaultShearStrengthModel = false; soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ? ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : ShearStrengthModel.CPhi; if (soil.ShearStrengthModel == ShearStrengthModel.StressTable) { @@ -420,15 +416,12 @@ } } - soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : Double.NaN; - soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : Double.NaN; - soil.OCR = inputSoil.OcrSpecified ? inputSoil.Ocr : Double.NaN; - soil.RestSlope = inputSoil.SlopeRestProfileSpecified ? inputSoil.SlopeRestProfile : Double.NaN; - soil.DilatancyType = inputSoil.DilatancyTypeSpecified ? ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : DilatancyType.Phi; - soil.RRatio = inputSoil.RRatioSpecified ? inputSoil.RRatio : Double.NaN; - soil.StrengthIncreaseExponent = inputSoil.StrengthIncreaseExponentSpecified ? inputSoil.StrengthIncreaseExponent : Double.NaN; - soil.RatioCuPc = inputSoil.RatioCuPcSpecified ? inputSoil.RatioCuPc : Double.NaN; - soil.POP = inputSoil.PopSpecified ? inputSoil.Pop : Double.NaN; + soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : double.NaN; + soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : double.NaN; + soil.OCR = inputSoil.OcrSpecified ? inputSoil.Ocr : double.NaN; + soil.StrengthIncreaseExponent = inputSoil.StrengthIncreaseExponentSpecified ? inputSoil.StrengthIncreaseExponent : double.NaN; + soil.RatioCuPc = inputSoil.RatioCuPcSpecified ? inputSoil.RatioCuPc : double.NaN; + soil.POP = inputSoil.PopSpecified ? inputSoil.Pop : double.NaN; soils.Add(soil); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r6098 -r6160 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6098) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6160) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; @@ -458,18 +457,10 @@ inputSoil.AbovePhreaticLevel = soil.AbovePhreaticLevel; inputSoil.BelowPhreaticLevelSpecified = !Double.IsNaN(soil.BelowPhreaticLevel); inputSoil.BelowPhreaticLevel = soil.BelowPhreaticLevel; - inputSoil.DryUnitWeightSpecified = !Double.IsNaN(soil.DryUnitWeight); - inputSoil.DryUnitWeight = soil.DryUnitWeight; - inputSoil.BeddingAngleSpecified = !Double.IsNaN(soil.BeddingAngle); - inputSoil.BeddingAngle = soil.BeddingAngle; inputSoil.DiameterD70Specified = !Double.IsNaN(soil.DiameterD70); inputSoil.DiameterD70 = soil.DiameterD70; - inputSoil.DiameterD90Specified = !Double.IsNaN(soil.DiameterD90); - inputSoil.DiameterD90 = soil.DiameterD90; inputSoil.PermeabKxSpecified = !Double.IsNaN(soil.PermeabKx); inputSoil.PermeabKx = soil.PermeabKx; - inputSoil.WhitesConstantSpecified = !Double.IsNaN(soil.WhitesConstant); - inputSoil.WhitesConstant = soil.WhitesConstant; inputSoil.ShearStrengthModelSpecified = true; inputSoil.ShearStrengthModel = ConversionHelper.ConvertToSoilShearStrengthModel(soil.ShearStrengthModel); if (soil.ShearStrengthModel == ShearStrengthModel.StressTable) @@ -496,20 +487,12 @@ }; } } - inputSoil.UseDefaultShearStrengthModelSpecified = true; - inputSoil.UseDefaultShearStrengthModel = soil.UseDefaultShearStrengthModel; inputSoil.CohesionSpecified = !Double.IsNaN(soil.Cohesion); inputSoil.Cohesion = soil.Cohesion; inputSoil.FrictionAngleSpecified = !Double.IsNaN(soil.FrictionAngle); inputSoil.FrictionAngle = soil.FrictionAngle; inputSoil.OcrSpecified = !Double.IsNaN(soil.OCR); inputSoil.Ocr = soil.OCR; - inputSoil.SlopeRestProfileSpecified = !Double.IsNaN(soil.RestSlope); - inputSoil.SlopeRestProfile = soil.RestSlope; - inputSoil.DilatancyTypeSpecified = true; - inputSoil.DilatancyType = ConversionHelper.ConvertToSoilDilatancyType(soil.DilatancyType); - inputSoil.RRatioSpecified = !Double.IsNaN(soil.RRatio); - inputSoil.RRatio = soil.RRatio; inputSoil.StrengthIncreaseExponentSpecified = !Double.IsNaN(soil.StrengthIncreaseExponent); inputSoil.StrengthIncreaseExponent = soil.StrengthIncreaseExponent; inputSoil.RatioCuPcSpecified = !Double.IsNaN(soil.RatioCuPc); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r5954 -r6160 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5954) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6160) @@ -24,7 +24,6 @@ using Deltares.Dam.Data.DamEngineIo; using Deltares.DamEngine.Io.XmlInput; using Deltares.DamEngine.Io.XmlOutput; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Standard; @@ -358,24 +357,6 @@ } [Test] - [TestCase(DilatancyType.Zero, SoilDilatancyType.Zero)] - [TestCase(DilatancyType.Phi, SoilDilatancyType.Phi)] - [TestCase(DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi)] - public void CanConvertToSoilDilatancyType(DilatancyType dilatancyType, SoilDilatancyType soilDilatancyType) - { - Assert.That(ConversionHelper.ConvertToSoilDilatancyType(dilatancyType), Is.EqualTo(soilDilatancyType)); - } - - [Test] - [TestCase(SoilDilatancyType.Zero, DilatancyType.Zero)] - [TestCase(SoilDilatancyType.Phi, DilatancyType.Phi)] - [TestCase(SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi)] - public void CanConvertToDilatancyType(SoilDilatancyType soilDilatancyType, DilatancyType dilatancyType) - { - Assert.That(ConversionHelper.ConvertToDilatancyType(soilDilatancyType), Is.EqualTo(dilatancyType)); - } - - [Test] [TestCase(LocationDesignOptionsStabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption, StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption)] [TestCase(LocationDesignOptionsStabilityDesignMethod.OptimizedSlopeAndShoulderAdaption, StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption)] public void CanConvertToInputStabilityDesignMethod(LocationDesignOptionsStabilityDesignMethod inputStabilityDesignMethod, StabilityDesignMethod stabilityDesignMethod)