Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r3353bf211a1b34b81752a0dcdc40c153a94df1fa -r6fb58a23f000deb73c506a739ecf43d50b9034e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3353bf211a1b34b81752a0dcdc40c153a94df1fa) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) @@ -797,6 +797,15 @@ } /// + /// Looks up a localized string similar to Effectieve spanning (dagelijks) [kN/m²]. + /// + public static string MacroStabilityInwardsSlicesTable_ColumnHeader_EffectiveStressDaily { + get { + return ResourceManager.GetString("MacroStabilityInwardsSlicesTable_ColumnHeader_EffectiveStressDaily", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Externe belasting [kN/m²]. /// public static string MacroStabilityInwardsSlicesTable_ColumnHeader_ExternalLoad { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r3353bf211a1b34b81752a0dcdc40c153a94df1fa -r6fb58a23f000deb73c506a739ecf43d50b9034e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3353bf211a1b34b81752a0dcdc40c153a94df1fa) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) @@ -667,6 +667,9 @@ Effectieve spanning [kN/m²] + + Effectieve spanning (dagelijks) [kN/m²] + Externe belasting [kN/m²] Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSliceRow.cs =================================================================== diff -u -r7b8a021f38d77546b7c3318f5f0dedda63168f91 -r6fb58a23f000deb73c506a739ecf43d50b9034e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSliceRow.cs (.../MacroStabilityInwardsSliceRow.cs) (revision 7b8a021f38d77546b7c3318f5f0dedda63168f91) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSliceRow.cs (.../MacroStabilityInwardsSliceRow.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares ²017. All rights reserved. +// Copyright (C) Stichting Deltares 2017. All rights reserved. // // This file is part of Ringtoets. // @@ -55,6 +55,7 @@ FrictionAngle = slice.FrictionAngle; Cohesion = slice.Cohesion; EffectiveStress = slice.EffectiveStress; + EffectiveStressDaily = slice.EffectiveStressDaily; TotalPorePressure = slice.TotalPorePressure; Weight = slice.Weight; PiezometricPorePressure = slice.PiezometricPorePressure; @@ -213,5 +214,12 @@ /// [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: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSlicesTable.cs =================================================================== diff -u -r3353bf211a1b34b81752a0dcdc40c153a94df1fa -r6fb58a23f000deb73c506a739ecf43d50b9034e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSlicesTable.cs (.../MacroStabilityInwardsSlicesTable.cs) (revision 3353bf211a1b34b81752a0dcdc40c153a94df1fa) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSlicesTable.cs (.../MacroStabilityInwardsSlicesTable.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) @@ -83,6 +83,9 @@ AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.EffectiveStress), Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_EffectiveStress, true); + AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.EffectiveStressDaily), + Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_EffectiveStressDaily, + true); AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.TotalPorePressure), Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_TotalPorePressure, true); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSliceRowTest.cs =================================================================== diff -u -r7b8a021f38d77546b7c3318f5f0dedda63168f91 -r6fb58a23f000deb73c506a739ecf43d50b9034e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSliceRowTest.cs (.../MacroStabilityInwardsSliceRowTest.cs) (revision 7b8a021f38d77546b7c3318f5f0dedda63168f91) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSliceRowTest.cs (.../MacroStabilityInwardsSliceRowTest.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) @@ -68,7 +68,8 @@ Pop = 14.0, NormalStress = 15.0, ShearStress = 16.0, - LoadStress = 17.0 + LoadStress = 17.0, + EffectiveStressDaily = 18.0 }); // Call @@ -100,6 +101,7 @@ 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: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSlicesTableTest.cs =================================================================== diff -u -r7b8a021f38d77546b7c3318f5f0dedda63168f91 -r6fb58a23f000deb73c506a739ecf43d50b9034e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSlicesTableTest.cs (.../MacroStabilityInwardsSlicesTableTest.cs) (revision 7b8a021f38d77546b7c3318f5f0dedda63168f91) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSlicesTableTest.cs (.../MacroStabilityInwardsSlicesTableTest.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) @@ -44,20 +44,21 @@ private const int frictionAngleColumnIndex = 7; private const int cohesionColumnIndex = 8; private const int effectiveStressColumnIndex = 9; - private const int totalPorePressureColumnIndex = 10; - private const int weightColumnIndex = 11; - private const int piezometricPorePressureColumnIndex = 12; - private const int degreePorePressureSoilColumnIndex = 13; - private const int degreePorePressureLoadColumnIndex = 14; - private const int porePressureColumnIndex = 15; - private const int verticalPorePressureColumnIndex = 16; - private const int horizontalPorePressureColumnIndex = 17; - private const int externalLoadColumnIndex = 18; - private const int overConsolidationRatioColumnIndex = 19; - private const int popColumnIndex = 20; - private const int normalStressColumnIndex = 21; - private const int shearStressColumnIndex = 22; - private const int loadStressColumnIndex = 23; + private const int effectiveStressDailyColumnIndex = 10; + private const int totalPorePressureColumnIndex = 11; + private const int weightColumnIndex = 12; + private const int piezometricPorePressureColumnIndex = 13; + private const int degreePorePressureSoilColumnIndex = 14; + private const int degreePorePressureLoadColumnIndex = 15; + private const int porePressureColumnIndex = 16; + private const int verticalPorePressureColumnIndex = 17; + private const int horizontalPorePressureColumnIndex = 18; + private const int externalLoadColumnIndex = 19; + private const int overConsolidationRatioColumnIndex = 20; + private const int popColumnIndex = 21; + private const int normalStressColumnIndex = 22; + private const int shearStressColumnIndex = 23; + private const int loadStressColumnIndex = 24; [Test] public void Constructor_InitializesWithColumns() @@ -86,6 +87,8 @@ Assert.AreEqual("Cohesie [kN/m²]", cohesionColumn.HeaderText); DataGridViewColumn effectiveStressColumn = table.GetColumnFromIndex(effectiveStressColumnIndex); Assert.AreEqual("Effectieve spanning [kN/m²]", effectiveStressColumn.HeaderText); + DataGridViewColumn effectiveStressDailyColumn = table.GetColumnFromIndex(effectiveStressDailyColumnIndex); + Assert.AreEqual("Effectieve spanning (dagelijks) [kN/m²]", effectiveStressDailyColumn.HeaderText); DataGridViewColumn totalPorePressureColumn = table.GetColumnFromIndex(totalPorePressureColumnIndex); Assert.AreEqual("Totale waterspanning [kN/m²]", totalPorePressureColumn.HeaderText); DataGridViewColumn weightColumn = table.GetColumnFromIndex(weightColumnIndex); @@ -260,6 +263,11 @@ 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,