Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs =================================================================== diff -u -r165068d9499f2282a744a79877d0af4461106d9d -r2363244674e6b7b97bead9a6855806420d368d80 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision 165068d9499f2282a744a79877d0af4461106d9d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision 2363244674e6b7b97bead9a6855806420d368d80) @@ -43,9 +43,6 @@ private readonly GeneralPipingInput generalInputParameters; private readonly NormalDistribution phreaticLevelExit; private readonly LogNormalDistribution dampingFactorExit; - private readonly ShiftedLogNormalDistribution saturatedVolumicWeightOfCoverageLayer; - private readonly LogNormalDistribution darcyPermeability; - private readonly LogNormalDistribution diameter70; private RoundedDouble exitPointL; private RoundedDouble entryPointL; private RingtoetsPipingSurfaceLine surfaceLine; @@ -75,14 +72,6 @@ Mean = (RoundedDouble)0.7, StandardDeviation = (RoundedDouble)0.0 }; - saturatedVolumicWeightOfCoverageLayer = new ShiftedLogNormalDistribution(2) - { - Mean = (RoundedDouble)17.5, - StandardDeviation = (RoundedDouble)0, - Shift = (RoundedDouble)10 - }; - diameter70 = new LogNormalDistribution(6); - darcyPermeability = new LogNormalDistribution(6); } /// @@ -442,13 +431,8 @@ { get { - return diameter70; + return new DerivedPipingInput(this).DiameterD70; } - set - { - diameter70.Mean = value.Mean; - diameter70.StandardDeviation = value.StandardDeviation; - } } /// @@ -459,17 +443,12 @@ { get { - return darcyPermeability; + return new DerivedPipingInput(this).DarcyPermeability; } - set - { - darcyPermeability.Mean = value.Mean; - darcyPermeability.StandardDeviation = value.StandardDeviation; - } } /// - /// Gets or sets the thickness of the aquifer layer. + /// Gets or sets the total thickness of the aquifer layers at the exit point. /// [m] /// public LogNormalDistribution ThicknessAquiferLayer @@ -515,14 +494,8 @@ { get { - return saturatedVolumicWeightOfCoverageLayer; + return new DerivedPipingInput(this).SaturatedVolumicWeightOfCoverageLayer; } - set - { - saturatedVolumicWeightOfCoverageLayer.Mean = value.Mean; - saturatedVolumicWeightOfCoverageLayer.StandardDeviation = value.StandardDeviation; - saturatedVolumicWeightOfCoverageLayer.Shift = value.Shift; - } } #endregion