Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs =================================================================== diff -u -r71148524edf9415e4c488bcb41755cd1b3b49fd8 -r92bfc045c7d91bd68410e9fd4d61e2b456893b8b --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs (.../UpliftVanCalculator.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs (.../UpliftVanCalculator.cs) (revision 92bfc045c7d91bd68410e9fd4d61e2b456893b8b) @@ -118,7 +118,6 @@ upliftVanKernel.SetMaximumSliceWidth(input.MaximumSliceWidth); upliftVanKernel.SetSoilModel(SoilModelCreator.Create(layersWithSoil.Select(lws => lws.Soil).ToArray())); upliftVanKernel.SetSoilProfile(SoilProfileCreator.Create(input.SoilProfile.PreconsolidationStresses, layersWithSoil)); - upliftVanKernel.SetLocationExtreme(UpliftVanStabilityLocationCreator.CreateExtreme(input)); upliftVanKernel.SetLocationDaily(UpliftVanStabilityLocationCreator.CreateDaily(input)); upliftVanKernel.SetSurfaceLine(SurfaceLineCreator.Create(input.SurfaceLine)); upliftVanKernel.SetSlipPlaneUpliftVan(SlipPlaneUpliftVanCreator.Create(input.SlipPlane)); Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs =================================================================== diff -u -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0 -r92bfc045c7d91bd68410e9fd4d61e2b456893b8b --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs (.../IUpliftVanKernel.cs) (revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs (.../IUpliftVanKernel.cs) (revision 92bfc045c7d91bd68410e9fd4d61e2b456893b8b) @@ -87,11 +87,6 @@ void SetSoilProfile(SoilProfile2D soilProfile); /// - /// Sets the location under extreme conditions. - /// - void SetLocationExtreme(Location stabilityLocation); - - /// /// Sets the location under daily circumstances. /// void SetLocationDaily(Location stabilityLocation); Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs =================================================================== diff -u -r1f993af469f800b98c75c481e0bec6e8010b7a75 -r92bfc045c7d91bd68410e9fd4d61e2b456893b8b --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs (.../UpliftVanKernelWrapper.cs) (revision 1f993af469f800b98c75c481e0bec6e8010b7a75) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs (.../UpliftVanKernelWrapper.cs) (revision 92bfc045c7d91bd68410e9fd4d61e2b456893b8b) @@ -41,10 +41,10 @@ internal class UpliftVanKernelWrapper : IUpliftVanKernel { private readonly StabilityModel stabilityModel; + private KernelModel kernelModel; private SoilProfile2D soilProfile2D; private SurfaceLine2 surfaceLine; private Location locationDaily; - private Location locationExtreme; private bool autoGridDetermination; @@ -81,11 +81,6 @@ public IEnumerable CalculationMessages { get; private set; } - public void SetLocationExtreme(Location stabilityLocation) - { - locationExtreme = stabilityLocation; - } - public void SetLocationDaily(Location stabilityLocation) { locationDaily = stabilityLocation; @@ -135,7 +130,7 @@ { try { - var kernelModel = new KernelModel + kernelModel = new KernelModel { StabilityModel = stabilityModel, PreprocessingModel = new PreprocessingModel() @@ -159,8 +154,7 @@ stage.SoilProfile = soilProfile2D; var wtiStabilityCalculation = new WTIStabilityCalculation(); - wtiStabilityCalculation.InitializeForDeterministic(WTISerializer.Serialize(stabilityModel)); - + wtiStabilityCalculation.InitializeForDeterministic(WTISerializer.Serialize(kernelModel)); string result = wtiStabilityCalculation.Run(); ReadResult(result); @@ -176,7 +170,7 @@ try { var wtiStabilityCalculation = new WTIStabilityCalculation(); - wtiStabilityCalculation.InitializeForDeterministic(WTISerializer.Serialize(stabilityModel)); + wtiStabilityCalculation.InitializeForDeterministic(WTISerializer.Serialize(kernelModel)); string result = wtiStabilityCalculation.Validate(); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs =================================================================== diff -u -r9626babf5090585c8de73f1ff4051d79817e9b3e -r92bfc045c7d91bd68410e9fd4d61e2b456893b8b --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs (.../UpliftVanKernelWrapperTest.cs) (revision 9626babf5090585c8de73f1ff4051d79817e9b3e) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs (.../UpliftVanKernelWrapperTest.cs) (revision 92bfc045c7d91bd68410e9fd4d61e2b456893b8b) @@ -72,7 +72,6 @@ // Call var kernel = new UpliftVanKernelWrapper(); kernel.SetSoilProfile(soilProfile2D); - kernel.SetLocationExtreme(stabilityLocationExtreme); kernel.SetLocationDaily(stabilityLocationDaily); kernel.SetSurfaceLine(surfaceLine); kernel.SetMaximumSliceWidth(maximumSliceWidth); @@ -257,7 +256,6 @@ } } }); - kernelWrapper.SetLocationExtreme(new Location()); kernelWrapper.SetLocationDaily(new Location()); kernelWrapper.SetSurfaceLine(new SurfaceLine2()); kernelWrapper.SetSlipPlaneUpliftVan(new SlipPlaneUpliftVan());