Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r6776 -r6812 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6776) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6812) @@ -1013,7 +1013,7 @@ soil.RatioCuPc = 29 + 0.1 * i; dike.AddDamSoil(soil); - dike.DamSoils.Last().TrafficLoadDegreeOfConsolidation = 30 + 0.1 * i; + dike.DamSoils.Last().TrafficLoadDegreeOfConsolidation = 30 + 1 * i; } // Change 1 soil to ShearStrengthModel.StressTable (SigmaTauCurve) @@ -1053,7 +1053,7 @@ UseDefaultShearStrengthModel = false }; dike.AddDamSoil(dikeSoil); - dike.DamSoils.Last().TrafficLoadDegreeOfConsolidation = 31.1; + dike.DamSoils.Last().TrafficLoadDegreeOfConsolidation = 41; // Add shoulder embankment materials for (var i = 0; i < locationCount; i++) @@ -1064,7 +1064,7 @@ UseDefaultShearStrengthModel = false }; dike.AddDamSoil(shoulderSoil); - dike.DamSoils.Last().TrafficLoadDegreeOfConsolidation = 32.2; + dike.DamSoils.Last().TrafficLoadDegreeOfConsolidation = 42; } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs =================================================================== diff -u -r6776 -r6812 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs (.../DikeTest.cs) (revision 6776) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs (.../DikeTest.cs) (revision 6812) @@ -262,7 +262,6 @@ [Test] public void TestFillImportedCsvSoilsFromCsvFileWithSoilRecords_ThenDataBaseSoilsAreFilled() { - const double percentageToFraction = 0.01; var newDike = new Dike(); var random = new Random(21); @@ -283,7 +282,7 @@ StrengthIncreaseExponent = random.NextDouble(), RatioSuPc = random.NextDouble(), Pop = random.NextDouble(), - TrafficLoadDegreeOfConsolidation = random.NextDouble() + TrafficLoadDegreeOfConsolidation = random.Next(0, 100) }, new() { @@ -300,7 +299,7 @@ StrengthIncreaseExponent = random.NextDouble(), RatioSuPc = random.NextDouble(), Pop = random.NextDouble(), - TrafficLoadDegreeOfConsolidation = random.NextDouble() + TrafficLoadDegreeOfConsolidation = random.Next(0, 100) } }; @@ -326,7 +325,7 @@ Assert.That(soil.StrengthIncreaseExponent, Is.EqualTo(soilRecord.StrengthIncreaseExponent)); Assert.That(soil.RatioCuPc, Is.EqualTo(soilRecord.RatioSuPc)); Assert.That(soil.POP, Is.EqualTo(soilRecord.Pop)); - Assert.That(soil.TrafficLoadDegreeOfConsolidation, Is.EqualTo(soilRecord.TrafficLoadDegreeOfConsolidation * percentageToFraction)); + Assert.That(soil.TrafficLoadDegreeOfConsolidation, Is.EqualTo(soilRecord.TrafficLoadDegreeOfConsolidation)); }); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamProjectDataTests.cs =================================================================== diff -u -r6811 -r6812 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamProjectDataTests.cs (.../DamProjectDataTests.cs) (revision 6811) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamProjectDataTests.cs (.../DamProjectDataTests.cs) (revision 6812) @@ -108,7 +108,7 @@ { Assert.That(validationResults.Any(v => v.Text.Contains("Unsaturated unit weight")), Is.True); Assert.That(validationResults.Any(v => v.Text.Contains("Saturated unit weight")), Is.True); - Assert.That(validationResults.Any(v => v.Text.Contains("Traffic load degree of consolidation")), Is.EqualTo(false)); // DoC can be empty + Assert.That(validationResults.Any(v => v.Text.Contains("Traffic load degree of consolidation")), Is.EqualTo(false)); // DoC is not clearable Assert.That(validationResults.Any(v => v.Text.Contains("Cohesion")), Is.EqualTo(isStability && isMohrCoulomb)); Assert.That(validationResults.Any(v => v.Text.Contains("Friction")), Is.EqualTo(isStability && isMohrCoulomb)); Assert.That(validationResults.Any(v => v.Text.Contains("Ratio Su/Pc")), Is.EqualTo(isStability && isShansep)); @@ -158,7 +158,7 @@ damSoil.RatioCuPc = 0.2; damSoil.StrengthIncreaseExponent = 0.5; damSoil.POP = 25; - damSoil.TrafficLoadDegreeOfConsolidation = 0.2; + damSoil.TrafficLoadDegreeOfConsolidation = 20; damSoil.UseDefaultShearStrengthModel = false; return damSoil; @@ -176,7 +176,7 @@ damSoil.RatioCuPc = -0.2; damSoil.StrengthIncreaseExponent = -0.5; // Exponent m has no valid range defined damSoil.POP = -25; - damSoil.TrafficLoadDegreeOfConsolidation = -0.2; + damSoil.TrafficLoadDegreeOfConsolidation = -20; damSoil.UseDefaultShearStrengthModel = false; return damSoil; @@ -194,7 +194,6 @@ damSoil.RatioCuPc = double.NaN; damSoil.StrengthIncreaseExponent = double.NaN; damSoil.POP = double.NaN; - damSoil.TrafficLoadDegreeOfConsolidation = -double.NaN; damSoil.UseDefaultShearStrengthModel = false; return damSoil; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r6776 -r6812 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6776) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6812) @@ -774,7 +774,6 @@ private static void TransferTrafficLoadDegreeOfConsolidation(List trafficLoadDegreeOfConsolidations, List usedSoils, Input input) { - const double fractionToPercentage = 100; InputTrafficLoadDegreeOfConsolidation[] inputTrafficLoadDegreeOfConsolidations; if (trafficLoadDegreeOfConsolidations != null && trafficLoadDegreeOfConsolidations.Count > 0) { @@ -787,7 +786,7 @@ inputTrafficLoadDegreeOfConsolidations[index] = new InputTrafficLoadDegreeOfConsolidation { SoilName = damSoil.Name, - DegreeOfConsolidation = damSoil.TrafficLoadDegreeOfConsolidation * fractionToPercentage + DegreeOfConsolidation = damSoil.TrafficLoadDegreeOfConsolidation }; index += 1; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r6811 -r6812 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 6811) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 6812) @@ -157,7 +157,6 @@ /// public void FillImportedCsvSoilsFromCsvFile(IEnumerable soilRecords) { - const double percentageToFraction = 0.01; if (soilRecords == null) { return; @@ -242,7 +241,7 @@ if (soilRecord.TrafficLoadDegreeOfConsolidation.HasValue) { - soil.TrafficLoadDegreeOfConsolidation = soilRecord.TrafficLoadDegreeOfConsolidation.Value * percentageToFraction; + soil.TrafficLoadDegreeOfConsolidation = soilRecord.TrafficLoadDegreeOfConsolidation.Value; } ImportedCsvSoils.Add(soil); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamSoil.cs =================================================================== diff -u -r6803 -r6812 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamSoil.cs (.../DamSoil.cs) (revision 6803) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamSoil.cs (.../DamSoil.cs) (revision 6812) @@ -33,16 +33,14 @@ { /// /// Degree of consolidation due to traffic load [%]. - /// Note that it is a fraction: a degree of consolidation of 22% in the GUI has a value of 0.22 here. /// Default is 100% (which means no effect of the traffic load on the pore pressures). /// [PropertyOrder(10, 5)] [Minimum(0)] - [Maximum(1)] - [Format("F0")] - [Unit(UnitType.Percentage)] + [Maximum(100)] + [Unit(UnitType.Fractions)] [UserColumnFilter(UserColumnFilters.MacrostabilityWti)] - public double TrafficLoadDegreeOfConsolidation { get; set; } = 1; + public int TrafficLoadDegreeOfConsolidation { get; set; } = 100; public override void Assign(Soil soil) { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r6776 -r6812 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6776) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6812) @@ -572,13 +572,12 @@ private static void TransferTrafficLoadDegreeOfConsolidation(IList inputTrafficLoadDegreeOfConsolidations, Dike dike) { - const double percentageToFraction = 0.01; if (inputTrafficLoadDegreeOfConsolidations != null) { foreach (InputTrafficLoadDegreeOfConsolidation inputDegreeOfConsolidation in inputTrafficLoadDegreeOfConsolidations) { DamSoil soil = dike.DamSoils.First(s => s.Name == inputDegreeOfConsolidation.SoilName); - soil.TrafficLoadDegreeOfConsolidation = inputDegreeOfConsolidation.DegreeOfConsolidation * percentageToFraction; + soil.TrafficLoadDegreeOfConsolidation = (int) inputDegreeOfConsolidation.DegreeOfConsolidation; } } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r6793 -r6812 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6793) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6812) @@ -851,7 +851,7 @@ en-US="Traffic load degree of consolidation" nl-NL="Consolidatiegraad verkeersbelasting"/> + en-US="Degree of consolidation for traffic load" + nl-NL="Consolidatiegraad voor verkeersbelasting"/> \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoils.cs =================================================================== diff -u -r6436 -r6812 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoils.cs (.../CsvImporterSoils.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoils.cs (.../CsvImporterSoils.cs) (revision 6812) @@ -131,7 +131,7 @@ } soil.Pop = FetchOptionalColumn(colIndexPop, csv); - soil.TrafficLoadDegreeOfConsolidation = FetchOptionalColumn(colIndexTrafficLoadDegreeOfConsolidation, csv); + soil.TrafficLoadDegreeOfConsolidation = (int?) FetchOptionalColumn(colIndexTrafficLoadDegreeOfConsolidation, csv); ImportedItems.Add(soil); } @@ -190,6 +190,6 @@ public double? StrengthIncreaseExponent { get; set; } public double? RatioSuPc { get; set; } public double? Pop { get; set; } - public double? TrafficLoadDegreeOfConsolidation { get; set; } + public int? TrafficLoadDegreeOfConsolidation { get; set; } } } \ No newline at end of file