Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs =================================================================== diff -u -r3522 -r3761 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 3761) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.IO; using Deltares.DamEngine.Data.Geotechnics; using Deltares.DamEngine.Data.Standard; using Deltares.DamEngine.Data.Standard.Validation; @@ -28,18 +27,13 @@ { public class FailureMechanismParametersMStab : IAssignable, ICloneable { - private const string dGeoStabilityExeName = @"DGeoStability.exe"; - private readonly string dGeoStabilityExePath; - /// /// Additional specifications/settings of calculation using MStab /// public FailureMechanismParametersMStab() { - this.MStabParameters = new MStabParameters(); - this.IsStabilityCheckOnUplift = false; - // Make sure that D-Geo Stability path points to the D-Geo Stability version that is located in the application map - dGeoStabilityExePath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), dGeoStabilityExeName); + MStabParameters = new MStabParameters(); + IsStabilityCheckOnUplift = false; } /// @@ -50,20 +44,6 @@ /// public string ProjectWorkingPath { get; set; } - /// - /// Gets the D-GeoStability executable path. - /// - /// - /// The D-GeoStability path. - /// - public string DGeoStabilityExePath - { - get - { - return dGeoStabilityExePath; - } - } - public Location Location { get; set; } public SurfaceLine2 SurfaceLine { get; set; } public PlLines.PlLines PlLines { get; set; } @@ -93,19 +73,19 @@ public MStabParameters MStabParameters { get; set; } /// - /// Checks whether all rerquired data is there. + /// Checks whether all required data is there. /// public bool IsComplete { get { return - !string.IsNullOrEmpty(this.MStabParameters.SoilDatabaseName) && - this.PlLines != null && - (this.SoilProfile != null || this.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename != "") && - this.Location != null && - this.SurfaceLine != null && - !string.IsNullOrEmpty(this.MStabParameters.ProjectFileName); + !string.IsNullOrEmpty(MStabParameters.SoilDatabaseName) && + PlLines != null && + (SoilProfile != null || MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename != "") && + Location != null && + SurfaceLine != null && + !string.IsNullOrEmpty(MStabParameters.ProjectFileName); } } @@ -115,20 +95,20 @@ /// public void Assign(FailureMechanismParametersMStab failureMechanismParametersMStab) { - this.ProjectWorkingPath = failureMechanismParametersMStab.ProjectWorkingPath; + ProjectWorkingPath = failureMechanismParametersMStab.ProjectWorkingPath; - this.Location = failureMechanismParametersMStab.Location; - this.SurfaceLine = failureMechanismParametersMStab.SurfaceLine; - this.SoilProfile = failureMechanismParametersMStab.SoilProfile; - this.SoilGeometry2DName = failureMechanismParametersMStab.SoilGeometry2DName; - this.PlLines = failureMechanismParametersMStab.PlLines; + Location = failureMechanismParametersMStab.Location; + SurfaceLine = failureMechanismParametersMStab.SurfaceLine; + SoilProfile = failureMechanismParametersMStab.SoilProfile; + SoilGeometry2DName = failureMechanismParametersMStab.SoilGeometry2DName; + PlLines = failureMechanismParametersMStab.PlLines; - this.RiverLevel = failureMechanismParametersMStab.RiverLevel; - this.DikeTableHeight = failureMechanismParametersMStab.DikeTableHeight; - this.TrafficLoad = failureMechanismParametersMStab.TrafficLoad; ; - this.EmbankmentDesignParameters = failureMechanismParametersMStab.EmbankmentDesignParameters; + RiverLevel = failureMechanismParametersMStab.RiverLevel; + DikeTableHeight = failureMechanismParametersMStab.DikeTableHeight; + TrafficLoad = failureMechanismParametersMStab.TrafficLoad; + EmbankmentDesignParameters = failureMechanismParametersMStab.EmbankmentDesignParameters; - this.MStabParameters.Assign(failureMechanismParametersMStab.MStabParameters); + MStabParameters.Assign(failureMechanismParametersMStab.MStabParameters); } /// @@ -138,7 +118,7 @@ public FailureMechanismParametersMStab Clone() { FailureMechanismParametersMStab failureMechanismParametersMStab = new FailureMechanismParametersMStab(); - failureMechanismParametersMStab.MStabParameters = this.MStabParameters.Clone(); + failureMechanismParametersMStab.MStabParameters = MStabParameters.Clone(); failureMechanismParametersMStab.Assign(this); return failureMechanismParametersMStab;