Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r1947 -r1975 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 1947) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 1975) @@ -25,7 +25,6 @@ using System.Xml.Serialization; using Deltares.Geographic; using Deltares.Geometry; -using Deltares.Geotechnics.GeotechnicalGeometry; using Deltares.Standard; using Deltares.Standard.EventPublisher; using Deltares.Standard.Units; @@ -110,7 +109,7 @@ private ResultEvaluation resultEvaluation = ResultEvaluation.NotEvaluated; private string notes = ""; - private StabilityKernelType selectedStabilityKernelType = StabilityKernelType.DamClassic; + private StabilityKernelType selectedStabilityKernelType = StabilityKernelType.DamClassicStabilty; // redesigned LOCAL surfaceline (initialized with original local surfaceline) private SurfaceLine2 redesignedSurfaceLine; // redesigned Global surfaceline in use for this result (either piping or stability) @@ -231,7 +230,7 @@ if (!String.IsNullOrEmpty(BaseFileName)) { string fileExtension = ".sti"; - if (selectedStabilityKernelType != StabilityKernelType.DamClassic) + if (selectedStabilityKernelType != StabilityKernelType.DamClassicStabilty) { fileExtension = ".dsx"; } @@ -2447,7 +2446,7 @@ private string GetCurrentExeForOpenCalculationFile() { var exeName = DamHelperFunctions.MStabExePath; - if (SelectedStabilityKernelType != StabilityKernelType.DamClassic) + if (SelectedStabilityKernelType != StabilityKernelType.DamClassicStabilty) { exeName = Path.GetDirectoryName(exeName) + "\\MStab.exe"; } @@ -2465,7 +2464,7 @@ Path.GetFileNameWithoutExtension(InputFile) + " (copy)" + Path.GetExtension(InputFile); File.Copy(InputFile, copyFile, true); var exeName = GetCurrentExeForOpenCalculationFile(); - if (SelectedStabilityKernelType == StabilityKernelType.DamClassic) + if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStabilty) { const string stdExtension = ".std"; CopyResultFile(stdExtension); @@ -2481,13 +2480,8 @@ FileName = exeName } }; - if (SelectedStabilityKernelType == StabilityKernelType.DamClassicWti || - SelectedStabilityKernelType == StabilityKernelType.AdvancedWti) + if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStabilty) { - process.StartInfo.Arguments = " -rto " + " \"" + copyFile + "\""; - } - else - { process.StartInfo.Arguments = " \"" + copyFile + "\""; } process.StartInfo.UseShellExecute = false; @@ -2556,9 +2550,6 @@ return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping; case "OpenCalculationFile": return File.Exists(GetCurrentExeForOpenCalculationFile()); - case "IsUplift": - return !(damFailureMechanismeCalculationSpecification.StabilityKernelType == StabilityKernelType.AdvancedWti || - damFailureMechanismeCalculationSpecification.StabilityKernelType == StabilityKernelType.AdvancedDotNet); default: return true; }