Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/FrieslandIJsselmeer/CalculationParametersDupuitDynamic.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DupuitPLLines.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/FrieslandIJsselmeer/CalculationParametersDupuitStatic.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs =================================================================== diff -u -r2168 -r2466 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs (.../LocationImportHelper.cs) (revision 2168) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs (.../LocationImportHelper.cs) (revision 2466) @@ -107,8 +107,6 @@ var translationTable = new Dictionary() { {"none", PLLineCreationMethod.None}, - {"dupuitdynamic", PLLineCreationMethod.DupuitDynamic}, - {"dupuitstatic", PLLineCreationMethod.DupuitStatic}, {"expertknowledgelinearindike", PLLineCreationMethod.ExpertKnowledgeLinearInDike}, {"expertknowledgerrd", PLLineCreationMethod.ExpertKnowledgeRRD}, {"gaugeswithfallbacktoexpertknowledgerrd", PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD} Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r2447 -r2466 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2447) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2466) @@ -3187,24 +3187,12 @@ { switch (property) { - case "PLLineCreationMethod": // ToDo Moet dit nog afhankelijk van damProjectType (design/calamity etc) o.i.d. ? --->> Erik - if (DamProjectType == DamProjectType.DamLiveConfiguration) + case "PLLineCreationMethod": + return new[] { - return new[] - { - PLLineCreationMethod.ExpertKnowledgeRRD, - PLLineCreationMethod.ExpertKnowledgeLinearInDike, - PLLineCreationMethod.DupuitStatic - }; - } - else - { - return new[] - { - PLLineCreationMethod.ExpertKnowledgeRRD, - PLLineCreationMethod.ExpertKnowledgeLinearInDike, - }; - } + PLLineCreationMethod.ExpertKnowledgeRRD, + PLLineCreationMethod.ExpertKnowledgeLinearInDike, + }; case "IntrusionVerticalWaterPressure": return new[] { Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/GrebbeDijk/CalculationParameters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/SampleCalculationParameters.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd =================================================================== diff -u -r2089 -r2466 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd (.../CalculationParametersDefinition.xsd) (revision 2089) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd (.../CalculationParametersDefinition.xsd) (revision 2466) @@ -56,8 +56,6 @@ - - Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r2398 -r2466 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2398) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2466) @@ -243,8 +243,6 @@ ExpertKnowledgeRRD, ExpertKnowledgeLinearInDike, GaugesWithFallbackToExpertKnowledgeRRD, - DupuitStatic, - DupuitDynamic, Sensors, None } @@ -257,13 +255,6 @@ InProjectMap } - public enum StabMethodDupuit - { - None = 0, - Fellenius = 1, - Bishop = 2 - } - public enum DataSourceType { CsvFiles, Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj =================================================================== diff -u -r2456 -r2466 --- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 2456) +++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 2466) @@ -201,20 +201,11 @@ Always - - PreserveNewest - - - PreserveNewest - Always - - PreserveNewest - PreserveNewest @@ -261,18 +252,6 @@ Always - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs =================================================================== diff -u -r2089 -r2466 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs (.../FailureMechanismeParamatersMStab.cs) (revision 2089) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs (.../FailureMechanismeParamatersMStab.cs) (revision 2466) @@ -39,7 +39,6 @@ public Location Location { get; set; } public SurfaceLine2 SurfaceLine { get; set; } public PLLines PLLines { get; set; } - public DupuitPLLines DupuitPLLines { get; set; } public SoilProfile1D SoilProfile { get; set; } public string SoilGeometry2DName { get; set; } public double RiverLevel { get; set; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r2454 -r2466 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 2454) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 2466) @@ -226,8 +226,6 @@ - - Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj =================================================================== diff -u -r2456 -r2466 --- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 2456) +++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 2466) @@ -458,9 +458,6 @@ PreserveNewest - - PreserveNewest - Always @@ -504,9 +501,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -633,33 +627,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj =================================================================== diff -u -r2459 -r2466 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2459) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2466) @@ -195,7 +195,6 @@ - Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/UnittestOrg.C000'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/UnittestOrg.C001'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/UnittestOrg.C002'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/Unittest.A'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/Unittest.E'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/Unittest.B'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/Unittest.H'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/Unittest.G'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/Unittest.K'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/Dupuit/Unittest.P'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/SallandStabDupuit/CalculationParameters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/SallandStabDupuit/input_DAM.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/SallandProbabilistic/CalculationParameters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2466 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/SallandProbabilistic/input_DAM.xml'. Fisheye: No comparison available. Pass `N' to diff?