Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r2554 -r2560 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2554) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2560) @@ -169,7 +169,7 @@ private SurfaceLine2 surfaceLine2; private string surfaceLineId = ""; private double trafficLoad = 0; - private double degreeOfConsolidation = 0; + private double? degreeOfConsolidation; private bool useNewDikeSlopeInside; private bool useNewDikeSlopeOutside; private bool useNewDikeTopWidth; @@ -366,7 +366,7 @@ [Format("F3")] [Category(DikeCategory)] [PropertyOrder(1, 21)] - public virtual double TL_DegreeOfConsolidation + public virtual double? TL_DegreeOfConsolidation { get { @@ -1751,7 +1751,10 @@ nameValuePairs.Add(LocationParameterNames.StabilityShoulderGrowDeltaX, StabilityShoulderGrowDeltaX.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.StabilitySlopeAdaptionDeltaX, StabilitySlopeAdaptionDeltaX.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.TrafficLoad, TrafficLoad.ToString(numberFormatInfo)); - nameValuePairs.Add(LocationParameterNames.TL_DegreeOfConsolidation, TL_DegreeOfConsolidation.ToString(numberFormatInfo)); + if (TL_DegreeOfConsolidation.HasValue) + { + nameValuePairs.Add(LocationParameterNames.TL_DegreeOfConsolidation, TL_DegreeOfConsolidation.Value.ToString(numberFormatInfo)); + } nameValuePairs.Add(LocationParameterNames.MinimalCircleDepth, MinimalCircleDepth.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.DistanceToEntryPoint, DistanceToEntryPoint.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.StabilityZoneType, StabilityZoneType.ToString()); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r2529 -r2560 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2529) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2560) @@ -762,7 +762,7 @@ location.DampingFactorPL4 = locationRecord.DampingFactorPl4.GetValueOrDefault(location.DampingFactorPL4); location.PenetrationLength = locationRecord.PenetrationLength.GetValueOrDefault(location.PenetrationLength); location.TrafficLoad = locationRecord.TrafficLoad.GetValueOrDefault(location.TrafficLoad); - location.TL_DegreeOfConsolidation = locationRecord.TL_DegreeOfConsolidation.GetValueOrDefault(location.TL_DegreeOfConsolidation); + location.TL_DegreeOfConsolidation = locationRecord.TL_DegreeOfConsolidation; location.PLLineCreationMethod = locationRecord.PLLineCreationMethod.GetValueOrDefault(location.PLLineCreationMethod); if (locationRecord.IntrusionVerticalWaterPressure.HasValue) { Index: DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs =================================================================== diff -u -r2529 -r2560 --- DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 2529) +++ DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 2560) @@ -57,7 +57,6 @@ const bool areLocalXzObjectsCreated = false; const double penetrationLength = 0.0; const double trafficLoad = 0.0; - const double tL_DegreeOfConsolidation = 0.0; const PLLineCreationMethod plLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; const double stabilityShoulderGrowSlope = 0.3333333333333; const double stabilityShoulderGrowDeltaX = 2.0; @@ -70,7 +69,7 @@ Assert.AreEqual(areLocalXzObjectsCreated, actualLocation.AreLocalXZObjectsCreated); Assert.AreEqual(penetrationLength, actualLocation.PenetrationLength); Assert.AreEqual(trafficLoad, actualLocation.TrafficLoad); - Assert.AreEqual(tL_DegreeOfConsolidation, actualLocation.TL_DegreeOfConsolidation); + Assert.AreEqual(null, actualLocation.TL_DegreeOfConsolidation); Assert.AreEqual(plLineCreationMethod, actualLocation.PLLineCreationMethod); Assert.AreEqual(IntrusionVerticalWaterPressureType.Standard, actualLocation.IntrusionVerticalWaterPressure); Assert.AreEqual(stabilityShoulderGrowSlope, actualLocation.StabilityShoulderGrowSlope, 1e-12); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r2526 -r2560 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2526) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2560) @@ -632,8 +632,8 @@ ZoneAreaRestSlopeCrestWidth = location.ZoneAreaRestSlopeCrestWidth, TrafficLoadSpecified = true, TrafficLoad = location.TrafficLoad, - TrafficLoadDegreeOfConsolidationSpecified = true, - TrafficLoadDegreeOfConsolidation = location.TL_DegreeOfConsolidation, + TrafficLoadDegreeOfConsolidationSpecified = location.TL_DegreeOfConsolidation.HasValue, + TrafficLoadDegreeOfConsolidation = location.TL_DegreeOfConsolidation?? 0.0, MinimumCircleDepthSpecified = true, MinimumCircleDepth = location.MinimalCircleDepth };