Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.Designer.cs
===================================================================
diff -u -r4055 -r4127
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 4055)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 4127)
@@ -123,24 +123,6 @@
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute(".\\DGeoStability.exe")]
- public string MStabExePath {
- get {
- return ((string)(this["MStabExePath"]));
- }
- }
-
- [global::System.Configuration.ApplicationScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute(".\\GeoStudio.exe")]
- public string SlopeWExePath {
- get {
- return ((string)(this["SlopeWExePath"]));
- }
- }
-
- [global::System.Configuration.ApplicationScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Automatic")]
public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleGridSizeDetermination {
get {
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/SensorModelRunner.cs
===================================================================
diff -u -r4056 -r4127
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/SensorModelRunner.cs (.../SensorModelRunner.cs) (revision 4056)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/SensorModelRunner.cs (.../SensorModelRunner.cs) (revision 4127)
@@ -59,7 +59,6 @@
public override void Run()
{
CalculationParameters calcParams = CalculationParameters ?? new CalculationParameters();
- calcParams.StabilityExePath = StabilityExePath;
calcParams.WorkingPath = WorkingPath;
calcParams.StabilityWorkingPath = StabilityWorkingPath;
ReadUserSettingsSlipCircleDefinition(calcParams.MStabParameters.SlipCircleDefinition);
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/app.config
===================================================================
diff -u -r4055 -r4127
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/app.config (.../app.config) (revision 4055)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/app.config (.../app.config) (revision 4127)
@@ -36,9 +36,6 @@
True
-
- .\DGeoStability.exe
-
.\mstabfiles\
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.resx
===================================================================
diff -u -r4115 -r4127
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.resx (.../Resources.resx) (revision 4115)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.resx (.../Resources.resx) (revision 4127)
@@ -162,9 +162,6 @@
The import folder is not valid
-
- Couldn't find the MStab executable at location {0}
-
Couldn't parse the file because it has no valid content
@@ -249,9 +246,6 @@
The surfaceline is not assigned
-
- Couldn't find the SlopeW (GeoStudio) executable at location {0}
-
The soil list is not yet created.
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/IModelRunner.cs
===================================================================
diff -u -r4056 -r4127
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/IModelRunner.cs (.../IModelRunner.cs) (revision 4056)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/IModelRunner.cs (.../IModelRunner.cs) (revision 4127)
@@ -27,8 +27,6 @@
{
string StabilityWorkingPath { get; set; }
string PipingWorkingPath { get; set; }
- string StabilityExePath { get; set; }
- bool UseMStabForCalculation { get; set; }
double WaterLevelOffset { get; set; }
string WorkingPath { get; set; }
CalculationParameters CalculationParameters { get; set; }
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/Settings.settings
===================================================================
diff -u -r4055 -r4127
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/Settings.settings (.../Settings.settings) (revision 4055)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/Settings.settings (.../Settings.settings) (revision 4127)
@@ -6,9 +6,6 @@
True
-
- .\DGeoStability.exe
-
.\mstabfiles\
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ThrowHelper.cs
===================================================================
diff -u -r4115 -r4127
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ThrowHelper.cs (.../ThrowHelper.cs) (revision 4115)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ThrowHelper.cs (.../ThrowHelper.cs) (revision 4127)
@@ -44,8 +44,6 @@
ImportFileNotExist,
ImportFolderNotExist,
ImportFolderNullOrEmpty,
- MStabExecutableFileNameNotFound,
- SlopeWExecutableFileNameNotFound,
OutputFileNotExist,
OutputFileHasNoContent,
OutputFileNameNotValid,
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.settings
===================================================================
diff -u -r4055 -r4127
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.settings (.../Settings.settings) (revision 4055)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.settings (.../Settings.settings) (revision 4127)
@@ -36,12 +36,6 @@
gauges
-
- .\DGeoStability.exe
-
-
- .\GeoStudio.exe
-
Automatic
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/Settings.Designer.cs
===================================================================
diff -u -r4055 -r4127
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 4055)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 4127)
@@ -24,24 +24,6 @@
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("True")]
- public bool UseMStabForCalculation {
- get {
- return ((bool)(this["UseMStabForCalculation"]));
- }
- }
-
- [global::System.Configuration.ApplicationScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute(".\\DGeoStability.exe")]
- public string MStabExePath {
- get {
- return ((string)(this["MStabExePath"]));
- }
- }
-
- [global::System.Configuration.ApplicationScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute(".\\mstabfiles\\")]
public string StabilityWorkingPath {
get {
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/ModelRunner.cs
===================================================================
diff -u -r4056 -r4127
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/ModelRunner.cs (.../ModelRunner.cs) (revision 4056)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/ModelRunner.cs (.../ModelRunner.cs) (revision 4127)
@@ -44,8 +44,6 @@
// WorkingPath will be extracted from file name if available
StabilityWorkingPath = Settings.Default.StabilityWorkingPath;
PipingWorkingPath = Settings.Default.PipingWorkingPath;
- StabilityExePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), Settings.Default.MStabExePath);
- UseMStabForCalculation = Settings.Default.UseMStabForCalculation;
WaterLevelOffset = Settings.Default.WaterLevelOffset;
}
@@ -70,8 +68,6 @@
public string StabilityWorkingPath { get; set; }
public string PipingWorkingPath { get; set; }
- public string StabilityExePath { get; set; }
- public bool UseMStabForCalculation { get; set; }
public double WaterLevelOffset { get; set; }
public string WorkingPath { get; set; }
public string Filter { get; set; }
@@ -178,9 +174,7 @@
{
RunnerDelegate.WorkingPath = WorkingPath;
RunnerDelegate.WaterLevelOffset = WaterLevelOffset;
- RunnerDelegate.StabilityExePath = StabilityExePath;
RunnerDelegate.PipingWorkingPath = PipingWorkingPath;
- RunnerDelegate.UseMStabForCalculation = UseMStabForCalculation;
RunnerDelegate.StabilityWorkingPath = StabilityWorkingPath;
RunnerDelegate.CalculationParameters = CalculationParameters;
RunnerDelegate.InputTimeSeriesCollection = InputTimeSeriesCollection;
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs
===================================================================
diff -u -r4124 -r4127
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 4124)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 4127)
@@ -53,8 +53,6 @@
// WorkingPath will be extracted from file name if available
StabilityWorkingPath = Settings.Default.StabilityWorkingPath;
PipingWorkingPath = Settings.Default.PipingWorkingPath;
- StabilityExePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), Settings.Default.MStabExePath);
- UseMStabForCalculation = Settings.Default.UseMStabForCalculation;
WaterLevelOffset = Settings.Default.WaterLevelOffset;
}
@@ -107,22 +105,6 @@
public string PipingWorkingPath { get; set; }
///
- /// Gets or sets the stability executable path.
- ///
- ///
- /// The stability executable path.
- ///
- public string StabilityExePath { get; set; }
-
- ///
- /// Gets or sets a value indicating whether [use m stab for calculation].
- ///
- ///
- /// true if [use m stab for calculation]; otherwise, false.
- ///
- public bool UseMStabForCalculation { get; set; }
-
- ///
/// Gets or sets the water level offset.
///
///
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r4115 -r4127
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4115)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4127)
@@ -280,15 +280,6 @@
}
///
- /// Looks up a localized string similar to Couldn't find the MStab executable at location {0}.
- ///
- internal static string MStabExecutableFileNameNotFound {
- get {
- return ResourceManager.GetString("MStabExecutableFileNameNotFound", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to No calculation type specified.
///
internal static string NoCalculationTypeSpecified {
@@ -478,15 +469,6 @@
}
///
- /// Looks up a localized string similar to Couldn't find the SlopeW (GeoStudio) executable at location {0}.
- ///
- internal static string SlopeWExecutableFileNameNotFound {
- get {
- return ResourceManager.GetString("SlopeWExecutableFileNameNotFound", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to The soil material in the layer could not be converted to local type.
///
internal static string SoilAttachedToLayerNotValid {
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CalculationParameters.cs
===================================================================
diff -u -r4056 -r4127
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CalculationParameters.cs (.../CalculationParameters.cs) (revision 4056)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CalculationParameters.cs (.../CalculationParameters.cs) (revision 4127)
@@ -40,8 +40,7 @@
public string WorkingPath { get; set; }
public string StabilityWorkingPath { get; set; }
public string PipingWorkingPath { get; set; }
- public string StabilityExePath { get; set; }
-
+
public bool CalculateAllAtOnce
{
get
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config
===================================================================
diff -u -r4055 -r4127
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config (.../app.config) (revision 4055)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config (.../app.config) (revision 4127)
@@ -1,25 +1,25 @@
-
@@ -65,12 +65,6 @@
gauges
-
- .\DGeoStability.exe
-
-
- .\GeoStudio.exe
-
Automatic