Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx =================================================================== diff -u -r3541 -r3649 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 3541) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 3649) @@ -129,9 +129,6 @@ Model Horizontaal Evenwicht ondersteunt geen 2D profielen. - - Het gebruik van zones is niet toegestaan voor buitenwaardse stabiliteit. - Geen uitvoer object gedefinieerd voor Macrostabiliteit Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r3626 -r3649 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 3626) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 3649) @@ -369,7 +369,7 @@ location.StabilityOptions = new StabilityOptions { SoilGeometries2DPath = Path.Combine(projectPath, @"Sub\TestMap"), - StabilityZoneType = MStabZonesType.ZoneAreas, + StabilityZoneType = MStabZonesType.ForbiddenZone, ForbiddenZoneFactor = 10.0 * i + 0.42, ZoneAreaRestSlopeCrestWidth = 10.0 * i + 0.43, TrafficLoad = 10.0 * i + 0.44, Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs =================================================================== diff -u -r3541 -r3649 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3541) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3649) @@ -1,5 +1,4 @@ -// Copyright (C) Stichting Deltares 2021. All rights reserved. -// +// // This file is part of the Dam Engine. // // The Dam Engine is free software: you can redistribute it and/or modify @@ -118,15 +117,6 @@ } /// - /// Looks up a localized string similar to The use of Zone Areas is not allowed for stability outside.. - /// - internal static string DamMacroStabilityKernelWrapper_OutsideWithZoneAreasNotAllowed { - get { - return ResourceManager.GetString("DamMacroStabilityKernelWrapper_OutsideWithZoneAreasNotAllowed", resourceCulture); - } - } - - /// /// Looks up a localized string similar to No output object defined for Macro Stability. /// internal static string DamMacroStabilityKernelWrapper_PostProcess_NoOutputObjectDefinedForMacroStability { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx =================================================================== diff -u -r3541 -r3649 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 3541) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 3649) @@ -156,9 +156,6 @@ Location '{0}', subsoil scenario '{1}', design scenario '{2}': The preparation for this calculation failed. - - The use of Zone Areas is not allowed for stability outside. - Model horizontal balance does not support 2d-geometries. Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r3643 -r3649 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 3643) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 3649) @@ -346,6 +346,7 @@ } [Test, Category("Slow")] + [Ignore("Test disabled due to removal of zone areas")] public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1D() { // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx @@ -469,6 +470,7 @@ } [Test, Category("Slow")] + [Ignore("Test disabled due to removal of zone areas")] public void TestRunMacroStabilityDeltaDijkZoneAreasUpliftVanWith1D() { // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r3617 -r3649 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3617) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3649) @@ -545,9 +545,9 @@ public const int InputZoneTypeNoZones = 0; /// - /// The input zone type zone areas + /// The input zone type old zone area, this now translates to No Zones as Zone Area is no longer to be used. /// - public const int InputZoneTypeZoneAreas = 1; + public const int InputZoneTypeOldZoneArea = 1; /// /// The input zone types forbidden zones @@ -564,7 +564,6 @@ var translationTable = new Dictionary() { {MStabZonesType.NoZones, InputZoneTypeNoZones}, - {MStabZonesType.ZoneAreas, InputZoneTypeZoneAreas}, {MStabZonesType.ForbiddenZone, InputZoneTypesForbiddenZones} }; return translationTable[zoneType]; @@ -580,7 +579,7 @@ var translationTable = new Dictionary() { {InputZoneTypeNoZones, MStabZonesType.NoZones}, - {InputZoneTypeZoneAreas, MStabZonesType.ZoneAreas}, + {InputZoneTypeOldZoneArea, MStabZonesType.NoZones}, {InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone} }; return translationTable[inputZoneType]; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r3617 -r3649 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3617) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3649) @@ -276,7 +276,6 @@ [Test] [TestCase(MStabZonesType.NoZones, ConversionHelper.InputZoneTypeNoZones)] - [TestCase(MStabZonesType.ZoneAreas, ConversionHelper.InputZoneTypeZoneAreas)] [TestCase(MStabZonesType.ForbiddenZone, ConversionHelper.InputZoneTypesForbiddenZones)] public void CanConvertToInputZoneType(MStabZonesType zoneType, int inputZoneType) { @@ -285,7 +284,7 @@ [Test] [TestCase(ConversionHelper.InputZoneTypeNoZones, MStabZonesType.NoZones)] - [TestCase(ConversionHelper.InputZoneTypeZoneAreas, MStabZonesType.ZoneAreas)] + [TestCase(ConversionHelper.InputZoneTypeOldZoneArea, MStabZonesType.NoZones)] [TestCase(ConversionHelper.InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone)] public void CanConvertToZoneType(int inputZoneType, MStabZonesType zoneType) { Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs =================================================================== diff -u -r3522 -r3649 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 3649) @@ -305,34 +305,6 @@ } } - public class MStabZoneAreas : IAssignable, ICloneable - { - public double DikeTableHeight { get; set; } - public double DikeTableWidth { get; set; } - public double XCoordinateDikeTopAtRiver { get; set; } - public double XCoordinateDikeTopAtPolder { get; set; } - public double XCoordinateStartRestProfile { get; set; } - public double SafetyFactorZone1A { get; set; } - public double SafetyFactorZone1B { get; set; } - public void Assign(MStabZoneAreas mstabZoneAreas) - { - this.DikeTableHeight = mstabZoneAreas.DikeTableHeight; - this.DikeTableWidth = mstabZoneAreas.DikeTableWidth; - this.XCoordinateDikeTopAtRiver = mstabZoneAreas.XCoordinateDikeTopAtRiver; - this.XCoordinateDikeTopAtPolder = mstabZoneAreas.XCoordinateDikeTopAtPolder; - this.XCoordinateStartRestProfile = mstabZoneAreas.XCoordinateStartRestProfile; - this.SafetyFactorZone1A = mstabZoneAreas.SafetyFactorZone1A; - this.SafetyFactorZone1B = mstabZoneAreas.SafetyFactorZone1B; - } - - public MStabZoneAreas Clone() - { - var mstabZoneAreas = new MStabZoneAreas(); - mstabZoneAreas.Assign(this); - return mstabZoneAreas; - } - } - public class MStabForbiddenZone : IAssignable, ICloneable { public bool IsXEntryMinUsed { get; set; } @@ -432,7 +404,6 @@ this.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; this.Model = MStabModelType.Bishop; this.SearchMethod = MStabSearchMethod.Grid; - this.ZoneAreas = null; this.gridPosition = MStabGridPosition.Right; this.CalculationOptions = new MStabCalculationOptions(); this.GeometryCreationOptions = new MStabGeometryCreationOptions(); @@ -462,7 +433,6 @@ public bool IsProbabilistic { get; set; } public string ProjectFileName { get; set; } public string SoilDatabaseName { get; set; } - public MStabZoneAreas ZoneAreas { get; set; } public MStabForbiddenZone ForbiddenZone { get; set; } public MStabGeometryCreationOptions GeometryCreationOptions { get; set; } public SheetPiling SheetPiling { get; set; } @@ -490,14 +460,6 @@ this.GridPosition = mstabParameters.GridPosition; this.ProjectFileName = mstabParameters.ProjectFileName; this.SoilDatabaseName = mstabParameters.SoilDatabaseName; - if (this.ZoneAreas != null) - { - this.ZoneAreas.Assign(mstabParameters.ZoneAreas); - } - else - { - this.ZoneAreas = null; - } if (this.ForbiddenZone != null) { this.ForbiddenZone.Assign(mstabParameters.ForbiddenZone); @@ -558,8 +520,6 @@ public MStabParameters Clone() { var mstabParameters = new MStabParameters(); - if (this.ZoneAreas != null) - mstabParameters.ZoneAreas = this.ZoneAreas.Clone(); if (this.ForbiddenZone != null) mstabParameters.ForbiddenZone = this.ForbiddenZone.Clone(); if (this.GeometryCreationOptions != null) Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs =================================================================== diff -u -r3617 -r3649 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 3617) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 3649) @@ -90,7 +90,6 @@ public enum MStabZonesType { NoZones = 0, - ZoneAreas = 1, ForbiddenZone = 2 }