Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs =================================================================== diff -u -r4540 -r5810 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 5810) @@ -74,23 +74,6 @@ [Validate] public MStabParameters MStabParameters { get; set; } /// - /// Checks whether all required data is there. - /// - public bool IsComplete - { - get - { - return - !string.IsNullOrEmpty(MStabParameters.SoilDatabaseName) && - PlLines != null && - (SoilProfile != null || MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename != "") && - Location != null && - SurfaceLine != null && - !string.IsNullOrEmpty(MStabParameters.ProjectFileName); - } - } - - /// /// Performs the Assignment /// /// Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs =================================================================== diff -u -r5793 -r5810 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 5793) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 5810) @@ -24,29 +24,6 @@ namespace Deltares.DamEngine.Data.General; -public class SheetPiling : IAssignable, ICloneable -{ - public double XCoordinate { get; set; } - public double YCoordinate { get; set; } - public double ZCoordinate { get; set; } - public double Length { get; set; } - - public void Assign(SheetPiling sheetPiling) - { - XCoordinate = sheetPiling.XCoordinate; - YCoordinate = sheetPiling.YCoordinate; - ZCoordinate = sheetPiling.ZCoordinate; - Length = sheetPiling.Length; - } - - public SheetPiling Clone() - { - var sheetPiling = new SheetPiling(); - sheetPiling.Assign(this); - return sheetPiling; - } -} - public class SlipCircleDefinition : IAssignable, ICloneable { public double XCoordinateLowestUpliftFactorPoint { get; set; } @@ -117,165 +94,31 @@ } } -public class MStabForbiddenZone : IAssignable, ICloneable -{ - public bool IsXEntryMinUsed { get; set; } - public bool IsXEntryMaxUsed { get; set; } - public double XEntryMin { get; set; } - public double XEntryMax { get; set; } - - public void Assign(MStabForbiddenZone mstabForbiddenZone) - { - IsXEntryMinUsed = mstabForbiddenZone.IsXEntryMinUsed; - IsXEntryMaxUsed = mstabForbiddenZone.IsXEntryMaxUsed; - XEntryMin = mstabForbiddenZone.XEntryMin; - XEntryMax = mstabForbiddenZone.XEntryMax; - } - - public MStabForbiddenZone Clone() - { - var mstabForbiddenZone = new MStabForbiddenZone(); - mstabForbiddenZone.Assign(this); - return mstabForbiddenZone; - } -} - -public class MStabGeometryCreationOptions : IAssignable, ICloneable -{ - public MStabGeometryCreationOptions() - { - SoilProfileType = SoilProfileType.ProfileType1D; - SoilGeometry2DFilename = ""; - XOffsetSoilGeometry2DOrigin = 0.0; - MaterialForDike = ""; - MaterialForShoulder = ""; - PlLineAssignment = PlLineAssignment.ExpertKnowledge; - IntrusionVerticalWaterPressureType = IntrusionVerticalWaterPressureType.Standard; - PenetrationLength = 0.0; - IsDesign = false; - } - - public SoilProfileType SoilProfileType { get; set; } - public string SoilGeometry2DFilename { get; set; } - public double XOffsetSoilGeometry2DOrigin { get; set; } - public string MaterialForDike { get; set; } - public string MaterialForShoulder { get; set; } - public PlLineAssignment PlLineAssignment { get; set; } - public IntrusionVerticalWaterPressureType IntrusionVerticalWaterPressureType { get; set; } - public double PenetrationLength { get; set; } - public bool IsDesign { get; set; } - - public void Assign(MStabGeometryCreationOptions mstabGeometryCreationOptions) - { - SoilProfileType = mstabGeometryCreationOptions.SoilProfileType; - SoilGeometry2DFilename = mstabGeometryCreationOptions.SoilGeometry2DFilename; - XOffsetSoilGeometry2DOrigin = mstabGeometryCreationOptions.XOffsetSoilGeometry2DOrigin; - MaterialForDike = mstabGeometryCreationOptions.MaterialForDike; - MaterialForShoulder = mstabGeometryCreationOptions.MaterialForShoulder; - PlLineAssignment = mstabGeometryCreationOptions.PlLineAssignment; - IntrusionVerticalWaterPressureType = mstabGeometryCreationOptions.IntrusionVerticalWaterPressureType; - PenetrationLength = mstabGeometryCreationOptions.PenetrationLength; - IsDesign = mstabGeometryCreationOptions.IsDesign; - } - - public MStabGeometryCreationOptions Clone() - { - var mstabGeometryCreationOptions = new MStabGeometryCreationOptions(); - mstabGeometryCreationOptions.Assign(this); - return mstabGeometryCreationOptions; - } -} - -public class MStabCalculationOptions : IAssignable, ICloneable -{ - public MStabZonesType ZonesType { get; set; } - - public void Assign(MStabCalculationOptions mstabCalculationOptions) - { - ZonesType = mstabCalculationOptions.ZonesType; - } - - public MStabCalculationOptions Clone() - { - var mstabCalculationOptions = new MStabCalculationOptions(); - mstabCalculationOptions.Assign(this); - return mstabCalculationOptions; - } -} - public class MStabParameters : ICloneable { public MStabParameters() { Model = MStabModelType.Bishop; SearchMethod = MStabSearchMethod.Grid; GridPosition = MStabGridPosition.Right; - CalculationOptions = new MStabCalculationOptions(); - GeometryCreationOptions = new MStabGeometryCreationOptions(); - SheetPiling = null; SlipCircleDefinition = new SlipCircleDefinition(); } public MStabModelType Model { get; set; } public MStabSearchMethod SearchMethod { get; set; } - public bool IsProbabilistic { get; set; } public string ProjectFileName { get; set; } - public string SoilDatabaseName { get; set; } - public MStabForbiddenZone ForbiddenZone { get; set; } - public MStabGeometryCreationOptions GeometryCreationOptions { get; set; } - public SheetPiling SheetPiling { get; set; } - + [Validate] public SlipCircleDefinition SlipCircleDefinition { get; set; } - public MStabCalculationOptions CalculationOptions { get; set; } - public MStabGridPosition GridPosition { get; set; } public void Assign(MStabParameters mstabParameters) { Model = mstabParameters.Model; SearchMethod = mstabParameters.SearchMethod; - IsProbabilistic = mstabParameters.IsProbabilistic; GridPosition = mstabParameters.GridPosition; ProjectFileName = mstabParameters.ProjectFileName; - SoilDatabaseName = mstabParameters.SoilDatabaseName; - if (ForbiddenZone != null) - { - ForbiddenZone.Assign(mstabParameters.ForbiddenZone); - } - else - { - ForbiddenZone = null; - } - - if (CalculationOptions != null) - { - CalculationOptions.Assign(mstabParameters.CalculationOptions); - } - else - { - CalculationOptions = null; - } - - if (GeometryCreationOptions != null) - { - GeometryCreationOptions.Assign(mstabParameters.GeometryCreationOptions); - } - else - { - GeometryCreationOptions = null; - } - - if (SheetPiling != null) - { - SheetPiling.Assign(mstabParameters.SheetPiling); - } - else - { - SheetPiling = null; - } - - SoilDatabaseName = mstabParameters.SoilDatabaseName; + if (SlipCircleDefinition != null) { SlipCircleDefinition.Assign(mstabParameters.SlipCircleDefinition); @@ -289,31 +132,12 @@ public MStabParameters Clone() { var mstabParameters = new MStabParameters(); - if (ForbiddenZone != null) - { - mstabParameters.ForbiddenZone = ForbiddenZone.Clone(); - } - - if (GeometryCreationOptions != null) - { - mstabParameters.GeometryCreationOptions = GeometryCreationOptions.Clone(); - } - - if (SheetPiling != null) - { - mstabParameters.SheetPiling = SheetPiling.Clone(); - } if (SlipCircleDefinition != null) { mstabParameters.SlipCircleDefinition = SlipCircleDefinition.Clone(); } - if (CalculationOptions != null) - { - mstabParameters.CalculationOptions = CalculationOptions.Clone(); - } - mstabParameters.Assign(this); return mstabParameters;