Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0ae46890a124e95e3746e00e9fcb8c392881a2e0 --- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision 0ae46890a124e95e3746e00e9fcb8c392881a2e0) @@ -235,11 +235,12 @@ 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; + calculator.SetExitPointXCoordinate(input.ExitPointXCoordinate); + calculator.SetPhreaticLevel(input.PhreaticLevelExit); + calculator.SetSoilProfile(CreateSoilProfile()); + calculator.SetSurfaceLine(CreateSurfaceLine()); + calculator.SetVolumicWeightOfWater(input.WaterVolumetricWeight); + return calculator; } Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/EffectiveThicknessCalculator.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0ae46890a124e95e3746e00e9fcb8c392881a2e0 --- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/EffectiveThicknessCalculator.cs (.../EffectiveThicknessCalculator.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/EffectiveThicknessCalculator.cs (.../EffectiveThicknessCalculator.cs) (revision 0ae46890a124e95e3746e00e9fcb8c392881a2e0) @@ -39,52 +39,37 @@ wrappedCalculator = new Deltares.WTIPiping.EffectiveThicknessCalculator(); } - public double ExitPointXCoordinate + public double EffectiveHeight { - set + get { - wrappedCalculator.ExitPointXCoordinate = value; + return wrappedCalculator.EffectiveHeight; } } - public double PhreaticLevel + public void SetExitPointXCoordinate(double exitPointXCoordinate) { - set - { - wrappedCalculator.PhreaticLevel = value; - } + wrappedCalculator.ExitPointXCoordinate = exitPointXCoordinate; } - public double VolumicWeightOfWater + public void SetPhreaticLevel(double phreaticLevel) { - set - { - wrappedCalculator.VolumicWeightOfWater = value; - } + wrappedCalculator.PhreaticLevel = phreaticLevel; } - public PipingProfile SoilProfile + public void SetVolumicWeightOfWater(double volumicWeightOfWater) { - set - { - wrappedCalculator.SoilProfile = value; - } + wrappedCalculator.VolumicWeightOfWater = volumicWeightOfWater; } - public PipingSurfaceLine SurfaceLine + public void SetSoilProfile(PipingProfile soilProfile) { - set - { - wrappedCalculator.SurfaceLine = value; - } + wrappedCalculator.SoilProfile = soilProfile; } - public double EffectiveHeight + public void SetSurfaceLine(PipingSurfaceLine surfaceLine) { - get - { - return wrappedCalculator.EffectiveHeight; - } + wrappedCalculator.SurfaceLine = surfaceLine; } public List Validate() Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IEffectiveThicknessCalculator.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0ae46890a124e95e3746e00e9fcb8c392881a2e0 --- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IEffectiveThicknessCalculator.cs (.../IEffectiveThicknessCalculator.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IEffectiveThicknessCalculator.cs (.../IEffectiveThicknessCalculator.cs) (revision 0ae46890a124e95e3746e00e9fcb8c392881a2e0) @@ -32,27 +32,27 @@ /// /// Sets the exit point's x-coordinate. /// - double ExitPointXCoordinate { set; } + void SetExitPointXCoordinate(double exitPointXCoordinate); /// /// Sets the phreatic level at the exit point. /// - double PhreaticLevel { set; } + void SetPhreaticLevel(double phreaticLevel); /// /// Sets the volumic weight of water. /// - double VolumicWeightOfWater { set; } + void SetVolumicWeightOfWater(double volumicWeightOfWater); /// /// Sets the soil profile. /// - PipingProfile SoilProfile { set; } + void SetSoilProfile(PipingProfile soilProfile); /// /// Sets the surface line. /// - PipingSurfaceLine SurfaceLine { set; } + void SetSurfaceLine(PipingSurfaceLine surfaceLine); /// /// Gets the effective thickness of the cover layer. Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/EffectiveThicknessCalculatorStub.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0ae46890a124e95e3746e00e9fcb8c392881a2e0 --- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/EffectiveThicknessCalculatorStub.cs (.../EffectiveThicknessCalculatorStub.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/EffectiveThicknessCalculatorStub.cs (.../EffectiveThicknessCalculatorStub.cs) (revision 0ae46890a124e95e3746e00e9fcb8c392881a2e0) @@ -40,12 +40,13 @@ /// public bool Validated { get; private set; } - public double ExitPointXCoordinate { get; set; } - public double PhreaticLevel { get; set; } - public double VolumicWeightOfWater { get; set; } - public PipingProfile SoilProfile { get; set; } - public PipingSurfaceLine SurfaceLine { get; set; } + public double ExitPointXCoordinate { get; private set; } + public double PhreaticLevel { get; private set; } + public double VolumicWeightOfWater { get; private set; } + public PipingProfile SoilProfile { get; private set; } + public PipingSurfaceLine SurfaceLine { get; private set; } + public double EffectiveHeight { get @@ -54,6 +55,31 @@ } } + public void SetExitPointXCoordinate(double exitPointXCoordinate) + { + ExitPointXCoordinate = exitPointXCoordinate; + } + + public void SetPhreaticLevel(double phreaticLevel) + { + PhreaticLevel = phreaticLevel; + } + + public void SetVolumicWeightOfWater(double volumicWeightOfWater) + { + VolumicWeightOfWater = volumicWeightOfWater; + } + + public void SetSoilProfile(PipingProfile soilProfile) + { + SoilProfile = soilProfile; + } + + public void SetSurfaceLine(PipingSurfaceLine surfaceLine) + { + SurfaceLine = surfaceLine; + } + public List Validate() { Validated = true;