Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r4751 -r4771 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 4751) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 4771) @@ -861,6 +861,6 @@ en-US="Data has not been imported yet" nl-NL="Gegevens zijn nog niet geïmporteerd"/> \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r4649 -r4771 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4649) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4771) @@ -247,6 +247,18 @@ /// The piping model type bligh /// public const int PipingModelTypeBligh = 0; + + /// + /// The piping model type Sellmeijer. + /// Obsolete but still present to inform the user when opening an old file with this model. + /// + public const int PipingModelTypeSellmeijer = 1; + + /// + /// The piping model type Sellmeijer 4 forces. + /// Obsolete but still present to inform the user when opening an old file with this model. + /// + public const int PipingModelTypeSellmeijer4Forces = 2; /// /// The piping model type wti2017 Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r4539 -r4771 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 4771) @@ -74,9 +74,15 @@ BishopUpliftVan } +/// +/// Both models Sellmeijer and Sellmeijer4Forces are not supported anymore +/// but still present in this enum to be able to inform the user when opening old files where they were selected. +/// public enum PipingModelType { Bligh, + Sellmeijer, + Sellmeijer4Forces, Wti2017 } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamFailureMechanismeCalculationSpecificationTest.cs =================================================================== diff -u -r4539 -r4771 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamFailureMechanismeCalculationSpecificationTest.cs (.../DamFailureMechanismeCalculationSpecificationTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamFailureMechanismeCalculationSpecificationTest.cs (.../DamFailureMechanismeCalculationSpecificationTest.cs) (revision 4771) @@ -20,6 +20,9 @@ // All rights reserved. using Deltares.Dam.Data; +using Deltares.Dam.TestHelper; +using Deltares.DamEngine.Data.Standard.Language; +using Deltares.Standard.Logging; using NUnit.Framework; namespace Deltares.Dam.Tests @@ -145,5 +148,24 @@ // Assert Assert.That(isVisible, Is.True); } + + [Test] + public void GivenDamxFileWithObsoletePipingModel_WhenLoading_ThenModelIsChangedToSellmeijerRevisedAndInformativeMessageIsDisplayed() + { + const string projectFilename = @"..\..\..\..\..\data\Benchmarks\Piping\Test 2\Integratietest piping 2.damx"; + + DamProjectData damProjectData = ProjectLoader.LoadProjectData(projectFilename); + + string expectedLogMessage = LocalizationManager.GetTranslatedText(typeof(DamFailureMechanismeCalculationSpecification), + "ReplaceOldPipingModel"); + Assert.That(LogManager.Messages, Has.Count.EqualTo(2)); + Assert.Multiple(() => + { + Assert.That(LogManager.Messages[0].Message, Is.EqualTo(expectedLogMessage)); + Assert.That(LogManager.Messages[1].Message, Is.EqualTo(expectedLogMessage)); + Assert.That(damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications[0].PipingModelType, + Is.EqualTo(PipingModelType.Wti2017)); + }); + } } } \ No newline at end of file