Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/LayerProperties.cs =================================================================== diff -u -r8dfec2e1be6d23c02919ff849906fc89822f99b3 -rf878e05fdb2b65d1184118867e7d5664e6e3d9a6 --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/LayerProperties.cs (.../LayerProperties.cs) (revision 8dfec2e1be6d23c02919ff849906fc89822f99b3) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/LayerProperties.cs (.../LayerProperties.cs) (revision f878e05fdb2b65d1184118867e7d5664e6e3d9a6) @@ -93,6 +93,66 @@ PermeabilityMean = reader.ReadOrDefault(readColumn); readColumn = SoilProfileTableDefinitions.PermeabilityCoefficientOfVariation; PermeabilityCoefficientOfVariation = reader.ReadOrDefault(readColumn); + + readColumn = SoilProfileTableDefinitions.UsePop; + UsePop = reader.ReadOrDefault(readColumn); + + readColumn = SoilProfileTableDefinitions.ShearStrengthModel; + ShearStrengthModel = reader.ReadOrDefault(readColumn); + + readColumn = SoilProfileTableDefinitions.AbovePhreaticLevelDistribution; + AbovePhreaticLevelDistribution = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.AbovePhreaticLevelMean; + AbovePhreaticLevelMean = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.AbovePhreaticLevelCoefficientOfVariation; + AbovePhreaticLevelCoefficientOfVariation = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.AbovePhreaticLevelShift; + AbovePhreaticLevelShift = reader.ReadOrDefault(readColumn); + + readColumn = SoilProfileTableDefinitions.CohesionDistribution; + CohesionDistribution = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.CohesionMean; + CohesionMean = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.CohesionCoefficientOfVariation; + CohesionCoefficientOfVariation = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.CohesionShift; + CohesionShift = reader.ReadOrDefault(readColumn); + + readColumn = SoilProfileTableDefinitions.FrictionAngleDistribution; + FrictionAngleDistribution = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.FrictionAngleMean; + FrictionAngleMean = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.FrictionAngleCoefficientOfVariation; + FrictionAngleCoefficientOfVariation = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.FrictionAngleShift; + FrictionAngleShift = reader.ReadOrDefault(readColumn); + + readColumn = SoilProfileTableDefinitions.ShearStrengthRatioDistribution; + ShearStrengthRatioDistribution = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.ShearStrengthRatioMean; + ShearStrengthRatioMean = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.ShearStrengthRatioCoefficientOfVariation; + ShearStrengthRatioCoefficientOfVariation = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.ShearStrengthRatioShift; + ShearStrengthRatioShift = reader.ReadOrDefault(readColumn); + + readColumn = SoilProfileTableDefinitions.StrengthIncreaseExponentDistribution; + StrengthIncreaseExponentDistribution = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.StrengthIncreaseExponentMean; + StrengthIncreaseExponentMean = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.StrengthIncreaseExponentCoefficientOfVariation; + StrengthIncreaseExponentCoefficientOfVariation = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.StrengthIncreaseExponentShift; + StrengthIncreaseExponentShift = reader.ReadOrDefault(readColumn); + + readColumn = SoilProfileTableDefinitions.PopDistribution; + PopDistribution = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.PopMean; + PopMean = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.PopCoefficientOfVariation; + PopCoefficientOfVariation = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileTableDefinitions.PopShift; + PopShift = reader.ReadOrDefault(readColumn); } catch (InvalidCastException e) { @@ -198,113 +258,155 @@ public double? PermeabilityCoefficientOfVariation { get; } /// - /// Gets or sets a value indicating whether to use POP for the layer. + /// Gets the value indicating whether to use POP for the layer. /// public bool? UsePop { get; } /// - /// Gets or sets the shear strength model to use for the layer. + /// Gets the shear strength model to use for the layer. /// public ShearStrengthModel? ShearStrengthModel { get; } /// - /// Gets or sets the mean of the distribution for the volumic weight of the layer above the phreatic level. + /// Gets the distribution for the volumic weight of the layer above the phreatic level. /// [kN/m³] /// + public long? AbovePhreaticLevelDistribution { get; } + + /// + /// Gets the mean of the distribution for the volumic weight of the layer above the phreatic level. + /// [kN/m³] + /// public double? AbovePhreaticLevelMean { get; } /// - /// Gets or sets the deviation of the distribution for the volumic weight of the layer above the phreatic level. + /// Gets the deviation of the distribution for the volumic weight of the layer above the phreatic level. /// [kN/m³] /// - public double? AbovePhreaticLevelDeviation { get; } + public double? AbovePhreaticLevelCoefficientOfVariation { get; } /// - /// Gets or sets the mean of the distribution for the cohesion. + /// Gets the shift of the distribution for the volumic weight of the layer above the phreatic level. /// [kN/m³] /// + public double? AbovePhreaticLevelShift { get; } + + /// + /// Gets the distribution for the mean of the distribution for the cohesion. + /// [kN/m³] + /// + public long? CohesionDistribution { get; } + + /// + /// Gets the mean of the distribution for the cohesion. + /// [kN/m³] + /// public double? CohesionMean { get; } /// - /// Gets or sets the deviation of the distribution for the cohesion. + /// Gets the deviation of the distribution for the cohesion. /// [kN/m³] /// - public double? CohesionDeviation { get; } + public double? CohesionCoefficientOfVariation { get; } /// - /// Gets or sets the shift of the distribution for the cohesion. + /// Gets the shift of the distribution for the cohesion. /// [kN/m³] /// public double? CohesionShift { get; } /// - /// Gets or sets the mean of the distribution for the friction angle + /// Gets the distribution of the distribution for the friction angle /// [°] /// + public long? FrictionAngleDistribution { get; } + + /// + /// Gets the mean of the distribution for the friction angle + /// [°] + /// public double? FrictionAngleMean { get; } /// - /// Gets or sets the deviation of the distribution for the friction angle. + /// Gets the deviation of the distribution for the friction angle. /// [°] /// - public double? FrictionAngleDeviation { get; } + public double? FrictionAngleCoefficientOfVariation { get; } /// - /// Gets or sets the shift of the distribution for the friction angle. + /// Gets the shift of the distribution for the friction angle. /// [°] /// public double? FrictionAngleShift { get; } /// - /// Gets or sets the mean of the distribution for the ratio of shear strength S + /// Gets the distribution for the ratio of shear strength S /// [-] /// + public long? ShearStrengthRatioDistribution { get; } + + /// + /// Gets the mean of the distribution for the ratio of shear strength S + /// [-] + /// public double? ShearStrengthRatioMean { get; } /// - /// Gets or sets the deviation of the distribution for the ratio of shear strength S. + /// Gets the deviation of the distribution for the ratio of shear strength S. /// [-] /// - public double? ShearStrengthRatioDeviation { get; } + public double? ShearStrengthRatioCoefficientOfVariation { get; } /// - /// Gets or sets the shift of the distribution for the ratio of shear strength S. + /// Gets the shift of the distribution for the ratio of shear strength S. /// [-] /// public double? ShearStrengthRatioShift { get; } /// - /// Gets or sets the mean of the distribution for the strength increase exponent (m) + /// Gets the distribution for the strength increase exponent (m) /// [-] /// + public long? StrengthIncreaseExponentDistribution { get; } + + /// + /// Gets the mean of the distribution for the strength increase exponent (m) + /// [-] + /// public double? StrengthIncreaseExponentMean { get; } /// - /// Gets or sets the deviation of the distribution for the strength increase exponent (m). + /// Gets the deviation of the distribution for the strength increase exponent (m). /// [-] /// - public double? StrengthIncreaseExponentDeviation { get; } + public double? StrengthIncreaseExponentCoefficientOfVariation { get; } /// - /// Gets or sets the shift of the distribution for the strength increase exponent (m). + /// Gets the shift of the distribution for the strength increase exponent (m). /// [-] /// public double? StrengthIncreaseExponentShift { get; } /// - /// Gets or sets the mean of the distribution for the POP + /// Gets the distribution for the POP /// [kN/m²] /// + public long? PopDistribution { get; } + + /// + /// Gets mean of the distribution for the POP + /// [kN/m²] + /// public double? PopMean { get; } /// - /// Gets or sets the deviation of the distribution for the POP. + /// Gets the deviation of the distribution for the POP. /// [kN/m²] /// - public double? PopDeviation { get; } + public double? PopCoefficientOfVariation { get; } /// - /// Gets or sets the shift of the distribution for the POP. + /// Gets the shift of the distribution for the POP. /// [kN/m²] /// public double? PopShift { get; }