Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorTest.cs =================================================================== diff -u -r4624 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorTest.cs (.../SoilVolumeMassCalculatorTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorTest.cs (.../SoilVolumeMassCalculatorTest.cs) (revision 6157) @@ -111,16 +111,9 @@ const double cTolerance = 0.0001; var calculator = new SoilVolumicMassCalculator(); calculator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); - foreach (SoilLayer1D layer in calculator.SoilProfile.Layers) - { - layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel; - layer.Soil.AbovePhreaticLevel = layer.Soil.AbovePhreaticLevel + 1.0; - } - calculator.SurfaceLevel = 5.0; calculator.PhreaticLevel = -1.0; calculator.TopOfLayerToBeEvaluated = -10; - calculator.IsUseOvenDryUnitWeight = true; // Phreatic level in profile // dry 6 m x 12 kN/m3 = 72 // wet 9 m x 16 kN/m3 = 144 Index: DamEngine/trunk/xsd/DamSoil.xsd =================================================================== diff -u -r5813 -r6157 --- DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 5813) +++ DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 6157) @@ -9,14 +9,10 @@ - - - - @@ -27,21 +23,9 @@ - - - - - - - - - - - - Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/SoilVolumicMassCalculator.cs =================================================================== diff -u -r4540 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/SoilVolumicMassCalculator.cs (.../SoilVolumicMassCalculator.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/SoilVolumicMassCalculator.cs (.../SoilVolumicMassCalculator.cs) (revision 6157) @@ -40,10 +40,8 @@ public SoilVolumicMassCalculator() { VolumicWeightOfWater = 9.81; - IsUseOvenDryUnitWeight = false; } - public bool IsUseOvenDryUnitWeight { get; set; } public double VolumicWeightOfWater { get; set; } public double PhreaticLevel { get; set; } public double SurfaceLevel { get; set; } @@ -103,7 +101,7 @@ double factorWet; double factorDry; DetermineHeightAndDryAndWetFraction(topLevel, bottomLevel, out factorWet, out factorDry); - weight += GetSoilUnitWeightDry(soil).Value * factorDry * height + + weight += soil.AbovePhreaticLevel * factorDry * height + (soil.BelowPhreaticLevel - VolumicWeightOfWater) * factorWet * height; } @@ -157,7 +155,7 @@ double factorDry; DetermineHeightAndDryAndWetFraction(topLevel, bottomLevel, out factorWet, out factorDry); - return GetSoilUnitWeightDry(soil).Value * factorDry * height + soil.BelowPhreaticLevel * factorWet * height; + return soil.AbovePhreaticLevel * factorDry * height + soil.BelowPhreaticLevel * factorWet * height; } /// @@ -178,7 +176,7 @@ // If above phreatic line use the dry weight of the soil // if below phreatic line use the effective submerged weight (gamma_sat - gamma_water) - return GetSoilUnitWeightDry(soil).Value * factorDry * height + + return soil.AbovePhreaticLevel * factorDry * height + (soil.BelowPhreaticLevel - VolumicWeightOfWater) * factorWet * height; } @@ -237,21 +235,6 @@ } /// - /// Gets the soil dry unit weight. - /// - /// The soil. - /// - private double? GetSoilUnitWeightDry(Soil soil) - { - if (IsUseOvenDryUnitWeight) - { - return soil.DryUnitWeight; - } - - return soil.AbovePhreaticLevel; - } - - /// /// Gets the height of the layer. /// /// The layer. Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs =================================================================== diff -u -r5813 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 5813) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/Soil.cs (.../Soil.cs) (revision 6157) @@ -71,12 +71,8 @@ public void Assign(Soil aSoil) { name = aSoil.Name; - BeddingAngle = aSoil.BeddingAngle; DiameterD70 = aSoil.DiameterD70; PermeabKx = aSoil.PermeabKx; - WhitesConstant = aSoil.WhitesConstant; - DiameterD90 = aSoil.DiameterD90; - DilatancyType = aSoil.DilatancyType; ShearStrengthModel = aSoil.ShearStrengthModel; BelowPhreaticLevel = aSoil.BelowPhreaticLevel; AbovePhreaticLevel = aSoil.AbovePhreaticLevel; @@ -85,8 +81,6 @@ PoP = aSoil.PoP; Ocr = aSoil.Ocr; RatioCuPc = aSoil.RatioCuPc; - CuTop = aSoil.CuTop; - CuBottom = aSoil.CuBottom; StrengthIncreaseExponent = aSoil.StrengthIncreaseExponent; SigmaTauCurve = new SigmaTauCurve(); if ((ShearStrengthModel == Geotechnics.ShearStrengthModel.SigmaTauCurve) && (aSoil.SigmaTauCurve != null)) @@ -147,14 +141,6 @@ #region Piping /// - /// Bedding Angle (degree). - /// - /// - /// The bedding angle. - /// - public double BeddingAngle { get; set; } = double.NaN; - - /// /// Diameter D70 (micrometer). /// /// @@ -170,32 +156,11 @@ /// public double PermeabKx { get; set; } = double.NaN; - /// - /// Whites constant (-). - /// - /// - /// The whites constant. - /// - public double WhitesConstant { get; set; } = double.NaN; - - /// - /// Diameter D90 (micrometer). - /// - /// - /// The diameter D90. - /// - public double DiameterD90 { get; set; } = double.NaN; - #endregion #region Macrostability - + /// - /// Ovendry unit weight [kN/m3] - /// - public double DryUnitWeight { get; set; } = double.NaN; - - /// /// Cohesion (the force that holds together molecules or like particles within a soil) [kN/m2] /// public double Cohesion { get; set; } = double.NaN; @@ -221,25 +186,6 @@ /// public double RatioCuPc { get; set; } = double.NaN; - /// - /// Cu Top - /// - public double CuTop { get; set; } = double.NaN; - - /// - /// Cu Bottom - /// - public double CuBottom { get; set; } = double.NaN; - - /// - /// Dilatancy (shear thickening) type - /// - public DilatancyType? DilatancyType { get; set; } - - /// Gets or sets the RRatio. - /// The RRatio. - public double RRatio { get; set; } = double.NaN; - /// Gets or sets the strength increase exponent. /// The strength increase exponent. public double StrengthIncreaseExponent { get; set; } = double.NaN; @@ -250,22 +196,6 @@ public ShearStrengthModel? ShearStrengthModel { get; set; } /// - /// Gets or sets a value indicating whether to use the default shear strength model. - /// - /// - /// true if default shear strength model must be used; otherwise, false. - /// - public bool? UseDefaultShearStrengthModel { get; set; } - - /// - /// Gets or sets the slope of the rest profile. - /// - /// - /// The slope of the rest profile. - /// - public double SlopeRestProfile { get; set; } = double.NaN; - - /// /// The sigma tau curve (for Shear Strength Model = SigmaTauCurve) /// public SigmaTauCurve SigmaTauCurve { get; set; } = new(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs =================================================================== diff -u -r6082 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6082) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6157) @@ -41,10 +41,7 @@ { #region Soil - [TestCase(DilatancyType.MinusPhi)] - [TestCase(DilatancyType.Phi)] - [TestCase(DilatancyType.Zero)] - public void GivenMacroStabilitySoilWhenConvertingToDamSoilAndBackThenResultEqualsOriginal(DilatancyType dilatancyType) + public void GivenMacroStabilitySoilWhenConvertingToDamSoilAndBackThenResultEqualsOriginal() { // Given MacroStability Soil var macroStabilitySoil = new Soil @@ -54,32 +51,14 @@ BelowPhreaticLevel = 1.02, Cohesion = 1.03, FrictionAngle = 1.04, - Dilatancy = 0, + Dilatancy = 1.04, RatioCuPc = 1.06, ShearStrengthAbovePhreaticLevelModel = ShearStrengthModelType.MohrCoulomb, ShearStrengthBelowPhreaticLevelModel = ShearStrengthModelType.MohrCoulomb, StrengthIncreaseExponent = 1.08, UseSoilClassification = false, // must be false BondStressCurve = null // must be null }; - switch (dilatancyType) - { - case DilatancyType.MinusPhi: - { - macroStabilitySoil.Dilatancy = macroStabilitySoil.FrictionAngle * -1; - break; - } - case DilatancyType.Phi: - { - macroStabilitySoil.Dilatancy = macroStabilitySoil.FrictionAngle; - break; - } - case DilatancyType.Zero: - { - macroStabilitySoil.Dilatancy = 0; - break; - } - } // When Converting to DamSoil and back Data.Geotechnics.Soil damSoil = ConversionHelper.ConvertToDamSoil(macroStabilitySoil); @@ -94,7 +73,7 @@ } }; ComparisonResult result = compare.Compare(macroStabilitySoil, actualMacroStabilitySoil); - Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found converting/reconverting Soil but this ok now if diff = 3"); + Assert.That(result.Differences, Is.Empty, "Differences found converting/reconverting Soil but this ok now if diff = 3"); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs =================================================================== diff -u -r4671 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 4671) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 6157) @@ -33,18 +33,13 @@ // Given var sourceSoil = new Soil("Source Soil", 10.0, 20.0) { - BeddingAngle = 30.0, DiameterD70 = 0.5, PermeabKx = 0.01, - WhitesConstant = 1.2, - DiameterD90 = 0.7, Cohesion = 5.0, FrictionAngle = 25.0, PoP = 100.0, Ocr = 1.5, RatioCuPc = 0.8, - CuTop = 2.0, - CuBottom = 3.0, StrengthIncreaseExponent = 0.3, ShearStrengthModel = ShearStrengthModel.SigmaTauCurve, SigmaTauCurve = new SigmaTauCurve() @@ -57,23 +52,21 @@ // When targetSoil.Assign(sourceSoil); - // Then - Assert.That(targetSoil.Name, Is.EqualTo(sourceSoil.Name)); - Assert.That(targetSoil.BeddingAngle, Is.EqualTo(sourceSoil.BeddingAngle)); - Assert.That(targetSoil.DiameterD70, Is.EqualTo(sourceSoil.DiameterD70)); - Assert.That(targetSoil.PermeabKx, Is.EqualTo(sourceSoil.PermeabKx)); - Assert.That(targetSoil.WhitesConstant, Is.EqualTo(sourceSoil.WhitesConstant)); - Assert.That(targetSoil.DiameterD90, Is.EqualTo(sourceSoil.DiameterD90)); - Assert.That(targetSoil.Cohesion, Is.EqualTo(sourceSoil.Cohesion)); - Assert.That(targetSoil.FrictionAngle, Is.EqualTo(sourceSoil.FrictionAngle)); - Assert.That(targetSoil.PoP, Is.EqualTo(sourceSoil.PoP)); - Assert.That(targetSoil.Ocr, Is.EqualTo(sourceSoil.Ocr)); - Assert.That(targetSoil.RatioCuPc, Is.EqualTo(sourceSoil.RatioCuPc)); - Assert.That(targetSoil.CuTop, Is.EqualTo(sourceSoil.CuTop)); - Assert.That(targetSoil.CuBottom, Is.EqualTo(sourceSoil.CuBottom)); - Assert.That(targetSoil.StrengthIncreaseExponent, Is.EqualTo(sourceSoil.StrengthIncreaseExponent)); - Assert.That(targetSoil.ShearStrengthModel, Is.EqualTo(sourceSoil.ShearStrengthModel)); - Assert.That(targetSoil.SigmaTauCurve.Points.Count, Is.EqualTo(sourceSoil.SigmaTauCurve.Points.Count)); + Assert.Multiple(() => + { + // Then + Assert.That(targetSoil.Name, Is.EqualTo(sourceSoil.Name)); + Assert.That(targetSoil.DiameterD70, Is.EqualTo(sourceSoil.DiameterD70)); + Assert.That(targetSoil.PermeabKx, Is.EqualTo(sourceSoil.PermeabKx)); + Assert.That(targetSoil.Cohesion, Is.EqualTo(sourceSoil.Cohesion)); + Assert.That(targetSoil.FrictionAngle, Is.EqualTo(sourceSoil.FrictionAngle)); + Assert.That(targetSoil.PoP, Is.EqualTo(sourceSoil.PoP)); + Assert.That(targetSoil.Ocr, Is.EqualTo(sourceSoil.Ocr)); + Assert.That(targetSoil.RatioCuPc, Is.EqualTo(sourceSoil.RatioCuPc)); + Assert.That(targetSoil.StrengthIncreaseExponent, Is.EqualTo(sourceSoil.StrengthIncreaseExponent)); + Assert.That(targetSoil.ShearStrengthModel, Is.EqualTo(sourceSoil.ShearStrengthModel)); + Assert.That(targetSoil.SigmaTauCurve.Points.Count, Is.EqualTo(sourceSoil.SigmaTauCurve.Points.Count)); + }); for (var i = 0; i < sourceSoil.SigmaTauCurve.Points.Count; i++) { Assert.That(targetSoil.SigmaTauCurve.Points[i].Sigma, Is.EqualTo(sourceSoil.SigmaTauCurve.Points[i].Sigma)); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs =================================================================== diff -u -r6107 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 6107) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 6157) @@ -35,15 +35,6 @@ /// public class UpliftLocationDeterminator { - /// - /// Constructor - /// - public UpliftLocationDeterminator() - { - IsUseOvenDryUnitWeight = false; - } - - public bool IsUseOvenDryUnitWeight { get; set; } public PlLines PlLines { get; set; } public SurfaceLine2 SurfaceLine { get; set; } public SoilProfile1D SoilProfile { get; set; } @@ -228,8 +219,7 @@ SoilProfile = soilProfile, TopOfLayerToBeEvaluated = topOfLayer, SurfaceLevel = point.Z, - UnitWeightSoilEmbankment = (DikeEmbankmentMaterial == null) ? null : DikeEmbankmentMaterial.AbovePhreaticLevel, - IsUseOvenDryUnitWeight = IsUseOvenDryUnitWeight + UnitWeightSoilEmbankment = (DikeEmbankmentMaterial == null) ? null : DikeEmbankmentMaterial.AbovePhreaticLevel }; } Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs =================================================================== diff -u -r6086 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 6086) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 6157) @@ -53,7 +53,6 @@ var layer = new SoilLayer1D(); layer.TopLevel = 10.0; layer.Soil = new Soil("Clay", 16.0, 12.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -73,15 +72,13 @@ var layer = new SoilLayer1D(); layer.TopLevel = 10.0; layer.Soil = new Soil("HW-OBO", 12.0, 10.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; layer.WaterpressureInterpolationModel = WaterpressureInterpolationModel.Automatic; soilProfile.Layers.Add(layer); layer = new SoilLayer1D(); layer.TopLevel = 2.0; layer.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; layer.WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic; soilProfile.Layers.Add(layer); @@ -100,9 +97,7 @@ var soilProfile = new SoilProfile1D(); var soil1 = new Soil("HW-OBO", 12.0, 10.0); - soil1.DryUnitWeight = 0.01; var soil2 = new Soil("Alg-zand (0-30)", 22.0, 20.0); - soil2.DryUnitWeight = 0.01; soilList = new SoilList(); soilList.Add(soil1); soilList.Add(soil2); @@ -176,7 +171,6 @@ }; layer.TopLevel = topClay1; layer.Soil = new Soil("HW-OBO", 12.0, 10.0); - layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel - 1.0; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -186,7 +180,6 @@ }; layer.TopLevel = topSand1; layer.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); - layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel - 1.0; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -196,7 +189,6 @@ }; layer.TopLevel = topClay2; layer.Soil = new Soil("HW-DUN", 16.8, 15.8); - layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel - 1.0; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -206,7 +198,6 @@ }; layer.TopLevel = topSand2; layer.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); - layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel - 1.0; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -228,7 +219,6 @@ }; layer.TopLevel = level1; layer.Soil = new Soil("HW-OBO", 12.0, 10.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -238,7 +228,6 @@ }; layer.TopLevel = level2; layer.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -248,7 +237,6 @@ }; layer.TopLevel = level3; layer.Soil = new Soil("HW-DUN", 16.8, 15.8); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -258,7 +246,6 @@ }; layer.TopLevel = level4; layer.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -268,7 +255,6 @@ }; layer.TopLevel = level5; layer.Soil = new Soil("HW-DUN", 16.8, 15.8); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -278,7 +264,6 @@ }; layer.TopLevel = level6; layer.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -345,7 +330,6 @@ }; layer.TopLevel = 10.0; layer.Soil = new Soil("HW-OBO", 12.0, 10.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -355,7 +339,6 @@ }; layer.TopLevel = 1.0; layer.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -365,7 +348,6 @@ }; layer.TopLevel = -1.5; layer.Soil = new Soil("HW-DUN", 16.8, 15.8); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -375,7 +357,6 @@ }; layer.TopLevel = -2.3; layer.Soil = new Soil("HW-OBO", 12.0, 10.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -385,7 +366,6 @@ }; layer.TopLevel = -3.2; layer.Soil = new Soil("HW-DUN", 16.8, 15.8); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -395,7 +375,6 @@ }; layer.TopLevel = -4.1; layer.Soil = new Soil("HW-OBO", 12.0, 10.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -405,7 +384,6 @@ }; layer.TopLevel = -5.0; layer.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -428,7 +406,6 @@ }; layer.TopLevel = 10.0; layer.Soil = new Soil("HW-OBO", 16.8, 15.8); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -438,7 +415,6 @@ }; layer.TopLevel = -0.6; layer.Soil = new Soil("HW-DUN", 16.8, 15.8); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -448,7 +424,6 @@ }; layer.TopLevel = -1.8; layer.Soil = new Soil("HW-DUOzand", 18.7, 17.7); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -458,7 +433,6 @@ }; layer.TopLevel = -2.8; layer.Soil = new Soil("HW-HVN", 11.4, 10.4); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -468,7 +442,6 @@ }; layer.TopLevel = -4.0; layer.Soil = new Soil("HW-HVN", 11.40, 10.40); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -478,7 +451,6 @@ }; layer.TopLevel = -5.0; layer.Soil = new Soil("Alg-zand (0-30)", 19.0, 18.0); - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -502,9 +474,6 @@ layer.Soil = new Soil("Topmaterial", 1.0, 1.0); layer.Soil.PermeabKx = 0.0003; layer.Soil.DiameterD70 = 0.0003; - layer.Soil.WhitesConstant = 0.5; - layer.Soil.BeddingAngle = 57.0; - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -516,9 +485,6 @@ layer.Soil = new Soil("Sand upper", 22.0, 20.0); layer.Soil.PermeabKx = 0.0001; layer.Soil.DiameterD70 = 0.0002; - layer.Soil.WhitesConstant = 0.25; - layer.Soil.BeddingAngle = 37.0; - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -530,9 +496,6 @@ layer.Soil = new Soil("Clay", 22.0, 20.0); layer.Soil.PermeabKx = 0.0001; layer.Soil.DiameterD70 = 0.0002; - layer.Soil.WhitesConstant = 0.25; - layer.Soil.BeddingAngle = 37.0; - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = false; soilProfile.Layers.Add(layer); @@ -544,9 +507,6 @@ layer.Soil = new Soil("Sand lower", 22.0, 20.0); layer.Soil.PermeabKx = 0.0002; layer.Soil.DiameterD70 = 0.0003; - layer.Soil.WhitesConstant = 0.35; - layer.Soil.BeddingAngle = 47.0; - layer.Soil.DryUnitWeight = 0.01; layer.IsAquifer = true; soilProfile.Layers.Add(layer); @@ -566,16 +526,12 @@ var topMaterial = new Soil("Topmaterial", 14, 11) { PermeabKx = 0.0003, - DiameterD70 = Physics.FactorMicroMeterToMeter * 300.0, - WhitesConstant = 0.5, - BeddingAngle = 57.0 + DiameterD70 = Physics.FactorMicroMeterToMeter * 300.0 }; var sand = new Soil("Sand", 22.0, 20.0) { PermeabKx = 0.0001, - DiameterD70 = Physics.FactorMicroMeterToMeter * 200.0, - WhitesConstant = 0.25, - BeddingAngle = 37.0 + DiameterD70 = Physics.FactorMicroMeterToMeter * 200.0 }; soilList = new SoilList(); soilList.Add(topMaterial); Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r6097 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6097) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6157) @@ -9,14 +9,14 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by xsd, Version=4.8.4084.0. +// This source code was auto-generated by xsd, Version=4.8.3928.0. // namespace Deltares.DamEngine.Io.XmlInput { using System.Xml.Serialization; /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -326,7 +326,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -511,7 +511,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -545,7 +545,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -567,7 +567,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -705,7 +705,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -778,7 +778,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -800,7 +800,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1053,7 +1053,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1127,7 +1127,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1149,7 +1149,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1270,7 +1270,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1355,7 +1355,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1388,7 +1388,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1422,7 +1422,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1456,7 +1456,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1491,7 +1491,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1589,7 +1589,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1675,7 +1675,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1720,7 +1720,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1766,7 +1766,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1824,7 +1824,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2261,7 +2261,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2308,7 +2308,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2368,7 +2368,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2403,7 +2403,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2438,7 +2438,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2473,7 +2473,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2534,7 +2534,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2581,7 +2581,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2655,7 +2655,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2689,7 +2689,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2763,7 +2763,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2775,10 +2775,6 @@ private string nameField; - private double beddingAngleField; - - private bool beddingAngleFieldSpecified; - private double diameterD70Field; private bool diameterD70FieldSpecified; @@ -2787,14 +2783,6 @@ private bool permeabKxFieldSpecified; - private double whitesConstantField; - - private bool whitesConstantFieldSpecified; - - private double diameterD90Field; - - private bool diameterD90FieldSpecified; - private double abovePhreaticLevelField; private bool abovePhreaticLevelFieldSpecified; @@ -2803,18 +2791,10 @@ private bool belowPhreaticLevelFieldSpecified; - private double dryUnitWeightField; - - private bool dryUnitWeightFieldSpecified; - private SoilShearStrengthModel shearStrengthModelField; private bool shearStrengthModelFieldSpecified; - private bool useDefaultShearStrengthModelField; - - private bool useDefaultShearStrengthModelFieldSpecified; - private double cohesionField; private bool cohesionFieldSpecified; @@ -2827,18 +2807,6 @@ private bool ocrFieldSpecified; - private double slopeRestProfileField; - - private bool slopeRestProfileFieldSpecified; - - private SoilDilatancyType dilatancyTypeField; - - private bool dilatancyTypeFieldSpecified; - - private double rRatioField; - - private bool rRatioFieldSpecified; - private double strengthIncreaseExponentField; private bool strengthIncreaseExponentFieldSpecified; @@ -2886,28 +2854,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double BeddingAngle { - get { - return this.beddingAngleField; - } - set { - this.beddingAngleField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool BeddingAngleSpecified { - get { - return this.beddingAngleFieldSpecified; - } - set { - this.beddingAngleFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public double DiameterD70 { get { return this.diameterD70Field; @@ -2952,50 +2898,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double WhitesConstant { - get { - return this.whitesConstantField; - } - set { - this.whitesConstantField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool WhitesConstantSpecified { - get { - return this.whitesConstantFieldSpecified; - } - set { - this.whitesConstantFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double DiameterD90 { - get { - return this.diameterD90Field; - } - set { - this.diameterD90Field = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool DiameterD90Specified { - get { - return this.diameterD90FieldSpecified; - } - set { - this.diameterD90FieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public double AbovePhreaticLevel { get { return this.abovePhreaticLevelField; @@ -3040,28 +2942,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double DryUnitWeight { - get { - return this.dryUnitWeightField; - } - set { - this.dryUnitWeightField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool DryUnitWeightSpecified { - get { - return this.dryUnitWeightFieldSpecified; - } - set { - this.dryUnitWeightFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public SoilShearStrengthModel ShearStrengthModel { get { return this.shearStrengthModelField; @@ -3084,28 +2964,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public bool UseDefaultShearStrengthModel { - get { - return this.useDefaultShearStrengthModelField; - } - set { - this.useDefaultShearStrengthModelField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool UseDefaultShearStrengthModelSpecified { - get { - return this.useDefaultShearStrengthModelFieldSpecified; - } - set { - this.useDefaultShearStrengthModelFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public double Cohesion { get { return this.cohesionField; @@ -3172,72 +3030,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double SlopeRestProfile { - get { - return this.slopeRestProfileField; - } - set { - this.slopeRestProfileField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool SlopeRestProfileSpecified { - get { - return this.slopeRestProfileFieldSpecified; - } - set { - this.slopeRestProfileFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public SoilDilatancyType DilatancyType { - get { - return this.dilatancyTypeField; - } - set { - this.dilatancyTypeField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool DilatancyTypeSpecified { - get { - return this.dilatancyTypeFieldSpecified; - } - set { - this.dilatancyTypeFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double RRatio { - get { - return this.rRatioField; - } - set { - this.rRatioField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool RRatioSpecified { - get { - return this.rRatioFieldSpecified; - } - set { - this.rRatioFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public double StrengthIncreaseExponent { get { return this.strengthIncreaseExponentField; @@ -3304,7 +3096,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3339,7 +3131,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3374,7 +3166,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum SoilShearStrengthModel { @@ -3393,24 +3185,8 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public enum SoilDilatancyType { - - /// - Phi, - - /// - Zero, - - /// - MinusPhi, - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] - [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SurfaceLine { @@ -3443,7 +3219,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3491,7 +3267,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3903,7 +3679,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationDesignOptionsStabilityDesignMethod { @@ -3916,7 +3692,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4016,7 +3792,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsPhreaticLineCreationMethod { @@ -4038,7 +3814,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsIntrusionVerticalWaterPressure { @@ -4060,7 +3836,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsDikeSoilScenario { @@ -4079,7 +3855,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4179,7 +3955,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4526,7 +4302,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4704,7 +4480,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4739,7 +4515,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4774,7 +4550,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4822,7 +4598,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputDamProjectType { @@ -4835,7 +4611,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputPipingModelType { @@ -4854,7 +4630,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputStabilityModelType { @@ -4870,7 +4646,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputAnalysisType { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r6103 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6103) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6157) @@ -375,24 +375,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) Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r6107 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6107) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6157) @@ -512,25 +512,12 @@ 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.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ? ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : null; - soil.UseDefaultShearStrengthModel = inputSoil.UseDefaultShearStrengthModelSpecified ? inputSoil.UseDefaultShearStrengthModel : null; - if (soil.UseDefaultShearStrengthModel.HasValue && soil.UseDefaultShearStrengthModel.Value) - { - soil.ShearStrengthModel = ShearStrengthModel.CPhi; - } - 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.SlopeRestProfile = inputSoil.SlopeRestProfileSpecified ? inputSoil.SlopeRestProfile : double.NaN; - soil.DilatancyType = inputSoil.DilatancyTypeSpecified ? ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : null; - 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; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs =================================================================== diff -u -r6082 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6082) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6157) @@ -277,6 +277,7 @@ BelowPhreaticLevel = soil.BelowPhreaticLevel, Cohesion = soil.Cohesion, FrictionAngle = soil.FrictionAngle, + Dilatancy = soil.FrictionAngle, RatioCuPc = soil.RatioCuPc, StrengthIncreaseExponent = soil.ShearStrengthModel == ShearStrengthModel.SuTable && double.IsNaN(soil.StrengthIncreaseExponent) ? 1.0 : soil.StrengthIncreaseExponent, // can't be NaN in MAC kernel because used for multi-stages UseSoilClassification = false, // Soil type is not given so make sure it is not used. @@ -314,20 +315,7 @@ }); } } - - switch (soil.DilatancyType) - { - case DilatancyType.MinusPhi: - macroStabilitySoil.Dilatancy = -macroStabilitySoil.FrictionAngle; // -Phi (FrictionAngle) - break; - case DilatancyType.Phi: - macroStabilitySoil.Dilatancy = macroStabilitySoil.FrictionAngle; // Phi (FrictionAngle) - break; - default: - macroStabilitySoil.Dilatancy = 0.0; // Zero and default - break; - } - + return macroStabilitySoil; } @@ -377,23 +365,6 @@ } } - if (soil.Dilatancy.AlmostEquals(soil.FrictionAngle, tolerance)) - { - damSoil.DilatancyType = DilatancyType.Phi; - } - else if (soil.Dilatancy.AlmostEquals(-soil.FrictionAngle, tolerance)) - { - damSoil.DilatancyType = DilatancyType.MinusPhi; - } - else if (soil.Dilatancy.AlmostEquals(0.0, tolerance)) - { - damSoil.DilatancyType = DilatancyType.Zero; - } - else - { - throw new FormatException($"Cannot determine DilatancyType; Dilatancy = {soil.Dilatancy}, FrictionAngle = {soil.FrictionAngle}"); - } - return damSoil; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs =================================================================== diff -u -r6087 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 6087) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 6157) @@ -712,7 +712,6 @@ var upliftCalculator = new UpliftCalculator { - IsUseOvenDryUnitWeight = false, UnitWeightSoilEmbankment = (DikeEmbankmentMaterial == null) ? null : DikeEmbankmentMaterial.AbovePhreaticLevel }; Point2D startSurfacePoint = SurfaceLine.GetDikeToeInward(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs =================================================================== diff -u -r5981 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 5981) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 6157) @@ -175,9 +175,7 @@ Soil = new Soil("Sand", 22.0, 20.0) { PermeabKx = 0.0001, - DiameterD70 = Physics.FactorMicroMeterToMeter * 200.0, - WhitesConstant = 0.25, - BeddingAngle = 37.0 + DiameterD70 = Physics.FactorMicroMeterToMeter * 200.0 }, IsAquifer = isAquifer }; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r6120 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6120) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6157) @@ -1111,50 +1111,6 @@ } /// - /// Converts the dilatancy type to soil 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: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftCalculatorTest.cs =================================================================== diff -u -r4624 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftCalculatorTest.cs (.../UpliftCalculatorTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftCalculatorTest.cs (.../UpliftCalculatorTest.cs) (revision 6157) @@ -90,7 +90,6 @@ double upliftFactor = calculator.CalculateUpliftFactor(11.6); Assert.That(upliftFactor, Is.EqualTo(1.0).Within(cTolerance)); - calculator.IsUseOvenDryUnitWeight = true; double head = calculator.CalculateHeadOfPlLine(1.0); double upliftFactorOvenDry = calculator.CalculateUpliftFactor(head); Assert.That(upliftFactorOvenDry, Is.EqualTo(1.0).Within(cTolerance)); @@ -127,17 +126,10 @@ const double cTolerance = 0.0001; var calculator = new UpliftCalculator(); calculator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); - foreach (SoilLayer1D layer in calculator.SoilProfile.Layers) - { - layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel; - layer.Soil.AbovePhreaticLevel = layer.Soil.AbovePhreaticLevel + 1.0; - } - calculator.SurfaceLevel = 5.0; calculator.PhreaticLevel = -1.0; calculator.TopOfLayerToBeEvaluated = -10; calculator.VolumicWeightOfWater = 10.0; - calculator.IsUseOvenDryUnitWeight = true; // Phreatic level in profile // Mass of soil volume above Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r6097 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6097) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6157) @@ -474,46 +474,22 @@ 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 = (soil.ShearStrengthModel != null); if (inputSoil.ShearStrengthModelSpecified) { inputSoil.ShearStrengthModel = ConversionHelper.ConvertToSoilShearStrengthModel(soil.ShearStrengthModel.Value); } - inputSoil.UseDefaultShearStrengthModelSpecified = (soil.UseDefaultShearStrengthModel != null); - if (inputSoil.UseDefaultShearStrengthModelSpecified) - { - inputSoil.UseDefaultShearStrengthModel = soil.UseDefaultShearStrengthModel.Value; - } - 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.SlopeRestProfile); - inputSoil.SlopeRestProfile = soil.SlopeRestProfile; - inputSoil.DilatancyTypeSpecified = (soil.DilatancyType != null); - if (inputSoil.DilatancyTypeSpecified) - { - inputSoil.DilatancyType = ConversionHelper.ConvertToSoilDilatancyType(soil.DilatancyType.Value); - } - - 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: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs =================================================================== diff -u -r6086 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 6086) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 6157) @@ -140,25 +140,21 @@ const double cRiverlevel = 4; SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); SoilProfile1D soilProfile = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh(out SoilList soilList); - foreach (SoilLayer1D layer in soilProfile.Layers) - { - layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel; - layer.Soil.AbovePhreaticLevel = layer.Soil.AbovePhreaticLevel + 1.0; - } - PlLines plLines = CreatePlLines(surfaceLine, soilProfile, soilList, cRiverlevel, false); var upliftLocationDeterminator = new UpliftLocationDeterminator { SurfaceLine = surfaceLine, SoilProfile = soilProfile, - PlLines = plLines, - IsUseOvenDryUnitWeight = true + PlLines = plLines }; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationInPolderNearestDikeWithUpliftFactorLowerThanRequired(1.0); - Assert.That(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetPoint2D(CharacteristicPointType.DikeToeAtPolder)), Is.True); - Assert.That(upliftLocationAndResult.UpliftFactor.Value, Is.EqualTo(cExpectedUpliftFactor).Within(cTolerance)); + Assert.Multiple(() => + { + Assert.That(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetPoint2D(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(upliftLocationAndResult.UpliftFactor.Value, Is.EqualTo(cExpectedUpliftFactor).Within(cTolerance)); + }); } private static PlLines CreatePlLines(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile, SoilList soilList, double riverLevel, bool isUseOvenDryUnitWeight) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs =================================================================== diff -u -r6149 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs (.../DamEngineDataTestFactory.cs) (revision 6149) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs (.../DamEngineDataTestFactory.cs) (revision 6157) @@ -65,8 +65,7 @@ BelowPhreaticLevel = 20.00, ShearStrengthModel = ShearStrengthModel.CPhi, FrictionAngle = 30, - Cohesion = 0, - DilatancyType = DilatancyType.Phi + Cohesion = 0 }; soilList.Soils.Add(s1); var s2 = new Soil("LM") @@ -75,8 +74,7 @@ BelowPhreaticLevel = 17.50, ShearStrengthModel = ShearStrengthModel.CPhi, FrictionAngle = 10, - Cohesion = 5, - DilatancyType = DilatancyType.Phi + Cohesion = 5 }; soilList.Soils.Add(s2); var s3 = new Soil("OB1") @@ -85,8 +83,7 @@ BelowPhreaticLevel = 20.10, ShearStrengthModel = ShearStrengthModel.CPhi, FrictionAngle = 31, - Cohesion = 0, - DilatancyType = DilatancyType.Phi + Cohesion = 0 }; soilList.Soils.Add(s3); var s4 = new Soil("OB2") @@ -95,8 +92,7 @@ BelowPhreaticLevel = 19.50, ShearStrengthModel = ShearStrengthModel.CPhi, FrictionAngle = 34, - Cohesion = 0, - DilatancyType = DilatancyType.Phi + Cohesion = 0 }; soilList.Soils.Add(s4); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs =================================================================== diff -u -r6135 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 6135) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 6157) @@ -463,7 +463,7 @@ { AbovePhreaticLevel = soilLayer1D.Soil.AbovePhreaticLevel, BelowPhreaticLevel = soilLayer1D.Soil.BelowPhreaticLevel, - DryUnitWeight = soilLayer1D.Soil.DryUnitWeight, + DryUnitWeight = soilLayer1D.Soil.AbovePhreaticLevel, IsAquifer = soilLayer1D.IsAquifer, TopLevel = soilLayer1D.TopLevel, Name = soilLayer1D.Name Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r6135 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6135) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6157) @@ -288,23 +288,15 @@ Name = "Soil 1", AbovePhreaticLevel = 7, BelowPhreaticLevel = 8, - DryUnitWeight = 9, ShearStrengthModel = ShearStrengthModel.CPhi, - UseDefaultShearStrengthModel = false, Cohesion = 10, FrictionAngle = 13, Ocr = 14, - SlopeRestProfile = 15, - DilatancyType = DilatancyType.Zero, - RRatio = 16, StrengthIncreaseExponent = 17, RatioCuPc = 18, PoP = 11, - BeddingAngle = 19, DiameterD70 = 20, - DiameterD90 = 21, - PermeabKx = 22, - WhitesConstant = 23 + PermeabKx = 22 }; dike.SoilList.Add(soil); @@ -313,31 +305,21 @@ { Name = "DikeMat", ShearStrengthModel = ShearStrengthModel.CPhi, - DilatancyType = DilatancyType.Zero, AbovePhreaticLevel = 7, BelowPhreaticLevel = 8, - DryUnitWeight = 9, - BeddingAngle = 18, DiameterD70 = 19, - DiameterD90 = 20, - PermeabKx = 21, - WhitesConstant = 22 + PermeabKx = 21 }; dike.SoilList.Add(dikemat); var sigmaTauCurveSoil = new Soil { Name = "sigmaTauCurveSoil", ShearStrengthModel = ShearStrengthModel.SigmaTauCurve, - DilatancyType = DilatancyType.Zero, AbovePhreaticLevel = 7, BelowPhreaticLevel = 8, - DryUnitWeight = 9, - BeddingAngle = 18, DiameterD70 = 19, - DiameterD90 = 20, PermeabKx = 21, - WhitesConstant = 22, SigmaTauCurve = new SigmaTauCurve() }; sigmaTauCurveSoil.SigmaTauCurve.Points.Add(new SigmaTauPoint()); @@ -349,15 +331,10 @@ { Name = "suTableSoil", ShearStrengthModel = ShearStrengthModel.SuTable, - DilatancyType = DilatancyType.Zero, AbovePhreaticLevel = 7, BelowPhreaticLevel = 8, - DryUnitWeight = 9, - BeddingAngle = 18, DiameterD70 = 19, - DiameterD90 = 20, PermeabKx = 21, - WhitesConstant = 22, SuTableCurve = new SuTableCurve() }; suTableSoil.SuTableCurve.Points.Add(new SigmaSuPoint()); Fisheye: Tag 6157 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/DilatancyType.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftCalculator.cs =================================================================== diff -u -r4540 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftCalculator.cs (.../UpliftCalculator.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftCalculator.cs (.../UpliftCalculator.cs) (revision 6157) @@ -51,10 +51,7 @@ { VolumicWeightOfWater = 9.81; UnitWeightSoilEmbankment = null; - IsUseOvenDryUnitWeight = false; } - - public bool IsUseOvenDryUnitWeight { get; set; } public double VolumicWeightOfWater { get; set; } public SoilProfile1D SoilProfile { get; set; } public double TopOfLayerToBeEvaluated { get; set; } @@ -74,7 +71,6 @@ SoilVolumicMassCalculator massCalculator = CreateSoilVolumeMassCalculator(); - massCalculator.IsUseOvenDryUnitWeight = IsUseOvenDryUnitWeight; double mass = massCalculator.CalculateTotalMass(); double height = headOfPlLine - TopOfLayerToBeEvaluated; double phreaticPressure = VolumicWeightOfWater * height; @@ -92,7 +88,6 @@ /// /// /// - /// /// Required extra height public double CalculateExtraHeight(double headOfPlLine, double upliftFactor) { @@ -131,8 +126,7 @@ ThrowWhenSoilProfileIsNull(); SoilVolumicMassCalculator massCalculator = CreateSoilVolumeMassCalculator(); - massCalculator.IsUseOvenDryUnitWeight = IsUseOvenDryUnitWeight; - + double massSoils = massCalculator.CalculateTotalMass(); double massWater = massSoils / (upliftFactor * VolumicWeightOfWater); return massWater + TopOfLayerToBeEvaluated; @@ -156,7 +150,7 @@ } /// - /// Adds an extra top layer if surface level is higher then toplevel soil profile. + /// Adds an extra top layer if surface level is higher than toplevel soil profile. /// /// The updated soil profile. /// @@ -169,8 +163,7 @@ updatedSoilProfile.Layers.Insert(0, new SoilLayer1D(new Soil { AbovePhreaticLevel = UnitWeightSoilEmbankment.Value, - BelowPhreaticLevel = UnitWeightSoilEmbankment.Value, - DryUnitWeight = UnitWeightSoilEmbankment.Value + BelowPhreaticLevel = UnitWeightSoilEmbankment.Value }, SurfaceLevel)); }