Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSoilProfileExtensions.cs =================================================================== diff -u -r155f90720529de4c163cb3498ef10901e084c2f7 -rbc3f3fa34e839d801599d4e0cef89734aa8e0475 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSoilProfileExtensions.cs (.../MacroStabilityInwardsSoilProfileExtensions.cs) (revision 155f90720529de4c163cb3498ef10901e084c2f7) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSoilProfileExtensions.cs (.../MacroStabilityInwardsSoilProfileExtensions.cs) (revision bc3f3fa34e839d801599d4e0cef89734aa8e0475) @@ -27,18 +27,18 @@ namespace Ringtoets.MacroStabilityInwards.Data { /// - /// Defines extension methods dealing with instances. + /// Defines extension methods dealing with instances. /// public static class MacroStabilityInwardsSoilProfileExtensions { /// /// Retrieves the thickness of the consecutive aquifer layers (if any) which are (partly) under a certain . /// Only the thickness of the part of the aquifer layer under the level is determined. /// - /// The soil profile containing to consider. + /// The soil profile containing to consider. /// The level under which the aquifer layers are sought. /// The thickness of the part of the consecutive aquifer layer(s) (partly) under the . - public static double GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(this PipingSoilProfile soilProfile, double level) + public static double GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(this MacroStabilityInwardsSoilProfile soilProfile, double level) { return TotalThicknessOfConsecutiveLayersBelowLevel( soilProfile, @@ -50,10 +50,10 @@ /// Retrieves the thickness of the consecutive coverage layers (if any) which are (partly) under a certain . /// Only the thickness of the part of the coverage layer under the level is determined. /// - /// The soil profile containing to consider. + /// The soil profile containing to consider. /// The level under which the coverage layers are sought. /// The thickness of the part of the consecutive coverage layer(s) (partly) under the . - public static double GetConsecutiveCoverageLayerThicknessBelowLevel(this PipingSoilProfile soilProfile, double level) + public static double GetConsecutiveCoverageLayerThicknessBelowLevel(this MacroStabilityInwardsSoilProfile soilProfile, double level) { return TotalThicknessOfConsecutiveLayersBelowLevel( soilProfile, @@ -64,47 +64,47 @@ /// /// Retrieves the collection of aquifer layers below a certain . /// - /// The soil profile containing to consider. + /// The soil profile containing to consider. /// The level under which the aquifer layers are sought. /// The collection of consecutive aquifer layer(s) (partly) under the . - public static IEnumerable GetConsecutiveAquiferLayersBelowLevel(this PipingSoilProfile soilProfile, double level) + public static IEnumerable GetConsecutiveAquiferLayersBelowLevel(this MacroStabilityInwardsSoilProfile soilProfile, double level) { return GetConsecutiveLayers(soilProfile, level, true); } /// /// Retrieves the collection of aquitard layers below a certain . /// - /// The soil profile containing to consider. + /// The soil profile containing to consider. /// The level under which the aquitard layers are sought. /// The collection of consecutive aquitard layer(s) (partly) under the . - public static IEnumerable GetConsecutiveCoverageLayersBelowLevel(this PipingSoilProfile soilProfile, double level) + public static IEnumerable GetConsecutiveCoverageLayersBelowLevel(this MacroStabilityInwardsSoilProfile soilProfile, double level) { - PipingSoilLayer topAquiferLayer = soilProfile.GetConsecutiveAquiferLayersBelowLevel(level).FirstOrDefault(); + MacroStabilityInwardsSoilLayer topAquiferLayer = soilProfile.GetConsecutiveAquiferLayersBelowLevel(level).FirstOrDefault(); if (topAquiferLayer != null) { - PipingSoilLayer[] aquitardLayers = GetConsecutiveLayers(soilProfile, level, false).ToArray(); + MacroStabilityInwardsSoilLayer[] aquitardLayers = GetConsecutiveLayers(soilProfile, level, false).ToArray(); if (aquitardLayers.Any() && topAquiferLayer.Top < aquitardLayers.First().Top) { return aquitardLayers; } } - return Enumerable.Empty(); + return Enumerable.Empty(); } /// - /// Calculates the thickness of a collection of consecutive . + /// Calculates the thickness of a collection of consecutive . /// - /// The containing the . + /// The containing the . /// The level under which to calculate the total thickness. - /// Collection of consecutive , ordered by - /// which are part of . + /// Collection of consecutive , ordered by + /// which are part of . /// The total thickness of the consecutive layers below the given . /// Thrown when either or /// is null. - /// Thrown when the bottommost is not part of + /// Thrown when the bottommost is not part of /// . - private static double TotalThicknessOfConsecutiveLayersBelowLevel(PipingSoilProfile soilProfile, double level, PipingSoilLayer[] layers) + private static double TotalThicknessOfConsecutiveLayersBelowLevel(MacroStabilityInwardsSoilProfile soilProfile, double level, MacroStabilityInwardsSoilLayer[] layers) { if (soilProfile == null) { @@ -119,29 +119,29 @@ return double.NaN; } - PipingSoilLayer bottomLayer = layers.Last(); - PipingSoilLayer topLayer = layers.First(); + MacroStabilityInwardsSoilLayer bottomLayer = layers.Last(); + MacroStabilityInwardsSoilLayer topLayer = layers.First(); return Math.Min(topLayer.Top, level) - (bottomLayer.Top - soilProfile.GetLayerThickness(bottomLayer)); } /// /// Gets consecutive layers in the which have an aquifer property of . /// - /// The soil profile containing to consider. + /// The soil profile containing to consider. /// The level under which the aquitard layers are sought. /// Value indicating whether the consecutive layers should be aquifer or aquitard. /// The collection of consecutive layer(s) with an aquifer property equal to /// under the . - private static IEnumerable GetConsecutiveLayers(PipingSoilProfile soilProfile, double level, bool isAquifer) + private static IEnumerable GetConsecutiveLayers(MacroStabilityInwardsSoilProfile soilProfile, double level, bool isAquifer) { if (level < soilProfile.Bottom) { yield break; } var yielding = false; - foreach (PipingSoilLayer soilLayer in soilProfile.Layers) + foreach (MacroStabilityInwardsSoilLayer soilLayer in soilProfile.Layers) { if (soilLayer.IsAquifer == isAquifer && IsSoilLayerPartlyBelowLevel(soilProfile, soilLayer, level)) { @@ -156,7 +156,7 @@ } } - private static bool IsSoilLayerPartlyBelowLevel(PipingSoilProfile soilProfile, PipingSoilLayer soilLayer, double level) + private static bool IsSoilLayerPartlyBelowLevel(MacroStabilityInwardsSoilProfile soilProfile, MacroStabilityInwardsSoilLayer soilLayer, double level) { return soilLayer.Top < level || soilLayer.Top - soilProfile.GetLayerThickness(soilLayer) < level; }