Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r2932 -r2954 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2932) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2954) @@ -505,6 +505,12 @@ 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); + inputSoil.RatioCuPc = soil.RatioCuPc; inputSoils[i] = inputSoil; } } Index: DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest.cs =================================================================== diff -u -r2945 -r2954 --- DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest.cs (.../DamProjectTest.cs) (revision 2945) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest.cs (.../DamProjectTest.cs) (revision 2954) @@ -115,10 +115,10 @@ Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[2].MapForSoilGeometries2D); } } - [TestCase("Alg-zand (0-30)", 20.0, 22.0, 1.0, 0.7)] - [TestCase("HW-DUN", 15.8, 16.8, 0.0, 0.8)] - [TestCase("HW-OBO", 10.0, 12.0, 1.0, 0.9)] - public void GivenMSoilbaseDatabaseWhenReadingSoilsThenCorrectParametersAreRead(string soilName, double abovePhreaticLevel, double belowPhreaticLevel, double rRatio, double strengthIncreaseExponent) + [TestCase("Alg-zand (0-30)", 20.0, 22.0, 1.0, 0.7, 0.22)] + [TestCase("HW-DUN", 15.8, 16.8, 0.0, 0.8, 0.23)] + [TestCase("HW-OBO", 10.0, 12.0, 1.0, 0.9, 0.24)] + public void GivenMSoilbaseDatabaseWhenReadingSoilsThenCorrectParametersAreRead(string soilName, double abovePhreaticLevel, double belowPhreaticLevel, double rRatio, double strengthIncreaseExponent, double ratioCuPc) { const double tolerance = 0.005; // Given MSoilbase Database @@ -137,8 +137,7 @@ Assert.AreEqual(belowPhreaticLevel, soil.BelowPhreaticLevel, tolerance); Assert.AreEqual(rRatio, soil.RRatio, tolerance); Assert.AreEqual(strengthIncreaseExponent, soil.StrengthIncreaseExponent, tolerance); - - + Assert.AreEqual(ratioCuPc, soil.RatioCuPc, tolerance); } } } Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r2932 -r2954 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2932) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2954) @@ -321,7 +321,10 @@ 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; + dike.SoilList.Add(soil); } } @@ -600,7 +603,8 @@ "MapForSoilGeometries2D" }; var result = compare.Compare(expected, actual); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write Input object"); + Assert.AreEqual(0, result.Differences.Count, + "Differences found read/write Input object:" + result.DifferencesString); } Index: DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest/DamProjectTestMSoilbaseRead.mdb =================================================================== diff -u -r2945 -r2954 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r2932 -r2954 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2932) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2954) @@ -372,6 +372,9 @@ 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; soils.Add(soil); } }