Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/PipingResults.cs =================================================================== diff -u -r4070 -r4377 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/PipingResults.cs (.../PipingResults.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/PipingResults.cs (.../PipingResults.cs) (revision 4377) @@ -27,12 +27,6 @@ public string CalculationSubDir { get; set; } public double? BlighPipingFactor { get; set; } public double? BlighHCritical { get; set; } - public double? Sellmeijer2ForcesPipingFactor { get; set; } - public double? Sellmeijer2ForcesHCritical { get; set; } - public double? Sellmeijer4ForcesPipingFactor { get; set; } - public double? Sellmeijer4ForcesHCritical { get; set; } - public double? SellmeijerPipingFactor { get; set; } - public double? SellmeijerHCritical { get; set; } public double? Wti2017PipingFactor { get; set; } public double? Wti2017HCritical { get; set; } public double? PipingExitPointX { get; set; } Index: DamClients/DamUI/trunk/src/Dam/Forms/DesignCalculationPropertyControl.cs =================================================================== diff -u -r4255 -r4377 --- DamClients/DamUI/trunk/src/Dam/Forms/DesignCalculationPropertyControl.cs (.../DesignCalculationPropertyControl.cs) (revision 4255) +++ DamClients/DamUI/trunk/src/Dam/Forms/DesignCalculationPropertyControl.cs (.../DesignCalculationPropertyControl.cs) (revision 4377) @@ -127,6 +127,12 @@ { if (locationJob != null) { + CsvExportData designResult = locationJob.GetDesignResultByProfileScenarioAndCalculationName( + soilProfileName, scenarioName, calculationName); + if (designResult != null) + { + return true; + } return locationJob.GetFirstDesignResult() != null; } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs =================================================================== diff -u -r4332 -r4377 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs (.../DamPipingBenchmarkTest.cs) (revision 4332) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs (.../DamPipingBenchmarkTest.cs) (revision 4377) @@ -46,19 +46,7 @@ { const string projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 1\Integratietest piping 1.damx"; - List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0); - double expectedLocalPipingExitPointX = 35; // This is just taken from the calculation result itself - var expectedPl3HeadAdjusted = 0.0; // For Piping, this must always be 0 - var expectedPl4HeadAdjusted = 0.0; // For Piping, this must always be 0 - - Assert.AreEqual(3, LogManager.Messages.Count); - Assert.AreEqual(true, allCalculationresults[0].IsUplift.Value); - Assert.AreEqual(expectedLocalPipingExitPointX, allCalculationresults[0].LocalPipingExitPointX.Value, cTolerance); - Assert.AreEqual(expectedPl3HeadAdjusted, allCalculationresults[0].Pl3HeadAdjusted.Value, cTolerance); - Assert.AreEqual(expectedPl4HeadAdjusted, allCalculationresults[0].Pl4HeadAdjusted.Value, cTolerance); - - allCalculationresults.Clear(); - allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); + List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); @@ -67,9 +55,9 @@ allCalculationresults = ComputeProject(projectFilename, PipingModelType.Wti2017, 0); expectedPipingFactor = 0.43219776821374467; // This is just taken from the calculation result itself var expectedHCritical = 1.9830328582839827; // This is just taken from the calculation result itself - expectedLocalPipingExitPointX = 35; // This is just taken from the calculation result itself - expectedPl3HeadAdjusted = 0.0; // This is just taken from the calculation result itself - expectedPl4HeadAdjusted = 0.0; // This is just taken from the calculation result itself + var expectedLocalPipingExitPointX = 35; // This is just taken from the calculation result itself + var expectedPl3HeadAdjusted = 0.0; // This is just taken from the calculation result itself + var expectedPl4HeadAdjusted = 0.0; // This is just taken from the calculation result itself var expectedCCreep = 18.076215507286715; var expectedEffectiveStress = 12.38; var expectedBackwardErosionDeltaPhiReduced = 3.20; @@ -110,11 +98,7 @@ { var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 2\Integratietest piping 2.damx"; - List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0); - Assert.AreEqual(3, LogManager.Messages.Count); - - allCalculationresults.Clear(); - allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); + List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); @@ -133,13 +117,7 @@ { var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 3\Integratietest piping 3.damx"; - List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0); - Assert.AreEqual(3, LogManager.Messages.Count); - Assert.AreEqual(LocalizationManager.GetTranslatedText(typeof(DamFailureMechanismeCalculationSpecification), - "ReplaceOldPipingModel"), LogManager.Messages[0].Message); - - allCalculationresults.Clear(); - allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); + List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); @@ -158,11 +136,7 @@ { var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 4\Integratietest piping 4.damx"; - List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0); - Assert.AreEqual(3, LogManager.Messages.Count); - - allCalculationresults.Clear(); - allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); + List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); @@ -181,11 +155,7 @@ { var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 5\Integratietest piping 5.damx"; - List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, 0); - Assert.AreEqual(3, LogManager.Messages.Count); - - allCalculationresults.Clear(); - allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); + List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); @@ -264,11 +234,7 @@ { var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 5\Integratietest piping 5.damx"; - List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Sellmeijer4Forces, distanceToEntryPoint); - Assert.AreEqual(3, LogManager.Messages.Count); - - allCalculationresults.Clear(); - allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, distanceToEntryPoint); + List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, distanceToEntryPoint); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r4292 -r4377 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 4292) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 4377) @@ -327,7 +327,6 @@ - @@ -475,16 +474,6 @@ - - - - - - @@ -578,11 +567,8 @@ - - - - /// The piping model type sellmeijer - /// - public const int PipingModelTypeSellmeijer = 1; - - /// - /// The piping model type sellmeijer4 forces - /// - public const int PipingModelTypeSellmeijer4Forces = 2; - - /// /// The piping model type wti2017 /// public const int PipingModelTypeWti2017 = 3; @@ -880,12 +870,6 @@ PipingModelType.Bligh, InputPipingModelType.Bligh }, { - PipingModelType.Sellmeijer, InputPipingModelType.SellmeijerVnk - }, - { - PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces - }, - { PipingModelType.Wti2017, InputPipingModelType.WtiSellmeijerRevised } }; @@ -905,12 +889,6 @@ InputPipingModelType.Bligh, PipingModelType.Bligh }, { - InputPipingModelType.SellmeijerVnk, PipingModelType.Sellmeijer - }, - { - InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces - }, - { InputPipingModelType.WtiSellmeijerRevised, PipingModelType.Wti2017 } }; @@ -1590,56 +1568,6 @@ } /// - /// Converts to Piping Model Type. - /// - /// The input PipingModelType. - /// - public static PipingModelType ConvertToPipingModelType(int inputPipingModelType) - { - var translationTable = new Dictionary - { - { - PipingModelTypeBligh, PipingModelType.Bligh - }, - { - PipingModelTypeSellmeijer, PipingModelType.Sellmeijer - }, - { - PipingModelTypeSellmeijer4Forces, PipingModelType.Sellmeijer4Forces - }, - { - PipingModelTypeWti2017, PipingModelType.Wti2017 - } - }; - return translationTable[inputPipingModelType]; - } - - /// - /// Converts to output PipingModelType. - /// - /// The UpliftType. - /// - public static int ConvertToOutputPipingModelType(PipingModelType pipingModelType) - { - var translationTable = new Dictionary - { - { - PipingModelType.Bligh, PipingModelTypeBligh - }, - { - PipingModelType.Sellmeijer, PipingModelTypeSellmeijer - }, - { - PipingModelType.Sellmeijer4Forces, PipingModelTypeSellmeijer4Forces - }, - { - PipingModelType.Wti2017, PipingModelTypeWti2017 - } - }; - return translationTable[pipingModelType]; - } - - /// /// Converts the input TimeStepUnit to the TimeStepUnit. /// /// The time step unit. Index: DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs =================================================================== diff -u -r4255 -r4377 --- DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs (.../DamSpatialEditorDecorator.cs) (revision 4255) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs (.../DamSpatialEditorDecorator.cs) (revision 4377) @@ -188,11 +188,12 @@ { if (csvExportData != null && csvExportData.ResultSlices != null) { + List resultSlices = csvExportData.ResultSlices; var resultSlice = new StabilityResultSlices(); resultSlice.StabilityResultSlice = new List(); - for (var sliceIndex = 0; sliceIndex < csvExportData.ResultSlices.Count; sliceIndex++) + for (var sliceIndex = 0; sliceIndex < resultSlices.Count; sliceIndex++) { - resultSlice.StabilityResultSlice.Add(csvExportData.ResultSlices[sliceIndex]); + resultSlice.StabilityResultSlice.Add(resultSlices[sliceIndex]); } if (csvExportData.ActiveCenterPointX.HasValue && csvExportData.ActiveCenterPointZ.HasValue) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd =================================================================== diff -u -r4055 -r4377 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd (.../CalculationParametersDefinition.xsd) (revision 4055) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd (.../CalculationParametersDefinition.xsd) (revision 4377) @@ -51,7 +51,6 @@ - Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r4070 -r4377 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 4377) @@ -98,6 +98,7 @@ private double? pipingEntryPointY; private double? pipingExitPointX; private double? pipingExitPointY; + private string FCalculationSubDir; /// /// Initializes a new instance of the class. @@ -221,7 +222,7 @@ string fullFilename = DamProject.ProjectWorkingPath; if (string.IsNullOrEmpty(CalculationSubDir)) { - throw new NullReferenceException(nameof(CalculationSubDir) + "is null"); + throw new NullReferenceException(nameof(CalculationSubDir) + " is null."); } fullFilename = Path.Combine(fullFilename, CalculationSubDir); @@ -885,48 +886,6 @@ [Browsable(false)] public double? BlighHCritical { get; set; } - [CsvExportColumn("Sellmeijer2ForcesPipingFactor", 65)] - [Format("F3")] - [Unit(UnitType.None)] - [ReadOnly(true)] - [Browsable(false)] - public double? Sellmeijer2ForcesPipingFactor { get; set; } - - [CsvExportColumn("Sellmeijer2ForcesHCritical", 66)] - [Format("F3")] - [Unit(UnitType.Length)] - [ReadOnly(true)] - [Browsable(false)] - public double? Sellmeijer2ForcesHCritical { get; set; } - - [CsvExportColumn("Sellmeijer4ForcesPipingFactor", 67)] - [Format("F3")] - [Unit(UnitType.None)] - [ReadOnly(true)] - [Browsable(false)] - public double? Sellmeijer4ForcesPipingFactor { get; set; } - - [CsvExportColumn("Sellmeijer4ForcesHCritical", 68)] - [Format("F3")] - [Unit(UnitType.Length)] - [ReadOnly(true)] - [Browsable(false)] - public double? Sellmeijer4ForcesHCritical { get; set; } - - [CsvExportColumn("SellmeijerPipingFactor", 69)] - [Format("F3")] - [Unit(UnitType.None)] - [ReadOnly(true)] - [Browsable(false)] - public double? SellmeijerPipingFactor { get; set; } - - [CsvExportColumn("SellmeijerHCritical", 70)] - [Format("F3")] - [Unit(UnitType.Length)] - [ReadOnly(true)] - [Browsable(false)] - public double? SellmeijerHCritical { get; set; } - /// /// Gets or sets the wti2017 safety factor for backward erosion. /// @@ -1706,15 +1665,6 @@ case PipingModelType.Bligh: res = BlighPipingFactor; break; - case PipingModelType.Sellmeijer: - res = SellmeijerPipingFactor; - break; - case PipingModelType.Sellmeijer2Forces: - res = Sellmeijer2ForcesPipingFactor; - break; - case PipingModelType.Sellmeijer4Forces: - res = Sellmeijer4ForcesPipingFactor; - break; case PipingModelType.Wti2017: res = Wti2017SafetyFactorOverall; break; @@ -1920,15 +1870,6 @@ case PipingModelType.Bligh: res = BlighHCritical; break; - case PipingModelType.Sellmeijer: - res = SellmeijerHCritical; - break; - case PipingModelType.Sellmeijer2Forces: - res = Sellmeijer2ForcesHCritical; - break; - case PipingModelType.Sellmeijer4Forces: - res = Sellmeijer4ForcesHCritical; - break; case PipingModelType.Wti2017: res = Wti2017HcriticalOverall; break; @@ -1941,8 +1882,22 @@ [Browsable(false)] public string BaseFileName { get; set; } - [Browsable(false)] public string CalculationSubDir { get; set; } + [Browsable(false)] public string CalculationSubDir { + get + { + if (string.IsNullOrEmpty(FCalculationSubDir)) + { + FCalculationSubDir = PipingModel.ToString(); + } + return FCalculationSubDir; + } + set + { + FCalculationSubDir = value; + } + } + public ResultEvaluation ResultEvaluation { get Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r4070 -r4377 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 4377) @@ -28,6 +28,7 @@ using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Mathematics; +using Deltares.Standard; using Deltares.Standard.EventPublisher; using Deltares.Standard.Logging; using SurfaceLine = Deltares.DamEngine.Io.XmlOutput.SurfaceLine; @@ -141,6 +142,10 @@ for (var i = 0; i < output.Results.CalculationResults.Length; i++) { DesignResult designResult = output.Results.CalculationResults[i]; + if (string.IsNullOrEmpty(designResult.BaseFileName)) + { + designResult.BaseFileName = "Loc(" + designResult.LocationName + ")_Prof(" + designResult.ProfileName + ")_Scen(" + designResult.ScenarioName + ")"; + } var desResult = new CsvExportData(designResult.LocationName, designResult.ScenarioName) { DamFailureMechanismeCalculation = damProjectData.DamProjectCalculationSpecification.CurrentSpecification, // vanuit invoer @@ -212,26 +217,6 @@ desResult.BlighHCritical = designResult.PipingDesignResults.BlighHcritical; } - if (designResult.PipingDesignResults.Sellmeijer4ForcesFactorSpecified) - { - desResult.Sellmeijer4ForcesPipingFactor = designResult.PipingDesignResults.Sellmeijer4ForcesFactor; - } - - if (designResult.PipingDesignResults.Sellmeijer4ForcesHcriticalSpecified) - { - desResult.Sellmeijer4ForcesHCritical = designResult.PipingDesignResults.Sellmeijer4ForcesHcritical; - } - - if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified) - { - desResult.SellmeijerPipingFactor = designResult.PipingDesignResults.SellmeijerVnkFactor; - } - - if (designResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified) - { - desResult.SellmeijerHCritical = designResult.PipingDesignResults.SellmeijerVnkHcritical; - } - if (designResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified) { desResult.Wti2017BackwardErosionSafetyFactor = designResult.PipingDesignResults.Wti2017BackwardErosionFactor; @@ -508,7 +493,8 @@ } } - if (string.IsNullOrEmpty(desResult.CalculationSubDir)) + if (string.IsNullOrEmpty(desResult.CalculationSubDir) && (desResult.CalculationResult != CalculationResult.RunFailed) && + (desResult.CalculationResult != CalculationResult.UnexpectedError)) { throw new NullReferenceException(nameof(desResult.CalculationSubDir) + " is null"); } @@ -518,7 +504,11 @@ throw new NullReferenceException(nameof(desResult.BaseFileName) + " is null"); } - desResult.CreateResultsFileForSurfaceLineAndProfile(desResult.DesignResultFile); + if ((desResult.CalculationResult != CalculationResult.RunFailed) && + (desResult.CalculationResult != CalculationResult.UnexpectedError)) + { + desResult.CreateResultsFileForSurfaceLineAndProfile(desResult.DesignResultFile); + } } private static void ResetUpliftValues(CsvExportData desResult) Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r4195 -r4377 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4195) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4377) @@ -460,26 +460,6 @@ } [Test] - [TestCase(PipingModelType.Bligh, ConversionHelper.PipingModelTypeBligh)] - [TestCase(PipingModelType.Sellmeijer, ConversionHelper.PipingModelTypeSellmeijer)] - [TestCase(PipingModelType.Sellmeijer4Forces, ConversionHelper.PipingModelTypeSellmeijer4Forces)] - [TestCase(PipingModelType.Wti2017, ConversionHelper.PipingModelTypeWti2017)] - public void CanConvertToOutputPipingModelType(PipingModelType pipingModelType, int outputPipingModelType) - { - Assert.AreEqual(outputPipingModelType, ConversionHelper.ConvertToOutputPipingModelType(pipingModelType)); - } - - [Test] - [TestCase(ConversionHelper.PipingModelTypeBligh, PipingModelType.Bligh)] - [TestCase(ConversionHelper.PipingModelTypeSellmeijer, PipingModelType.Sellmeijer)] - [TestCase(ConversionHelper.PipingModelTypeSellmeijer4Forces, PipingModelType.Sellmeijer4Forces)] - [TestCase(ConversionHelper.PipingModelTypeWti2017, PipingModelType.Wti2017)] - public void CanConvertToPipingModelType(int outputPipingModelType, PipingModelType pipingModelType) - { - Assert.AreEqual(pipingModelType, ConversionHelper.ConvertToPipingModelType(outputPipingModelType)); - } - - [Test] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop)] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)] Index: DamClients/DamUI/trunk/src/Dam/Dam.Setup/BinFolder.wxs =================================================================== diff -u -r4070 -r4377 --- DamClients/DamUI/trunk/src/Dam/Dam.Setup/BinFolder.wxs (.../BinFolder.wxs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Dam.Setup/BinFolder.wxs (.../BinFolder.wxs) (revision 4377) @@ -65,18 +65,10 @@ - - - - - - Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r4206 -r4377 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 4206) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 4377) @@ -77,9 +77,6 @@ public enum PipingModelType { Bligh, - Sellmeijer, - Sellmeijer2Forces, - Sellmeijer4Forces, Wti2017 }