Index: DamClients/DamUI/trunk/data/Dam/Benchmarks/Piping/Test 1/Integratietest piping 1.damx =================================================================== diff -u -r875 -r1975 --- DamClients/DamUI/trunk/data/Dam/Benchmarks/Piping/Test 1/Integratietest piping 1.damx (.../Integratietest piping 1.damx) (revision 875) +++ DamClients/DamUI/trunk/data/Dam/Benchmarks/Piping/Test 1/Integratietest piping 1.damx (.../Integratietest piping 1.damx) (revision 1975) @@ -1,480 +1,761 @@  - - - + + + - - - - + + + + - - - - - + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - + + - + + + + + + + + + + - - - - - - - - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r1545 -r1975 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1975) @@ -66,21 +66,10 @@ { // The Classic models all use DGMStabDam.dll to generate a sti file from the input (so also pl-lines only) // DAM classic uses the Delphi version of DGS (as exe) to solve the calculation - DamClassic, + DamClassicStabilty, - // DAM classic .Net uses the .Net version of DGS which is based on the old Delphi code to solve the calculation - DamClassicDotNet, - - // DAM classic WTI uses the .Net version of DGS which is based on the new C# code to solve the calculation - DamClassicWti, - - // The advanced models use the geotechnics and DGS classes to generate the required data from input, - // using the waternet only. This requires the -rto option for starting - // Advanced .Net uses the .Net version of DGS which is based on the old Delphi code to solve the calculation - AdvancedDotNet, - - // Advanced WTI uses the .Net version of DGS which is based on the new C# code to solve the calculation - AdvancedWti + // WtiMacroStabilityKernel uses the latest MacroStability kernel as used by the new C# version of DGeoStabilty. + WtiMacroStabilityKernel }; public enum AnalysisType Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs =================================================================== diff -u -r1594 -r1975 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 1594) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 1975) @@ -27,7 +27,7 @@ { public class ConfigurationManager { - private const int MaxModelCount = 10; // #Bka added SpencerHigh/SpencerLow as quick fix. Should be reset to 8 + private const int maxModelCount = 10; // #Bka added SpencerHigh/SpencerLow as quick fix. Should be reset to 8 [ThreadStatic] private static readonly ConfigurationManager instance = new ConfigurationManager(); @@ -132,7 +132,7 @@ var availableList = new List(); foreach (FailureMechanismSystemType failureMechanismSystemType in Enum.GetValues(typeof(FailureMechanismSystemType))) { - for (int i = 0; i < MaxModelCount; i++) + for (int i = 0; i < maxModelCount; i++) { if (this[kernelType, damProjectType, probabilisticType, failureMechanismSystemType, i] == ConfigurationStatus.Available) { @@ -156,7 +156,7 @@ FailureMechanismSystemType failureMechanismSystemType) { var availableList = new List(); - for (int i = 0; i < MaxModelCount; i++) + for (int i = 0; i < maxModelCount; i++) { if (this[kernelType, damProjectType, probabilisticType, failureMechanismSystemType, i] == ConfigurationStatus.Available) { @@ -193,7 +193,7 @@ configurationStatus = new ConfigurationStatus[GetLength(), GetLength(), GetLength(), GetLength(), - MaxModelCount]; + maxModelCount]; foreach (StabilityKernelType kernelType in Enum.GetValues(typeof(StabilityKernelType))) { foreach (DamProjectType damProjectType in Enum.GetValues(typeof(DamProjectType))) @@ -204,7 +204,7 @@ FailureMechanismSystemType failureMechanismSystemType in Enum.GetValues(typeof(FailureMechanismSystemType))) { - for (int i = 0; i < MaxModelCount; i++) + for (int i = 0; i < maxModelCount; i++) { this[kernelType, damProjectType, probabilisticType, failureMechanismSystemType, i] = ConfigurationStatus.NotImplemented; @@ -214,49 +214,32 @@ } } // This is the place to enable new possible failure mechanisms and models - this[StabilityKernelType.DamClassic, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.BishopUpliftVan] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer2Forces] = ConfigurationStatus.NotAvailable; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide, (int) FlowSlideModelType.All] = ConfigurationStatus.NotAvailable; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.BishopUpliftVan] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer2Forces] = ConfigurationStatus.NotAvailable; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide, (int) FlowSlideModelType.All] = ConfigurationStatus.NotAvailable; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - - this[StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - this[StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; - this[StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - - this[StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Spencer] = ConfigurationStatus.Available; - this[StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - - this[StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; - this[StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; - this[StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.SpencerHigh] = ConfigurationStatus.Available; - this[StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.SpencerLow] = ConfigurationStatus.Available; - this[StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; + this[StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r1786 -r1975 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 1786) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 1975) @@ -411,15 +411,18 @@ if (projectData == null) return; initial = false; - var args = Environment.GetCommandLineArgs(); - foreach (string arg in args) - { - if (arg.ToLower().Equals("-wti")) - { - projectData.DamProjectCalculationSpecification.VisibleEnabledProvider = this; - StabilityKernelTypeSpecificationsVisible = true; - } - } +// var args = Environment.GetCommandLineArgs(); +// foreach (string arg in args) +// { +// if (arg.ToLower().Equals("-wti")) +// { +// projectData.DamProjectCalculationSpecification.VisibleEnabledProvider = this; +// StabilityKernelTypeSpecificationsVisible = true; +// } +// } + // For easy testing purposes, make sure kernel selectionoption is true + projectData.DamProjectCalculationSpecification.VisibleEnabledProvider = this; + StabilityKernelTypeSpecificationsVisible = true; Context.CurrentContext = new DamContext { Wti = StabilityKernelTypeSpecificationsVisible Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r1545 -r1975 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 1975) @@ -43,7 +43,7 @@ private FailureMechanismeParamatersMStab failureMechanismeParamatersMStab; private static ProbabilisticType probabilisticType; private static DamProjectType damProjectType; - private StabilityKernelType stabilityKernelType = StabilityKernelType.DamClassic; + private StabilityKernelType stabilityKernelType = StabilityKernelType.DamClassicStabilty; private Boolean firstTime = true; public DamFailureMechanismeCalculationSpecification() 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; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r1966 -r1975 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 1966) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 1975) @@ -153,7 +153,7 @@ var desResult = new CsvExportData(designResult.LocationName, designResult.ScenarioName) { DamFailureMechanismeCalculation = damProjectData.DamProjectCalculationSpecification.CurrentSpecification, // vanuit invoer - SelectedStabilityKernelType = StabilityKernelType.DamClassic, // de enige die we nu doen + SelectedStabilityKernelType = damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType, AnalysisType = DamProjectCalculationSpecification.SelectedAnalysisType, //is vanuit invoer ProbabilisticType = ProbabilisticType.Deterministic, // is de enige voor nu DikeName = damProjectData.WaterBoard.Dikes[0].Name, // is de enige voor nu Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r1947 -r1975 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 1947) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 1975) @@ -470,7 +470,7 @@ - + @@ -562,11 +562,8 @@ - - - - - + + @@ -599,20 +596,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + Index: DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs =================================================================== diff -u -r1597 -r1975 --- DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 1597) +++ DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 1975) @@ -54,46 +54,34 @@ [Test] public void ReturnsCorrectAvailableProbalisticFailuremechanisms() { - ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Probabilistic); - Assert.AreEqual(1, failureMechanisms.Count, "DamClassic: Incorrect number of failuremechanisms for probabilistic calculation"); + ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Probabilistic); + Assert.AreEqual(1, failureMechanisms.Count, "DamClassicStabilty: Incorrect number of failuremechanisms for probabilistic calculation"); foreach (var failureMechanism in failureMechanisms) { Assert.IsTrue(failureMechanism.Equals(FailureMechanismSystemType.Piping)); } - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic); - Assert.AreEqual(0, failureMechanisms.Count, "DamClassicDotNet: Incorrect number of failuremechanisms for probabilistic calculation"); - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Probabilistic); - Assert.AreEqual(0, failureMechanisms.Count, "DamClassicWti: Incorrect number of failuremechanisms for probabilistic calculation"); - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic); - Assert.AreEqual(0, failureMechanisms.Count, "AdvancedDotNet: Incorrect number of failuremechanisms for probabilistic calculation"); - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Probabilistic); - Assert.AreEqual(0, failureMechanisms.Count, "AdvancedWti: Incorrect number of failuremechanisms for probabilistic calculation"); + failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Probabilistic); + Assert.AreEqual(0, failureMechanisms.Count, "WtiMacroStabilityKernel: Incorrect number of failuremechanisms for probabilistic calculation"); } [Test] public void ReturnsCorrectAvailableProbalisticFragilityFailuremechanisms() { - ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility); - Assert.AreEqual(1, failureMechanisms.Count, "DamClassic: Incorrect number of failuremechanisms for probabilistic fragility calculation"); + ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility); + Assert.AreEqual(1, failureMechanisms.Count, "DamClassicStabilty: Incorrect number of failuremechanisms for probabilistic fragility calculation"); foreach (var failureMechanism in failureMechanisms) { Assert.IsTrue(failureMechanism.Equals(FailureMechanismSystemType.Piping)); } - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility); - Assert.AreEqual(0, failureMechanisms.Count, "DamClassicDotNet: Incorrect number of failuremechanisms for probabilistic fragility calculation"); - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility); - Assert.AreEqual(0, failureMechanisms.Count, "DamClassicWti: Incorrect number of failuremechanisms for probabilistic fragility calculation"); - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility); - Assert.AreEqual(0, failureMechanisms.Count, "AdvancedDotNet: Incorrect number of failuremechanisms for probabilistic fragility calculation"); - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility); - Assert.AreEqual(0, failureMechanisms.Count, "AdvancedWti: Incorrect number of failuremechanisms for probabilistic fragility calculation"); + failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility); + Assert.AreEqual(0, failureMechanisms.Count, "WtiMacroStabilityKernel: Incorrect number of failuremechanisms for probabilistic fragility calculation"); } [Test] public void ReturnsCorrectAvailableDeterministicFailuremechanisms() { - ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic); - Assert.AreEqual(3, failureMechanisms.Count, "DamClassic: Incorrect number of failuremechanisms for deterministic calculation"); + ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic); + Assert.AreEqual(3, failureMechanisms.Count, "DamClassicStabilty: Incorrect number of failuremechanisms for deterministic calculation"); foreach (var failureMechanism in failureMechanisms) { Assert.IsTrue(failureMechanism.Equals(FailureMechanismSystemType.Piping) || @@ -102,131 +90,72 @@ failureMechanism.Equals(FailureMechanismSystemType.FlowSlide)); } - //Overleggen met TOM ERIK wat wel niet mag! Voorlopig voor alle nieuwe kernels alleen stability inside en outside - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Deterministic); - Assert.AreEqual(2, failureMechanisms.Count, "DamClassicDotNet: Incorrect number of failuremechanisms for deterministic calculation"); - - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Deterministic); - Assert.AreEqual(2, failureMechanisms.Count, "DamClassicWti: Incorrect number of failuremechanisms for deterministic calculation"); - - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Deterministic); - Assert.AreEqual(2, failureMechanisms.Count, "AdvancedDotNet: Incorrect number of failuremechanisms for deterministic calculation"); - - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Deterministic); - Assert.AreEqual(2, failureMechanisms.Count, "AdvancedWti: Incorrect number of failuremechanisms for deterministic calculation"); + failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Deterministic); + Assert.AreEqual(1, failureMechanisms.Count, "WtiMacroStabilityKernel: Incorrect number of failuremechanisms for deterministic calculation"); } [Test] public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForDesignOption() { - ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); - Assert.AreEqual(4, pipingModels.Count, "DamClassic: Incorrect number of models for deterministic piping calculation"); - ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(3, stabilityInsideModels.Count, "DamClassic: Incorrect number of models for deterministic stability inside calculation"); - ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside); - Assert.AreEqual(1, stabilityOutsideModels.Count, "DamClassic: Incorrect number of models for deterministic stability outside calculation"); - ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.HorizontalBalance); - Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassic: Incorrect number of models for deterministic horizontal balance calculation"); - ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide); - Assert.AreEqual(0, flowSlideModels.Count, "DamClassic: Incorrect number of models for deterministic flowslide calculation"); + ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); + Assert.AreEqual(4, pipingModels.Count, "DamClassicStabilty: Incorrect number of models for deterministic piping calculation"); + ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); + Assert.AreEqual(3, stabilityInsideModels.Count, "DamClassicStabilty: Incorrect number of models for deterministic stability inside calculation"); + ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside); + Assert.AreEqual(1, stabilityOutsideModels.Count, "DamClassicStabilty: Incorrect number of models for deterministic stability outside calculation"); + ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.HorizontalBalance); + Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassicStabilty: Incorrect number of models for deterministic horizontal balance calculation"); + ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide); + Assert.AreEqual(0, flowSlideModels.Count, "DamClassicStabilty: Incorrect number of models for deterministic flowslide calculation"); - // aanvullen na overleg - // voorlopig 3: Bishop UpliftVan Spencer - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(3, stabilityInsideModels.Count, "DamClassicWti: Incorrect number of models for deterministic stability inside calculation"); - // voorlopig 2: Bishop UpliftVan - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(2, stabilityInsideModels.Count, "DamClassicDotNet: Incorrect number of models for deterministic stability inside calculation"); - // voorlopig 4: Bishop UpliftVan SpencerHigh SpencerLow - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(4, stabilityInsideModels.Count, "AdvancedWti: Incorrect number of models for deterministic stability inside calculation"); - // voorlopig 2: Bishop UpliftVan - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(2, stabilityInsideModels.Count, "AdvancedDotNet: Incorrect number of models for deterministic stability inside calculation"); - - pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); - Assert.AreEqual(0, pipingModels.Count, "DamClassicWti: Incorrect number of models for deterministic piping calculation"); - pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); - Assert.AreEqual(0, pipingModels.Count, "DamClassicDotNet: Incorrect number of models for deterministic piping calculation"); - pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); - Assert.AreEqual(0, pipingModels.Count, "AdvancedWti: Incorrect number of models for deterministic piping calculation"); - pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); - Assert.AreEqual(0, pipingModels.Count, "AdvancedDotNet: Incorrect number of models for deterministic piping calculation"); - - + stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); + Assert.AreEqual(1, stabilityInsideModels.Count, "WtiMacroStabilityKernel: Incorrect number of models for deterministic stability inside calculation"); + + pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); + Assert.AreEqual(0, pipingModels.Count, "WtiMacroStabilityKernel: Incorrect number of models for deterministic piping calculation"); } [Test] public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForCalamityOption() { - ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); + ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); Assert.AreEqual(3, pipingModels.Count, "Incorrect number of models for deterministic piping calculation"); - ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); + ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); Assert.AreEqual(2, stabilityInsideModels.Count, "Incorrect number of models for deterministic stability inside calculation"); - ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside); + ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside); Assert.AreEqual(1, stabilityOutsideModels.Count, "Incorrect number of models for deterministic stability outside calculation"); - ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.HorizontalBalance); + ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.HorizontalBalance); Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "Incorrect number of models for deterministic horizontal balance calculation"); - ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide); + ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide); Assert.AreEqual(0, flowSlideModels.Count, "Incorrect number of models for deterministic flowslide calculation"); - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicWti, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, stabilityInsideModels.Count, "DamClassicWti: Incorrect number of models for deterministic stability inside calculation"); - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicDotNet, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, stabilityInsideModels.Count, "DamClassicDotNet: Incorrect number of models for deterministic stability inside calculation"); - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedWti, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, stabilityInsideModels.Count, "AdvancedWti: Incorrect number of models for deterministic stability inside calculation"); - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedDotNet, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, stabilityInsideModels.Count, "AdvancedDotNet: Incorrect number of models for deterministic stability inside calculation"); + stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); + Assert.AreEqual(0, stabilityInsideModels.Count, "WtiMacroStabilityKernel: Incorrect number of models for deterministic stability inside calculation"); } [Test] public void ReturnsCorrectAvailableProbalisticFailuremechanismModels() { - ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping); - Assert.AreEqual(1, pipingModels.Count, "DamClassic: Incorrect number of models for deterministic piping calculation"); - ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, stabilityInsideModels.Count, "DamClassic: Incorrect number of models for deterministic stability inside calculation"); - ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityOutside); - Assert.AreEqual(0, stabilityOutsideModels.Count, "DamClassic: Incorrect number of models for deterministic stability outside calculation"); - ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.HorizontalBalance); - Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassic: Incorrect number of models for deterministic horizontal balance calculation"); + ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping); + Assert.AreEqual(1, pipingModels.Count, "DamClassicStabilty: Incorrect number of models for deterministic piping calculation"); + ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityInside); + Assert.AreEqual(0, stabilityInsideModels.Count, "DamClassicStabilty: Incorrect number of models for deterministic stability inside calculation"); + ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityOutside); + Assert.AreEqual(0, stabilityOutsideModels.Count, "DamClassicStabilty: Incorrect number of models for deterministic stability outside calculation"); + ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.HorizontalBalance); + Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassicStabilty: Incorrect number of models for deterministic horizontal balance calculation"); - pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping); - Assert.AreEqual(0, pipingModels.Count, "DamClassicDotNet: Incorrect number of models for deterministic piping calculation"); - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, stabilityInsideModels.Count, "DamClassicDotNet: Incorrect number of models for deterministic stability inside calculation"); - stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityOutside); - Assert.AreEqual(0, stabilityOutsideModels.Count, "DamClassicDotNet: Incorrect number of models for deterministic stability outside calculation"); - stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.HorizontalBalance); - Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassicDotNet: Incorrect number of models for deterministic horizontal balance calculation"); - - pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping); - Assert.AreEqual(0, pipingModels.Count, "DamClassicWti: Incorrect number of models for deterministic piping calculation"); - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, stabilityInsideModels.Count, "DamClassicWti: Incorrect number of models for deterministic stability inside calculation"); - stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityOutside); - Assert.AreEqual(0, stabilityOutsideModels.Count, "DamClassicWti: Incorrect number of models for deterministic stability outside calculation"); - stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicWti, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.HorizontalBalance); - Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassicWti: Incorrect number of models for deterministic horizontal balance calculation"); - - pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping); - Assert.AreEqual(0, pipingModels.Count, "AdvancedDotNet: Incorrect number of models for deterministic piping calculation"); - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, stabilityInsideModels.Count, "AdvancedDotNet: Incorrect number of models for deterministic stability inside calculation"); - stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityOutside); - Assert.AreEqual(0, stabilityOutsideModels.Count, "AdvancedDotNet: Incorrect number of models for deterministic stability outside calculation"); - stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedDotNet, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.HorizontalBalance); - Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "AdvancedDotNet: Incorrect number of models for deterministic horizontal balance calculation"); - - pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping); - Assert.AreEqual(0, pipingModels.Count, "AdvancedWti: Incorrect number of models for deterministic piping calculation"); - stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, stabilityInsideModels.Count, "AdvancedWti: Incorrect number of models for deterministic stability inside calculation"); - stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityOutside); - Assert.AreEqual(0, stabilityOutsideModels.Count, "AdvancedWti: Incorrect number of models for deterministic stability outside calculation"); - stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.AdvancedWti, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.HorizontalBalance); - Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "AdvancedWti: Incorrect number of models for deterministic horizontal balance calculation"); + pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping); + Assert.AreEqual(0, pipingModels.Count, "WtiMacroStabilityKernel: Incorrect number of models for deterministic piping calculation"); + + pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping); + Assert.AreEqual(0, pipingModels.Count, "WtiMacroStabilityKernel: Incorrect number of models for Probabilistic piping calculation"); + stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityInside); + Assert.AreEqual(0, stabilityInsideModels.Count, "DamClassicWti: Incorrect number of models for Probabilistic stability inside calculation"); + stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityOutside); + Assert.AreEqual(0, stabilityOutsideModels.Count, "DamClassicWti: Incorrect number of models for Probabilistic stability outside calculation"); + stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.HorizontalBalance); + Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassicWti: Incorrect number of models for deterministic horizontal balance calculation"); } } Index: DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs =================================================================== diff -u -r1051 -r1975 --- DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 1051) +++ DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 1975) @@ -50,7 +50,7 @@ Assert.AreEqual(1, damProjectData.WaterBoard.Dikes.Count); var dike = damProjectData.WaterBoard.Dikes[0]; Assert.AreEqual(expectedLocations, dike.Locations.Count); - damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityKernelType = StabilityKernelType.DamClassic; + damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityKernelType = StabilityKernelType.DamClassicStabilty; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.Bishop; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside;