Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r4779 -r5469 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4779) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 5469) @@ -815,9 +815,24 @@ FillInputTimeSeries(damProjectData); FillSensorData(damProjectData); + FillTrafficLoadDegreeOfConsolidation(dike); return damProjectData; } + private static void FillTrafficLoadDegreeOfConsolidation(Dike dike) + { + dike.TrafficLoadDegreeOfConsolidations = new List(); + for (var i = 0; i < dike.SoilList.Soils.Count; i++) + { + var loadDegreeOfConsolidation = new TrafficLoadDegreeOfConsolidation + { + DegreeOfConsolidation = i * 3, + SoilName = dike.SoilList.Soils[i].Name + }; + dike.TrafficLoadDegreeOfConsolidations.Add(loadDegreeOfConsolidation); + } + } + private void FillSensorData(DamProjectData damProjectData) { // Note: the properties SensorLocations, Sensors and SensorGroups of SensorData are automatically created Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r4673 -r5469 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 4673) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 5469) @@ -71,6 +71,7 @@ TransferSoilProfiles1D(input.SoilProfiles1D, dike.SoilProfiles, dike.SoilList); TransferSegments(input.Segments, dike.SoilProfiles, damProjectData.WaterBoard.Segments); TransferLocations(input.Locations, dike.Locations, localSurfaceLines, damProjectData.WaterBoard.Segments); + TransferTrafficLoadDegreeOfConsolidation(input.TrafficLoadDegreeOfConsolidations, dike); if (input.OperationalInputTimeSeries != null) { damProjectData.InputTimeSerieCollection = new TimeSerieCollection(); @@ -596,6 +597,23 @@ dikeLocations.Add(location); } } + + private static void TransferTrafficLoadDegreeOfConsolidation(IList inputTrafficLoadDegreeOfConsolidations, Dike dike) + { + if (inputTrafficLoadDegreeOfConsolidations != null) + { + dike.TrafficLoadDegreeOfConsolidations = new List(inputTrafficLoadDegreeOfConsolidations.Count); + foreach (InputTrafficLoadDegreeOfConsolidation inputDegreeOfConsolidation in inputTrafficLoadDegreeOfConsolidations) + { + var trafficLoadDegreeOfConsolidation = new TrafficLoadDegreeOfConsolidation + { + SoilName = inputDegreeOfConsolidation.SoilName, + DegreeOfConsolidation = inputDegreeOfConsolidation.DegreeOfConsolidation + }; + dike.TrafficLoadDegreeOfConsolidations.Add(trafficLoadDegreeOfConsolidation); + } + } + } private static void TransferSoilProfiles1D(DamEngine.Io.XmlInput.SoilProfile1D[] inputSoilProfiles1D, IList dikeSoilProfiles, SoilList soils) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r4976 -r5469 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 4976) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 5469) @@ -112,6 +112,8 @@ } input.SoilProfiles2D = soilProfiles2DToSerialize.ToArray(); + + TransferTrafficLoadDegreeOfConsolidation(dike.TrafficLoadDegreeOfConsolidations, input); // Process segments if (localSegments != null) @@ -695,6 +697,28 @@ inputSegments[i] = inputSegment; } } + + private static void TransferTrafficLoadDegreeOfConsolidation(IList trafficLoadDegreeOfConsolidations, Input input) + { + InputTrafficLoadDegreeOfConsolidation[] inputTrafficLoadDegreeOfConsolidations; + if (trafficLoadDegreeOfConsolidations != null && trafficLoadDegreeOfConsolidations.Count > 0) + { + inputTrafficLoadDegreeOfConsolidations = new InputTrafficLoadDegreeOfConsolidation[trafficLoadDegreeOfConsolidations.Count]; + for (var i = 0; i < trafficLoadDegreeOfConsolidations.Count; i++) + { + inputTrafficLoadDegreeOfConsolidations[i] = new InputTrafficLoadDegreeOfConsolidation() + { + SoilName = trafficLoadDegreeOfConsolidations[i].SoilName, + DegreeOfConsolidation = trafficLoadDegreeOfConsolidations[i].DegreeOfConsolidation + }; + } + } + else + { + inputTrafficLoadDegreeOfConsolidations = null; + } + input.TrafficLoadDegreeOfConsolidations = inputTrafficLoadDegreeOfConsolidations; + } private static void AddSoilProfileProbabilities(Segment segment, DamEngine.Io.XmlInput.Segment inputSegment) {