Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsSlice.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsSlice.cs (.../MacroStabilityInwardsSlice.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsSlice.cs (.../MacroStabilityInwardsSlice.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -104,7 +104,6 @@ VerticalPorePressure = new RoundedDouble(3, properties.VerticalPorePressure); PiezometricPorePressure = new RoundedDouble(3, properties.PiezometricPorePressure); EffectiveStress = new RoundedDouble(3, properties.EffectiveStress); - EffectiveStressDaily = new RoundedDouble(3, properties.EffectiveStressDaily); ExcessPorePressure = new RoundedDouble(3, properties.ExcessPorePressure); ShearStress = new RoundedDouble(3, properties.ShearStress); SoilStress = new RoundedDouble(3, properties.SoilStress); @@ -307,12 +306,6 @@ public RoundedDouble EffectiveStress { get; } /// - /// Gets the daily effective stress. - /// [kN/m²] - /// - public RoundedDouble EffectiveStressDaily { get; } - - /// /// Gets the excess pore pressure. /// [kN/m²] /// @@ -389,7 +382,6 @@ VerticalPorePressure = double.NaN; PiezometricPorePressure = double.NaN; EffectiveStress = double.NaN; - EffectiveStressDaily = double.NaN; ExcessPorePressure = double.NaN; ShearStress = double.NaN; SoilStress = double.NaN; @@ -536,12 +528,6 @@ public double EffectiveStress { internal get; set; } /// - /// Gets or sets the daily effective stress. - /// [kN/m²] - /// - public double EffectiveStressDaily { internal get; set; } - - /// /// Gets or sets the excess pore pressure. /// [kN/m²] /// Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataFactory.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataFactory.cs (.../MacroStabilityInwardsSliceChartDataFactory.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataFactory.cs (.../MacroStabilityInwardsSliceChartDataFactory.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -80,17 +80,6 @@ /// /// Create a for the representation - /// of values in a - /// sliding curve. - /// - /// The created . - public static ChartMultipleAreaData CreateEffectiveStressDailyChartData() - { - return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_EffectiveStressDaily_DisplayName, false); - } - - /// - /// Create a for the representation /// of values in a /// sliding curve. /// Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs (.../MacroStabilityInwardsSliceChartDataPointsFactory.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs (.../MacroStabilityInwardsSliceChartDataPointsFactory.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -88,20 +88,6 @@ } /// - /// Creates the areas for - /// values in . - /// - /// The to - /// get the slices from. - /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. - /// - public static IEnumerable> CreateEffectiveStressDailyAreas(MacroStabilityInwardsSlidingCurve slidingCurve) - { - return CreateParameterAreas(slidingCurve?.Slices, slice => slice.EffectiveStressDaily, 0.125); - } - - /// /// Creates the areas for /// values in . /// Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2019. All rights reserved. -// -// This file is part of Riskeer. -// -// Riskeer is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -713,15 +692,6 @@ } /// - /// Looks up a localized string similar to Effectieve spanning (dagelijks). - /// - public static string MacroStabilityInwardsSlice_EffectiveStressDaily_DisplayName { - get { - return ResourceManager.GetString("MacroStabilityInwardsSlice_EffectiveStressDaily_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Horizontale waterspanning op maaiveld. /// public static string MacroStabilityInwardsSlice_HorizontalPorePressure_DisplayName { @@ -857,16 +827,6 @@ } /// - /// Looks up a localized string similar to Effectieve spanning - ///(dagelijks). - /// - public static string MacroStabilityInwardsSlicesTable_EffectiveStressDaily_DisplayName { - get { - return ResourceManager.GetString("MacroStabilityInwardsSlicesTable_EffectiveStressDaily_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Horizontale waterspanning ///op maaiveld. /// Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -636,9 +636,6 @@ Effectieve spanning - - Effectieve spanning (dagelijks) - Wrijvingshoek @@ -738,10 +735,6 @@ Modelfactor [-] - - Effectieve spanning -(dagelijks) - Horizontale waterspanning op maaiveld Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs =================================================================== diff -u -r5fd764f8bc968f35e200824a360b44a0a02fdf3e -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision 5fd764f8bc968f35e200824a360b44a0a02fdf3e) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -70,7 +70,6 @@ private readonly ChartDataCollection sliceParametersChartDataCollection; private readonly ChartMultipleAreaData sliceCohesionChartData; private readonly ChartMultipleAreaData sliceEffectiveStressChartData; - private readonly ChartMultipleAreaData sliceEffectiveStressDailyChartData; private readonly ChartMultipleAreaData sliceTotalPorePressureChartData; private readonly ChartMultipleAreaData sliceWeightChartData; private readonly ChartMultipleAreaData slicePiezometricPorePressureChartData; @@ -151,7 +150,6 @@ sliceParametersChartDataCollection = MacroStabilityInwardsSliceChartDataFactory.CreateSliceParametersChartDataCollection(); sliceCohesionChartData = MacroStabilityInwardsSliceChartDataFactory.CreateCohesionChartData(); sliceEffectiveStressChartData = MacroStabilityInwardsSliceChartDataFactory.CreateEffectiveStressChartData(); - sliceEffectiveStressDailyChartData = MacroStabilityInwardsSliceChartDataFactory.CreateEffectiveStressDailyChartData(); sliceTotalPorePressureChartData = MacroStabilityInwardsSliceChartDataFactory.CreateTotalPorePressureChartData(); sliceWeightChartData = MacroStabilityInwardsSliceChartDataFactory.CreateWeightChartData(); slicePiezometricPorePressureChartData = MacroStabilityInwardsSliceChartDataFactory.CreatePiezometricPorePressureChartData(); @@ -200,7 +198,6 @@ sliceParametersChartDataCollection.Add(slicePiezometricPorePressureChartData); sliceParametersChartDataCollection.Add(sliceWeightChartData); sliceParametersChartDataCollection.Add(sliceTotalPorePressureChartData); - sliceParametersChartDataCollection.Add(sliceEffectiveStressDailyChartData); sliceParametersChartDataCollection.Add(sliceEffectiveStressChartData); sliceParametersChartDataCollection.Add(sliceCohesionChartData); @@ -273,7 +270,6 @@ { sliceCohesionChartData.Areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateCohesionAreas(slidingCurve); sliceEffectiveStressChartData.Areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressAreas(slidingCurve); - sliceEffectiveStressDailyChartData.Areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas(slidingCurve); sliceTotalPorePressureChartData.Areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateTotalPorePressureAreas(slidingCurve); sliceWeightChartData.Areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateWeightAreas(slidingCurve); slicePiezometricPorePressureChartData.Areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePiezometricPorePressureAreas(slidingCurve); Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSliceRow.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSliceRow.cs (.../MacroStabilityInwardsSliceRow.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSliceRow.cs (.../MacroStabilityInwardsSliceRow.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -55,7 +55,6 @@ FrictionAngle = slice.FrictionAngle; Cohesion = slice.Cohesion; EffectiveStress = slice.EffectiveStress; - EffectiveStressDaily = slice.EffectiveStressDaily; TotalPorePressure = slice.TotalPorePressure; Weight = slice.Weight; PiezometricPorePressure = slice.PiezometricPorePressure; @@ -193,12 +192,5 @@ /// [kN/m²] /// public RoundedDouble EffectiveStress { get; } - - /// - /// Gets the effective stress of the slice under - /// daily circumstances. - /// [kN/m²] - /// - public RoundedDouble EffectiveStressDaily { get; } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSlicesTable.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSlicesTable.cs (.../MacroStabilityInwardsSlicesTable.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSlicesTable.cs (.../MacroStabilityInwardsSlicesTable.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -83,9 +83,6 @@ AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.EffectiveStress), $"{Resources.MacroStabilityInwardsSlice_EffectiveStress_DisplayName}\r\n{Resources.Unit_KiloNewtonPerSquareMeter}", true); - AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.EffectiveStressDaily), - $"{Resources.MacroStabilityInwardsSlicesTable_EffectiveStressDaily_DisplayName}\r\n{Resources.Unit_KiloNewtonPerSquareMeter}", - true); AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.TotalPorePressure), $"{Resources.MacroStabilityInwardsSlicesTable_TotalPorePressure_DisplayName}\r\n{Resources.Unit_KiloNewtonPerSquareMeter}", true); Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSliceResult.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSliceResult.cs (.../UpliftVanSliceResult.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSliceResult.cs (.../UpliftVanSliceResult.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -96,7 +96,6 @@ VerticalPorePressure = properties.VerticalPorePressure; PiezometricPorePressure = properties.PiezometricPorePressure; EffectiveStress = properties.EffectiveStress; - EffectiveStressDaily = properties.EffectiveStressDaily; ExcessPorePressure = properties.ExcessPorePressure; ShearStress = properties.ShearStress; SoilStress = properties.SoilStress; @@ -263,12 +262,6 @@ public double EffectiveStress { get; } /// - /// Gets the daily effective stress. - /// [kN/m²] - /// - public double EffectiveStressDaily { get; } - - /// /// Gets the excess pore pressure. /// [kN/m²] /// @@ -337,7 +330,6 @@ VerticalPorePressure = double.NaN; PiezometricPorePressure = double.NaN; EffectiveStress = double.NaN; - EffectiveStressDaily = double.NaN; ExcessPorePressure = double.NaN; ShearStress = double.NaN; SoilStress = double.NaN; @@ -484,12 +476,6 @@ public double EffectiveStress { internal get; set; } /// - /// Gets or sets the daily effective stress. - /// [kN/m²] - /// - public double EffectiveStressDaily { internal get; set; } - - /// /// Gets or sets the excess pore pressure. /// [kN/m²] /// Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Output/UpliftVanSlidingCurveResultCreator.cs =================================================================== diff -u -red9152404afba777e74f11da2e10076ba8a2043c -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Output/UpliftVanSlidingCurveResultCreator.cs (.../UpliftVanSlidingCurveResultCreator.cs) (revision ed9152404afba777e74f11da2e10076ba8a2043c) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Output/UpliftVanSlidingCurveResultCreator.cs (.../UpliftVanSlidingCurveResultCreator.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -105,7 +105,6 @@ VerticalPorePressure = slice.VPoreOnSurface, PiezometricPorePressure = slice.PiezometricPorePressure, EffectiveStress = slice.EffectiveStress, - EffectiveStressDaily = slice.EffectiveStressDaily, ExcessPorePressure = slice.ExcessPorePressure, ShearStress = slice.ShearStress, SoilStress = slice.SoilStress, Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlidingCurveConverter.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlidingCurveConverter.cs (.../MacroStabilityInwardsSlidingCurveConverter.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlidingCurveConverter.cs (.../MacroStabilityInwardsSlidingCurveConverter.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -98,7 +98,6 @@ VerticalPorePressure = s.VerticalPorePressure, PiezometricPorePressure = s.PiezometricPorePressure, EffectiveStress = s.EffectiveStress, - EffectiveStressDaily = s.EffectiveStressDaily, ExcessPorePressure = s.ExcessPorePressure, ShearStress = s.ShearStress, SoilStress = s.SoilStress, Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSliceTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSliceTest.cs (.../MacroStabilityInwardsSliceTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSliceTest.cs (.../MacroStabilityInwardsSliceTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -161,7 +161,6 @@ Assert.IsNaN(slice.VerticalPorePressure); Assert.IsNaN(slice.PiezometricPorePressure); Assert.IsNaN(slice.EffectiveStress); - Assert.IsNaN(slice.EffectiveStressDaily); Assert.IsNaN(slice.ExcessPorePressure); Assert.IsNaN(slice.ShearStress); Assert.IsNaN(slice.SoilStress); @@ -198,7 +197,6 @@ double verticalPorePressure = random.NextDouble(); double piezometricPorePressure = random.NextDouble(); double effectiveStress = random.NextDouble(); - double effectiveStressDaily = random.NextDouble(); double excessPorePressure = random.NextDouble(); double shearStress = random.NextDouble(); double soilStress = random.NextDouble(); @@ -231,7 +229,6 @@ VerticalPorePressure = verticalPorePressure, PiezometricPorePressure = piezometricPorePressure, EffectiveStress = effectiveStress, - EffectiveStressDaily = effectiveStressDaily, ExcessPorePressure = excessPorePressure, ShearStress = shearStress, SoilStress = soilStress, @@ -315,9 +312,6 @@ Assert.AreEqual(3, slice.EffectiveStress.NumberOfDecimalPlaces); Assert.AreEqual(effectiveStress, slice.EffectiveStress, slice.EffectiveStress.GetAccuracy()); - Assert.AreEqual(3, slice.EffectiveStressDaily.NumberOfDecimalPlaces); - Assert.AreEqual(effectiveStressDaily, slice.EffectiveStressDaily, slice.EffectiveStressDaily.GetAccuracy()); - Assert.AreEqual(3, slice.ExcessPorePressure.NumberOfDecimalPlaces); Assert.AreEqual(excessPorePressure, slice.ExcessPorePressure, slice.ExcessPorePressure.GetAccuracy()); @@ -367,7 +361,6 @@ VerticalPorePressure = random.NextDouble(), PiezometricPorePressure = random.NextDouble(), EffectiveStress = random.NextDouble(), - EffectiveStressDaily = random.NextDouble(), ExcessPorePressure = random.NextDouble(), ShearStress = random.NextDouble(), SoilStress = random.NextDouble(), Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsSliceTestFactoryTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsSliceTestFactoryTest.cs (.../MacroStabilityInwardsSliceTestFactoryTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsSliceTestFactoryTest.cs (.../MacroStabilityInwardsSliceTestFactoryTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -60,7 +60,6 @@ AssertIsConcreteValue(slice.VerticalPorePressure); AssertIsConcreteValue(slice.PiezometricPorePressure); AssertIsConcreteValue(slice.EffectiveStress); - AssertIsConcreteValue(slice.EffectiveStressDaily); AssertIsConcreteValue(slice.ExcessPorePressure); AssertIsConcreteValue(slice.ShearStress); AssertIsConcreteValue(slice.SoilStress); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCloneAssert.cs =================================================================== diff -u -rea9770b83ed5e59f58b05ae908a0f033c1ad8313 -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCloneAssert.cs (.../MacroStabilityInwardsCloneAssert.cs) (revision ea9770b83ed5e59f58b05ae908a0f033c1ad8313) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCloneAssert.cs (.../MacroStabilityInwardsCloneAssert.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -299,7 +299,6 @@ Assert.AreEqual(original.VerticalPorePressure, clone.VerticalPorePressure); Assert.AreEqual(original.PiezometricPorePressure, clone.PiezometricPorePressure); Assert.AreEqual(original.EffectiveStress, clone.EffectiveStress); - Assert.AreEqual(original.EffectiveStressDaily, clone.EffectiveStressDaily); Assert.AreEqual(original.ExcessPorePressure, clone.ExcessPorePressure); Assert.AreEqual(original.ShearStress, clone.ShearStress); Assert.AreEqual(original.SoilStress, clone.SoilStress); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsSliceTestFactory.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsSliceTestFactory.cs (.../MacroStabilityInwardsSliceTestFactory.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsSliceTestFactory.cs (.../MacroStabilityInwardsSliceTestFactory.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -67,7 +67,6 @@ VerticalPorePressure = random.NextDouble(), PiezometricPorePressure = random.NextDouble(), EffectiveStress = random.NextDouble(), - EffectiveStressDaily = random.NextDouble(), ExcessPorePressure = random.NextDouble(), ShearStress = random.NextDouble(), SoilStress = random.NextDouble(), Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataFactoryTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataFactoryTest.cs (.../MacroStabilityInwardsSliceChartDataFactoryTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataFactoryTest.cs (.../MacroStabilityInwardsSliceChartDataFactoryTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -80,19 +80,6 @@ } [Test] - public void CreateEffectiveStressDailyChartData_ReturnsChartMultipleAreaData() - { - // Call - ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateEffectiveStressDailyChartData(); - - // Assert - CollectionAssert.IsEmpty(data.Areas); - Assert.AreEqual("Effectieve spanning (dagelijks)", data.Name); - Assert.IsFalse(data.IsVisible); - AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); - } - - [Test] public void CreateTotalPorePressureChartData_ReturnsChartMultipleAreaData() { // Call Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -397,141 +397,6 @@ } [Test] - public void CreateEffectiveStressDailyAreas_SlidingCurveNull_ReturnsEmptyCollection() - { - // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas(null); - - // Assert - CollectionAssert.IsEmpty(areas); - } - - [Test] - [TestCaseSource(nameof(GetValuesAboveUpperLimit))] - public void CreateEffectiveStressDailyAreas_ValueAboveUpperLimit_ReturnsExpectedAreas(double value) - { - // Setup - var constructionProperties = new MacroStabilityInwardsSlice.ConstructionProperties - { - EffectiveStressDaily = value - }; - - MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); - - // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas(slidingCurve); - - // Assert - CollectionAssert.AreEqual(new[] - { - new[] - { - new Point2D(0, 0), - new Point2D(1, 0), - new Point2D(1, -250), - new Point2D(0, -250) - }, - new[] - { - new Point2D(1, 0), - new Point2D(1, 1), - new Point2D(251, 1), - new Point2D(251, 0) - }, - new[] - { - new Point2D(1, 0), - new Point2D(2, 1), - new Point2D(178.776695, -175.776695), - new Point2D(177.776695, -176.776695) - } - }, areas, new Point2DComparerWithTolerance(1e-6)); - } - - [Test] - [TestCaseSource(nameof(GetValuesBelowLowerLimit))] - public void CreateEffectiveStressDailyAreas_ValueBelowLowerLimit_ReturnsExpectedAreas(double value) - { - // Setup - var constructionProperties = new MacroStabilityInwardsSlice.ConstructionProperties - { - EffectiveStressDaily = value - }; - - MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); - - // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas(slidingCurve); - - // Assert - CollectionAssert.AreEqual(new[] - { - new[] - { - new Point2D(0, 0), - new Point2D(1, 0), - new Point2D(1, 250), - new Point2D(0, 250) - }, - new[] - { - new Point2D(1, 0), - new Point2D(1, 1), - new Point2D(-249, 1), - new Point2D(-249, 0) - }, - new[] - { - new Point2D(1, 0), - new Point2D(2, 1), - new Point2D(-174.776695, 177.776695), - new Point2D(-175.776695, 176.776695) - } - }, areas, new Point2DComparerWithTolerance(1e-6)); - } - - [Test] - public void CreateEffectiveStressDailyAreas_ValidParameters_ReturnsExpectedAreas() - { - // Setup - var constructionProperties = new MacroStabilityInwardsSlice.ConstructionProperties - { - EffectiveStressDaily = 50.0 - }; - - MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); - - // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas(slidingCurve); - - // Assert - CollectionAssert.AreEqual(new[] - { - new[] - { - new Point2D(0, 0), - new Point2D(1, 0), - new Point2D(1, -6.25), - new Point2D(0, -6.25) - }, - new[] - { - new Point2D(1, 0), - new Point2D(1, 1), - new Point2D(7.25, 1), - new Point2D(7.25, 0) - }, - new[] - { - new Point2D(1, 0), - new Point2D(2, 1), - new Point2D(6.419417, -3.419417), - new Point2D(5.419417, -4.419417) - } - }, areas, new Point2DComparerWithTolerance(1e-6)); - } - - [Test] public void CreateTotalPorePressureAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call @@ -2025,9 +1890,6 @@ MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressAreas)) .SetName(nameof(MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressAreas)); yield return new TestCaseData(new Func>>( - MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas)) - .SetName(nameof(MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas)); - yield return new TestCaseData(new Func>>( MacroStabilityInwardsSliceChartDataPointsFactory.CreateTotalPorePressureAreas)) .SetName(nameof(MacroStabilityInwardsSliceChartDataPointsFactory.CreateTotalPorePressureAreas)); yield return new TestCaseData(new Func>>( Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSliceRowTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSliceRowTest.cs (.../MacroStabilityInwardsSliceRowTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSliceRowTest.cs (.../MacroStabilityInwardsSliceRowTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -68,8 +68,7 @@ Pop = 14.0, NormalStress = 15.0, ShearStress = 16.0, - LoadStress = 17.0, - EffectiveStressDaily = 18.0 + LoadStress = 17.0 }); // Call @@ -98,7 +97,6 @@ Assert.AreEqual(15.0, sliceRow.NormalStress, sliceRow.NormalStress.GetAccuracy()); Assert.AreEqual(16.0, sliceRow.ShearStress, sliceRow.ShearStress.GetAccuracy()); Assert.AreEqual(17.0, sliceRow.LoadStress, sliceRow.LoadStress.GetAccuracy()); - Assert.AreEqual(18.0, sliceRow.EffectiveStressDaily, sliceRow.EffectiveStressDaily.GetAccuracy()); } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSlicesTableTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSlicesTableTest.cs (.../MacroStabilityInwardsSlicesTableTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSlicesTableTest.cs (.../MacroStabilityInwardsSlicesTableTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -45,18 +45,17 @@ private const int frictionAngleColumnIndex = 7; private const int cohesionColumnIndex = 8; private const int effectiveStressColumnIndex = 9; - private const int effectiveStressDailyColumnIndex = 10; - private const int totalPorePressureColumnIndex = 11; - private const int weightColumnIndex = 12; - private const int piezometricPorePressureColumnIndex = 13; - private const int porePressureColumnIndex = 14; - private const int verticalPorePressureColumnIndex = 15; - private const int horizontalPorePressureColumnIndex = 16; - private const int overConsolidationRatioColumnIndex = 17; - private const int popColumnIndex = 18; - private const int normalStressColumnIndex = 19; - private const int shearStressColumnIndex = 20; - private const int loadStressColumnIndex = 21; + private const int totalPorePressureColumnIndex = 10; + private const int weightColumnIndex = 11; + private const int piezometricPorePressureColumnIndex = 12; + private const int porePressureColumnIndex = 13; + private const int verticalPorePressureColumnIndex = 14; + private const int horizontalPorePressureColumnIndex = 15; + private const int overConsolidationRatioColumnIndex = 16; + private const int popColumnIndex = 17; + private const int normalStressColumnIndex = 18; + private const int shearStressColumnIndex = 19; + private const int loadStressColumnIndex = 20; [Test] public void Constructor_InitializesWithColumns() @@ -87,8 +86,6 @@ Assert.AreEqual("Cohesie\r\n[kN/m²]", cohesionColumn.HeaderText); DataGridViewColumn effectiveStressColumn = table.GetColumnFromIndex(effectiveStressColumnIndex); Assert.AreEqual("Effectieve spanning\r\n[kN/m²]", effectiveStressColumn.HeaderText); - DataGridViewColumn effectiveStressDailyColumn = table.GetColumnFromIndex(effectiveStressDailyColumnIndex); - Assert.AreEqual("Effectieve spanning\r\n(dagelijks)\r\n[kN/m²]", effectiveStressDailyColumn.HeaderText); DataGridViewColumn totalPorePressureColumn = table.GetColumnFromIndex(totalPorePressureColumnIndex); Assert.AreEqual("Totale\r\nwaterspanning\r\n[kN/m²]", totalPorePressureColumn.HeaderText); DataGridViewColumn weightColumn = table.GetColumnFromIndex(weightColumnIndex); @@ -258,11 +255,6 @@ effectiveStress, effectiveStress.GetAccuracy()); - var effectiveStressDaily = (RoundedDouble) rowCells[effectiveStressDailyColumnIndex].Value; - Assert.AreEqual(slice.EffectiveStressDaily, - effectiveStressDaily, - effectiveStressDaily.GetAccuracy()); - var totalPorePressure = (RoundedDouble) rowCells[totalPorePressureColumnIndex].Value; Assert.AreEqual(slice.TotalPorePressure, totalPorePressure, Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -74,10 +74,9 @@ private const int sliceParameterPiezometricPorePressureIndex = 8; private const int sliceParameterWeightIndex = 9; private const int sliceParameterTotalPorePressureIndex = 10; - private const int sliceParameterEffectiveStressDailyIndex = 11; - private const int sliceParameterEffectiveStressIndex = 12; - private const int sliceParameterCohesionIndex = 13; - private const int sliceParameterNrOfChartData = 14; + private const int sliceParameterEffectiveStressIndex = 11; + private const int sliceParameterCohesionIndex = 12; + private const int sliceParameterNrOfChartData = 13; /// /// Asserts whether corresponds to the input of . @@ -260,8 +259,6 @@ ((ChartMultipleAreaData) actual.Collection.ElementAt(sliceParameterCohesionIndex)).Areas); CollectionAssert.AreEqual(CreateExpectedSliceParameterAreas(macroStabilityInwardsSlices, s => s.EffectiveStress, 0.125), ((ChartMultipleAreaData) actual.Collection.ElementAt(sliceParameterEffectiveStressIndex)).Areas); - CollectionAssert.AreEqual(CreateExpectedSliceParameterAreas(macroStabilityInwardsSlices, s => s.EffectiveStressDaily, 0.125), - ((ChartMultipleAreaData) actual.Collection.ElementAt(sliceParameterEffectiveStressDailyIndex)).Areas); CollectionAssert.AreEqual(CreateExpectedSliceParameterAreas(macroStabilityInwardsSlices, s => s.TotalPorePressure, 0.125), ((ChartMultipleAreaData) actual.Collection.ElementAt(sliceParameterTotalPorePressureIndex)).Areas); CollectionAssert.AreEqual(CreateExpectedSliceParameterAreas(macroStabilityInwardsSlices, s => s.Weight, 0.125), @@ -299,7 +296,6 @@ Assert.AreEqual(sliceParameterNrOfChartData, chartDataArray.Length); var cohesionSliceData = (ChartMultipleAreaData) chartDataArray[sliceParameterCohesionIndex]; var effectiveStressSliceData = (ChartMultipleAreaData) chartDataArray[sliceParameterEffectiveStressIndex]; - var effectiveStressDailySliceData = (ChartMultipleAreaData) chartDataArray[sliceParameterEffectiveStressDailyIndex]; var totalPorePressureSliceData = (ChartMultipleAreaData) chartDataArray[sliceParameterTotalPorePressureIndex]; var weightSliceData = (ChartMultipleAreaData) chartDataArray[sliceParameterWeightIndex]; var piezometricPorePressureSliceData = (ChartMultipleAreaData) chartDataArray[sliceParameterPiezometricPorePressureIndex]; @@ -314,7 +310,6 @@ CollectionAssert.IsEmpty(cohesionSliceData.Areas); CollectionAssert.IsEmpty(effectiveStressSliceData.Areas); - CollectionAssert.IsEmpty(effectiveStressDailySliceData.Areas); CollectionAssert.IsEmpty(totalPorePressureSliceData.Areas); CollectionAssert.IsEmpty(weightSliceData.Areas); CollectionAssert.IsEmpty(piezometricPorePressureSliceData.Areas); @@ -329,7 +324,6 @@ Assert.AreEqual("Cohesie", cohesionSliceData.Name); Assert.AreEqual("Effectieve spanning", effectiveStressSliceData.Name); - Assert.AreEqual("Effectieve spanning (dagelijks)", effectiveStressDailySliceData.Name); Assert.AreEqual("Totale waterspanning", totalPorePressureSliceData.Name); Assert.AreEqual("Gewicht", weightSliceData.Name); Assert.AreEqual("Piezometrische waterspanning", piezometricPorePressureSliceData.Name); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSliceResultTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSliceResultTest.cs (.../UpliftVanSliceResultTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSliceResultTest.cs (.../UpliftVanSliceResultTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -139,7 +139,6 @@ Assert.IsNaN(slice.VerticalPorePressure); Assert.IsNaN(slice.PiezometricPorePressure); Assert.IsNaN(slice.EffectiveStress); - Assert.IsNaN(slice.EffectiveStressDaily); Assert.IsNaN(slice.ExcessPorePressure); Assert.IsNaN(slice.ShearStress); Assert.IsNaN(slice.SoilStress); @@ -176,7 +175,6 @@ double verticalPorePressure = random.NextDouble(); double piezometricPorePressure = random.NextDouble(); double effectiveStress = random.NextDouble(); - double effectiveStressDaily = random.NextDouble(); double excessPorePressure = random.NextDouble(); double shearStress = random.NextDouble(); double soilStress = random.NextDouble(); @@ -209,7 +207,6 @@ VerticalPorePressure = verticalPorePressure, PiezometricPorePressure = piezometricPorePressure, EffectiveStress = effectiveStress, - EffectiveStressDaily = effectiveStressDaily, ExcessPorePressure = excessPorePressure, ShearStress = shearStress, SoilStress = soilStress, @@ -247,7 +244,6 @@ Assert.AreEqual(verticalPorePressure, slice.VerticalPorePressure); Assert.AreEqual(piezometricPorePressure, slice.PiezometricPorePressure); Assert.AreEqual(effectiveStress, slice.EffectiveStress); - Assert.AreEqual(effectiveStressDaily, slice.EffectiveStressDaily); Assert.AreEqual(excessPorePressure, slice.ExcessPorePressure); Assert.AreEqual(shearStress, slice.ShearStress); Assert.AreEqual(soilStress, slice.SoilStress); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanSlidingCurveResultCreatorTest.cs =================================================================== diff -u -red9152404afba777e74f11da2e10076ba8a2043c -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanSlidingCurveResultCreatorTest.cs (.../UpliftVanSlidingCurveResultCreatorTest.cs) (revision ed9152404afba777e74f11da2e10076ba8a2043c) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanSlidingCurveResultCreatorTest.cs (.../UpliftVanSlidingCurveResultCreatorTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -142,7 +142,6 @@ double verticalPorePressure = random.NextDouble(); double piezometricPorePressure = random.NextDouble(); double effectiveStress = random.NextDouble(); - double effectiveStressDaily = random.NextDouble(); double excessPorePressure = random.NextDouble(); double shearStress = random.NextDouble(); double soilStress = random.NextDouble(); @@ -187,7 +186,6 @@ VPoreOnSurface = verticalPorePressure, PiezometricPorePressure = piezometricPorePressure, EffectiveStress = effectiveStress, - EffectiveStressDaily = effectiveStressDaily, ExcessPorePressure = excessPorePressure, ShearStress = shearStress, SoilStress = soilStress, @@ -233,7 +231,6 @@ Assert.AreEqual(verticalPorePressure, slice.VerticalPorePressure); Assert.AreEqual(piezometricPorePressure, slice.PiezometricPorePressure); Assert.AreEqual(effectiveStress, slice.EffectiveStress); - Assert.AreEqual(effectiveStressDaily, slice.EffectiveStressDaily); Assert.AreEqual(excessPorePressure, slice.ExcessPorePressure); Assert.AreEqual(shearStress, slice.ShearStress); Assert.AreEqual(soilStress, slice.SoilStress); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorOutputAssert.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorOutputAssert.cs (.../UpliftVanCalculatorOutputAssert.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorOutputAssert.cs (.../UpliftVanCalculatorOutputAssert.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -115,7 +115,6 @@ Assert.AreEqual(expected[i].VerticalPorePressure, actual[i].VerticalPorePressure); Assert.AreEqual(expected[i].PiezometricPorePressure, actual[i].PiezometricPorePressure); Assert.AreEqual(expected[i].EffectiveStress, actual[i].EffectiveStress); - Assert.AreEqual(expected[i].EffectiveStressDaily, actual[i].EffectiveStressDaily); Assert.AreEqual(expected[i].ExcessPorePressure, actual[i].ExcessPorePressure); Assert.AreEqual(expected[i].ShearStress, actual[i].ShearStress); Assert.AreEqual(expected[i].SoilStress, actual[i].SoilStress); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlidingCurveConverterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlidingCurveConverterTest.cs (.../MacroStabilityInwardsSlidingCurveConverterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlidingCurveConverterTest.cs (.../MacroStabilityInwardsSlidingCurveConverterTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -104,7 +104,6 @@ Assert.AreEqual(expectedSlices[i].VerticalPorePressure, actualSlices[i].VerticalPorePressure); Assert.AreEqual(expectedSlices[i].PiezometricPorePressure, actualSlices[i].PiezometricPorePressure); Assert.AreEqual(expectedSlices[i].EffectiveStress, actualSlices[i].EffectiveStress); - Assert.AreEqual(expectedSlices[i].EffectiveStressDaily, actualSlices[i].EffectiveStressDaily); Assert.AreEqual(expectedSlices[i].ExcessPorePressure, actualSlices[i].ExcessPorePressure); Assert.AreEqual(expectedSlices[i].ShearStress, actualSlices[i].ShearStress); Assert.AreEqual(expectedSlices[i].SoilStress, actualSlices[i].SoilStress); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -rba564a2ca0ec7d9ad0c8e5bc2cf05abf4fd7f15b -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision ba564a2ca0ec7d9ad0c8e5bc2cf05abf4fd7f15b) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -942,7 +942,6 @@ Assert.AreEqual(expectedSlices[i].VerticalPorePressure, actualSlices[i].VerticalPorePressure); Assert.AreEqual(expectedSlices[i].PiezometricPorePressure, actualSlices[i].PiezometricPorePressure); Assert.AreEqual(expectedSlices[i].EffectiveStress, actualSlices[i].EffectiveStress); - Assert.AreEqual(expectedSlices[i].EffectiveStressDaily, actualSlices[i].EffectiveStressDaily); Assert.AreEqual(expectedSlices[i].ExcessPorePressure, actualSlices[i].ExcessPorePressure); Assert.AreEqual(expectedSlices[i].ShearStress, actualSlices[i].ShearStress); Assert.AreEqual(expectedSlices[i].SoilStress, actualSlices[i].SoilStress); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Serializers/MacroStabilityInwardsSliceCollectionXmlSerializer.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/Storage/src/Riskeer.Storage.Core/Serializers/MacroStabilityInwardsSliceCollectionXmlSerializer.cs (.../MacroStabilityInwardsSliceCollectionXmlSerializer.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Serializers/MacroStabilityInwardsSliceCollectionXmlSerializer.cs (.../MacroStabilityInwardsSliceCollectionXmlSerializer.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -89,7 +89,6 @@ verticalPorePressure = slice.VerticalPorePressure; piezometricPorePressure = slice.PiezometricPorePressure; effectiveStress = slice.EffectiveStress; - effectiveStressDaily = slice.EffectiveStressDaily; excessPorePressure = slice.ExcessPorePressure; shearStress = slice.ShearStress; soilStress = slice.SoilStress; @@ -134,7 +133,6 @@ VerticalPorePressure = verticalPorePressure, PiezometricPorePressure = piezometricPorePressure, EffectiveStress = effectiveStress, - EffectiveStressDaily = effectiveStressDaily, ExcessPorePressure = excessPorePressure, ShearStress = shearStress, SoilStress = soilStress, @@ -248,9 +246,6 @@ private readonly double effectiveStress; [DataMember] - private readonly double effectiveStressDaily; - - [DataMember] private readonly double excessPorePressure; [DataMember] Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r2f38d99573f6027e41bccc157013ca2fee9e1689 -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 2f38d99573f6027e41bccc157013ca2fee9e1689) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -1680,7 +1680,6 @@ Assert.AreEqual(expectedSlice.VerticalPorePressure, actualSlice.VerticalPorePressure); Assert.AreEqual(expectedSlice.PiezometricPorePressure, actualSlice.PiezometricPorePressure); Assert.AreEqual(expectedSlice.EffectiveStress, actualSlice.EffectiveStress); - Assert.AreEqual(expectedSlice.EffectiveStressDaily, actualSlice.EffectiveStressDaily); Assert.AreEqual(expectedSlice.ExcessPorePressure, actualSlice.ExcessPorePressure); Assert.AreEqual(expectedSlice.ShearStress, actualSlice.ShearStress); Assert.AreEqual(expectedSlice.SoilStress, actualSlice.SoilStress); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Serializers/MacroStabilityInwardsSliceCollectionXmlSerializerTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r502628993928a1e34023af884433fd19ebac2adb --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Serializers/MacroStabilityInwardsSliceCollectionXmlSerializerTest.cs (.../MacroStabilityInwardsSliceCollectionXmlSerializerTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Serializers/MacroStabilityInwardsSliceCollectionXmlSerializerTest.cs (.../MacroStabilityInwardsSliceCollectionXmlSerializerTest.cs) (revision 502628993928a1e34023af884433fd19ebac2adb) @@ -88,7 +88,6 @@ VerticalPorePressure = random.NextDouble(), PiezometricPorePressure = random.NextDouble(), EffectiveStress = random.NextDouble(), - EffectiveStressDaily = random.NextDouble(), ExcessPorePressure = random.NextDouble(), ShearStress = random.NextDouble(), SoilStress = random.NextDouble(), @@ -138,7 +137,6 @@ && x.VerticalPorePressure.Equals(y.VerticalPorePressure) && x.PiezometricPorePressure.Equals(y.PiezometricPorePressure) && x.EffectiveStress.Equals(y.EffectiveStress) - && x.EffectiveStressDaily.Equals(y.EffectiveStressDaily) && x.ExcessPorePressure.Equals(y.ExcessPorePressure) && x.ShearStress.Equals(y.ShearStress) && x.SoilStress.Equals(y.SoilStress)