Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs =================================================================== diff -u -r435 -r454 --- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 435) +++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 454) @@ -22,27 +22,55 @@ StaticReflection.GetMemberName(s => s.SoilType), }; - private readonly HashSet macrostabilityBasicProperties = new HashSet + private readonly HashSet macrostabilitySoilProperties = new HashSet { StaticReflection.GetMemberName(s => s.AbovePhreaticLevel), + StaticReflection.GetMemberName(s => s.AbovePhreaticLevelStochast), StaticReflection.GetMemberName(s => s.BelowPhreaticLevel), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast), StaticReflection.GetMemberName(s => s.ShearStrengthModel), StaticReflection.GetMemberName(s => s.Cohesion), + StaticReflection.GetMemberName(s => s.CohesionStochast), StaticReflection.GetMemberName(s => s.FrictionAngle), + StaticReflection.GetMemberName(s => s.FrictionAngleStochast), StaticReflection.GetMemberName(s => s.UsePop), StaticReflection.GetMemberName(s => s.POP), + StaticReflection.GetMemberName(s => s.POPStochast), StaticReflection.GetMemberName(s => s.RatioCuPc), + StaticReflection.GetMemberName(s => s.RatioCuPcStochast), StaticReflection.GetMemberName(s => s.StrengthIncreaseExponent), + StaticReflection.GetMemberName(s => s.StrengthIncreaseExponentStochast) }; - private readonly HashSet pipingRingtoetsProperties = new HashSet + private readonly HashSet pipingSoilProperties = new HashSet { - StaticReflection.GetMemberName(s => s.DiameterD70Stochast), - StaticReflection.GetMemberName(s => s.PermeabKxStochast), + StaticReflection.GetMemberName(s => s.AbovePhreaticLevel), StaticReflection.GetMemberName(s => s.AbovePhreaticLevelStochast), StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevel), + StaticReflection.GetMemberName(s => s.DiameterD70), + StaticReflection.GetMemberName(s => s.DiameterD70Stochast), + StaticReflection.GetMemberName(s => s.PermeabKx), + StaticReflection.GetMemberName(s => s.PermeabKxStochast), }; + private readonly HashSet flowslideSoilProperties = new HashSet + { + StaticReflection.GetMemberName(s => s.DiameterD15), + StaticReflection.GetMemberName(s => s.DiameterD50), + StaticReflection.GetMemberName(s => s.FrictionAngle), + StaticReflection.GetMemberName(s => s.Porosity), + StaticReflection.GetMemberName(s => s.MinPorosity), + StaticReflection.GetMemberName(s => s.MaxPorosity), + StaticReflection.GetMemberName(s => s.Evoldm), + StaticReflection.GetMemberName(s => s.Ks0), + StaticReflection.GetMemberName(s => s.GammaKorrel), + StaticReflection.GetMemberName(s => s.ParM), + StaticReflection.GetMemberName(s => s.ParU), + StaticReflection.GetMemberName(s => s.ParV), + StaticReflection.GetMemberName(s => s.ParR), + }; + #endregion /// @@ -340,14 +368,18 @@ { switch ((UserColumnFilters)soilUserFilter) { - case UserColumnFilters.MacrostabilityBasicModule: + case UserColumnFilters.MacrostabilityWti: { - return macrostabilityBasicProperties; + return macrostabilitySoilProperties; } - case UserColumnFilters.PipingRingtoets: + case UserColumnFilters.PipingWti: { - return pipingRingtoetsProperties; + return pipingSoilProperties; } + case UserColumnFilters.FlowSlideWti: + { + return flowslideSoilProperties; + } } }