Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r1975 -r1982
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 1975)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 1982)
@@ -562,7 +562,7 @@
-
+
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u -r1975 -r1982
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 1975)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 1982)
@@ -43,7 +43,7 @@
private FailureMechanismeParamatersMStab failureMechanismeParamatersMStab;
private static ProbabilisticType probabilisticType;
private static DamProjectType damProjectType;
- private StabilityKernelType stabilityKernelType = StabilityKernelType.DamClassicStabilty;
+ private StabilityKernelType stabilityKernelType = StabilityKernelType.DamClassicStability;
private Boolean firstTime = true;
public DamFailureMechanismeCalculationSpecification()
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r1975 -r1982
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 1975)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 1982)
@@ -109,7 +109,7 @@
private ResultEvaluation resultEvaluation = ResultEvaluation.NotEvaluated;
private string notes = "";
- private StabilityKernelType selectedStabilityKernelType = StabilityKernelType.DamClassicStabilty;
+ private StabilityKernelType selectedStabilityKernelType = StabilityKernelType.DamClassicStability;
// redesigned LOCAL surfaceline (initialized with original local surfaceline)
private SurfaceLine2 redesignedSurfaceLine;
// redesigned Global surfaceline in use for this result (either piping or stability)
@@ -230,7 +230,7 @@
if (!String.IsNullOrEmpty(BaseFileName))
{
string fileExtension = ".sti";
- if (selectedStabilityKernelType != StabilityKernelType.DamClassicStabilty)
+ if (selectedStabilityKernelType != StabilityKernelType.DamClassicStability)
{
fileExtension = ".dsx";
}
@@ -2446,7 +2446,7 @@
private string GetCurrentExeForOpenCalculationFile()
{
var exeName = DamHelperFunctions.MStabExePath;
- if (SelectedStabilityKernelType != StabilityKernelType.DamClassicStabilty)
+ if (SelectedStabilityKernelType != StabilityKernelType.DamClassicStability)
{
exeName = Path.GetDirectoryName(exeName) + "\\MStab.exe";
}
@@ -2464,7 +2464,7 @@
Path.GetFileNameWithoutExtension(InputFile) + " (copy)" + Path.GetExtension(InputFile);
File.Copy(InputFile, copyFile, true);
var exeName = GetCurrentExeForOpenCalculationFile();
- if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStabilty)
+ if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStability)
{
const string stdExtension = ".std";
CopyResultFile(stdExtension);
@@ -2480,7 +2480,7 @@
FileName = exeName
}
};
- if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStabilty)
+ if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStability)
{
process.StartInfo.Arguments = " \"" + copyFile + "\"";
}
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
===================================================================
diff -u -r1975 -r1982
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1975)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1982)
@@ -66,7 +66,7 @@
{
// 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
- DamClassicStabilty,
+ DamClassicStability,
// WtiMacroStabilityKernel uses the latest MacroStability kernel as used by the new C# version of DGeoStabilty.
WtiMacroStabilityKernel
Index: DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs
===================================================================
diff -u -r1975 -r1982
--- DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 1975)
+++ DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 1982)
@@ -54,8 +54,8 @@
[Test]
public void ReturnsCorrectAvailableProbalisticFailuremechanisms()
{
- ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Probabilistic);
- Assert.AreEqual(1, failureMechanisms.Count, "DamClassicStabilty: Incorrect number of failuremechanisms for probabilistic calculation");
+ ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Probabilistic);
+ Assert.AreEqual(1, failureMechanisms.Count, "DamClassicStability: Incorrect number of failuremechanisms for probabilistic calculation");
foreach (var failureMechanism in failureMechanisms)
{
Assert.IsTrue(failureMechanism.Equals(FailureMechanismSystemType.Piping));
@@ -67,8 +67,8 @@
[Test]
public void ReturnsCorrectAvailableProbalisticFragilityFailuremechanisms()
{
- 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");
+ ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility);
+ Assert.AreEqual(1, failureMechanisms.Count, "DamClassicStability: Incorrect number of failuremechanisms for probabilistic fragility calculation");
foreach (var failureMechanism in failureMechanisms)
{
Assert.IsTrue(failureMechanism.Equals(FailureMechanismSystemType.Piping));
@@ -80,8 +80,8 @@
[Test]
public void ReturnsCorrectAvailableDeterministicFailuremechanisms()
{
- ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicStabilty, DamProjectType.Design, ProbabilisticType.Deterministic);
- Assert.AreEqual(3, failureMechanisms.Count, "DamClassicStabilty: Incorrect number of failuremechanisms for deterministic calculation");
+ ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic);
+ Assert.AreEqual(3, failureMechanisms.Count, "DamClassicStability: Incorrect number of failuremechanisms for deterministic calculation");
foreach (var failureMechanism in failureMechanisms)
{
Assert.IsTrue(failureMechanism.Equals(FailureMechanismSystemType.Piping) ||
@@ -97,16 +97,16 @@
[Test]
public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForDesignOption()
{
- 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");
+ ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping);
+ Assert.AreEqual(4, pipingModels.Count, "DamClassicStability: Incorrect number of models for deterministic piping calculation");
+ ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside);
+ Assert.AreEqual(3, stabilityInsideModels.Count, "DamClassicStability: Incorrect number of models for deterministic stability inside calculation");
+ ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside);
+ Assert.AreEqual(1, stabilityOutsideModels.Count, "DamClassicStability: Incorrect number of models for deterministic stability outside calculation");
+ ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.HorizontalBalance);
+ Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassicStability: Incorrect number of models for deterministic horizontal balance calculation");
+ ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide);
+ Assert.AreEqual(0, flowSlideModels.Count, "DamClassicStability: Incorrect number of models for deterministic flowslide 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");
@@ -118,15 +118,15 @@
[Test]
public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForCalamityOption()
{
- ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping);
+ ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, 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.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside);
+ ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, 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.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside);
+ ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, 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.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.HorizontalBalance);
+ ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, 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.DamClassicStabilty, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide);
+ ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide);
Assert.AreEqual(0, flowSlideModels.Count, "Incorrect number of models for deterministic flowslide calculation");
stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside);
@@ -136,14 +136,14 @@
[Test]
public void ReturnsCorrectAvailableProbalisticFailuremechanismModels()
{
- 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");
+ ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping);
+ Assert.AreEqual(1, pipingModels.Count, "DamClassicStability: Incorrect number of models for deterministic piping calculation");
+ ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityInside);
+ Assert.AreEqual(0, stabilityInsideModels.Count, "DamClassicStability: Incorrect number of models for deterministic stability inside calculation");
+ ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.StabilityOutside);
+ Assert.AreEqual(0, stabilityOutsideModels.Count, "DamClassicStability: Incorrect number of models for deterministic stability outside calculation");
+ ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.HorizontalBalance);
+ Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassicStability: 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");
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs
===================================================================
diff -u -r1975 -r1982
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 1975)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 1982)
@@ -214,30 +214,30 @@
}
}
// This is the place to enable new possible failure mechanisms and models
- 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.DamClassicStability, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = 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.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.BishopUpliftVan] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer2Forces] = ConfigurationStatus.NotAvailable;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide, (int) FlowSlideModelType.All] = ConfigurationStatus.NotAvailable;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Probabilistic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.ProbabilisticFragility, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = 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.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available;
this[StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
}
Index: DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs
===================================================================
diff -u -r1975 -r1982
--- DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 1975)
+++ DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 1982)
@@ -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.DamClassicStabilty;
+ damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityKernelType = StabilityKernelType.DamClassicStability;
damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.Bishop;
damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside;