Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r3625 -r3664 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3625) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3664) @@ -202,8 +202,6 @@ [TestCase(FailureMechanismSystemType.StabilityInside, ConversionHelper.InputFailureMechanismStabilityInside)] [TestCase(FailureMechanismSystemType.StabilityOutside, ConversionHelper.InputFailureMechanismStabilityOutside)] [TestCase(FailureMechanismSystemType.Piping, ConversionHelper.InputFailureMechanismPiping)] - [TestCase(FailureMechanismSystemType.HorizontalBalance, ConversionHelper.InputFailureMechanismHorizontalBalance)] - [TestCase(FailureMechanismSystemType.FlowSlide, ConversionHelper.InputFailureMechanismFlowSlide)] public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) { Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType)); @@ -213,8 +211,6 @@ [TestCase(ConversionHelper.InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside)] [TestCase(ConversionHelper.InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside)] [TestCase(ConversionHelper.InputFailureMechanismPiping, FailureMechanismSystemType.Piping)] - [TestCase(ConversionHelper.InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance)] - [TestCase(ConversionHelper.InputFailureMechanismFlowSlide, FailureMechanismSystemType.FlowSlide)] public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType)); @@ -224,8 +220,6 @@ [TestCase(FailureMechanismSystemType.StabilityInside, ConversionHelper.InputSegmentFailureMechanismStability)] [TestCase(FailureMechanismSystemType.StabilityOutside, ConversionHelper.InputSegmentFailureMechanismStability)] [TestCase(FailureMechanismSystemType.Piping, ConversionHelper.InputSegmentFailureMechanismPiping)] - [TestCase(FailureMechanismSystemType.HorizontalBalance, ConversionHelper.InputSegmentFailureMechanismStability)] - [TestCase(FailureMechanismSystemType.FlowSlide, ConversionHelper.InputSegmentFailureMechanismLiquefaction)] public void CanConvertToInputSegmentFailureMechanismType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) { Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputSegmentFailureMechanismType(failureMechanismSystemType)); @@ -234,7 +228,6 @@ [Test] [TestCase(ConversionHelper.InputSegmentFailureMechanismStability, FailureMechanismSystemType.StabilityInside)] [TestCase(ConversionHelper.InputSegmentFailureMechanismPiping, FailureMechanismSystemType.Piping)] - [TestCase(ConversionHelper.InputSegmentFailureMechanismLiquefaction, FailureMechanismSystemType.FlowSlide)] public void CanConvertToSegmentFailureMechanismType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToSegmentFailureMechanismType(inputFailureMechanismSystemType)); @@ -453,10 +446,7 @@ [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] [TestCase(MStabModelType.UpliftSpencer, ConversionHelper.MStabModelTypeUpliftSpencer)] [TestCase(MStabModelType.BishopRandomField, ConversionHelper.MStabModelTypeBishopRandomField)] - [TestCase(MStabModelType.HorizontalBalance, ConversionHelper.MStabModelTypeHorizontalBalance)] [TestCase(MStabModelType.BishopUpliftVan, ConversionHelper.MStabModelTypeBishopUpliftVan)] - [TestCase(MStabModelType.SpencerHigh, ConversionHelper.MStabModelTypeSpencerHigh)] - [TestCase(MStabModelType.SpencerLow, ConversionHelper.MStabModelTypeSpencerLow)] public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) { Assert.AreEqual(outputMStabModelType, ConversionHelper.ConvertToOutputMStabModelType(mStabModelType)); @@ -469,10 +459,7 @@ [TestCase(ConversionHelper.MStabModelTypeUpliftVan, MStabModelType.UpliftVan)] [TestCase(ConversionHelper.MStabModelTypeUpliftSpencer, MStabModelType.UpliftSpencer)] [TestCase(ConversionHelper.MStabModelTypeBishopRandomField, MStabModelType.BishopRandomField)] - [TestCase(ConversionHelper.MStabModelTypeHorizontalBalance, MStabModelType.HorizontalBalance)] [TestCase(ConversionHelper.MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan)] - [TestCase(ConversionHelper.MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh)] - [TestCase(ConversionHelper.MStabModelTypeSpencerLow, MStabModelType.SpencerLow)] public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) { Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(outputMStabModelType)); Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r3655 -r3664 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 3655) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 3664) @@ -1386,8 +1386,6 @@ csvExportSurfaceLineIdentifiers.CalculationModel = designResult.DamFailureMechanismeCalculation.PipingModelType.ToString(); break; - case FailureMechanismSystemType.HorizontalBalance: - break; } return csvExportSurfaceLineIdentifiers; } Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r3527 -r3664 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 3664) @@ -1227,8 +1227,6 @@ [Test] [TestCase(FailureMechanismSystemType.StabilityOutside, "Location 'Location 1', scenario '1' has no river level low")] [TestCase(FailureMechanismSystemType.StabilityInside, "")] - [TestCase(FailureMechanismSystemType.HorizontalBalance, "")] - [TestCase(FailureMechanismSystemType.FlowSlide, "")] [TestCase(FailureMechanismSystemType.Piping, "")] public void RaiseExceptionWhenRiverLevelLowIsMissingForStabilityOutside(FailureMechanismSystemType failureMechanismSystemType, string expectedMessage) { Index: DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs =================================================================== diff -u -r3611 -r3664 --- DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 3611) +++ DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 3664) @@ -45,8 +45,7 @@ { Assert.IsTrue(failureMechanism.Equals(FailureMechanismSystemType.Piping) || failureMechanism.Equals(FailureMechanismSystemType.StabilityInside) || - failureMechanism.Equals(FailureMechanismSystemType.StabilityOutside) || - failureMechanism.Equals(FailureMechanismSystemType.FlowSlide)); + failureMechanism.Equals(FailureMechanismSystemType.StabilityOutside)); } } @@ -59,10 +58,6 @@ Assert.AreEqual(3, stabilityInsideModels.Count, "DamClassicStability: Incorrect number of models for deterministic stability inside calculation"); ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Design, FailureMechanismSystemType.StabilityOutside); Assert.AreEqual(1, stabilityOutsideModels.Count, "DamClassicStability: Incorrect number of models for deterministic stability outside calculation"); - ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Design, FailureMechanismSystemType.HorizontalBalance); - Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "DamClassicStability: Incorrect number of models for deterministic horizontal balance calculation"); - ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Design, FailureMechanismSystemType.FlowSlide); - Assert.AreEqual(0, flowSlideModels.Count, "DamClassicStability: Incorrect number of models for deterministic flowslide calculation"); } [Test] @@ -74,10 +69,6 @@ Assert.AreEqual(2, stabilityInsideModels.Count, "Incorrect number of models for deterministic stability inside calculation"); ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Calamity, FailureMechanismSystemType.StabilityOutside); Assert.AreEqual(1, stabilityOutsideModels.Count, "Incorrect number of models for deterministic stability outside calculation"); - ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Calamity, FailureMechanismSystemType.HorizontalBalance); - Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "Incorrect number of models for deterministic horizontal balance calculation"); - ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Calamity, FailureMechanismSystemType.FlowSlide); - Assert.AreEqual(0, flowSlideModels.Count, "Incorrect number of models for deterministic flowslide calculation"); } } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r3613 -r3664 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 3613) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 3664) @@ -229,7 +229,6 @@ { case FailureMechanismSystemType.StabilityInside: return true; case FailureMechanismSystemType.StabilityOutside: return false; - case FailureMechanismSystemType.HorizontalBalance: return false; case FailureMechanismSystemType.Piping: return false; default: return true; } Index: DamClients/DamUI/trunk/src/Dam/Tests/DamFailureMechanismeCalculationSpecificationTest.cs =================================================================== diff -u -r3614 -r3664 --- DamClients/DamUI/trunk/src/Dam/Tests/DamFailureMechanismeCalculationSpecificationTest.cs (.../DamFailureMechanismeCalculationSpecificationTest.cs) (revision 3614) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamFailureMechanismeCalculationSpecificationTest.cs (.../DamFailureMechanismeCalculationSpecificationTest.cs) (revision 3664) @@ -90,7 +90,6 @@ [Test] [TestCase(FailureMechanismSystemType.Piping)] - [TestCase(FailureMechanismSystemType.FlowSlide)] public void GivenSpecificationWithNotStabilityModel_WhenIsEnabledCalledWithCalculationModel_ThenReturnsTrue( FailureMechanismSystemType failureMechanism) { @@ -110,9 +109,7 @@ [Test] [TestCase(FailureMechanismSystemType.StabilityInside, true)] [TestCase(FailureMechanismSystemType.StabilityOutside, false)] - [TestCase(FailureMechanismSystemType.HorizontalBalance, false)] [TestCase(FailureMechanismSystemType.Piping, false)] - [TestCase(FailureMechanismSystemType.FlowSlide, true)] public void IsVisible_WithFailureMechanismTypeAndCalledWithFailureMechanismeParamatersMStabProperty_ReturnsExpectedResult( FailureMechanismSystemType failureMechanismSystemType, bool expectedVisibility) { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs =================================================================== diff -u -r3611 -r3664 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 3611) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 3664) @@ -125,12 +125,8 @@ break; case FailureMechanismSystemType.StabilityInside: case FailureMechanismSystemType.StabilityOutside: - case FailureMechanismSystemType.HorizontalBalance: availableList.Add((MStabModelType) i); break; - case FailureMechanismSystemType.FlowSlide: - availableList.Add((FlowSlideModelType) i); - break; } } } @@ -173,8 +169,7 @@ this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; - this[DamProjectType.Design, FailureMechanismSystemType.FlowSlide, (int) FlowSlideModelType.All] = ConfigurationStatus.NotAvailable; - + this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r3655 -r3664 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3655) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3664) @@ -20,7 +20,6 @@ // All rights reserved. using System.Collections.Generic; -using System.Configuration; using Deltares.DamEngine.Io.XmlInput; using Deltares.DamEngine.Io.XmlOutput; using Deltares.Geotechnics; @@ -347,9 +346,7 @@ public const int InputFailureMechanismStabilityInside = 0; public const int InputFailureMechanismStabilityOutside = 1; public const int InputFailureMechanismPiping = 2; - public const int InputFailureMechanismHorizontalBalance = 3; - public const int InputFailureMechanismFlowSlide = 4; - + /// /// Converts the Dam failure mechanism type to the input failure mechanism type . /// @@ -361,9 +358,7 @@ { {FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside}, {FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside}, - {FailureMechanismSystemType.Piping, InputFailureMechanismPiping}, - {FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance}, - {FailureMechanismSystemType.FlowSlide, InputFailureMechanismFlowSlide} + {FailureMechanismSystemType.Piping, InputFailureMechanismPiping} }; return translationTable[segmentFailureMechanismType]; } @@ -379,9 +374,7 @@ { {InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside}, {InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside}, - {InputFailureMechanismPiping, FailureMechanismSystemType.Piping}, - {InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance}, - {InputFailureMechanismFlowSlide, FailureMechanismSystemType.FlowSlide}, + {InputFailureMechanismPiping, FailureMechanismSystemType.Piping} }; return translationTable[failureMechanismSystemType]; } @@ -390,8 +383,7 @@ public const int InputSegmentFailureMechanismAll = 0; public const int InputSegmentFailureMechanismStability = 1; public const int InputSegmentFailureMechanismPiping = 2; - public const int InputSegmentFailureMechanismLiquefaction = 3; - + /// /// Converts the Dam segment failure mechanism type to the input segment failure mechanism type . /// @@ -403,9 +395,7 @@ { {FailureMechanismSystemType.StabilityInside, InputSegmentFailureMechanismStability}, {FailureMechanismSystemType.StabilityOutside, InputSegmentFailureMechanismStability}, - {FailureMechanismSystemType.Piping, InputSegmentFailureMechanismPiping}, - {FailureMechanismSystemType.FlowSlide, InputSegmentFailureMechanismLiquefaction}, - {FailureMechanismSystemType.HorizontalBalance, InputSegmentFailureMechanismStability} + {FailureMechanismSystemType.Piping, InputSegmentFailureMechanismPiping} }; return translationTable[segmentFailureMechanismType]; } @@ -424,8 +414,7 @@ var translationTable = new Dictionary() { {InputSegmentFailureMechanismStability, FailureMechanismSystemType.StabilityInside}, - {InputSegmentFailureMechanismPiping, FailureMechanismSystemType.Piping}, - {InputSegmentFailureMechanismLiquefaction, FailureMechanismSystemType.FlowSlide}, + {InputSegmentFailureMechanismPiping, FailureMechanismSystemType.Piping} }; return translationTable[failureMechanismSystemType]; } @@ -1026,26 +1015,11 @@ public const int MStabModelTypeBishopRandomField = 5; /// - /// The m stab model type horizontal balance - /// - public const int MStabModelTypeHorizontalBalance = 6; - - /// /// The m stab model type bishop uplift van /// public const int MStabModelTypeBishopUpliftVan = 7; /// - /// The m stab model type spencer high - /// - public const int MStabModelTypeSpencerHigh = 8; - - /// - /// The m stab model type spencer low - /// - public const int MStabModelTypeSpencerLow = 9; - - /// /// Converts to MStab Model Type. /// /// The input MStabModelType. @@ -1060,10 +1034,7 @@ {MStabModelTypeUpliftVan, MStabModelType.UpliftVan}, {MStabModelTypeUpliftSpencer, MStabModelType.UpliftSpencer}, {MStabModelTypeBishopRandomField, MStabModelType.BishopRandomField}, - {MStabModelTypeHorizontalBalance, MStabModelType.HorizontalBalance}, - {MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan}, - {MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh}, - {MStabModelTypeSpencerLow, MStabModelType.SpencerLow} + {MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan} }; return translationTable[inputMStabModelType]; } @@ -1083,10 +1054,7 @@ {MStabModelType.UpliftVan, MStabModelTypeUpliftVan}, {MStabModelType.UpliftSpencer, MStabModelTypeUpliftSpencer}, {MStabModelType.BishopRandomField, MStabModelTypeBishopRandomField}, - {MStabModelType.HorizontalBalance, MStabModelTypeHorizontalBalance}, - {MStabModelType.BishopUpliftVan, MStabModelTypeBishopUpliftVan}, - {MStabModelType.SpencerHigh, MStabModelTypeSpencerHigh}, - {MStabModelType.SpencerLow, MStabModelTypeSpencerLow} + {MStabModelType.BishopUpliftVan, MStabModelTypeBishopUpliftVan} }; return translationTable[mStabModelType]; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r3537 -r3664 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 3537) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 3664) @@ -1646,7 +1646,6 @@ double? res = null; switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) { - case FailureMechanismSystemType.HorizontalBalance: case FailureMechanismSystemType.StabilityOutside: case FailureMechanismSystemType.StabilityInside: res = StabilityProfileProbability; @@ -1683,7 +1682,6 @@ double? res = null; switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) { - case FailureMechanismSystemType.HorizontalBalance: case FailureMechanismSystemType.StabilityOutside: case FailureMechanismSystemType.StabilityInside: res = StabilitySafetyFactor; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs =================================================================== diff -u -r3526 -r3664 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 3526) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 3664) @@ -28,6 +28,7 @@ using System; using System.Collections.Specialized; using System.Linq.Expressions; +using Deltares.DamEngine.Data.Standard; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Standard.Attributes; @@ -653,12 +654,12 @@ /// uplift criterion for this scenario public double GetUpliftCriterionStability(double? defaultUpliftCriterionStability) { - if ((defaultUpliftCriterionStability == null) && (ModelFactors.UpliftCriterionStability == null)) + if ((defaultUpliftCriterionStability == null) && ModelFactors.UpliftCriterionStability.IsNearEqual(0)) { throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForStability"), Location.Name, ToString())); } - return (ModelFactors.UpliftCriterionStability == null ? defaultUpliftCriterionStability.Value + return (ModelFactors.UpliftCriterionStability.IsNearEqual(0) ? defaultUpliftCriterionStability.Value : ModelFactors.UpliftCriterionStability); } @@ -669,11 +670,11 @@ /// uplift criterion for this scenario public double GetUpliftCriterionPiping(double? defaultUpliftCriterionPiping) { - if ((defaultUpliftCriterionPiping == null) && (ModelFactors.UpliftCriterionPiping == null)) + if ((defaultUpliftCriterionPiping == null) && (ModelFactors.UpliftCriterionPiping.IsNearEqual(0))) { throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForPiping"), Location.Name, ToString())); } - return (ModelFactors.UpliftCriterionPiping == null ? defaultUpliftCriterionPiping.Value : ModelFactors.UpliftCriterionPiping); + return (ModelFactors.UpliftCriterionPiping.IsNearEqual(0) ? defaultUpliftCriterionPiping.Value : ModelFactors.UpliftCriterionPiping); } /// @@ -683,11 +684,11 @@ /// uplift criterion for this scenario public double GetRequiredSafetyFactorPiping(double? defaultRequiredSafetyFactorPiping) { - if ((defaultRequiredSafetyFactorPiping == null) && (ModelFactors.RequiredSafetyFactorPiping == null)) + if ((defaultRequiredSafetyFactorPiping == null) && (ModelFactors.RequiredSafetyFactorPiping.IsNearEqual(0))) { throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyFactorPiping"), Location.Name, ToString())); } - return (ModelFactors.RequiredSafetyFactorPiping == null ? defaultRequiredSafetyFactorPiping.Value : ModelFactors.RequiredSafetyFactorPiping); + return (ModelFactors.RequiredSafetyFactorPiping.IsNearEqual(0) ? defaultRequiredSafetyFactorPiping.Value : ModelFactors.RequiredSafetyFactorPiping); } /// Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r3625 -r3664 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 3625) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 3664) @@ -59,9 +59,7 @@ [XmlOldName("Stability", "StabilityInsideMStab")] StabilityInside, StabilityOutside, - Piping, - HorizontalBalance, - FlowSlide + Piping } public enum MStabModelType @@ -72,10 +70,7 @@ UpliftVan, UpliftSpencer, BishopRandomField, - HorizontalBalance, - BishopUpliftVan, - SpencerHigh, // #Bka added SpencerHigh/SpencerLow as quick fix. Should be replaced with options for Spencer later! These enums should be removed. - SpencerLow + BishopUpliftVan } public enum PipingModelType @@ -87,11 +82,6 @@ Wti2017 }; - public enum FlowSlideModelType - { - All, - }; - public enum PLLineAssignment { NoPLLines,