Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile1DReader.cs =================================================================== diff -u -r49f905d3363336d44ef828259692644dcf5f9edc -r751aaf9b7623bac357cbacf4e6ddae87b2b69f1f --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile1DReader.cs (.../SoilProfile1DReader.cs) (revision 49f905d3363336d44ef828259692644dcf5f9edc) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile1DReader.cs (.../SoilProfile1DReader.cs) (revision 751aaf9b7623bac357cbacf4e6ddae87b2b69f1f) @@ -93,11 +93,25 @@ var pipingSoilLayer = new SoilLayer1D(properties.Top) { IsAquifer = properties.IsAquifer, - BelowPhreaticLevel = properties.BelowPhreaticLevel, AbovePhreaticLevel = properties.AbovePhreaticLevel, DryUnitWeight = properties.DryUnitWeight, MaterialName = properties.MaterialName, - Color = properties.Color + Color = properties.Color, + + BelowPhreaticLevelDistribution = properties.BelowPhreaticLevelDistribution, + BelowPhreaticLevelShift = properties.BelowPhreaticLevelShift, + BelowPhreaticLevelMean = properties.BelowPhreaticLevelMean, + BelowPhreaticLevelDeviation = properties.BelowPhreaticLevelDeviation, + + DiameterD70Distribution = properties.DiameterD70Distribution, + DiameterD70Shift = properties.DiameterD70Shift, + DiameterD70Mean = properties.DiameterD70Mean, + DiameterD70Deviation = properties.DiameterD70Deviation, + + PermeabilityDistribution = properties.PermeabilityDistribution, + PermeabilityShift = properties.PermeabilityShift, + PermeabilityMean = properties.PermeabilityMean, + PermeabilityDeviation = properties.PermeabilityDeviation }; return pipingSoilLayer; } @@ -106,12 +120,26 @@ { internal readonly double Top; internal readonly double? IsAquifer; - internal readonly double? BelowPhreaticLevel; - internal readonly double? AbovePhreaticLevel; - internal readonly double? DryUnitWeight; internal readonly string MaterialName; internal readonly double? Color; + internal readonly double? AbovePhreaticLevel; + internal readonly double? DryUnitWeight; + internal readonly double? BelowPhreaticLevelDistribution; + internal readonly double? BelowPhreaticLevelShift; + internal readonly double? BelowPhreaticLevelMean; + internal readonly double? BelowPhreaticLevelDeviation; + + internal readonly double? DiameterD70Distribution; + internal readonly double? DiameterD70Shift; + internal readonly double? DiameterD70Mean; + internal readonly double? DiameterD70Deviation; + + internal readonly double? PermeabilityDistribution; + internal readonly double? PermeabilityShift; + internal readonly double? PermeabilityMean; + internal readonly double? PermeabilityDeviation; + /// /// Creates a new instance of , which contains properties /// that are required to create a complete . If these properties @@ -131,20 +159,43 @@ readColumn = SoilProfileDatabaseColumns.IsAquifer; IsAquifer = reader.ReadOrDefault(readColumn); - readColumn = SoilProfileDatabaseColumns.BelowPhreaticLevel; - BelowPhreaticLevel = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.MaterialName; + MaterialName = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.Color; + Color = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.AbovePhreaticLevel; AbovePhreaticLevel = reader.ReadOrDefault(readColumn); - readColumn = SoilProfileDatabaseColumns.DryUnitWeight; DryUnitWeight = reader.ReadOrDefault(readColumn); - readColumn = SoilProfileDatabaseColumns.MaterialName; - MaterialName = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.BelowPhreaticLevelDistribution; + BelowPhreaticLevelDistribution = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.BelowPhreaticLevelShift; + BelowPhreaticLevelShift = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.BelowPhreaticLevelMean; + BelowPhreaticLevelMean = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.BelowPhreaticLevelDeviation; + BelowPhreaticLevelDeviation = reader.ReadOrDefault(readColumn); - readColumn = SoilProfileDatabaseColumns.Color; - Color = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.DiameterD70Distribution; + DiameterD70Distribution = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.DiameterD70Shift; + DiameterD70Shift = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.DiameterD70Mean; + DiameterD70Mean = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.DiameterD70Deviation; + DiameterD70Deviation = reader.ReadOrDefault(readColumn); + + readColumn = SoilProfileDatabaseColumns.PermeabilityDistribution; + PermeabilityDistribution = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.PermeabilityShift; + PermeabilityShift = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.PermeabilityMean; + PermeabilityMean = reader.ReadOrDefault(readColumn); + readColumn = SoilProfileDatabaseColumns.PermeabilityDeviation; + PermeabilityDeviation = reader.ReadOrDefault(readColumn); } catch (InvalidCastException e) {