Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Piping/PipingCalculationInput.cs =================================================================== diff -u -r51738b32494f726f1606a9f2fb354b15109aeb04 -ra43f2c340ceb6ca17f2b75b4d365fb6ae915a96f --- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Piping/PipingCalculationInput.cs (.../PipingCalculationInput.cs) (revision 51738b32494f726f1606a9f2fb354b15109aeb04) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Piping/PipingCalculationInput.cs (.../PipingCalculationInput.cs) (revision a43f2c340ceb6ca17f2b75b4d365fb6ae915a96f) @@ -59,6 +59,8 @@ private readonly double criticalHeaveGradientMean; private readonly double criticalHeaveGradientStandardDeviation; + private readonly bool hasCoverageLayer; + /// /// Creates a new instance of the class, taking into account the precense of a coverage layer. /// @@ -116,6 +118,8 @@ double criticalHeaveGradientStandardDeviation) : base(hydraulicBoundaryLocationId) { + hasCoverageLayer = true; + Section = new HydraRingSection(1, sectionLength, double.NaN); this.phreaticLevelExitMean = phreaticLevelExitMean; this.phreaticLevelExitStandardDeviation = phreaticLevelExitStandardDeviation; @@ -197,6 +201,8 @@ double criticalHeaveGradientStandardDeviation) : base(hydraulicBoundaryLocationId) { + hasCoverageLayer = false; + Section = new HydraRingSection(1, sectionLength, double.NaN); this.phreaticLevelExitMean = phreaticLevelExitMean; this.phreaticLevelExitStandardDeviation = phreaticLevelExitStandardDeviation; @@ -237,11 +243,21 @@ yield return new NormalHydraRingVariable(42, HydraRingDeviationType.Standard, phreaticLevelExitMean, phreaticLevelExitStandardDeviation); yield return new DeterministicHydraRingVariable(43, waterVolumetricWeight); - yield return new LogNormalHydraRingVariable(44, HydraRingDeviationType.Standard, effectiveThicknessCoverageLayerMean, - effectiveThicknessCoverageLayerStandardDeviation); - yield return new LogNormalHydraRingVariable(45, HydraRingDeviationType.Standard, saturatedVolumicWeightOfCoverageLayerMean, - saturatedVolumicWeightOfCoverageLayerStandardDeviation, - saturatedVolumicWeightOfCoverageLayerShift); + + if (hasCoverageLayer) + { + yield return new LogNormalHydraRingVariable(44, HydraRingDeviationType.Standard, effectiveThicknessCoverageLayerMean, + effectiveThicknessCoverageLayerStandardDeviation); + yield return new LogNormalHydraRingVariable(45, HydraRingDeviationType.Standard, saturatedVolumicWeightOfCoverageLayerMean, + saturatedVolumicWeightOfCoverageLayerStandardDeviation, + saturatedVolumicWeightOfCoverageLayerShift); + } + else + { + yield return new DeterministicHydraRingVariable(44, 0); + yield return new DeterministicHydraRingVariable(45, 0); + } + yield return new LogNormalHydraRingVariable(46, HydraRingDeviationType.Standard, upliftModelFactorMean, upliftModelFactorStandardDeviation); yield return new LogNormalHydraRingVariable(47, HydraRingDeviationType.Standard, dampingFactorExitMean,