Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6fb58a23f000deb73c506a739ecf43d50b9034e4 -r1d682d2d79d3dc08fc5a8c0ebac889d996dfb492 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1d682d2d79d3dc08fc5a8c0ebac889d996dfb492) @@ -768,26 +768,6 @@ } /// - /// Looks up a localized string similar to Waterspanning door consolidatiegraad belasting [kN/m²]. - /// - public static string MacroStabilityInwardsSlicesTable_ColumnHeader_DegreeOfConsolidationPorePressureLoad { - get { - return ResourceManager.GetString("MacroStabilityInwardsSlicesTable_ColumnHeader_DegreeOfConsolidationPorePressureLo" + - "ad", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Waterspanning door consolidatiegraad grond [kN/m²]. - /// - public static string MacroStabilityInwardsSlicesTable_ColumnHeader_DegreeOfConsolidationPorePressureSoil { - get { - return ResourceManager.GetString("MacroStabilityInwardsSlicesTable_ColumnHeader_DegreeOfConsolidationPorePressureSo" + - "il", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Effectieve spanning [kN/m²]. /// public static string MacroStabilityInwardsSlicesTable_ColumnHeader_EffectiveStress { @@ -806,15 +786,6 @@ } /// - /// Looks up a localized string similar to Externe belasting [kN/m²]. - /// - public static string MacroStabilityInwardsSlicesTable_ColumnHeader_ExternalLoad { - get { - return ResourceManager.GetString("MacroStabilityInwardsSlicesTable_ColumnHeader_ExternalLoad", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Horizontale waterspanning op maaiveld [kN/m²]. /// public static string MacroStabilityInwardsSlicesTable_ColumnHeader_HorizontalPorePressure { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r6fb58a23f000deb73c506a739ecf43d50b9034e4 -r1d682d2d79d3dc08fc5a8c0ebac889d996dfb492 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 1d682d2d79d3dc08fc5a8c0ebac889d996dfb492) @@ -658,21 +658,12 @@ Cohesie [kN/m²] - - Waterspanning door consolidatiegraad belasting [kN/m²] - - - Waterspanning door consolidatiegraad grond [kN/m²] - Effectieve spanning [kN/m²] Effectieve spanning (dagelijks) [kN/m²] - - Externe belasting [kN/m²] - Wrijvingshoek [°] Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSliceRow.cs =================================================================== diff -u -r6fb58a23f000deb73c506a739ecf43d50b9034e4 -r1d682d2d79d3dc08fc5a8c0ebac889d996dfb492 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSliceRow.cs (.../MacroStabilityInwardsSliceRow.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSliceRow.cs (.../MacroStabilityInwardsSliceRow.cs) (revision 1d682d2d79d3dc08fc5a8c0ebac889d996dfb492) @@ -59,12 +59,9 @@ TotalPorePressure = slice.TotalPorePressure; Weight = slice.Weight; PiezometricPorePressure = slice.PiezometricPorePressure; - DegreeOfConsolidationPorePressureSoil = slice.DegreeOfConsolidationPorePressureSoil; - DegreeOfConsolidationPorePressureLoad = slice.DegreeOfConsolidationPorePressureLoad; PorePressure = slice.PorePressure; VerticalPorePressure = slice.VerticalPorePressure; HorizontalPorePressure = slice.HorizontalPorePressure; - ExternalLoad = slice.ExternalLoad; OverConsolidationRatio = slice.OverConsolidationRatio; Pop = slice.Pop; NormalStress = slice.NormalStress; @@ -108,12 +105,6 @@ public RoundedDouble OverConsolidationRatio { get; } /// - /// Gets the external load of the slice. - /// [kN/m²] - /// - public RoundedDouble ExternalLoad { get; } - - /// /// Gets the horizontal pressure of the slice. /// [kN/m²] /// @@ -132,18 +123,6 @@ public RoundedDouble PorePressure { get; } /// - /// Gets the pore pressure from degree of consolidation load of the slice. - /// [kN/m²] - /// - public RoundedDouble DegreeOfConsolidationPorePressureLoad { get; } - - /// - /// Gets the pore pressure from degree of consolidation soil of the slice. - /// [kN/m²] - /// - public RoundedDouble DegreeOfConsolidationPorePressureSoil { get; } - - /// /// Gets the piezometric pore pressure of the slice. /// [kN/m²] /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSlicesTable.cs =================================================================== diff -u -r6fb58a23f000deb73c506a739ecf43d50b9034e4 -r1d682d2d79d3dc08fc5a8c0ebac889d996dfb492 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSlicesTable.cs (.../MacroStabilityInwardsSlicesTable.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSlicesTable.cs (.../MacroStabilityInwardsSlicesTable.cs) (revision 1d682d2d79d3dc08fc5a8c0ebac889d996dfb492) @@ -95,12 +95,6 @@ AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.PiezometricPorePressure), Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_PiezometricPorePressure, true); - AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.DegreeOfConsolidationPorePressureSoil), - Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_DegreeOfConsolidationPorePressureSoil, - true); - AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.DegreeOfConsolidationPorePressureLoad), - Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_DegreeOfConsolidationPorePressureLoad, - true); AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.PorePressure), Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_PorePressure, true); @@ -110,9 +104,6 @@ AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.HorizontalPorePressure), Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_HorizontalPorePressure, true); - AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.ExternalLoad), - Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_ExternalLoad, - true); AddTextBoxColumn(nameof(MacroStabilityInwardsSliceRow.OverConsolidationRatio), Resources.MacroStabilityInwardsSlicesTable_ColumnHeader_OverConsolidationRatio, true); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSliceRowTest.cs =================================================================== diff -u -r6fb58a23f000deb73c506a739ecf43d50b9034e4 -r1d682d2d79d3dc08fc5a8c0ebac889d996dfb492 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSliceRowTest.cs (.../MacroStabilityInwardsSliceRowTest.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSliceRowTest.cs (.../MacroStabilityInwardsSliceRowTest.cs) (revision 1d682d2d79d3dc08fc5a8c0ebac889d996dfb492) @@ -90,12 +90,9 @@ Assert.AreEqual(4.0, sliceRow.TotalPorePressure, sliceRow.TotalPorePressure.GetAccuracy()); Assert.AreEqual(5.0, sliceRow.Weight, sliceRow.Weight.GetAccuracy()); Assert.AreEqual(6.0, sliceRow.PiezometricPorePressure, sliceRow.PiezometricPorePressure.GetAccuracy()); - Assert.AreEqual(7.0, sliceRow.DegreeOfConsolidationPorePressureSoil, sliceRow.DegreeOfConsolidationPorePressureSoil.GetAccuracy()); - Assert.AreEqual(8.0, sliceRow.DegreeOfConsolidationPorePressureLoad, sliceRow.DegreeOfConsolidationPorePressureLoad.GetAccuracy()); Assert.AreEqual(9.0, sliceRow.PorePressure, sliceRow.PorePressure.GetAccuracy()); Assert.AreEqual(10.0, sliceRow.VerticalPorePressure, sliceRow.VerticalPorePressure.GetAccuracy()); Assert.AreEqual(11.0, sliceRow.HorizontalPorePressure, sliceRow.HorizontalPorePressure.GetAccuracy()); - Assert.AreEqual(12.0, sliceRow.ExternalLoad, sliceRow.ExternalLoad.GetAccuracy()); Assert.AreEqual(13.0, sliceRow.OverConsolidationRatio, sliceRow.OverConsolidationRatio.GetAccuracy()); Assert.AreEqual(14.0, sliceRow.Pop, sliceRow.Pop.GetAccuracy()); Assert.AreEqual(15.0, sliceRow.NormalStress, sliceRow.NormalStress.GetAccuracy()); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSlicesTableTest.cs =================================================================== diff -u -r6fb58a23f000deb73c506a739ecf43d50b9034e4 -r1d682d2d79d3dc08fc5a8c0ebac889d996dfb492 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSlicesTableTest.cs (.../MacroStabilityInwardsSlicesTableTest.cs) (revision 6fb58a23f000deb73c506a739ecf43d50b9034e4) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSlicesTableTest.cs (.../MacroStabilityInwardsSlicesTableTest.cs) (revision 1d682d2d79d3dc08fc5a8c0ebac889d996dfb492) @@ -48,17 +48,14 @@ 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; + 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; [Test] public void Constructor_InitializesWithColumns() @@ -95,18 +92,12 @@ Assert.AreEqual("Gewicht [kN/m]", weightColumn.HeaderText); DataGridViewColumn piezometricPorePressureColumn = table.GetColumnFromIndex(piezometricPorePressureColumnIndex); Assert.AreEqual("Piezometrische waterspanning [kN/m²]", piezometricPorePressureColumn.HeaderText); - DataGridViewColumn degreePorePressureSoilColumn = table.GetColumnFromIndex(degreePorePressureSoilColumnIndex); - Assert.AreEqual("Waterspanning door consolidatiegraad grond [kN/m²]", degreePorePressureSoilColumn.HeaderText); - DataGridViewColumn degreePorePressureLoadColumn = table.GetColumnFromIndex(degreePorePressureLoadColumnIndex); - Assert.AreEqual("Waterspanning door consolidatiegraad belasting [kN/m²]", degreePorePressureLoadColumn.HeaderText); DataGridViewColumn porePressureColumn = table.GetColumnFromIndex(porePressureColumnIndex); Assert.AreEqual("Waterspanning op maaiveld [kN/m²]", porePressureColumn.HeaderText); DataGridViewColumn verticalPorePressureColumn = table.GetColumnFromIndex(verticalPorePressureColumnIndex); Assert.AreEqual("Verticale waterspanning op maaiveld [kN/m²]", verticalPorePressureColumn.HeaderText); DataGridViewColumn horizontalPorePressureColumn = table.GetColumnFromIndex(horizontalPorePressureColumnIndex); Assert.AreEqual("Horizontale waterspanning op maaiveld [kN/m²]", horizontalPorePressureColumn.HeaderText); - DataGridViewColumn externalLoadColumn = table.GetColumnFromIndex(externalLoadColumnIndex); - Assert.AreEqual("Externe belasting [kN/m²]", externalLoadColumn.HeaderText); DataGridViewColumn overConsolidationRatioColumn = table.GetColumnFromIndex(overConsolidationRatioColumnIndex); Assert.AreEqual("OCR [-]", overConsolidationRatioColumn.HeaderText); DataGridViewColumn popColumn = table.GetColumnFromIndex(popColumnIndex); @@ -283,16 +274,6 @@ piezometricPorePressure, piezometricPorePressure.GetAccuracy()); - var degreePorePressureSoil = (RoundedDouble) rowCells[degreePorePressureSoilColumnIndex].Value; - Assert.AreEqual(slice.DegreeOfConsolidationPorePressureSoil, - degreePorePressureSoil, - degreePorePressureSoil.GetAccuracy()); - - var degreePorePressureLoad = (RoundedDouble) rowCells[degreePorePressureLoadColumnIndex].Value; - Assert.AreEqual(slice.DegreeOfConsolidationPorePressureLoad, - degreePorePressureLoad, - degreePorePressureLoad.GetAccuracy()); - var porePressure = (RoundedDouble) rowCells[porePressureColumnIndex].Value; Assert.AreEqual(slice.PorePressure, porePressure, @@ -308,11 +289,6 @@ horizontalPorePressure, horizontalPorePressure.GetAccuracy()); - var externalLoad = (RoundedDouble) rowCells[externalLoadColumnIndex].Value; - Assert.AreEqual(slice.ExternalLoad, - externalLoad, - externalLoad.GetAccuracy()); - var ocr = (RoundedDouble) rowCells[overConsolidationRatioColumnIndex].Value; Assert.AreEqual(slice.OverConsolidationRatio, ocr,