Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs =================================================================== diff -u -r34c8ca2d1bf3b98d7c134178f9999f6e4ea4695a -r0404f8f3788f3893c667328605ce1ab0f93ce21c --- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision 34c8ca2d1bf3b98d7c134178f9999f6e4ea4695a) +++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision 0404f8f3788f3893c667328605ce1ab0f93ce21c) @@ -240,7 +240,7 @@ calculator.SetSoilProfile(CreateSoilProfile()); calculator.SetSurfaceLine(CreateSurfaceLine()); calculator.SetVolumicWeightOfWater(input.WaterVolumetricWeight); - + return calculator; } @@ -253,7 +253,7 @@ calculator.SetPhiPolder(input.PhreaticLevelExit); calculator.SetRExit(input.DampingFactorExit); calculator.SetHExit(input.PhreaticLevelExit); - + return calculator; } @@ -299,9 +299,10 @@ private IPipingProfilePropertyCalculator CreatePipingProfilePropertyCalculator() { IPipingProfilePropertyCalculator calculator = factory.CreatePipingProfilePropertyCalculator(); - calculator.SoilProfile = CreateSoilProfile(); - calculator.SurfaceLine = CreateSurfaceLine(); - calculator.ExitPointX = input.ExitPointXCoordinate; + calculator.SetSoilProfile(CreateSoilProfile()); + calculator.SetSurfaceLine(CreateSurfaceLine()); + calculator.SetExitPointX(input.ExitPointXCoordinate); + return calculator; } Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IPipingProfilePropertyCalculator.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0404f8f3788f3893c667328605ce1ab0f93ce21c --- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IPipingProfilePropertyCalculator.cs (.../IPipingProfilePropertyCalculator.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IPipingProfilePropertyCalculator.cs (.../IPipingProfilePropertyCalculator.cs) (revision 0404f8f3788f3893c667328605ce1ab0f93ce21c) @@ -32,17 +32,17 @@ /// /// Sets the soil profile. /// - PipingProfile SoilProfile { set; } + void SetSoilProfile(PipingProfile soilProfile); /// /// Sets the surface line. /// - PipingSurfaceLine SurfaceLine { set; } + void SetSurfaceLine(PipingSurfaceLine surfaceLine); /// /// Sets the x-coordinate of the exit point. /// - double ExitPointX { set; } + void SetExitPointX(double exitPointX); /// /// Gets the bottom level of the bottommost aquitard that is above the exit point's z-coordinate. Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/PipingProfilePropertyCalculator.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0404f8f3788f3893c667328605ce1ab0f93ce21c --- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/PipingProfilePropertyCalculator.cs (.../PipingProfilePropertyCalculator.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/PipingProfilePropertyCalculator.cs (.../PipingProfilePropertyCalculator.cs) (revision 0404f8f3788f3893c667328605ce1ab0f93ce21c) @@ -39,28 +39,19 @@ wrappedCalculator = new Deltares.WTIPiping.PipingProfilePropertyCalculator(); } - public PipingProfile SoilProfile + public void SetSoilProfile(PipingProfile soilProfile) { - set - { - wrappedCalculator.SoilProfile = value; - } + wrappedCalculator.SoilProfile = soilProfile; } - public PipingSurfaceLine SurfaceLine + public void SetSurfaceLine(PipingSurfaceLine surfaceLine) { - set - { - wrappedCalculator.SurfaceLine = value; - } + wrappedCalculator.SurfaceLine = surfaceLine; } - public double ExitPointX + public void SetExitPointX(double exitPointX) { - set - { - wrappedCalculator.ExitPointX = value; - } + wrappedCalculator.ExitPointX = exitPointX; } public double BottomAquitardLayerAboveExitPointZ Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/PipingProfilePropertyCalculatorStub.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0404f8f3788f3893c667328605ce1ab0f93ce21c --- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/PipingProfilePropertyCalculatorStub.cs (.../PipingProfilePropertyCalculatorStub.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/PipingProfilePropertyCalculatorStub.cs (.../PipingProfilePropertyCalculatorStub.cs) (revision 0404f8f3788f3893c667328605ce1ab0f93ce21c) @@ -40,11 +40,27 @@ /// public bool Validated { get; private set; } - public PipingProfile SoilProfile { get; set; } - public PipingSurfaceLine SurfaceLine { get; set; } - public double ExitPointX { get; set; } + public PipingProfile SoilProfile { get; private set; } + public PipingSurfaceLine SurfaceLine { get; private set; } + public double ExitPointX { get; private set; } + public double BottomAquitardLayerAboveExitPointZ { get; set; } + public void SetSoilProfile(PipingProfile soilProfile) + { + SoilProfile = soilProfile; + } + + public void SetSurfaceLine(PipingSurfaceLine surfaceLine) + { + SurfaceLine = surfaceLine; + } + + public void SetExitPointX(double exitPointX) + { + ExitPointX = exitPointX; + } + public void Calculate() { Calculated = true;