Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r2197 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 2197) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 2513) @@ -889,49 +889,7 @@ return translationTable[stabilityDesignMethod]; } - public const int SoilTypeClay = 0; - public const int SoilTypeGravel = 1; - public const int SoilTypeLoam = 2; - public const int SoilTypePeat = 3; - public const int SoilTypeSand = 4; - /// - /// Converts the input dikeMaterialType to SoilType. - /// - /// Type of the dike material. - /// - public static SoilType ConvertToSoilType(int dikeMaterialType) - { - var translationTable = new Dictionary() - { - {SoilTypeClay, SoilType.Clay}, - {SoilTypeGravel, SoilType.Gravel}, - {SoilTypeLoam, SoilType.Loam}, - {SoilTypePeat, SoilType.Peat}, - {SoilTypeSand, SoilType.Sand} - }; - return translationTable[dikeMaterialType]; - } - - /// - /// Converts the SoilType to the input dikeMaterialType. - /// - /// Type of the soil. - /// - public static int ConvertToInputSoilType(SoilType soilType) - { - var translationTable = new Dictionary() - { - {SoilType.Clay, SoilTypeClay}, - {SoilType.Gravel, SoilTypeGravel}, - {SoilType.Loam, SoilTypeLoam}, - {SoilType.Peat, SoilTypePeat}, - {SoilType.Sand, SoilTypeSand} - }; - return translationTable[soilType]; - } - - /// /// The load situation dry /// public const int LoadSituationDry = 0; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs =================================================================== diff -u -r2508 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs (.../DamProjectCalculationSpecification.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs (.../DamProjectCalculationSpecification.cs) (revision 2513) @@ -192,10 +192,6 @@ switch (property) { case "SelectedAnalysisType": return new[] { AnalysisType.AdaptGeometry, AnalysisType.NoAdaption }; - case "SelectedProbabilisticType": - return - (ConfigurationManager.Instance.GetAvailableProbabilisticTypes( - DamFailureMechanismeCalculationSpecification.DamProjectType)); default: return null; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs =================================================================== diff -u -r2135 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 2513) @@ -32,7 +32,7 @@ [ThreadStatic] private static readonly ConfigurationManager instance = new ConfigurationManager(); - private static ConfigurationStatus[,,,,] configurationStatus; + private static ConfigurationStatus[,,,] configurationStatus; /// /// Initializes a new instance of the class. @@ -55,19 +55,18 @@ /// /// /// - /// /// /// /// - public ConfigurationStatus this[StabilityKernelType kernelType, DamProjectType damProjectType, ProbabilisticType probabilisticType, FailureMechanismSystemType failureMechanismSystemType, int i] + public ConfigurationStatus this[StabilityKernelType kernelType, DamProjectType damProjectType, FailureMechanismSystemType failureMechanismSystemType, int i] { get { - return configurationStatus[(int) kernelType, (int) damProjectType, (int) probabilisticType, (int) failureMechanismSystemType, i]; + return configurationStatus[(int) kernelType, (int) damProjectType, (int) failureMechanismSystemType, i]; } set { - configurationStatus[(int) kernelType, (int) damProjectType, (int) probabilisticType, (int) failureMechanismSystemType, i] = value; + configurationStatus[(int) kernelType, (int) damProjectType, (int) failureMechanismSystemType, i] = value; } } @@ -85,50 +84,19 @@ } /// - /// Gets the available probabilistic types. - /// - /// Type of the dam project. - /// - public ICollection GetAvailableProbabilisticTypes(DamProjectType damProjectType) - { - switch (damProjectType) - { - // For DAM 1.0 probabilistic is not to be used as this is not yet tested. - case DamProjectType.Design: - return new[] - { - ProbabilisticType.Deterministic - }; - case DamProjectType.Calamity: - return new[] - { - ProbabilisticType.Deterministic - }; - default: - return new[] - { - ProbabilisticType.Deterministic, - ProbabilisticType.Probabilistic, - ProbabilisticType.ProbabilisticFragility - }; - } - } - - /// /// Gets the available failure mechanisms. /// /// /// Type of the dam project. - /// Type of the probabilistic. /// - public ICollection GetAvailableFailureMechanisms(StabilityKernelType kernelType, DamProjectType damProjectType, ProbabilisticType probabilisticType) + public ICollection GetAvailableFailureMechanisms(StabilityKernelType kernelType, DamProjectType damProjectType) { var availableList = new List(); foreach (FailureMechanismSystemType failureMechanismSystemType in Enum.GetValues(typeof(FailureMechanismSystemType))) { for (int i = 0; i < maxModelCount; i++) { - if (this[kernelType, damProjectType, probabilisticType, failureMechanismSystemType, i] == ConfigurationStatus.Available) + if (this[kernelType, damProjectType, failureMechanismSystemType, i] == ConfigurationStatus.Available) { availableList.Add(failureMechanismSystemType); break; @@ -143,16 +111,14 @@ /// /// /// Type of the dam project. - /// Type of the probabilistic. /// Type of the failure mechanism system. /// - public ICollection GetAvailableMechanismModels(StabilityKernelType kernelType, DamProjectType damProjectType, ProbabilisticType probabilisticType, - FailureMechanismSystemType failureMechanismSystemType) + public ICollection GetAvailableMechanismModels(StabilityKernelType kernelType, DamProjectType damProjectType, FailureMechanismSystemType failureMechanismSystemType) { var availableList = new List(); for (int i = 0; i < maxModelCount; i++) { - if (this[kernelType, damProjectType, probabilisticType, failureMechanismSystemType, i] == ConfigurationStatus.Available) + if (this[kernelType, damProjectType, failureMechanismSystemType, i] == ConfigurationStatus.Available) { switch (failureMechanismSystemType) { @@ -185,50 +151,42 @@ private void InitDefaultStatus() { configurationStatus = new ConfigurationStatus[GetLength(), GetLength(), - GetLength(), GetLength(), maxModelCount]; foreach (StabilityKernelType kernelType in Enum.GetValues(typeof(StabilityKernelType))) { foreach (DamProjectType damProjectType in Enum.GetValues(typeof(DamProjectType))) { - foreach (ProbabilisticType probabilisticType in Enum.GetValues(typeof(ProbabilisticType))) + foreach (FailureMechanismSystemType failureMechanismSystemType in Enum.GetValues(typeof(FailureMechanismSystemType))) { - foreach ( - 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; - } + this[kernelType, damProjectType, failureMechanismSystemType, i] = + ConfigurationStatus.NotImplemented; } } } } // This is the place to enable new possible failure mechanisms and models - 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.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.BishopUpliftVan] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer2Forces] = ConfigurationStatus.NotAvailable; + this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.FlowSlide, (int) FlowSlideModelType.All] = ConfigurationStatus.NotAvailable; + + this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; + this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, 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; + this[StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs =================================================================== diff -u -r2508 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 2513) @@ -47,8 +47,7 @@ private static string currentCalculation = ""; private static DateTime currentTime = DateTime.Today; private static DamProjectType damProjectType = DamProjectType.Calamity; - private static ProbabilisticType probabilisticType = ProbabilisticType.Deterministic; - + private double designRequiredFactor = 0.0; public LocationJob() @@ -198,13 +197,10 @@ { foreach (var calculationResult in scenario.CalculationResults) { - if (ProbabilisticType == ProbabilisticType.Deterministic) + if ((calculationResult.SafetyFactor != null) || (calculationResult.CalculationResult == CalculationResult.UnexpectedError) ) { - if ((calculationResult.SafetyFactor != null) || (calculationResult.CalculationResult == CalculationResult.UnexpectedError) ) - { - return true; - } - } + return true; + } } } return false; @@ -290,11 +286,7 @@ { get { - if (ProbabilisticType == ProbabilisticType.Deterministic) - { - return JobResultInterpreter.GetJobResult(SafetyFactor, RequiredFactorOfSafety, true); - } - return JobResult.NoRun; + return JobResultInterpreter.GetJobResult(SafetyFactor, RequiredFactorOfSafety, true); } } @@ -362,14 +354,6 @@ set { damProjectType = value; } } - [XmlIgnore] - [Browsable(false)] - public static ProbabilisticType ProbabilisticType - { - get { return probabilisticType; } - set { probabilisticType = value; } - } - public bool IsEnabled(string property) { return true; @@ -379,10 +363,8 @@ { switch (property) { - case "SafetyFactor": return this.Result != JobResult.NoRun && this.Result != JobResult.Failed && - ProbabilisticType == ProbabilisticType.Deterministic; - case "RequiredFactorOfSafety": return this.Result != JobResult.NoRun && this.Result != JobResult.Failed && - ProbabilisticType == ProbabilisticType.Deterministic; + case "SafetyFactor": return this.Result != JobResult.NoRun && this.Result != JobResult.Failed; + case "RequiredFactorOfSafety": return this.Result != JobResult.NoRun && this.Result != JobResult.Failed; case "WaterLevelTimeSerie": return HasLocationResults; default: return true; Index: DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs =================================================================== diff -u -r2135 -r2513 --- DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 2513) @@ -37,44 +37,9 @@ } [Test] - public void ReturnsCorrectAvailableProbabilisticTypes() - { - ICollection probabilisticTypes = ConfigurationManager.Instance.GetAvailableProbabilisticTypes(DamProjectType.Design); - Assert.AreEqual(1, probabilisticTypes.Count); - probabilisticTypes = ConfigurationManager.Instance.GetAvailableProbabilisticTypes(DamProjectType.Calamity); - Assert.AreEqual(1, probabilisticTypes.Count); - } - - [Test] - public void ReturnsCorrectAvailableProbalisticFailuremechanisms() - { - 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)); - } - 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.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)); - } - 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.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic); + ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.DamClassicStability, DamProjectType.Design); Assert.AreEqual(3, failureMechanisms.Count, "DamClassicStability: Incorrect number of failuremechanisms for deterministic calculation"); foreach (var failureMechanism in failureMechanisms) { @@ -84,73 +49,47 @@ failureMechanism.Equals(FailureMechanismSystemType.FlowSlide)); } - failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, ProbabilisticType.Deterministic); + failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design); Assert.AreEqual(1, failureMechanisms.Count, "WtiMacroStabilityKernel: Incorrect number of failuremechanisms for deterministic calculation"); } [Test] public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForDesignOption() { - ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); + ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, 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); + ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, 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); + ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, 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); + ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, 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); + ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Design, 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); + stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, 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); + pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, 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.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping); + ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.Piping); Assert.AreEqual(3, pipingModels.Count, "Incorrect number of models for deterministic piping calculation"); - ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside); + ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside); Assert.AreEqual(2, stabilityInsideModels.Count, "Incorrect number of models for deterministic stability inside calculation"); - ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside); + ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.StabilityOutside); Assert.AreEqual(1, stabilityOutsideModels.Count, "Incorrect number of models for deterministic stability outside calculation"); - ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.HorizontalBalance); + ICollection stabilityHorizontalBalanceModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.HorizontalBalance); Assert.AreEqual(0, stabilityHorizontalBalanceModels.Count, "Incorrect number of models for deterministic horizontal balance calculation"); - ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.FlowSlide); + ICollection flowSlideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.DamClassicStability, DamProjectType.Calamity, 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); + stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Calamity, 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.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"); - - 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/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs =================================================================== diff -u -r2508 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs (.../LocationImportHelper.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs (.../LocationImportHelper.cs) (revision 2513) @@ -28,38 +28,6 @@ { internal static class LocationImportHelper { - public static SoilType ToSoilType(object value) - { - if (value == null) - throw new ArgumentNullException("value"); - - return ToSoilType(value.ToString()); - } - - public static SoilType ToSoilType(string value) - { - if (string.IsNullOrEmpty(value) || value.Trim() == "") - throw new ArgumentException("value"); - - var soilTypeTranslationTable = new Dictionary() - { - {"klei", SoilType.Clay}, - {"grind", SoilType.Gravel}, - {"leem", SoilType.Loam}, - {"veen", SoilType.Peat}, - {"zand", SoilType.Sand}, - {"clay", SoilType.Clay}, - {"gravel", SoilType.Gravel}, - {"loam", SoilType.Loam}, - {"peat", SoilType.Peat}, - {"sand", SoilType.Sand} - - }; - - var key = value.ToLowerInvariant(); - return key.ToEnumType(soilTypeTranslationTable); - } - internal static PLLineCreationMethod ToPLLineCreationMethod(object value) { if (value == null) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r2135 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 2513) @@ -146,7 +146,6 @@ DamFailureMechanismeCalculation = damProjectData.DamProjectCalculationSpecification.CurrentSpecification, // vanuit invoer 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 CalculationResult = ConversionHelper.ConvertToCalculationResult(designResult.CalculationResult), BaseFileName = designResult.BaseFileName, Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r2512 -r2513 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2512) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2513) @@ -319,8 +319,7 @@ soil.OCR = 25 + 0.1 * i; soil.RestSlope = 26 + 0.1 * i; soil.DilatancyType = DilatancyType.MinusPhi; - soil.SoilType = ConversionHelper.ConvertToSoilType(i); - + dike.SoilList.Add(soil); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r2409 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2409) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2513) @@ -372,8 +372,6 @@ soil.RestSlope = inputSoil.SlopeRestProfileSpecified ? inputSoil.SlopeRestProfile : Double.NaN; soil.DilatancyType = inputSoil.DilatancyTypeSpecified ? ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : DilatancyType.Phi; - soil.SoilType = inputSoil.SoilTypeSpecified ? ConversionHelper.ConvertToSoilType(inputSoil.SoilType) : SoilType.Clay; - inputSoil.SoilTypeSpecified = true; soils.Add(soil); } } Index: DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs =================================================================== diff -u -r1982 -r2513 --- DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 1982) +++ DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 2513) @@ -91,8 +91,6 @@ Assert.AreEqual(437106.000, allCalculationresults[0].Y); // * Analysis = No Adaption Assert.AreEqual(AnalysisType.NoAdaption, allCalculationresults[0].AnalysisType); -// * Probabilistic = Deterministic - Assert.AreEqual(ProbabilisticType.Deterministic, allCalculationresults[0].ProbabilisticType); // * Uplift = true Assert.AreEqual(true, allCalculationresults[0].IsUplift); // * Profile = "" (empty) but must be name of profile (1D: profile name, 2D-sti: name of stifile used as base, in future with real 2D: profile name) @@ -193,8 +191,6 @@ Assert.AreEqual(448871.233, allCalculationresults[1].Y, diff); // * Analysis = No Adaption Assert.AreEqual(AnalysisType.NoAdaption, allCalculationresults[1].AnalysisType); -// * Probabilistic = Deterministic - Assert.AreEqual(ProbabilisticType.Deterministic, allCalculationresults[1].ProbabilisticType); // * Uplift = false Assert.AreEqual(false, allCalculationresults[1].IsUplift); // * Profile = "" (leeg) maar zou gevuld moeten zijn met naam van 1D dus Segment_1_1D2 Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r2510 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2510) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2513) @@ -526,8 +526,6 @@ inputSoil.SlopeRestProfile = soil.RestSlope; inputSoil.DilatancyTypeSpecified = true; inputSoil.DilatancyType = ConversionHelper.ConvertToSoilDilatancyType(soil.DilatancyType); - inputSoil.SoilType = ConversionHelper.ConvertToInputSoilType(soil.SoilType); - inputSoil.SoilTypeSpecified = true; inputSoils[i] = inputSoil; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r2472 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2472) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2513) @@ -66,13 +66,6 @@ AdaptGeometry }; - public enum ProbabilisticType - { - Deterministic, - Probabilistic, - ProbabilisticFragility - }; - public enum FailureMechanismSystemType { [XmlOldName("Stability", "StabilityInsideMStab")] Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r2197 -r2513 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2197) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2513) @@ -414,29 +414,6 @@ } [Test] - [TestCase(ConversionHelper.SoilTypeClay, SoilType.Clay)] - [TestCase(ConversionHelper.SoilTypeGravel, SoilType.Gravel)] - [TestCase(ConversionHelper.SoilTypeLoam, SoilType.Loam)] - [TestCase(ConversionHelper.SoilTypePeat, SoilType.Peat)] - [TestCase(ConversionHelper.SoilTypeSand, SoilType.Sand)] - public void CanConvertToSoilType(int dikeSoilType, SoilType soilType) - { - Assert.AreEqual(soilType, ConversionHelper.ConvertToSoilType(dikeSoilType)); - } - - [Test] - [TestCase(SoilType.Clay, ConversionHelper.SoilTypeClay)] - [TestCase(SoilType.Gravel, ConversionHelper.SoilTypeGravel)] - [TestCase(SoilType.Loam, ConversionHelper.SoilTypeLoam)] - [TestCase(SoilType.Peat, ConversionHelper.SoilTypePeat)] - [TestCase(SoilType.Sand, ConversionHelper.SoilTypeSand)] - public void CanConvertToDikeMaterialType(SoilType soilType, int dikeSoilType) - { - Assert.AreEqual(dikeSoilType, ConversionHelper.ConvertToInputSoilType(soilType)); - } - - - [Test] [TestCase(LoadSituation.Dry, ConversionHelper.LoadSituationDry)] [TestCase(LoadSituation.Wet, ConversionHelper.LoadSituationWet)] public void CanConvertToOutputLoadSituation(LoadSituation loadSituation, int outputLoadSituation) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r2089 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 2089) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 2513) @@ -41,8 +41,7 @@ private PipingModelType pipingModelType = PipingModelType.Sellmeijer4Forces; private Enum calculationModel; private FailureMechanismeParamatersMStab failureMechanismeParamatersMStab; - private static ProbabilisticType probabilisticType; - private static DamProjectType damProjectType; + private static DamProjectType damProjectType; private StabilityKernelType stabilityKernelType = StabilityKernelType.DamClassicStability; private Boolean firstTime = true; @@ -123,13 +122,6 @@ set { damProjectType = value; } } - [Browsable(false)] - public static ProbabilisticType ProbabilisticType - { - get { return probabilisticType; } - set { probabilisticType = value; } - } - /// /// The calculationmodel is only needed to support the selection of the modeltype in the UI. The dropdownlist /// in the UI depends on this. This set can be filled with any proper types (for piping, stabilty etc) for any @@ -218,19 +210,13 @@ switch (property) { case "CalculationModel": - return (ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType, DamProjectType, - ProbabilisticType, failureMechanismSystemType)); - + return (ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType, DamProjectType, failureMechanismSystemType)); case "PipingModelType": - return (ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType, DamProjectType, - ProbabilisticType, FailureMechanismSystemType.Piping)); - + return (ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType, DamProjectType, FailureMechanismSystemType.Piping)); case "FailureMechanismSystemType": - return (ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType, DamProjectType, - ProbabilisticType)); + return (ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType, DamProjectType)); case "StabilityKernelType": - return (ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType, DamProjectType, - ProbabilisticType)); + return (ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType, DamProjectType)); default: return null; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r2472 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2472) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2513) @@ -54,7 +54,6 @@ private string calculationSubDir; private string dikeName; private AnalysisType analysisType; - private ProbabilisticType probabilisticType; private DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification; private Scenario scenario; private SoilProfile1D soilProfile; @@ -269,14 +268,6 @@ set { analysisType = value; } } - [PropertyOrder(1, 3)] - [ReadOnly(true)] - public ProbabilisticType ProbabilisticType // moet vanuit invoer komen - { - get { return probabilisticType; } - set { probabilisticType = value; } - } - [Browsable(false)] public DamFailureMechanismeCalculationSpecification DamFailureMechanismeCalculation // moet vanuit invoer komen { @@ -2383,10 +2374,6 @@ FailureMechanismSystemType.StabilityInside || damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside; - case "RequiredSafetyFactor": - return probabilisticType == ProbabilisticType.Deterministic; - case "SafetyFactor": - return probabilisticType == ProbabilisticType.Deterministic; case "PipingModel": return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping; case "PipingFactor": Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs =================================================================== diff -u -r2512 -r2513 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2512) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2513) @@ -373,7 +373,6 @@ Soil soilClay1 = new Soil(); soilClay1.UseDefaultProbabilisticValues = false; soilClay1.Name = "HW-OBO"; - soilClay1.SoilType = SoilType.Clay; soilClay1.AbovePhreaticLevel = 15.00; soilClay1.BelowPhreaticLevel = 16.00; soilClay1.DiameterD70 = 0.000013; @@ -393,29 +392,25 @@ soilClay1.CorrelationCPhi = 0.5; soilClay1.POP = 4.2; soilClay1.SoilGroup = 11; - soilClay1.UseSoilType = true; soilClay1.RRatio = 5.5; dike.SoilList.Soils.Add(soilClay1); Soil soilPeat1 = new Soil(); soilPeat1.UseDefaultProbabilisticValues = false; soilPeat1.Name = "HW-DUN"; - soilPeat1.SoilType = SoilType.Peat; soilPeat1.AbovePhreaticLevel = 11.00; soilPeat1.BelowPhreaticLevel = 13.00; dike.SoilList.Soils.Add(soilPeat1); Soil soilSand1 = new Soil(); soilSand1.UseDefaultProbabilisticValues = false; soilSand1.Name = "Alg-zand (0-30)"; - soilSand1.SoilType = SoilType.Sand; soilSand1.AbovePhreaticLevel = 18.50; soilSand1.BelowPhreaticLevel = 21.75; dike.SoilList.Soils.Add(soilSand1); Soil soilClay2 = new Soil(); soilClay2.UseDefaultProbabilisticValues = false; soilClay2.Name = "HW-OBO1"; - soilClay2.SoilType = SoilType.Clay; soilClay2.AbovePhreaticLevel = 14.67; soilClay2.BelowPhreaticLevel = 16.45; dike.SoilList.Soils.Add(soilClay2); @@ -424,14 +419,12 @@ soilPeat2.Name = "HW-DUN1"; soilPeat2.AbovePhreaticLevel = 11.13; soilPeat2.BelowPhreaticLevel = 12.64; - soilPeat2.SoilType = SoilType.Peat; dike.SoilList.Soils.Add(soilPeat2); Soil soilSand2 = new Soil(); soilSand2.UseDefaultProbabilisticValues = false; soilSand2.Name = "Alg-zand (0-30)1"; soilSand2.AbovePhreaticLevel = 17.92; soilSand2.BelowPhreaticLevel = 22.08; - soilSand2.SoilType = SoilType.Sand; dike.SoilList.Soils.Add(soilSand2); // Soil profiles