Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs =================================================================== diff -u -r588 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs (.../CalculationHelper.cs) (revision 588) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs (.../CalculationHelper.cs) (revision 595) @@ -73,7 +73,7 @@ internal static IEnumerable GetStabilityModels(bool isCombinedBishopUpliftVan, Location location, PLLines plLines, string soilGeometry2DName, MStabModelType defaultModel) { - double? upliftFactor = GetLowestUpliftFactor(location.LocalXZSurfaceLine2, + double? upliftFactor = GetLowestUpliftFactor(location.SurfaceLine, location.GetMostProbableProfile(FailureMechanismSystemType.StabilityInside), soilGeometry2DName, plLines, location); return !isCombinedBishopUpliftVan ? new List { defaultModel } : GetMStabModelsToCalculate(upliftFactor); } @@ -111,7 +111,7 @@ new FailureMechanismeParamatersMStab { Location = location, - SurfaceLine = location.LocalXZSurfaceLine2, + SurfaceLine = location.SurfaceLine, PLLines = plLines, SoilProfile = location.GetMostProbableProfile(FailureMechanismSystemType.StabilityInside), TrafficLoad = location.TrafficLoad, @@ -161,11 +161,11 @@ { SafetyFactorZone1A = location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope.Value, SafetyFactorZone1B = location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope.Value, - DikeTableHeight = location.LocalXZSurfaceLine2.GetDefaultDikeTableHeight().Value, + DikeTableHeight = location.SurfaceLine.GetDefaultDikeTableHeight().Value, DikeTableWidth = location.ZoneAreaRestSlopeCrestWidth, - XCoordinateDikeTopAtPolder = location.LocalXZSurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X, - XCoordinateDikeTopAtRiver = location.LocalXZSurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X, - XCoordinateStartRestProfile = location.LocalXZSurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X + XCoordinateDikeTopAtPolder = location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X, + XCoordinateDikeTopAtRiver = location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X, + XCoordinateStartRestProfile = location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X }; // Slip circle definition for Uplift Van; TODO: Combine with code in StabilityCalculation @@ -174,7 +174,7 @@ { // Determine right side of slip plane grid (right grid) // This is the location with the lowest uplift factor or, if present, the second NWO point - SurfaceLine2 surfaceLine = location.LocalXZSurfaceLine2; + SurfaceLine2 surfaceLine = location.SurfaceLine; var upliftLocationAndResult = GetLocationWithLowestUpliftFactor(surfaceLine, location.GetMostProbableProfile(FailureMechanismSystemType.StabilityInside), soilGeometry2DName, plLines, location); double upliftCriterion = location.UpliftCriterionStability.Value; bool isUplift = !(upliftLocationAndResult == null) && (upliftLocationAndResult.UpliftFactor < upliftCriterion); @@ -364,7 +364,7 @@ var plLinesCreator = new PLLinesCreator { WaterLevelRiverHigh = waterLevel, - SurfaceLine = location.LocalXZSurfaceLine2, + SurfaceLine = location.SurfaceLine, WaterLevelPolder = location.PolderLevel, HeadInPLLine2 = location.HeadPl2, HeadInPLLine3 = null, Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/UpliftRWEvaluator.cs =================================================================== diff -u -r578 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/UpliftRWEvaluator.cs (.../UpliftRWEvaluator.cs) (revision 578) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/UpliftRWEvaluator.cs (.../UpliftRWEvaluator.cs) (revision 595) @@ -82,7 +82,7 @@ plLinesCreator.HeadInPLLine3 = location.HeadPl3; plLinesCreator.HeadInPLLine4 = location.HeadPl4; - plLinesCreator.SurfaceLine = location.LocalXZSurfaceLine2; + plLinesCreator.SurfaceLine = location.SurfaceLine; plLinesCreator.WaterLevelPolder = location.PolderLevel; plLinesCreator.ModelParametersForPLLines = location.ModelParametersForPLLines; plLinesCreator.SoilProfile = soilGeometry.SoilProfile; @@ -132,7 +132,7 @@ UpliftLocationDeterminator upliftLocationDeterminator = new UpliftLocationDeterminator() { - SurfaceLine = location.LocalXZSurfaceLine2, + SurfaceLine = location.SurfaceLine, SoilProfile = soilGeometry.SoilProfile, SoilGeometry2DName = null, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), Index: dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs =================================================================== diff -u -r577 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 577) +++ dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 595) @@ -1034,7 +1034,7 @@ { if (objectAsKey != null) { - return redesignedSurfaceLines.ContainsKey(objectAsKey) ? redesignedSurfaceLines[objectAsKey] ?? Location.LocalXZSurfaceLine2 : Location.LocalXZSurfaceLine2; + return redesignedSurfaceLines.ContainsKey(objectAsKey) ? redesignedSurfaceLines[objectAsKey] ?? Location.SurfaceLine : Location.SurfaceLine; } return null; } Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs =================================================================== diff -u -r588 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 588) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 595) @@ -114,7 +114,7 @@ var dikeLengths = new List(); if (Scenario != null && Scenario.Location != null) { - SurfaceLine2 surfaceLine = Scenario.Location.LocalXZSurfaceLine2; + SurfaceLine2 surfaceLine = Scenario.Location.SurfaceLine; if (surfaceLine != null) dikeLengths.Add(surfaceLine.GetDikeLength()); } Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs =================================================================== diff -u -r586 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 586) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 595) @@ -576,7 +576,7 @@ try { SurfaceLine2 surfaceLineWithNewHeight = DamFailureMechanismeCalculator.RedesignSurfaceLineHeight(FailureMechanismSystemType.StabilityInside, scenario, - scenario.Location.LocalXZSurfaceLine2); + scenario.Location.SurfaceLine); // for scenarios the uplift should be calculated with the redesigned height, else a problem may occur with the waterlevel above the dike var upliftSituation = new UpliftSituation(); PLLines plLines = CreateAllPLLines(out upliftSituation, scenario.RiverLevel, Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r588 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 588) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 595) @@ -204,7 +204,7 @@ location.PlLineOffsetBelowDikeToeAtPolder = waternetOptions.Pl1BelowToeDikePolderside; SurfaceLine2 surfaceLine = dikeSurfaceLines.First(n => n.Name.Equals(inputLocation.SurfaceLineName)); - location.LocalXZSurfaceLine2 = surfaceLine; + location.SurfaceLine = surfaceLine; if (inputLocation.DesignScenarios != null) { 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) Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/PipingVoorbeeld1_BlighInputFile.xml =================================================================== diff -u -r587 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/PipingVoorbeeld1_BlighInputFile.xml (.../PipingVoorbeeld1_BlighInputFile.xml) (revision 587) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/PipingVoorbeeld1_BlighInputFile.xml (.../PipingVoorbeeld1_BlighInputFile.xml) (revision 595) @@ -16,9 +16,9 @@ + - Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r588 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 588) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 595) @@ -175,7 +175,7 @@ location.HeadPl2 = 1.0 * i + 0.24; location.HeadPl3 = 1.0 * i + 0.25; location.HeadPl4 = 1.0 * i + 0.21; - location.LocalXZSurfaceLine2 = dike.SurfaceLines2[i]; + location.SurfaceLine = dike.SurfaceLines2[i]; for (int j = 0; j < 3; j++) { var designScenario = FillDesignScenario((i +1) * (j + 1)); // The parameter factor is used to create unique data for the design scenarios Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs =================================================================== diff -u -r588 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 588) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 595) @@ -34,7 +34,7 @@ var damPipingBlighInput = new DamPipingBlighInput(); var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D; - var surfaceLine = damKernelInput.Location.LocalXZSurfaceLine2; + var surfaceLine = damKernelInput.Location.SurfaceLine; var location = damKernelInput.Location; double riverLevel = damKernelInput.DesignScenario.RiverLevel; var plLines = CreatePlLines(location, soilProfile1D, riverLevel); @@ -195,7 +195,7 @@ var plLineCreator = new PLLinesCreator { WaterLevelRiverHigh = waterLevel, - SurfaceLine = location.LocalXZSurfaceLine2, + SurfaceLine = location.SurfaceLine, WaterLevelPolder = location.PolderLevel, HeadInPLLine2 = location.HeadPl2, HeadInPLLine3 = location.HeadPl3, Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs =================================================================== diff -u -r588 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 588) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 595) @@ -266,7 +266,7 @@ public SurfaceLine2 SurfaceLine { - get { return Location.LocalXZSurfaceLine2; } + get { return Location.SurfaceLine; } } public double RiverLevel Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs =================================================================== diff -u -r588 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 588) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 595) @@ -243,11 +243,11 @@ } foreach (Location location in Locations) { - if (location.LocalXZSurfaceLine2 != null) + if (location.SurfaceLine != null) { var validator = new SurfaceLine2Validator(); - var validationResults = validator.ValidateCharacteristicPointsAreOrdered(location.LocalXZSurfaceLine2) - .Concat(validator.ValidateGeometryPointsAreOrdered(location.LocalXZSurfaceLine2)).ToArray(); + var validationResults = validator.ValidateCharacteristicPointsAreOrdered(location.SurfaceLine) + .Concat(validator.ValidateGeometryPointsAreOrdered(location.SurfaceLine)).ToArray(); if (validationResults.Length > 0) { throw new SurfaceLineException(validationResults[0].Text); @@ -393,11 +393,11 @@ //Add all locations with valid surfaceline var newLocations = new List(); - newLocations.AddRange(this.Locations.Where(loc => loc.LocalXZSurfaceLine2 != null)); + newLocations.AddRange(this.Locations.Where(loc => loc.SurfaceLine != null)); // Report which locations are not added because no valid surfaceline is found var deletedLocations = new List(); - deletedLocations.AddRange(this.Locations.Where(loc => loc.LocalXZSurfaceLine2 == null)); + deletedLocations.AddRange(this.Locations.Where(loc => loc.SurfaceLine == null)); foreach (var deletedLocation in deletedLocations) { var locationHasNoSurfaceLine = LocalizationManager.GetTranslatedText(this.GetType(), "LocationHasNoSurfaceLine"); Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs =================================================================== diff -u -r578 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs (.../TimeSerieStabilityCalculator.cs) (revision 578) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs (.../TimeSerieStabilityCalculator.cs) (revision 595) @@ -198,7 +198,7 @@ else { IList models; - double? upliftFactor = CalculationHelper.GetLowestUpliftFactor(location.LocalXZSurfaceLine2, + double? upliftFactor = CalculationHelper.GetLowestUpliftFactor(location.SurfaceLine, location.GetMostProbableProfile( FailureMechanismSystemType.StabilityInside), soilGeometry2DName, plLines, location); Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r590 -r595 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 590) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 595) @@ -160,7 +160,7 @@ var location = dikeLocations[i]; var inputLocation = new Io.XmlInput.Location(); - inputLocation.SurfaceLineName = location.LocalXZSurfaceLine2.Name; + inputLocation.SurfaceLineName = location.SurfaceLine.Name; var waternetOptions = new LocationWaternetOptions(); waternetOptions.PhreaticLineCreationMethod = ConversionHelper.ConvertToInputPhreaticLineCreationMethod(location.ModelParametersForPLLines.PLLineCreationMethod);