Index: DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r2932 -r2934 --- DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2932) +++ DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2934) @@ -322,7 +322,7 @@ //Check locations Assert.AreEqual(2, dike.Locations.Count); - Assert.AreEqual(MStabZonesType.ZoneAreas, dike.Locations[0].StabilityZoneType); + Assert.AreEqual(MStabZonesType.NoZones, dike.Locations[0].StabilityZoneType); Assert.AreEqual(0.5, dike.Locations[0].ForbiddenZoneFactor, cTolerance); Assert.AreEqual(MStabZonesType.ForbiddenZone, dike.Locations[1].StabilityZoneType); Assert.AreEqual(0.9, dike.Locations[1].ForbiddenZoneFactor, cTolerance); Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r2513 -r2934 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2513) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2934) @@ -265,7 +265,6 @@ [Test] [TestCase(MStabZonesType.NoZones, ConversionHelper.InputZoneTypeNoZones)] - [TestCase(MStabZonesType.ZoneAreas, ConversionHelper.InputZoneTypeZoneAreas)] [TestCase(MStabZonesType.ForbiddenZone, ConversionHelper.InputZoneTypesForbiddenZones)] public void CanConvertToInputZoneType(MStabZonesType zoneType, int inputZoneType) { @@ -274,7 +273,6 @@ [Test] [TestCase(ConversionHelper.InputZoneTypeNoZones, MStabZonesType.NoZones)] - [TestCase(ConversionHelper.InputZoneTypeZoneAreas, MStabZonesType.ZoneAreas)] [TestCase(ConversionHelper.InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone)] public void CanConvertToZoneType(int inputZoneType, MStabZonesType zoneType) { Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/CSVData/ProjectZoneType/csvfiles/locations.csv =================================================================== diff -u -r875 -r2934 --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/CSVData/ProjectZoneType/csvfiles/locations.csv (.../locations.csv) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/CSVData/ProjectZoneType/csvfiles/locations.csv (.../locations.csv) (revision 2934) @@ -1,3 +1,3 @@ location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;ZoneType;ForbiddenZoneFactor;ZoneAreaRestSlopeCrestWidth -16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0,9;0,2;13,056;0,9;0,8;1;1;klei;klei2;1;2;3;12;TRUE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;ZoneAreas;0,5;1,6 +16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0,9;0,2;13,056;0,9;0,8;1;1;klei;klei2;1;2;3;12;TRUE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;NoZones;0,5;1,6 25-2-2-A-1-A;25-2-2-A-1-A;106;66586;424173;2;25-2-2-A-1-A;-0,25;-0,25;0,8727;-0,25;-0,25;1;1;klei;klei2;1;2;3;12;FALSE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;ForbiddenZone;0,9;2,1 Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r2513 -r2934 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2513) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2934) @@ -147,10 +147,8 @@ { [Label("No zones")] NoZones = 0, - [Label("Zone areas")] - ZoneAreas = 1, [Label("Forbidden zones")] - ForbiddenZone = 2 + ForbiddenZone = 1 } public enum StabilityDesignMethod //Design Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r2931 -r2934 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2931) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2934) @@ -249,7 +249,7 @@ writer.WriteLine( "location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;dike_table_height;SlopeDampingPiezometricHeightPolderSide;StabilityDesignMethod;SlopeAdaptionStartCotangent;SlopeAdaptionEndCotangent;SlopeAdaptionStepCotangent; UseNewDikeTopWidth; NewDikeTopWidth;UseNewDikeSlopeInside;NewDikeSlopeInside;UseNewDikeSlopeOutside;NewDikeSlopeOutside;UseNewShoulderTopSlope;NewShoulderTopSlope;UseNewShoulderBaseSlope;NewShoulderBaseSlope;UseNewMaxHeightShoulderAsFraction;NewMaxHeightShoulderAsFraction;UseNewMinDistanceDikeToeStartDitch;NewMinDistanceDikeToeStartDitch;UseNewDitchDefinition;NewWidthDitchBottom;newSlopeAngleDitch;NewDepthDitch;ZoneType;ForbiddenZoneFactor;ZoneAreaRestSlopeCrestWidth;PLLineOffsetBelowDikeCrestMiddle;PLLineOffsetFactorBelowShoulderCrest;UsePLLineOffsetDryBelowDikeCrestMiddle;PLLineOffsetDryBelowDikeCrestMiddle;UsePLLineOffsetDryFactorBelowShoulderCrest;PLLineOffsetDryFactorBelowShoulderCrest;IntrusionVerticalWaterPressure;TL_DegreeOfConsolidation;water_height;water_height_low;water_height_decimerings_hoogte;max_waterheight"); writer.WriteLine( - "16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0.9;0.2;13.056;0.9;0.8;1;1;klei;klei2;1;2;3;12;TRUE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.01;OptimizedSlopeAndShoulderAdaption;3.0;6.0;0.5;TRUE;1.8;TRUE;1.9;TRUE;2.9;TRUE;2.8;TRUE;2.7;TRUE;0.6;TRUE;2.6;TRUE;1.1;1.2;1.3;ZoneAreas;0.5;1.6;1.0;0.1;TRUE;1.1;FALSE;0.11;Standard;10.1;1.2;1.3;1.4;1.5"); + "16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0.9;0.2;13.056;0.9;0.8;1;1;klei;klei2;1;2;3;12;TRUE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.01;OptimizedSlopeAndShoulderAdaption;3.0;6.0;0.5;TRUE;1.8;TRUE;1.9;TRUE;2.9;TRUE;2.8;TRUE;2.7;TRUE;0.6;TRUE;2.6;TRUE;1.1;1.2;1.3;NoZones;0.5;1.6;1.0;0.1;TRUE;1.1;FALSE;0.11;Standard;10.1;1.2;1.3;1.4;1.5"); writer.WriteLine( "25-2-2-A-1-A;25-2-2-A-1-A;106;66586;424173;2;25-2-2-A-1-A;-0.25;-0.25;0.8727;-0.25;-0.25;1;1;klei;klei2;1;2;3;12;FALSE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.2;SlopeAdaptionBeforeShoulderAdaption;4.5;6.5;0.25;FALSE;0.8;FALSE;0.9;FALSE;1.9;FALSE;1.8;FALSE;1.7;FALSE;0.7;FALSE;1.6;FALSE;1.4;1.5;1.6;ForbiddenZone;0.9;2.1; 1.1;0.11;FALSE; 1.0;TRUE;0.1;SemiTimeDependent;55.5;2.2;2.3;2.4;2.5"); } @@ -787,7 +787,7 @@ Assert.AreEqual(1.4, locationRecords[1].NewWidthDitchBottom, tolerance); Assert.AreEqual(1.5, locationRecords[1].NewSlopeAngleDitch, tolerance); Assert.AreEqual(1.6, locationRecords[1].NewDepthDitch, tolerance); - Assert.AreEqual(MStabZonesType.ZoneAreas, locationRecords[0].StabilityZoneType); + Assert.AreEqual(MStabZonesType.NoZones, locationRecords[0].StabilityZoneType); Assert.AreEqual(MStabZonesType.ForbiddenZone, locationRecords[1].StabilityZoneType); Assert.AreEqual(0.5, locationRecords[0].ForbiddenZoneFactor, tolerance); Assert.AreEqual(0.9, locationRecords[1].ForbiddenZoneFactor, tolerance); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r2513 -r2934 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 2513) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 2934) @@ -581,7 +581,6 @@ var translationTable = new Dictionary() { {MStabZonesType.NoZones, InputZoneTypeNoZones}, - {MStabZonesType.ZoneAreas, InputZoneTypeZoneAreas}, {MStabZonesType.ForbiddenZone, InputZoneTypesForbiddenZones} }; return translationTable[zoneType]; @@ -597,7 +596,6 @@ var translationTable = new Dictionary() { {InputZoneTypeNoZones, MStabZonesType.NoZones}, - {InputZoneTypeZoneAreas, MStabZonesType.ZoneAreas}, {InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone} }; return translationTable[inputZoneType]; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r2932 -r2934 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2932) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2934) @@ -1159,34 +1159,7 @@ } } - /// - /// Checks whether the required safety (stability inner slope) is given as that is needed to work with zone areas. - /// - /// [Validate] - public ValidationResult[] IsRequiredSafetySetForZoneTypeArea() - { - if (stabilityZoneType == MStabZonesType.ZoneAreas) - { - // For design projects, the safetey must be defined per scenario, not per location - if (DamProjectType == DamProjectType.Design && scenarios != null && scenarios.Count > 0) - { - foreach (var scenario in scenarios) - { - if (scenario.RequiredSafetyFactorStabilityInnerSlope == null) - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZonesScenario"), - scenario, "StabilityZoneType", "ZoneTypeSafety", null) - }; - } - } - } - return new ValidationResult[0]; - } - - [Validate] public ValidationResult[] ValidateDikeEmbankmentMaterial() { if (DamProjectType == DamProjectType.Design && Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs =================================================================== diff -u -r2931 -r2934 --- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2931) +++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2934) @@ -117,7 +117,7 @@ const double doubleTestValue = 111.1; const bool boolTestValue = true; const PLLineCreationMethod plLineCreationMethodTestValue = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; - const MStabZonesType mstabZonesTypeTestValue = MStabZonesType.ZoneAreas; + const MStabZonesType mstabZonesTypeTestValue = MStabZonesType.ForbiddenZone; const StabilityDesignMethod stabilityDesignMethodTestValue = StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption; var mocks = new MockRepository(); @@ -318,7 +318,7 @@ const string stringInitialValue = "someValue"; const double doubleInitialValue = 99.9; const PLLineCreationMethod plLineCreationMethodInitialValue = PLLineCreationMethod.ExpertKnowledgeRRD; - const MStabZonesType mstabZonesTypeTestValue = MStabZonesType.ZoneAreas; + const MStabZonesType mstabZonesTypeTestValue = MStabZonesType.ForbiddenZone; const StabilityDesignMethod stabilityDesignMethodTestValue = StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption; const IntrusionVerticalWaterPressureType intrusionVerticalWaterPressureTestValue = IntrusionVerticalWaterPressureType.Standard; const string stringTestValue = "testValue"; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs =================================================================== diff -u -r2513 -r2934 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs (.../LocationImportHelper.cs) (revision 2513) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs (.../LocationImportHelper.cs) (revision 2934) @@ -100,7 +100,6 @@ var translationTable = new Dictionary() { {"nozones", MStabZonesType.NoZones}, - {"zoneareas", MStabZonesType.ZoneAreas}, {"forbiddenzone", MStabZonesType.ForbiddenZone} }; var key = value.ToLowerInvariant();