Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs =================================================================== diff -u -r0404f8f3788f3893c667328605ce1ab0f93ce21c -rf6ca6ddb01e6d37f04f694d2f95103813e27bc29 --- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision 0404f8f3788f3893c667328605ce1ab0f93ce21c) +++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision f6ca6ddb01e6d37f04f694d2f95103813e27bc29) @@ -276,23 +276,24 @@ 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(); + calculator.SetModelFactorPiping(input.SellmeijerModelFactor); + calculator.SetHRiver(input.AssessmentLevel); + calculator.SetHExit(input.PhreaticLevelExit); + calculator.SetRc(input.SellmeijerReductionFactor); + calculator.SetDTotal(input.ThicknessCoverageLayer); + calculator.SetSeepageLength(input.SeepageLength); + calculator.SetGammaSubParticles(input.SandParticlesVolumicWeight); + calculator.SetWhitesDragCoefficient(input.WhitesDragCoefficient); + calculator.SetD70(input.Diameter70); + calculator.SetVolumetricWeightOfWater(input.WaterVolumetricWeight); + calculator.SetDarcyPermeability(input.DarcyPermeability); + calculator.SetKinematicViscosityWater(input.WaterKinematicViscosity); + calculator.SetGravity(input.Gravity); + calculator.SetDAquifer(input.ThicknessAquiferLayer); + calculator.SetD70Mean(input.MeanDiameter70); + calculator.SetBeddingAngle(input.BeddingAngle); + calculator.SetBottomLevelAquitardAboveExitPointZ(GetBottomAquitardLayerAboveExitPointZ()); + return calculator; } Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rf6ca6ddb01e6d37f04f694d2f95103813e27bc29 --- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs (.../ISellmeijerCalculator.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs (.../ISellmeijerCalculator.cs) (revision f6ca6ddb01e6d37f04f694d2f95103813e27bc29) @@ -31,87 +31,87 @@ /// /// Sets the bedding angle. /// - double BeddingAngle { set; } + void SetBeddingAngle(double beddingAngle); /// /// Sets the D70. /// - double D70 { set; } + void SetD70(double d70); /// /// Sets the D70 reference value. /// - double D70Mean { set; } + void SetD70Mean(double d70Mean); /// /// Sets the total thickness of the aquifer. /// - double DAquifer { set; } + void SetDAquifer(double dAquifer); /// /// Sets the hydraulic conductivity. /// - double DarcyPermeability { set; } + void SetDarcyPermeability(double darcyPermeability); /// /// Sets the total thickness of the cover layers. /// - double DTotal { set; } + void SetDTotal(double dTotal); /// /// Sets the submerged volumetric weight of sand particles. /// - double GammaSubParticles { set; } + void SetGammaSubParticles(double gammaSubParticles); /// /// Sets the gravitational constant. /// - double Gravity { set; } + void SetGravity(double gravity); /// /// Sets the phreatic level at the exit point. /// - double HExit { set; } + void SetHExit(double hExit); /// /// Sets the river water level. /// - double HRiver { set; } + void SetHRiver(double hRiver); /// /// Sets the kinematic viscosity of water at 10 degrees Celsius. /// - double KinematicViscosityWater { set; } + void SetKinematicViscosityWater(double kinematicViscosityWater); /// /// Sets the model factor. /// - double ModelFactorPiping { set; } + void SetModelFactorPiping(double modelFactorPiping); /// /// Sets the damping factor. /// - double Rc { set; } + void SetRc(double rc); /// /// Sets the horizontal seepage length. /// - double SeepageLength { set; } + void SetSeepageLength(double seepageLength); /// /// Sets the volumetric weight of water. /// - double VolumetricWeightOfWater { set; } + void SetVolumetricWeightOfWater(double volumetricWeightOfWater); /// /// Sets White's drag coefficient. /// - double WhitesDragCoefficient { set; } + void SetWhitesDragCoefficient(double whitesDragCoefficient); /// /// Sets the bottom level of the bottommost aquitard that is above the exit point's z-coordinate. /// - double BottomLevelAquitardAboveExitPointZ { set; } + void SetBottomLevelAquitardAboveExitPointZ(double bottomLevelAquitardAboveExitPointZ); /// /// Gets the creep factor. Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rf6ca6ddb01e6d37f04f694d2f95103813e27bc29 --- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs (.../SellmeijerCalculator.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs (.../SellmeijerCalculator.cs) (revision f6ca6ddb01e6d37f04f694d2f95103813e27bc29) @@ -38,181 +38,129 @@ { wrappedCalculator = new Sellmeijer2011Calculator(); } - - public double BeddingAngle + public double CreepCoefficient { - set + get { - wrappedCalculator.BeddingAngle = value; + return wrappedCalculator.CCreep; } } - public double D70 + public double CriticalFall { - set + get { - wrappedCalculator.D70 = value; + return wrappedCalculator.Hc; } } - public double D70Mean + public double ReducedFall { - set + get { - wrappedCalculator.D70Mean = value; + return wrappedCalculator.ReducedFall; } } - public double DAquifer + public double Zp { - set + get { - wrappedCalculator.DAquifer = value; + return wrappedCalculator.Zp; } } - public double DarcyPermeability + public double FoSp { - set + get { - wrappedCalculator.DarcyPermeability = value; + return wrappedCalculator.FoSp; } } - public double DTotal + public void SetBeddingAngle(double beddingAngle) { - set - { - wrappedCalculator.DTotal = value; - } + wrappedCalculator.BeddingAngle = beddingAngle; } - public double GammaSubParticles + public void SetD70(double d70) { - set - { - wrappedCalculator.GammaSubParticles = value; - } + wrappedCalculator.D70 = d70; } - public double Gravity + public void SetD70Mean(double d70Mean) { - set - { - wrappedCalculator.Gravity = value; - } + wrappedCalculator.D70Mean = d70Mean; } - public double HExit + public void SetDAquifer(double dAquifer) { - set - { - wrappedCalculator.HExit = value; - } + wrappedCalculator.DAquifer = dAquifer; } - public double HRiver + public void SetDarcyPermeability(double darcyPermeability) { - set - { - wrappedCalculator.HRiver = value; - } + wrappedCalculator.DarcyPermeability = darcyPermeability; } - public double KinematicViscosityWater + public void SetDTotal(double dTotal) { - set - { - wrappedCalculator.KinematicViscosityWater = value; - } + wrappedCalculator.DTotal = dTotal; } - public double ModelFactorPiping + public void SetGammaSubParticles(double gammaSubParticles) { - set - { - wrappedCalculator.ModelFactorPiping = value; - } + wrappedCalculator.GammaSubParticles = gammaSubParticles; } - public double Rc + public void SetGravity(double gravity) { - set - { - wrappedCalculator.Rc = value; - } + wrappedCalculator.Gravity = gravity; } - public double SeepageLength + public void SetHExit(double hExit) { - set - { - wrappedCalculator.SeepageLength = value; - } + wrappedCalculator.HExit = hExit; } - public double VolumetricWeightOfWater + public void SetHRiver(double hRiver) { - set - { - wrappedCalculator.VolumetricWeightOfWater = value; - } + wrappedCalculator.HRiver = hRiver; } - public double WhitesDragCoefficient + public void SetKinematicViscosityWater(double kinematicViscosityWater) { - set - { - wrappedCalculator.WhitesDragCoefficient = value; - } + wrappedCalculator.KinematicViscosityWater = kinematicViscosityWater; } - public double BottomLevelAquitardAboveExitPointZ + public void SetModelFactorPiping(double modelFactorPiping) { - set - { - wrappedCalculator.BottomLevelAquitardAboveExitPointZ = value; - } + wrappedCalculator.ModelFactorPiping = modelFactorPiping; } - public double CreepCoefficient + public void SetRc(double rc) { - get - { - return wrappedCalculator.CCreep; - } + wrappedCalculator.Rc = rc; } - public double CriticalFall + public void SetSeepageLength(double seepageLength) { - get - { - return wrappedCalculator.Hc; - } + wrappedCalculator.SeepageLength = seepageLength; } - public double ReducedFall + public void SetVolumetricWeightOfWater(double volumetricWeightOfWater) { - get - { - return wrappedCalculator.ReducedFall; - } + wrappedCalculator.VolumetricWeightOfWater = volumetricWeightOfWater; } - public double Zp + public void SetWhitesDragCoefficient(double whitesDragCoefficient) { - get - { - return wrappedCalculator.Zp; - } + wrappedCalculator.WhitesDragCoefficient = whitesDragCoefficient; } - public double FoSp + public void SetBottomLevelAquitardAboveExitPointZ(double bottomLevelAquitardAboveExitPointZ) { - get - { - return wrappedCalculator.FoSp; - } + wrappedCalculator.BottomLevelAquitardAboveExitPointZ = bottomLevelAquitardAboveExitPointZ; } public void Calculate() Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rf6ca6ddb01e6d37f04f694d2f95103813e27bc29 --- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs (.../SellmeijerCalculatorStub.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs (.../SellmeijerCalculatorStub.cs) (revision f6ca6ddb01e6d37f04f694d2f95103813e27bc29) @@ -56,6 +56,91 @@ public double VolumetricWeightOfWater { get; set; } public double WhitesDragCoefficient { get; set; } public double BottomLevelAquitardAboveExitPointZ { get; set; } + public void SetBeddingAngle(double beddingAngle) + { + BeddingAngle = beddingAngle; + } + + public void SetD70(double d70) + { + D70 = d70; + } + + public void SetD70Mean(double d70Mean) + { + D70Mean = d70Mean; + } + + public void SetDAquifer(double dAquifer) + { + DAquifer = dAquifer; + } + + public void SetDarcyPermeability(double darcyPermeability) + { + DarcyPermeability = darcyPermeability; + } + + public void SetDTotal(double dTotal) + { + DTotal = dTotal; + } + + public void SetGammaSubParticles(double gammaSubParticles) + { + GammaSubParticles = gammaSubParticles; + } + + public void SetGravity(double gravity) + { + Gravity = gravity; + } + + public void SetHExit(double hExit) + { + HExit = hExit; + } + + public void SetHRiver(double hRiver) + { + HRiver = hRiver; + } + + public void SetKinematicViscosityWater(double kinematicViscosityWater) + { + KinematicViscosityWater = kinematicViscosityWater; + } + + public void SetModelFactorPiping(double modelFactorPiping) + { + ModelFactorPiping = modelFactorPiping; + } + + public void SetRc(double rc) + { + Rc = rc; + } + + public void SetSeepageLength(double seepageLength) + { + SeepageLength = seepageLength; + } + + public void SetVolumetricWeightOfWater(double volumetricWeightOfWater) + { + VolumetricWeightOfWater = volumetricWeightOfWater; + } + + public void SetWhitesDragCoefficient(double whitesDragCoefficient) + { + WhitesDragCoefficient = whitesDragCoefficient; + } + + public void SetBottomLevelAquitardAboveExitPointZ(double bottomLevelAquitardAboveExitPointZ) + { + BottomLevelAquitardAboveExitPointZ = bottomLevelAquitardAboveExitPointZ; + } + public double CreepCoefficient { get; private set; } public double CriticalFall { get; private set; } public double ReducedFall { get; private set; }