Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs =================================================================== diff -u -r4000 -r4052 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs (.../SoilGeometry.cs) (revision 4000) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs (.../SoilGeometry.cs) (revision 4052) @@ -22,61 +22,60 @@ using System; using Deltares.DamEngine.Data.Geotechnics; -namespace Deltares.DamEngine.Data.General +namespace Deltares.DamEngine.Data.General; + +/// +/// Exception class for SoilGeometry +/// +public class SoilGeometryException : ApplicationException { + public SoilGeometryException(string message) : base(message) {} +} + +public class SoilGeometryBase +{ + public virtual SoilProfileType SoilProfileType { get; set; } + public virtual string SoilGeometryName { get; set; } +} + +/// +/// Super class to contain 1D and 2D soil geometry +/// +public class SoilGeometry : SoilGeometryBase +{ /// - /// Exception class for SoilGeometry + /// Constructor /// - public class SoilGeometryException : ApplicationException + public SoilGeometry(SoilProfile1D soilProfile, string soilGeometry2DName) { - public SoilGeometryException(string message) : base(message) {} + SoilProfile = soilProfile; + SoilGeometry2DName = soilGeometry2DName; } - public class SoilGeometryBase - { - public virtual SoilProfileType SoilProfileType { get; set; } - public virtual string SoilGeometryName { get; set; } - } + #region PublicPropteries - /// - /// Super class to contain 1D and 2D soil geometry - /// - public class SoilGeometry : SoilGeometryBase + public override SoilProfileType SoilProfileType { - /// - /// Constructor - /// - public SoilGeometry(SoilProfile1D soilProfile, string soilGeometry2DName) + get { - SoilProfile = soilProfile; - SoilGeometry2DName = soilGeometry2DName; - } - - #region PublicPropteries - - public override SoilProfileType SoilProfileType - { - get + var soilProfileType = SoilProfileType.ProfileTypeStiFile; + if (SoilProfile != null) { - var soilProfileType = SoilProfileType.ProfileTypeStiFile; - if (SoilProfile != null) - { - soilProfileType = SoilProfileType.ProfileType1D; - } + soilProfileType = SoilProfileType.ProfileType1D; + } - if ((SoilProfile == null) && ((SoilGeometry2DName == null) || SoilGeometry2DName == "")) - { - throw new SoilGeometryException("No geometry assigned"); - } - - return soilProfileType; + if ((SoilProfile == null) && ((SoilGeometry2DName == null) || SoilGeometry2DName == "")) + { + throw new SoilGeometryException("No geometry assigned"); } + + return soilProfileType; } + } - public SoilProfile1D SoilProfile { get; set; } + public SoilProfile1D SoilProfile { get; set; } - public string SoilGeometry2DName { get; set; } + public string SoilGeometry2DName { get; set; } - #endregion PublicPropteries - } + #endregion PublicPropteries } \ No newline at end of file