Fisheye: Tag 2511 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/OvertoppingErosionCalculator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r2508 -r2511
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 2508)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 2511)
@@ -182,7 +182,6 @@
-
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u -r2135 -r2511
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 2135)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 2511)
@@ -565,8 +565,6 @@
XOffsetSoilGeometry2DOrigin = 0.0;
MaterialForDike = "";
MaterialForShoulder = "";
- IsUseOriginalPLLineAssignments = false;
- IsUseOriginalCalculationOptions = false;
IsDrySituation = false;
PLLineAssignment = PLLineAssignment.ExpertKnowledge;
IntrusionVerticalWaterPressureType = IntrusionVerticalWaterPressureType.Standard;
@@ -579,8 +577,6 @@
public double XOffsetSoilGeometry2DOrigin { get; set; }
public string MaterialForDike { get; set; }
public string MaterialForShoulder { get; set; }
- public bool IsUseOriginalPLLineAssignments { get; set; }
- public bool IsUseOriginalCalculationOptions { get; set; }
public bool IsDrySituation { get; set; }
public PLLineAssignment PLLineAssignment { get; set; }
public IntrusionVerticalWaterPressureType IntrusionVerticalWaterPressureType { get; set; }
@@ -594,8 +590,6 @@
this.XOffsetSoilGeometry2DOrigin = mstabGeometryCreationOptions.XOffsetSoilGeometry2DOrigin;
this.MaterialForDike = mstabGeometryCreationOptions.MaterialForDike;
this.MaterialForShoulder = mstabGeometryCreationOptions.MaterialForShoulder;
- this.IsUseOriginalPLLineAssignments = mstabGeometryCreationOptions.IsUseOriginalPLLineAssignments;
- this.IsUseOriginalCalculationOptions = mstabGeometryCreationOptions.IsUseOriginalCalculationOptions;
this.IsDrySituation = mstabGeometryCreationOptions.IsDrySituation;
this.PLLineAssignment = mstabGeometryCreationOptions.PLLineAssignment;
this.IntrusionVerticalWaterPressureType = mstabGeometryCreationOptions.IntrusionVerticalWaterPressureType;
Index: DamClients/DamUI/trunk/src/Dam/Forms/Properties/licenses.licx
===================================================================
diff -u -r2508 -r2511
--- DamClients/DamUI/trunk/src/Dam/Forms/Properties/licenses.licx (.../licenses.licx) (revision 2508)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Properties/licenses.licx (.../licenses.licx) (revision 2511)
@@ -1,2 +1 @@
-DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
Index: DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs
===================================================================
diff -u -r2508 -r2511
--- DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2508)
+++ DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2511)
@@ -123,11 +123,7 @@
Assert.AreEqual(13, dike.Locations.Count);
Location location = dike.Locations.First(x => x.Name.Equals(locationId));
Assert.AreEqual(-0.70, location.PolderLevel, cTolerance);
-// Assert.AreEqual(0.5, location.LevelReductionInside, cTolerance); // is default from modelparameters
-// Assert.AreEqual(0.6, location.LevelReductionOutside, cTolerance); // is default from modelparameters
// Assert.AreEqual(0.25, location.MinimalCircleDepth, cTolerance); // is default from modelparameters
-// Assert.AreEqual(0.05, location.LayerHeightDeviation, cTolerance); // is default from modelparameters
-// Assert.AreEqual(DistributionType.LogNormal, location.LayerHeightDistribution); // is default from modelparameters
Assert.AreEqual("segment_dijkring10_dwp04_1", location.Segment.Name);
Assert.AreEqual("dijkring10_dwp04_1", location.SurfaceLine2.Name);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2508 -r2511
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2508)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2511)
@@ -2833,21 +2833,11 @@
case "DistanceToEntryPoint":
return false;
- case "LevelReductionInside":
+ case "HasSensorData":
return false;
- case "LevelReductionOutside":
- return false;
- case "LayerHeightDistribution":
- return false;
- case "LayerHeightDeviation":
- return false;
- case "HasSensorData":
- return false;
case "XRdDikeLine":
return false;
- case "IsUseOriginalPLLineAssignments":
- return false;
- // The following design parameters are only visible for design option and when that design option does not involve the special Rijnland option.
+ // The following design parameters are only visible for design option and when that design option does not involve the special Rijnland option.
case "NewDikeTopWidth":
case "UseNewDikeTopWidth":
case "NewDikeSlopeInside":
Fisheye: Tag 2511 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/OvertoppingErosionCalculatorTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r2508 -r2511
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2508)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2511)
@@ -312,7 +312,6 @@
-
Code