Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r589 -r595
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 589)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 595)
@@ -73,7 +73,6 @@
private double levelReductionOutside = 0;
private PL1Line localXZPL1Line;
private GeometryPoint localXZSheetPilePoint;
- private SurfaceLine2 localXzSurfaceLine;
private string mapForSoilGeometries2D = "";
private double minimalCircleDepth = 0;
private ModelFactors modelFactors = new ModelFactors();
@@ -408,21 +407,11 @@
}
///
- /// TODO
+ /// The surfaceline in local coordinates
///
/// Composite relationship.
[Validate]
- public virtual SurfaceLine2 LocalXZSurfaceLine2
- {
- get
- {
- return localXzSurfaceLine;
- }
- set
- {
- localXzSurfaceLine = value;
- }
- }
+ public virtual SurfaceLine2 SurfaceLine { get; set; }
public virtual GeometryPoint LocalXZSheetPilePoint
{
@@ -1361,7 +1350,7 @@
SoilProfile1D soilProfile = soilGeometryProbability.SoilProfile1D;
if (soilProfile != null)
{
- isSurfaceLineAboveSoilProfile = isSurfaceLineAboveSoilProfile || (LocalXZSurfaceLine2.Geometry.GetMaxZ() > soilGeometryProbability.SoilProfile1D.TopLevel);
+ isSurfaceLineAboveSoilProfile = isSurfaceLineAboveSoilProfile || (SurfaceLine.Geometry.GetMaxZ() > soilGeometryProbability.SoilProfile1D.TopLevel);
}
}
}
@@ -1840,9 +1829,9 @@
[Validate]
public ValidationResult[] AscendingLocalXZSurfaceLine()
{
- if (LocalXZSurfaceLine2 != null)
+ if (SurfaceLine != null)
{
- return new SurfaceLine2Validator().ValidateCharacteristicPointsAreOrdered(LocalXZSurfaceLine2).ToArray();
+ return new SurfaceLine2Validator().ValidateCharacteristicPointsAreOrdered(SurfaceLine).ToArray();
}
else
{
@@ -1950,7 +1939,7 @@
SoilProfile1D originalProfile = soilGeometryProbability != null ? soilGeometryProbability.SoilProfile1D : null;
probability = soilGeometryProbability != null ? soilGeometryProbability.Probability : 0;
- if (soilSurfaceProfile == null || soilSurfaceProfile.SoilProfile != originalProfile || soilSurfaceProfile.SurfaceLine2 != LocalXZSurfaceLine2)
+ if (soilSurfaceProfile == null || soilSurfaceProfile.SoilProfile != originalProfile || soilSurfaceProfile.SurfaceLine2 != SurfaceLine)
{
Soil dikeSoil = SoilList.GetSoilByName(DikeEmbankmentMaterial);
@@ -1962,15 +1951,15 @@
SoilProfile1D soilProfile1D;
if (originalProfile == null)
{
- soilProfile1D = new SoilProfile1D(LocalXZSurfaceLine2.Geometry.GetMaxZ(), -10, dikeSoil);
+ soilProfile1D = new SoilProfile1D(SurfaceLine.Geometry.GetMaxZ(), -10, dikeSoil);
}
else
{
soilProfile1D = new SoilProfile1D();
soilProfile1D.Assign(originalProfile);
}
soilSurfaceProfile.SoilProfile = soilProfile1D;
- soilSurfaceProfile.SurfaceLine2 = LocalXZSurfaceLine2;
+ soilSurfaceProfile.SurfaceLine2 = SurfaceLine;
soilSurfaceProfile.DikeEmbankmentMaterial = GetDikeEmbankmentSoil();
foreach (SoilLayer2D layer in soilSurfaceProfile.Surfaces)