Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r2931 -r2932
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2931)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2932)
@@ -751,7 +751,6 @@
var errorInrecord = false;
location = new Location();
- location.SetDefaultValues();
location.Name = locationRecord.LocationId;
location.SurfaceLineId = locationRecord.SurfaceLineId;
location.SegmentId = locationRecord.SegmentId;
Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r2807 -r2932
--- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2807)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2932)
@@ -353,7 +353,6 @@
location.MapForSoilGeometries2D = "TestMap";
location.StabilityZoneType = MStabZonesType.NoZones;
location.ForbiddenZoneFactor = 10.0 * i + 0.42;
- location.ZoneAreaRestSlopeCrestWidth = 10.0 * i + 0.43;
location.TrafficLoad = 10.0 * i + 0.44;
location.TL_DegreeOfConsolidation = 10.0 * i + 0.45;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r2803 -r2932
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2803)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2932)
@@ -598,8 +598,7 @@
ZoneType = ConversionHelper.ConvertToInputZoneType(location.StabilityZoneType),
ForbiddenZoneFactorSpecified = true,
ForbiddenZoneFactor = location.ForbiddenZoneFactor,
- ZoneAreaRestSlopeCrestWidthSpecified = true,
- ZoneAreaRestSlopeCrestWidth = location.ZoneAreaRestSlopeCrestWidth,
+ ZoneAreaRestSlopeCrestWidthSpecified = false,
TrafficLoadSpecified = true,
TrafficLoad = location.TrafficLoad,
TrafficLoadDegreeOfConsolidationSpecified = location.TL_DegreeOfConsolidation.HasValue,
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r2803 -r2932
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2803)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2932)
@@ -452,10 +452,6 @@
{
location.ForbiddenZoneFactor = inputLocation.StabilityOptions.ForbiddenZoneFactor;
}
- if (inputLocation.StabilityOptions.ZoneAreaRestSlopeCrestWidthSpecified)
- {
- location.ZoneAreaRestSlopeCrestWidth = inputLocation.StabilityOptions.ZoneAreaRestSlopeCrestWidth;
- }
if (inputLocation.StabilityOptions.TrafficLoadSpecified)
{
location.TrafficLoad = inputLocation.StabilityOptions.TrafficLoad;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r2915 -r2932
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 2915)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 2932)
@@ -154,7 +154,6 @@
-
Index: DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs
===================================================================
diff -u -r2798 -r2932
--- DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2798)
+++ DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2932)
@@ -324,10 +324,8 @@
Assert.AreEqual(2, dike.Locations.Count);
Assert.AreEqual(MStabZonesType.ZoneAreas, dike.Locations[0].StabilityZoneType);
Assert.AreEqual(0.5, dike.Locations[0].ForbiddenZoneFactor, cTolerance);
- Assert.AreEqual(1.6, dike.Locations[0].ZoneAreaRestSlopeCrestWidth, cTolerance);
Assert.AreEqual(MStabZonesType.ForbiddenZone, dike.Locations[1].StabilityZoneType);
Assert.AreEqual(0.9, dike.Locations[1].ForbiddenZoneFactor, cTolerance);
- Assert.AreEqual(2.1, dike.Locations[1].ZoneAreaRestSlopeCrestWidth, cTolerance);
}
}
}
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2821 -r2932
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2821)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2932)
@@ -69,7 +69,6 @@
public const string DistanceToEntryPoint = "DistanceToEntryPoint";
public const string StabilityZoneType = "StabilityZoneType";
public const string ForbiddenZoneFactor = "ForbiddenZoneFactor";
- public const string ZoneAreaRestSlopeCrestWidth = "ZoneAreaRestSlopeCrestWidth";
public const string StabilityDesignMethod = "StabilityDesignMethod";
public const string SlopeAdaptionStartCotangent = "SlopeAdaptionStartCotangent";
public const string SlopeAdaptionEndCotangent = "SlopeAdaptionEndCotangent";
@@ -178,7 +177,6 @@
private double xSoilGeometry2DOrigin = 0;
private double xrd = 0;
private double yrd = 0;
- private double zoneAreaRestSlopeCrestWidth = 3.0;
private IntrusionVerticalWaterPressureType? intrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.Standard;
@@ -1133,27 +1131,6 @@
}
}
- [Label("Zone Area Rest Slope Crest Width")]
- [Description("Zone Area Rest Slope Crest Width")]
- [Format("F2")]
- [Unit(UnitType.Length)]
- [Minimum(0.1)]
- [PropertyOrder(4, 12)]
- [Category(AllCategory)]
- public double ZoneAreaRestSlopeCrestWidth
- {
- get
- {
- return zoneAreaRestSlopeCrestWidth;
- }
- set
- {
- DataEventPublisher.BeforeChange(this, "ZoneAreaRestSlopeCrestWidth");
- zoneAreaRestSlopeCrestWidth = value;
- DataEventPublisher.AfterChange(this, "ZoneAreaRestSlopeCrestWidth");
- }
- }
-
[XmlIgnore]
[Browsable(false)]
public double X
@@ -1638,14 +1615,6 @@
#endregion
///
- /// Sets the default values
- ///
- public void SetDefaultValues()
- {
- zoneAreaRestSlopeCrestWidth = 3.0;
- }
-
- ///
/// Assemble a list of key/value pairs with the relevant parameters for the location
///
///
@@ -1699,7 +1668,6 @@
nameValuePairs.Add(LocationParameterNames.DistanceToEntryPoint, DistanceToEntryPoint.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.StabilityZoneType, StabilityZoneType.ToString());
nameValuePairs.Add(LocationParameterNames.ForbiddenZoneFactor, ForbiddenZoneFactor.ToString(numberFormatInfo));
- nameValuePairs.Add(LocationParameterNames.ZoneAreaRestSlopeCrestWidth, ZoneAreaRestSlopeCrestWidth.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.SlopeDampingPiezometricHeightPolderSide, SlopeDampingPiezometricHeightPolderSide.ToString(numberFormatInfo));
@@ -2032,10 +2000,6 @@
{
ForbiddenZoneFactor = Convert.ToDouble(parameterValue, numberFormatInfo);
}
- if (parameterName.Equals(LocationParameterNames.ZoneAreaRestSlopeCrestWidth))
- {
- ZoneAreaRestSlopeCrestWidth = Convert.ToDouble(parameterValue, numberFormatInfo);
- }
if (parameterName.Equals(LocationParameterNames.SlopeDampingPiezometricHeightPolderSide))
{