Fisheye: Tag 942b3b97b3b04c821f397a7b15059688427834c8 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.InputParameterCalculation/InputParameterCalculationService.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.InputParameterCalculation/Ringtoets.MacroStabilityInwards.InputParameterCalculation.csproj =================================================================== diff -u -rcbf104c75fe0dda56a0eab7a5f7ff60c89d8c112 -r942b3b97b3b04c821f397a7b15059688427834c8 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.InputParameterCalculation/Ringtoets.MacroStabilityInwards.InputParameterCalculation.csproj (.../Ringtoets.MacroStabilityInwards.InputParameterCalculation.csproj) (revision cbf104c75fe0dda56a0eab7a5f7ff60c89d8c112) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.InputParameterCalculation/Ringtoets.MacroStabilityInwards.InputParameterCalculation.csproj (.../Ringtoets.MacroStabilityInwards.InputParameterCalculation.csproj) (revision 942b3b97b3b04c821f397a7b15059688427834c8) @@ -47,7 +47,6 @@ Properties\GlobalAssembly.cs - Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs =================================================================== diff -u -r6e5542b8efe99d6de8e00a3730e1e14871eb4514 -r942b3b97b3b04c821f397a7b15059688427834c8 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs (.../MacroStabilityInwardsCalculator.cs) (revision 6e5542b8efe99d6de8e00a3730e1e14871eb4514) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs (.../MacroStabilityInwardsCalculator.cs) (revision 942b3b97b3b04c821f397a7b15059688427834c8) @@ -151,9 +151,7 @@ public double CalculatePiezometricHeadAtExit() { IPiezoHeadCalculator calculator = factory.CreatePiezometricHeadAtExitCalculator(); - calculator.PhiPolder = input.PhreaticLevelExit; calculator.HRiver = input.AssessmentLevel; - calculator.RExit = input.DampingFactorExit; calculator.Calculate(); return calculator.PhiExit; @@ -233,61 +231,28 @@ private IEffectiveThicknessCalculator CreateEffectiveThicknessCalculator() { IEffectiveThicknessCalculator calculator = factory.CreateEffectiveThicknessCalculator(); - calculator.ExitPointXCoordinate = input.ExitPointXCoordinate; - calculator.PhreaticLevel = input.PhreaticLevelExit; calculator.SoilProfile = CreateSoilProfile(); calculator.SurfaceLine = CreateSurfaceLine(); - calculator.VolumicWeightOfWater = input.WaterVolumetricWeight; return calculator; } private IHeaveCalculator CreateHeaveCalculator() { IHeaveCalculator calculator = factory.CreateHeaveCalculator(); - calculator.Ich = input.CriticalHeaveGradient; - calculator.PhiExit = input.PiezometricHeadExit; - calculator.DTotal = input.ThicknessCoverageLayer; - calculator.PhiPolder = input.PhreaticLevelExit; - calculator.RExit = input.DampingFactorExit; - calculator.HExit = input.PhreaticLevelExit; return calculator; } private IUpliftCalculator CreateUpliftCalculator() { - double effectiveStress = DetermineEffectiveStressForOneLayerProfile(input.EffectiveThicknessCoverageLayer, input.SaturatedVolumicWeightOfCoverageLayer, input.WaterVolumetricWeight); - IUpliftCalculator calculator = factory.CreateUpliftCalculator(); - calculator.VolumetricWeightOfWater = input.WaterVolumetricWeight; - calculator.ModelFactorUplift = input.UpliftModelFactor; - calculator.EffectiveStress = effectiveStress; calculator.HRiver = input.AssessmentLevel; - calculator.PhiExit = input.PiezometricHeadExit; - calculator.RExit = input.DampingFactorExit; - calculator.HExit = input.PhreaticLevelExit; - calculator.PhiPolder = input.PhreaticLevelExit; return calculator; } private ISellmeijerCalculator CreateSellmeijerCalculator() { ISellmeijerCalculator calculator = factory.CreateSellmeijerCalculator(); - calculator.ModelFactorPiping = input.SellmeijerModelFactor; calculator.HRiver = input.AssessmentLevel; - calculator.HExit = input.PhreaticLevelExit; - calculator.Rc = input.SellmeijerReductionFactor; - calculator.DTotal = input.ThicknessCoverageLayer; - calculator.SeepageLength = input.SeepageLength; - calculator.GammaSubParticles = input.SandParticlesVolumicWeight; - calculator.WhitesDragCoefficient = input.WhitesDragCoefficient; - calculator.D70 = input.Diameter70; - calculator.VolumetricWeightOfWater = input.WaterVolumetricWeight; - calculator.DarcyPermeability = input.DarcyPermeability; - calculator.KinematicViscosityWater = input.WaterKinematicViscosity; - calculator.Gravity = input.Gravity; - calculator.DAquifer = input.ThicknessAquiferLayer; - calculator.D70Mean = input.MeanDiameter70; - calculator.BeddingAngle = input.BeddingAngle; calculator.BottomLevelAquitardAboveExitPointZ = GetBottomAquitardLayerAboveExitPointZ(); return calculator; } @@ -297,7 +262,6 @@ IMacroStabilityInwardsProfilePropertyCalculator calculator = factory.CreateMacroStabilityInwardsProfilePropertyCalculator(); calculator.SoilProfile = CreateSoilProfile(); calculator.SurfaceLine = CreateSurfaceLine(); - calculator.ExitPointX = input.ExitPointXCoordinate; return calculator; } @@ -317,17 +281,5 @@ profilePropertyCalculator.Calculate(); return profilePropertyCalculator.BottomAquitardLayerAboveExitPointZ; } - - /// - /// Determines the effective stress for a one layer profile. - /// - /// The thickness of the aquitard layer. - /// The saturated volumic weight of the aquitard layer. - /// The volumetric weight of water. - /// The effective stress. - private static double DetermineEffectiveStressForOneLayerProfile(double thicknessOfCoverageLayer, double volumicWeightOfCoverageLayer, double waterVolumetricWeight) - { - return thicknessOfCoverageLayer * (volumicWeightOfCoverageLayer - waterVolumetricWeight); - } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorInput.cs =================================================================== diff -u -r6e5542b8efe99d6de8e00a3730e1e14871eb4514 -r942b3b97b3b04c821f397a7b15059688427834c8 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorInput.cs (.../MacroStabilityInwardsCalculatorInput.cs) (revision 6e5542b8efe99d6de8e00a3730e1e14871eb4514) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorInput.cs (.../MacroStabilityInwardsCalculatorInput.cs) (revision 942b3b97b3b04c821f397a7b15059688427834c8) @@ -42,162 +42,20 @@ { throw new ArgumentNullException(nameof(properties)); } - WaterVolumetricWeight = properties.WaterVolumetricWeight; - SaturatedVolumicWeightOfCoverageLayer = properties.SaturatedVolumicWeightOfCoverageLayer; - UpliftModelFactor = properties.UpliftModelFactor; AssessmentLevel = properties.AssessmentLevel; - PiezometricHeadExit = properties.PiezometricHeadExit; - DampingFactorExit = properties.DampingFactorExit; - PhreaticLevelExit = properties.PhreaticLevelExit; - CriticalHeaveGradient = properties.CriticalHeaveGradient; - ThicknessCoverageLayer = properties.ThicknessCoverageLayer; - EffectiveThicknessCoverageLayer = properties.EffectiveThicknessCoverageLayer; - SellmeijerModelFactor = properties.SellmeijerModelFactor; - SellmeijerReductionFactor = properties.SellmeijerReductionFactor; - SeepageLength = properties.SeepageLength; - SandParticlesVolumicWeight = properties.SandParticlesVolumicWeight; - WhitesDragCoefficient = properties.WhitesDragCoefficient; - Diameter70 = properties.Diameter70; - DarcyPermeability = properties.DarcyPermeability; - WaterKinematicViscosity = properties.WaterKinematicViscosity; - Gravity = properties.Gravity; - ThicknessAquiferLayer = properties.ThicknessAquiferLayer; - MeanDiameter70 = properties.MeanDiameter70; - BeddingAngle = properties.BeddingAngle; - ExitPointXCoordinate = properties.ExitPointXCoordinate; SurfaceLine = properties.SurfaceLine; SoilProfile = properties.SoilProfile; } #region properties /// - /// Gets the volumetric weight of water. - /// [kN/m³] - /// - public double WaterVolumetricWeight { get; private set; } - - /// - /// Gets the calculation value used to account for uncertainty in the model for uplift. - /// - public double UpliftModelFactor { get; private set; } - - /// /// Gets the outside high water level. /// [m] /// public double AssessmentLevel { get; private set; } /// - /// Gets the piezometric head at the exit point. - /// [m] - /// - public double PiezometricHeadExit { get; private set; } - - /// - /// Gets the damping factor at the exit point. - /// - public double DampingFactorExit { get; private set; } - - /// - /// Gets the phreatic level at the exit point. - /// [m] - /// - public double PhreaticLevelExit { get; private set; } - - /// - /// Gets the critical exit gradient for heave. - /// - public double CriticalHeaveGradient { get; private set; } - - /// - /// Gets the total thickness of the coverage layer at the exit point. - /// [m] - /// - public double ThicknessCoverageLayer { get; private set; } - - /// - /// Gets the effective thickness of the coverage layer at the exit point. - /// [m] - /// - public double EffectiveThicknessCoverageLayer { get; private set; } - - /// - /// Gets the calculation value used to account for uncertainty in the model for Sellmeijer. - /// - public double SellmeijerModelFactor { get; private set; } - - /// - /// Gets the reduction factor Sellmeijer. - /// - public double SellmeijerReductionFactor { get; private set; } - - /// - /// Gets the horizontal distance between entry and exit point. - /// [m] - /// - public double SeepageLength { get; private set; } - - /// - /// Gets the (lowerbound) volumic weight of sand grain material of a sand layer under water. - /// [kN/m³] - /// - public double SandParticlesVolumicWeight { get; private set; } - - /// - /// Gets the White's drag coefficient. - /// - public double WhitesDragCoefficient { get; private set; } - - /// - /// Gets the sieve size through which 70% of the grains of the top part of the aquifer pass. - /// [m] - /// - public double Diameter70 { get; private set; } - - /// - /// Gets the Darcy-speed with which water flows through the aquifer layer. - /// [m/s] - /// - public double DarcyPermeability { get; private set; } - - /// - /// Gets the kinematic viscosity of water at 10 °C. - /// [m²/s] - /// - public double WaterKinematicViscosity { get; private set; } - - /// - /// Gets the gravitational acceleration. - /// [m/s²] - /// - public double Gravity { get; private set; } - - /// - /// Gets the thickness of the aquifer layer. - /// [m] - /// - public double ThicknessAquiferLayer { get; private set; } - - /// - /// Gets the mean diameter of small scale tests applied to different kinds of sand, on which the formula of Sellmeijer has been fit. - /// [m] - /// - public double MeanDiameter70 { get; private set; } - - /// - /// Gets the angle of the force balance representing the amount in which sand grains resist rolling. - /// [°] - /// - public double BeddingAngle { get; private set; } - - /// - /// Gets the X-coordinate of the exit point. - /// [m] - /// - public double ExitPointXCoordinate { get; private set; } - - /// /// Gets the surface line. /// public RingtoetsMacroStabilityInwardsSurfaceLine SurfaceLine { get; private set; } @@ -207,11 +65,6 @@ /// public MacroStabilityInwardsSoilProfile SoilProfile { get; private set; } - /// - /// Gets the volumic weight of the coverage layer when saturated. - /// - public double SaturatedVolumicWeightOfCoverageLayer { get; private set; } - #endregion public class ConstructionProperties @@ -221,162 +74,20 @@ /// public ConstructionProperties() { - WaterVolumetricWeight = double.NaN; - SaturatedVolumicWeightOfCoverageLayer = double.NaN; - UpliftModelFactor = double.NaN; AssessmentLevel = double.NaN; - PiezometricHeadExit = double.NaN; - DampingFactorExit = double.NaN; - PhreaticLevelExit = double.NaN; - CriticalHeaveGradient = double.NaN; - ThicknessCoverageLayer = double.NaN; - EffectiveThicknessCoverageLayer = double.NaN; - SellmeijerModelFactor = double.NaN; - SellmeijerReductionFactor = double.NaN; - SeepageLength = double.NaN; - SandParticlesVolumicWeight = double.NaN; - WhitesDragCoefficient = double.NaN; - Diameter70 = double.NaN; - DarcyPermeability = double.NaN; - WaterKinematicViscosity = double.NaN; - Gravity = double.NaN; - ThicknessAquiferLayer = double.NaN; - MeanDiameter70 = double.NaN; - BeddingAngle = double.NaN; - ExitPointXCoordinate = double.NaN; SurfaceLine = null; SoilProfile = null; } #region properties /// - /// Gets the volumetric weight of water. - /// [kN/m³] - /// - public double WaterVolumetricWeight { internal get; set; } - - /// - /// Gets the calculation value used to account for uncertainty in the model for uplift. - /// - public double UpliftModelFactor { internal get; set; } - - /// /// Gets the outside high water level. /// [m] /// public double AssessmentLevel { internal get; set; } /// - /// Gets the piezometric head at the exit point. - /// [m] - /// - public double PiezometricHeadExit { internal get; set; } - - /// - /// Gets the damping factor at the exit point. - /// - public double DampingFactorExit { internal get; set; } - - /// - /// Gets the phreatic level at the exit point. - /// [m] - /// - public double PhreaticLevelExit { internal get; set; } - - /// - /// Gets the critical exit gradient for heave. - /// - public double CriticalHeaveGradient { internal get; set; } - - /// - /// Gets the total thickness of the coverage layer at the exit point. - /// [m] - /// - public double ThicknessCoverageLayer { internal get; set; } - - /// - /// Gets the effective thickness of the coverage layer at the exit point. - /// [m] - /// - public double EffectiveThicknessCoverageLayer { internal get; set; } - - /// - /// Gets the calculation value used to account for uncertainty in the model for Sellmeijer. - /// - public double SellmeijerModelFactor { internal get; set; } - - /// - /// Gets the reduction factor Sellmeijer. - /// - public double SellmeijerReductionFactor { internal get; set; } - - /// - /// Gets the horizontal distance between entry and exit point. - /// [m] - /// - public double SeepageLength { internal get; set; } - - /// - /// Gets the (lowerbound) volumic weight of sand grain material of a sand layer under water. - /// [kN/m³] - /// - public double SandParticlesVolumicWeight { internal get; set; } - - /// - /// Gets the White's drag coefficient. - /// - public double WhitesDragCoefficient { internal get; set; } - - /// - /// Gets the sieve size through which 70% of the grains of the top part of the aquifer pass. - /// [m] - /// - public double Diameter70 { internal get; set; } - - /// - /// Gets the Darcy-speed with which water flows through the aquifer layer. - /// [m/s] - /// - public double DarcyPermeability { internal get; set; } - - /// - /// Gets the kinematic viscosity of water at 10 °C. - /// [m²/s] - /// - public double WaterKinematicViscosity { internal get; set; } - - /// - /// Gets the gravitational acceleration. - /// [m/s²] - /// - public double Gravity { internal get; set; } - - /// - /// Gets the thickness of the aquifer layer. - /// [m] - /// - public double ThicknessAquiferLayer { internal get; set; } - - /// - /// Gets the mean diameter of small scale tests applied to different kinds of sand, on which the formula of Sellmeijer has been fit. - /// [m] - /// - public double MeanDiameter70 { internal get; set; } - - /// - /// Gets the angle of the force balance representing the amount in which sand grains resist rolling. - /// [°] - /// - public double BeddingAngle { internal get; set; } - - /// - /// Gets the X-coordinate of the exit point. - /// [m] - /// - public double ExitPointXCoordinate { internal get; set; } - - /// /// Gets the surface line. /// public RingtoetsMacroStabilityInwardsSurfaceLine SurfaceLine { internal get; set; } @@ -386,11 +97,6 @@ /// public MacroStabilityInwardsSoilProfile SoilProfile { internal get; set; } - /// - /// Gets the volumic weight of the coverage layer when saturated. - /// - public double SaturatedVolumicWeightOfCoverageLayer { internal get; set; } - #endregion } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs =================================================================== diff -u -r0eabd047acd8eead1728b1153e8a2db5bed4a1ba -r942b3b97b3b04c821f397a7b15059688427834c8 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 0eabd047acd8eead1728b1153e8a2db5bed4a1ba) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 942b3b97b3b04c821f397a7b15059688427834c8) @@ -21,14 +21,11 @@ using System; using System.Collections.Generic; -using System.Linq; -using Core.Common.Base.Data; using Ringtoets.Common.Service; using Ringtoets.Common.Service.ValidationRules; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.KernelWrapper; using Ringtoets.MacroStabilityInwards.KernelWrapper.SubCalculator; -using Ringtoets.MacroStabilityInwards.Primitives; using Ringtoets.MacroStabilityInwards.Service.Properties; using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -56,7 +53,6 @@ } CalculationServiceHelper.LogValidationBeginTime(calculation.Name); - CalculationServiceHelper.LogMessagesAsWarning(GetInputWarnings(calculation.InputParameters).ToArray()); string[] inputValidationResults = ValidateInput(calculation.InputParameters).ToArray(); @@ -130,16 +126,6 @@ IEnumerable coreValidationError = ValidateCoreSurfaceLineAndSoilProfileProperties(inputParameters); validationResults.AddRange(coreValidationError); - if (double.IsNaN(inputParameters.EntryPointL)) - { - validationResults.Add(Resources.PipingCalculationService_ValidateInput_No_value_for_EntryPointL); - } - - if (!coreValidationError.Any()) - { - validationResults.AddRange(ValidateSoilLayers(inputParameters)); - } - return validationResults; } @@ -153,11 +139,6 @@ else { validationResults.AddRange(ValidateAssessmentLevel(inputParameters)); - - if (double.IsNaN(inputParameters.PiezometricHeadExit) || double.IsInfinity(inputParameters.PiezometricHeadExit)) - { - validationResults.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_PiezometricHeadExit); - } } return validationResults; @@ -193,184 +174,15 @@ { validationResults.Add(Resources.PipingCalculationService_ValidateInput_No_StochasticSoilProfile_selected); } - if (double.IsNaN(inputParameters.ExitPointL)) - { - validationResults.Add(Resources.PipingCalculationService_ValidateInput_No_value_for_ExitPointL); - } return validationResults; } - private static IEnumerable ValidateSoilLayers(MacroStabilityInwardsInput inputParameters) - { - var validationResults = new List(); - if (double.IsNaN(inputParameters.ThicknessAquiferLayer.Mean)) - { - validationResults.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_thickness_aquifer_layer); - } - - MacroStabilityInwardsSoilProfile macroStabilityInwardsSoilProfile = inputParameters.StochasticSoilProfile.SoilProfile; - double surfaceLevel = inputParameters.SurfaceLine.GetZAtL(inputParameters.ExitPointL); - - validationResults.AddRange(ValidateAquiferLayers(inputParameters, macroStabilityInwardsSoilProfile, surfaceLevel)); - validationResults.AddRange(ValidateCoverageLayers(inputParameters, macroStabilityInwardsSoilProfile, surfaceLevel)); - return validationResults; - } - - private static IEnumerable ValidateAquiferLayers(MacroStabilityInwardsInput inputParameters, MacroStabilityInwardsSoilProfile macroStabilityInwardsSoilProfile, double surfaceLevel) - { - var validationResult = new List(); - - bool hasConsecutiveAquiferLayers = macroStabilityInwardsSoilProfile.GetConsecutiveAquiferLayersBelowLevel(surfaceLevel).Any(); - if (!hasConsecutiveAquiferLayers) - { - validationResult.Add(Resources.PipingCalculationService_ValidateInput_No_aquifer_layer_at_ExitPointL_under_SurfaceLine); - } - else - { - if (double.IsNaN(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetDarcyPermeability(inputParameters).GetDesignValue())) - { - validationResult.Add(Resources.PipingCalculationService_ValidateInput_Cannot_derive_DarcyPermeability); - } - - if (double.IsNaN(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetDiameter70(inputParameters).GetDesignValue())) - { - validationResult.Add(Resources.PipingCalculationService_ValidateInput_Cannot_derive_Diameter70); - } - } - return validationResult; - } - - private static IEnumerable ValidateCoverageLayers(MacroStabilityInwardsInput inputParameters, MacroStabilityInwardsSoilProfile macroStabilityInwardsSoilProfile, double surfaceLevel) - { - var validationResult = new List(); - - bool hasConsecutiveCoverageLayers = macroStabilityInwardsSoilProfile.GetConsecutiveCoverageLayersBelowLevel(surfaceLevel).Any(); - if (hasConsecutiveCoverageLayers) - { - RoundedDouble saturatedVolumicWeightOfCoverageLayer = - MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetSaturatedVolumicWeightOfCoverageLayer(inputParameters).GetDesignValue(); - - if (double.IsNaN(saturatedVolumicWeightOfCoverageLayer)) - { - validationResult.Add(Resources.PipingCalculationService_ValidateInput_Cannot_derive_SaturatedVolumicWeight); - } - else if (saturatedVolumicWeightOfCoverageLayer < inputParameters.WaterVolumetricWeight) - { - validationResult.Add(Resources.PipingCalculationService_ValidateInput_SaturatedVolumicWeightCoverageLayer_must_be_larger_than_WaterVolumetricWeight); - } - } - - return validationResult; - } - - private static List GetInputWarnings(MacroStabilityInwardsInput inputParameters) - { - var warnings = new List(); - - if (IsSurfaceLineProfileDefinitionComplete(inputParameters)) - { - double surfaceLineLevel = inputParameters.SurfaceLine.GetZAtL(inputParameters.ExitPointL); - - warnings.AddRange(GetMultipleAquiferLayersWarning(inputParameters, surfaceLineLevel)); - warnings.AddRange(GetMultipleCoverageLayersWarning(inputParameters, surfaceLineLevel)); - warnings.AddRange(GetDiameter70Warnings(inputParameters)); - warnings.AddRange(GetThicknessCoverageLayerWarnings(inputParameters)); - } - - return warnings; - } - - private static IEnumerable GetThicknessCoverageLayerWarnings(MacroStabilityInwardsInput inputParameters) - { - var warnings = new List(); - - MacroStabilityInwardsSoilProfile macroStabilityInwardsSoilProfile = inputParameters.StochasticSoilProfile.SoilProfile; - double surfaceLevel = inputParameters.SurfaceLine.GetZAtL(inputParameters.ExitPointL); - - bool hasConsecutiveCoverageLayers = macroStabilityInwardsSoilProfile.GetConsecutiveCoverageLayersBelowLevel(surfaceLevel).Any(); - if (!hasConsecutiveCoverageLayers) - { - warnings.Add(Resources.PipingCalculationService_ValidateInput_No_coverage_layer_at_ExitPointL_under_SurfaceLine); - } - if (double.IsNaN(inputParameters.ThicknessCoverageLayer.Mean)) - { - warnings.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_thickness_coverage_layer); - } - return warnings; - } - - private static IEnumerable GetDiameter70Warnings(MacroStabilityInwardsInput inputParameters) - { - var warnings = new List(); - - RoundedDouble diameter70Value = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetDiameter70(inputParameters).GetDesignValue(); - - if (!double.IsNaN(diameter70Value) && (diameter70Value < 6.3e-5 || diameter70Value > 0.5e-3)) - { - warnings.Add(string.Format(Resources.PipingCalculationService_GetInputWarnings_Specified_DiameterD70_value_0_not_in_valid_range_of_model, diameter70Value)); - } - return warnings; - } - - private static IEnumerable GetMultipleCoverageLayersWarning(MacroStabilityInwardsInput inputParameters, double surfaceLineLevel) - { - var warnings = new List(); - - bool hasMoreThanOneCoverageLayer = inputParameters.StochasticSoilProfile.SoilProfile.GetConsecutiveCoverageLayersBelowLevel(surfaceLineLevel).Count() > 1; - if (hasMoreThanOneCoverageLayer) - { - warnings.Add(Resources.PipingCalculationService_GetInputWarnings_Multiple_coverage_layers_Attempt_to_determine_value_from_combination); - } - return warnings; - } - - private static IEnumerable GetMultipleAquiferLayersWarning(MacroStabilityInwardsInput inputParameters, double surfaceLineLevel) - { - var warnings = new List(); - - bool hasMoreThanOneAquiferLayer = inputParameters.StochasticSoilProfile.SoilProfile.GetConsecutiveAquiferLayersBelowLevel(surfaceLineLevel).Count() > 1; - if (hasMoreThanOneAquiferLayer) - { - warnings.Add(Resources.PipingCalculationService_GetInputWarnings_Multiple_aquifer_layers_Attempt_to_determine_values_for_DiameterD70_and_DarcyPermeability_from_top_layer); - } - return warnings; - } - - private static bool IsSurfaceLineProfileDefinitionComplete(MacroStabilityInwardsInput surfaceLineMissing) - { - return surfaceLineMissing.SurfaceLine != null && - surfaceLineMissing.StochasticSoilProfile != null && - !double.IsNaN(surfaceLineMissing.ExitPointL); - } - private static MacroStabilityInwardsCalculatorInput CreateInputFromData(MacroStabilityInwardsInput inputParameters) { return new MacroStabilityInwardsCalculatorInput( new MacroStabilityInwardsCalculatorInput.ConstructionProperties { - WaterVolumetricWeight = inputParameters.WaterVolumetricWeight, - SaturatedVolumicWeightOfCoverageLayer = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetSaturatedVolumicWeightOfCoverageLayer(inputParameters).GetDesignValue(), - UpliftModelFactor = inputParameters.UpliftModelFactor, AssessmentLevel = inputParameters.AssessmentLevel, - PiezometricHeadExit = inputParameters.PiezometricHeadExit, - DampingFactorExit = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetDampingFactorExit(inputParameters).GetDesignValue(), - PhreaticLevelExit = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(inputParameters).GetDesignValue(), - CriticalHeaveGradient = inputParameters.CriticalHeaveGradient, - ThicknessCoverageLayer = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(inputParameters).GetDesignValue(), - EffectiveThicknessCoverageLayer = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetEffectiveThicknessCoverageLayer(inputParameters).GetDesignValue(), - SellmeijerModelFactor = inputParameters.SellmeijerModelFactor, - SellmeijerReductionFactor = inputParameters.SellmeijerReductionFactor, - SeepageLength = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetSeepageLength(inputParameters).GetDesignValue(), - SandParticlesVolumicWeight = inputParameters.SandParticlesVolumicWeight, - WhitesDragCoefficient = inputParameters.WhitesDragCoefficient, - Diameter70 = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetDiameter70(inputParameters).GetDesignValue(), - DarcyPermeability = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetDarcyPermeability(inputParameters).GetDesignValue(), - WaterKinematicViscosity = inputParameters.WaterKinematicViscosity, - Gravity = inputParameters.Gravity, - ThicknessAquiferLayer = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetThicknessAquiferLayer(inputParameters).GetDesignValue(), - MeanDiameter70 = inputParameters.MeanDiameter70, - BeddingAngle = inputParameters.BeddingAngle, - ExitPointXCoordinate = inputParameters.ExitPointL, SurfaceLine = inputParameters.SurfaceLine, SoilProfile = inputParameters.StochasticSoilProfile?.SoilProfile }); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs =================================================================== diff -u -r74d543273d49f04878c28092422a0de772bd3b79 -r942b3b97b3b04c821f397a7b15059688427834c8 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 74d543273d49f04878c28092422a0de772bd3b79) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 942b3b97b3b04c821f397a7b15059688427834c8) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2017. All rights reserved. -// -// This file is part of Ringtoets. -// -// Ringtoets is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -91,63 +70,6 @@ } /// - /// Looks up a localized string similar to Meerdere aaneengesloten watervoerende lagen gevonden. Er wordt geprobeerd de korrelgrootte en doorlatendheid van de bovenste watervoerende laag af te leiden.. - /// - internal static string PipingCalculationService_GetInputWarnings_Multiple_aquifer_layers_Attempt_to_determine_values_for_DiameterD70_and_DarcyPermeability_from_top_layer { - get { - return ResourceManager.GetString("PipingCalculationService_GetInputWarnings_Multiple_aquifer_layers_Attempt_to_dete" + - "rmine_values_for_DiameterD70_and_DarcyPermeability_from_top_layer", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Meerdere aaneengesloten deklagen gevonden. De grondeigenschappen worden bepaald door het nemen van een gewogen gemiddelde, mits de standaardafwijkingen en verschuivingen voor alle lagen gelijk zijn.. - /// - internal static string PipingCalculationService_GetInputWarnings_Multiple_coverage_layers_Attempt_to_determine_value_from_combination { - get { - return ResourceManager.GetString("PipingCalculationService_GetInputWarnings_Multiple_coverage_layers_Attempt_to_det" + - "ermine_value_from_combination", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Rekenwaarde voor d70 ({0} m) ligt buiten het geldigheidsbereik van dit model. Geldige waarden liggen tussen 0.000063 m en 0.0005 m.. - /// - internal static string PipingCalculationService_GetInputWarnings_Specified_DiameterD70_value_0_not_in_valid_range_of_model { - get { - return ResourceManager.GetString("PipingCalculationService_GetInputWarnings_Specified_DiameterD70_value_0_not_in_va" + - "lid_range_of_model", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kan de definitie voor de doorlatendheid van de watervoerende laag niet (volledig) afleiden.. - /// - internal static string PipingCalculationService_ValidateInput_Cannot_derive_DarcyPermeability { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_Cannot_derive_DarcyPermeability", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kan de definitie voor het 70%-fraktiel van de korreldiameter van de watervoerende laag niet (volledig) afleiden.. - /// - internal static string PipingCalculationService_ValidateInput_Cannot_derive_Diameter70 { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_Cannot_derive_Diameter70", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kan de definitie voor het verzadigd gewicht van de deklaag niet (volledig) afleiden.. - /// - internal static string PipingCalculationService_ValidateInput_Cannot_derive_SaturatedVolumicWeight { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_Cannot_derive_SaturatedVolumicWeight", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Kan het toetspeil niet afleiden op basis van de invoer.. /// internal static string PipingCalculationService_ValidateInput_Cannot_determine_AssessmentLevel { @@ -157,53 +79,6 @@ } /// - /// Looks up a localized string similar to Kan de stijghoogte bij het uittredepunt niet afleiden op basis van de invoer.. - /// - internal static string PipingCalculationService_ValidateInput_Cannot_determine_PiezometricHeadExit { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_Cannot_determine_PiezometricHeadExit", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kan de dikte van het watervoerend pakket niet afleiden op basis van de invoer.. - /// - internal static string PipingCalculationService_ValidateInput_Cannot_determine_thickness_aquifer_layer { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_Cannot_determine_thickness_aquifer_layer", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.. - /// - internal static string PipingCalculationService_ValidateInput_Cannot_determine_thickness_coverage_layer { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_Cannot_determine_thickness_coverage_layer", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Geen watervoerende laag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.. - /// - internal static string PipingCalculationService_ValidateInput_No_aquifer_layer_at_ExitPointL_under_SurfaceLine { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_No_aquifer_layer_at_ExitPointL_under_Surfa" + - "ceLine", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.. - /// - internal static string PipingCalculationService_ValidateInput_No_coverage_layer_at_ExitPointL_under_SurfaceLine { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_No_coverage_layer_at_ExitPointL_under_Surf" + - "aceLine", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Er is geen hydraulische randvoorwaardenlocatie geselecteerd.. /// internal static string PipingCalculationService_ValidateInput_No_HydraulicBoundaryLocation_selected { @@ -229,43 +104,5 @@ return ResourceManager.GetString("PipingCalculationService_ValidateInput_No_SurfaceLine_selected", resourceCulture); } } - - /// - /// Looks up a localized string similar to De waarde voor 'intredepunt' moet een concreet getal zijn.. - /// - internal static string PipingCalculationService_ValidateInput_No_value_for_EntryPointL { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_No_value_for_EntryPointL", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De waarde voor 'uittredepunt' moet een concreet getal zijn.. - /// - internal static string PipingCalculationService_ValidateInput_No_value_for_ExitPointL { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_No_value_for_ExitPointL", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Het verzadigd volumetrisch gewicht van de deklaag moet groter zijn dan het volumetrisch gewicht van water.. - /// - internal static string PipingCalculationService_ValidateInput_SaturatedVolumicWeightCoverageLayer_must_be_larger_than_WaterVolumetricWeight { - get { - return ResourceManager.GetString("PipingCalculationService_ValidateInput_SaturatedVolumicWeightCoverageLayer_must_b" + - "e_larger_than_WaterVolumetricWeight", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Veiligheidsfactor voor piping kan niet worden berekend.. - /// - internal static string PipingSemiProbabilisticCalculationService_ValidateOutputOnCalculation_Factor_of_safety_cannot_be_calculated { - get { - return ResourceManager.GetString("PipingSemiProbabilisticCalculationService_ValidateOutputOnCalculation_Factor_of_s" + - "afety_cannot_be_calculated", resourceCulture); - } - } } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.resx =================================================================== diff -u -rf707bfd37323ea1dcdb6e9ad562cb00a2e45233b -r942b3b97b3b04c821f397a7b15059688427834c8 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.resx (.../Resources.resx) (revision f707bfd37323ea1dcdb6e9ad562cb00a2e45233b) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.resx (.../Resources.resx) (revision 942b3b97b3b04c821f397a7b15059688427834c8) @@ -120,15 +120,6 @@ Piping berekening niet gelukt: {0} - - Kan de dikte van het watervoerend pakket niet afleiden op basis van de invoer. - - - Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer. - - - Veiligheidsfactor voor piping kan niet worden berekend. - Er is geen ondergrondschematisatie geselecteerd. @@ -138,43 +129,7 @@ Er is geen hydraulische randvoorwaardenlocatie geselecteerd. - - Kan de stijghoogte bij het uittredepunt niet afleiden op basis van de invoer. - Kan het toetspeil niet afleiden op basis van de invoer. - - De waarde voor 'intredepunt' moet een concreet getal zijn. - - - De waarde voor 'uittredepunt' moet een concreet getal zijn. - - - Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt. - - - Meerdere aaneengesloten watervoerende lagen gevonden. Er wordt geprobeerd de korrelgrootte en doorlatendheid van de bovenste watervoerende laag af te leiden. - - - Meerdere aaneengesloten deklagen gevonden. De grondeigenschappen worden bepaald door het nemen van een gewogen gemiddelde, mits de standaardafwijkingen en verschuivingen voor alle lagen gelijk zijn. - - - Geen watervoerende laag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt. - - - Kan de definitie voor de doorlatendheid van de watervoerende laag niet (volledig) afleiden. - - - Kan de definitie voor het 70%-fraktiel van de korreldiameter van de watervoerende laag niet (volledig) afleiden. - - - Kan de definitie voor het verzadigd gewicht van de deklaag niet (volledig) afleiden. - - - Rekenwaarde voor d70 ({0} m) ligt buiten het geldigheidsbereik van dit model. Geldige waarden liggen tussen 0.000063 m en 0.0005 m. - - - Het verzadigd volumetrisch gewicht van de deklaag moet groter zijn dan het volumetrisch gewicht van water. - \ No newline at end of file Fisheye: Tag 942b3b97b3b04c821f397a7b15059688427834c8 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.InputParameterCalculation.Test/Ringtoets.MacroStabilityInwards.InputParameterCalculation.Test.csproj =================================================================== diff -u -r4a27dfb1033419dd325dee88fd4abe3cb56e452d -r942b3b97b3b04c821f397a7b15059688427834c8 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.InputParameterCalculation.Test/Ringtoets.MacroStabilityInwards.InputParameterCalculation.Test.csproj (.../Ringtoets.MacroStabilityInwards.InputParameterCalculation.Test.csproj) (revision 4a27dfb1033419dd325dee88fd4abe3cb56e452d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.InputParameterCalculation.Test/Ringtoets.MacroStabilityInwards.InputParameterCalculation.Test.csproj (.../Ringtoets.MacroStabilityInwards.InputParameterCalculation.Test.csproj) (revision 942b3b97b3b04c821f397a7b15059688427834c8) @@ -55,7 +55,6 @@ Properties\GlobalAssembly.cs -