Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs =================================================================== diff -u -rca9e457de56679e8bdbba7953235b02543cbfac3 -r6bc65102a16d453d3e9f031aac2827130eef2b38 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs (.../UpliftVanKernelWrapper.cs) (revision ca9e457de56679e8bdbba7953235b02543cbfac3) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs (.../UpliftVanKernelWrapper.cs) (revision 6bc65102a16d453d3e9f031aac2827130eef2b38) @@ -98,17 +98,18 @@ public void SetSoilProfile(SoilProfile2D soilProfile) { - kernelModel.StabilityModel.ConstructionStages.ForEachElementDo(cs => cs.SoilProfile = soilProfile); + GetDailyConstructionStage().SoilProfile = soilProfile; + GetExtremeConstructionStage().SoilProfile = soilProfile; } public void SetWaternetDaily(WtiStabilityWaternet waternetDaily) { - kernelModel.StabilityModel.ConstructionStages.First().GeotechnicsData.CurrentWaternet = waternetDaily; + GetDailyConstructionStage().GeotechnicsData.CurrentWaternet = waternetDaily; } public void SetWaternetExtreme(WtiStabilityWaternet waternetExtreme) { - kernelModel.StabilityModel.ConstructionStages.ElementAt(1).GeotechnicsData.CurrentWaternet = waternetExtreme; + GetExtremeConstructionStage().GeotechnicsData.CurrentWaternet = waternetExtreme; } public void SetMoveGrid(bool moveGrid) @@ -152,18 +153,12 @@ public void SetFixedSoilStresses(IEnumerable soilStresses) { - kernelModel.StabilityModel.ConstructionStages.ForEachElementDo(cs => - { - cs.SoilStresses.AddRange(soilStresses); - }); + GetDailyConstructionStage().SoilStresses.AddRange(soilStresses); } public void SetPreConsolidationStresses(IEnumerable preConsolidationStresses) { - kernelModel.StabilityModel.ConstructionStages.ForEachElementDo(cs => - { - cs.PreconsolidationStresses.AddRange(preConsolidationStresses); - }); + GetDailyConstructionStage().PreconsolidationStresses.AddRange(preConsolidationStresses); } public void SetAutomaticForbiddenZones(bool automaticForbiddenZones) @@ -203,6 +198,16 @@ } } + private ConstructionStage GetDailyConstructionStage() + { + return kernelModel.StabilityModel.ConstructionStages.First(); + } + + private ConstructionStage GetExtremeConstructionStage() + { + return kernelModel.StabilityModel.ConstructionStages.ElementAt(1); + } + /// /// Pre processes the . /// Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs =================================================================== diff -u -re2da467f67f436ca9923eb99821e3750d72c9cc1 -r6bc65102a16d453d3e9f031aac2827130eef2b38 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs (.../UpliftVanKernelWrapperTest.cs) (revision e2da467f67f436ca9923eb99821e3750d72c9cc1) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs (.../UpliftVanKernelWrapperTest.cs) (revision 6bc65102a16d453d3e9f031aac2827130eef2b38) @@ -272,9 +272,12 @@ Assert.AreEqual(1, constructionStage.MultiplicationFactorsCPhiForUpliftList.Count); Assert.AreEqual(1.2, constructionStage.MultiplicationFactorsCPhiForUpliftList[0].UpliftFactor); Assert.AreEqual(0.0, constructionStage.MultiplicationFactorsCPhiForUpliftList[0].MultiplicationFactor); - CollectionAssert.AreEqual(fixedSoilStresses, constructionStage.SoilStresses); - CollectionAssert.AreEqual(preConsolidationStresses, constructionStage.PreconsolidationStresses); } + + CollectionAssert.AreEqual(fixedSoilStresses, constructionStages.First().SoilStresses); + CollectionAssert.AreEqual(preConsolidationStresses, constructionStages.First().PreconsolidationStresses); + CollectionAssert.IsEmpty(constructionStages.Last().SoilStresses); + CollectionAssert.IsEmpty(constructionStages.Last().PreconsolidationStresses); } private static UpliftVanKernelWrapper CreateValidKernel(Soil soil)