Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/LayerProperties.cs =================================================================== diff -u -r36e7a0a258891013379258ea856d49351594666e -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/LayerProperties.cs (.../LayerProperties.cs) (revision 36e7a0a258891013379258ea856d49351594666e) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/LayerProperties.cs (.../LayerProperties.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -34,14 +34,17 @@ internal class LayerProperties { /// - /// Creates a new instance of , which contains properties + /// Creates a new instance of , that contains properties /// that are required to create a complete soil layer. /// - /// The to obtain the required layer property values from. - /// The profile name used in generating exceptions messages if casting failed. - /// Thrown when any of the input parameters is null. - /// Thrown when the values in the database cannot be - /// casted to the expected column types. + /// The to obtain the required + /// layer property values from. + /// The profile name used in generating exceptions messages + /// if reading property values fails. + /// Thrown when any of the input parameters is + /// null. + /// Thrown when the values in the database + /// cannot be casted to the expected column types. internal LayerProperties(IRowBasedDatabaseReader reader, string profileName) { if (reader == null) @@ -101,7 +104,7 @@ } /// - /// Gets a value representing whether the layer is an aquifer. + /// Gets a value representing whether the layer is an aquifer. /// public double? IsAquifer { get; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/FailureMechanismType.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/FailureMechanismType.cs (.../FailureMechanismType.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/FailureMechanismType.cs (.../FailureMechanismType.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -31,12 +31,14 @@ Settlement = 2, PipingUpliftGradient = 3, Piping = 4, + Koswat = 5, FlowSlide = 6, Overtopping = 7, AnchorLoading = 9, DAM = 10, Structures = 11, BlockRevetment = 12, + AssessmentLevel = 13, Dunes = 14, AsphaltRevetment = 15 } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/MechanismTableDefinitions.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/MechanismTableDefinitions.cs (.../MechanismTableDefinitions.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/MechanismTableDefinitions.cs (.../MechanismTableDefinitions.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -27,17 +27,17 @@ internal static class MechanismTableDefinitions { /// - /// Gets the name of the table. + /// The name of the table. /// public const string TableName = "Mechanism"; /// - /// Gets the name of the failure mechanism id column. + /// The name of the failure mechanism id column. /// public const string MechanismId = "ME_ID"; /// - /// Gets the name of the failure mechanism name column. + /// The name of the failure mechanism name column. /// public const string MechanismName = "ME_Name"; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/MetaTableDefinitions.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/MetaTableDefinitions.cs (.../MetaTableDefinitions.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/MetaTableDefinitions.cs (.../MetaTableDefinitions.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -27,17 +27,17 @@ internal static class MetaTableDefinitions { /// - /// Gets the name of the table. + /// The name of the table. /// public const string TableName = "_MetaData"; /// - /// Gets the name of the 'key' column. + /// The name of the 'key' column. /// public const string Key = "Key"; /// - /// Gets the name of the 'value' column. + /// The name of the 'value' column. /// public const string Value = "Value"; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/SegmentPointsTableDefinitions.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/SegmentPointsTableDefinitions.cs (.../SegmentPointsTableDefinitions.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/SegmentPointsTableDefinitions.cs (.../SegmentPointsTableDefinitions.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -27,17 +27,17 @@ internal static class SegmentPointsTableDefinitions { /// - /// Gets the name of the table. + /// The name of the table. /// public const string TableName = "SegmentPoints"; /// - /// Gets the name of the world x coordinate column. + /// The name of the world x coordinate column. /// public const string CoordinateX = "XWorld"; /// - /// Gets the name of the world Y coordinate column. + /// The name of the world Y coordinate column. /// public const string CoordinateY = "YWorld"; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/SegmentTableDefinitions.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/SegmentTableDefinitions.cs (.../SegmentTableDefinitions.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/SegmentTableDefinitions.cs (.../SegmentTableDefinitions.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -27,12 +27,12 @@ internal static class SegmentTableDefinitions { /// - /// Gets the name of the table. + /// The name of the table. /// public const string TableName = "Segment"; /// - /// Gets the name of the segment id column. + /// The name of the segment id column. /// public const string SegmentId = "SE_ID"; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/SoilProfileTableDefinitions.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/SoilProfileTableDefinitions.cs (.../SoilProfileTableDefinitions.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/SoilProfileTableDefinitions.cs (.../SoilProfileTableDefinitions.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -26,28 +26,114 @@ /// internal static class SoilProfileTableDefinitions { + /// + /// The name of the database identifier column. + /// public const string SoilProfileId = "SoilProfileId"; + + /// + /// The name of the alias used whether the layer is an aquifer. + /// public const string IsAquifer = "IsAquifer"; + + /// + /// The name of the profile name column. + /// public const string ProfileName = "ProfileName"; + + /// + /// The name of the profile intersection column. + /// public const string IntersectionX = "IntersectionX"; + + /// + /// The name of the profile bottom column. + /// public const string Bottom = "Bottom"; + + /// + /// The name of the profile top column. + /// public const string Top = "Top"; + + /// + /// The name of the profile color column. + /// public const string Color = "Color"; + + /// + /// The name of the material name column. + /// public const string MaterialName = "MaterialName"; + + /// + /// The name of the profile layer geometry column. + /// public const string LayerGeometry = "LayerGeometry"; + + /// + /// The name of the below phreatic level distribution column. + /// public const string BelowPhreaticLevelDistribution = "BelowPhreaticLevelDistribution"; + + /// + /// The name of the below phreatic level shift column. + /// public const string BelowPhreaticLevelShift = "BelowPhreaticLevelShift"; + + /// + /// The name of the below phreatic level mean column. + /// public const string BelowPhreaticLevelMean = "BelowPhreaticLevelMean"; + + /// + /// The name of the below phreatic level deviation column. + /// public const string BelowPhreaticLevelDeviation = "BelowPhreaticLevelDeviation"; + + /// + /// The name of the permeability distribution column. + /// public const string PermeabilityDistribution = "PermeabKxDistribution"; + + /// + /// The name of the permeability shift column. + /// public const string PermeabilityShift = "PermeabKxShift"; + + /// + /// The name of the permeability mean column. + /// public const string PermeabilityMean = "PermeabKxMean"; + + /// + /// The name of the permeability coefficient of variation column. + /// public const string PermeabilityCoefficientOfVariation = "PermeabKxCoefficientOfVariation"; + + /// + /// The name of the diameter D70 distribution column. + /// public const string DiameterD70Distribution = "DiameterD70Distribution"; + + /// + /// The name of the diameter D70 shift column. + /// public const string DiameterD70Shift = "DiameterD70Shift"; + + /// + /// The name of the diameter D70 mean column. + /// public const string DiameterD70Mean = "DiameterD70Mean"; + + /// + /// The name of the diameter D70 coefficient of variation column. + /// public const string DiameterD70CoefficientOfVariation = "DiameterD70CoefficientOfVariation"; + /// + /// The name of the alias used for the number of layers that can be read. + /// public const string LayerCount = "LayerCount"; } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/StochasticSoilModelTableDefinitions.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/StochasticSoilModelTableDefinitions.cs (.../StochasticSoilModelTableDefinitions.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/StochasticSoilModelTableDefinitions.cs (.../StochasticSoilModelTableDefinitions.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -27,27 +27,27 @@ internal static class StochasticSoilModelTableDefinitions { /// - /// Gets the name of the table. + /// The name of the table. /// public const string TableName = "StochasticSoilModel"; /// - /// Gets the name of the stochastic soil model id column. + /// The name of the stochastic soil model id column. /// public const string StochasticSoilModelId = "SSM_ID"; /// - /// Gets the name of the stochastic soil model name column. + /// The name of the stochastic soil model name column. /// public const string StochasticSoilModelName = "SSM_Name"; /// - /// Gets the name of the alias used for identifying if segments are unique. + /// The name of the alias used for identifying if segments are unique. /// public const string AreSegmentsUnique = "AreSegmentsUnique"; /// - /// Gets the name of the alias used for the number of rows that can be read. + /// The name of the alias used for the number of rows that can be read. /// public const string Count = "nrOfRows"; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/StochasticSoilProfileTableDefinitions.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/StochasticSoilProfileTableDefinitions.cs (.../StochasticSoilProfileTableDefinitions.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/StochasticSoilProfileTableDefinitions.cs (.../StochasticSoilProfileTableDefinitions.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -27,27 +27,27 @@ internal static class StochasticSoilProfileTableDefinitions { /// - /// Gets the name of the table. + /// The name of the table. /// public const string TableName = "StochasticSoilProfile"; /// - /// Gets the name of the stochastic soil profile 1D id column. + /// The name of the stochastic soil profile 1D id column. /// public const string SoilProfile1DId = "SP1D_ID"; /// - /// Gets the name of the stochastic soil profile 2D id column. + /// The name of the stochastic soil profile 2D id column. /// public const string SoilProfile2DId = "SP2D_ID"; /// - /// Gets the name of the stochastic soil profile probability column. + /// The name of the stochastic soil profile probability column. /// public const string Probability = "Probability"; /// - /// Gets the name of the alias used for identifying if the database consists only of + /// The name of the alias used for identifying if the database consists only of /// valid probabilities. /// public const string AllProbabilitiesValid = "AllProbabilitiesValid"; Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -r4fc96d31a69029557095247c8ff890d06239b65a -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 4fc96d31a69029557095247c8ff890d06239b65a) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 2ff863d4f541aa91cc29852317a4ff50b0fb71ed) @@ -281,7 +281,7 @@ // Assert var exception = Assert.Throws(test); - const string expectedMessage = "Het faalmechanisme 'AssessmentLevel' wordt niet ondersteund."; + const string expectedMessage = "Het faalmechanisme 'UNKNOWN' wordt niet ondersteund."; Assert.AreEqual(expectedMessage, exception.Message); } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelReader/otherFailureMechanism.soil =================================================================== diff -u -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d -r2ff863d4f541aa91cc29852317a4ff50b0fb71ed Binary files differ