Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json =================================================================== diff -u -r6199 -r6203 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6199) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6203) @@ -6,9 +6,9 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Calculators/24.1.0.6194": { + "Deltares.DamEngine.Calculators/24.1.0.6197": { "dependencies": { - "Deltares.DamEngine.Data": "24.1.0.6194", + "Deltares.DamEngine.Data": "24.1.0.6197", "Deltares.StixFileWriter": "24.1.0.118", "Deltares.WTIPiping": "24.1.500.10" }, @@ -574,11 +574,11 @@ } }, "System.Threading.Tasks.Extensions/4.5.4": {}, - "Deltares.DamEngine.Data/24.1.0.6194": { + "Deltares.DamEngine.Data/24.1.0.6197": { "runtime": { "Deltares.DamEngine.Data.dll": { - "assemblyVersion": "24.1.0.6194", - "fileVersion": "24.1.0.6194" + "assemblyVersion": "24.1.0.6197", + "fileVersion": "24.1.0.6197" } }, "resources": { @@ -606,7 +606,7 @@ } }, "libraries": { - "Deltares.DamEngine.Calculators/24.1.0.6194": { + "Deltares.DamEngine.Calculators/24.1.0.6197": { "type": "project", "serviceable": false, "sha512": "" @@ -1087,7 +1087,7 @@ "path": "system.threading.tasks.extensions/4.5.4", "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512" }, - "Deltares.DamEngine.Data/24.1.0.6194": { + "Deltares.DamEngine.Data/24.1.0.6197": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json =================================================================== diff -u -r6199 -r6203 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6199) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6203) @@ -6,15 +6,15 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Io/24.1.0.6194": { + "Deltares.DamEngine.Io/24.1.0.6197": { "runtime": { "Deltares.DamEngine.Io.dll": {} } } } }, "libraries": { - "Deltares.DamEngine.Io/24.1.0.6194": { + "Deltares.DamEngine.Io/24.1.0.6197": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r6199 -r6203 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6199) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6203) @@ -266,14 +266,14 @@ input.AnalysisType = ConversionHelper.ConvertToInputAnalysisType(DamProjectCalculationSpecification.SelectedAnalysisType); } - input.PipingModelTypeSpecified = input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismPiping; + input.PipingModelTypeSpecified = input.FailureMechanismSystemType == InputFailureMechanismSystemType.Piping; if (input.PipingModelTypeSpecified) { input.PipingModelType = ConversionHelper.ConvertToInputPipingModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType); } - input.StabilityModelTypeSpecified = input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityInside || - input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityOutside; + input.StabilityModelTypeSpecified = input.FailureMechanismSystemType == InputFailureMechanismSystemType.StabilityInside || + input.FailureMechanismSystemType == InputFailureMechanismSystemType.StabilityOutside; if (input.StabilityModelTypeSpecified) { input.StabilityModelType = ConversionHelper.ConvertToInputStabilityModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType); @@ -293,8 +293,8 @@ SlipCircleDefinition slipCircleDefinition = curSpec.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition; if (slipCircleDefinition != null) { - input.StabilityParameters.UpliftVanGridDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.UpliftVanGridSizeDetermination); - input.StabilityParameters.BishopSearchAreaDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.BishopSearchAreaDetermination); + input.StabilityParameters.UpliftVanGridDetermination = ConversionHelper.ConvertToInputUpliftVanGridDetermination(slipCircleDefinition.UpliftVanGridSizeDetermination); + input.StabilityParameters.BishopSearchAreaDetermination = ConversionHelper.ConvertToInputBishopSearchAreaDetermination(slipCircleDefinition.BishopSearchAreaDetermination); input.StabilityParameters.BishopTangentLinesDistanceSpecified = true; input.StabilityParameters.BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance; input.StabilityParameters.BishopGridVerticalPointsCountSpecified = true; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r6160 -r6203 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6160) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6203) @@ -183,52 +183,52 @@ } [Test] - [TestCase(SoilProfileType.SoilProfile1D, 0)] - [TestCase(SoilProfileType.SoilProfile2D, 1)] - public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, int inputSoilGeometryType) + [TestCase(SoilProfileType.SoilProfile1D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D)] + [TestCase(SoilProfileType.SoilProfile2D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D)] + public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, SegmentSoilGeometryProbabilitySoilProfileType inputSoilGeometryType) { Assert.That(ConversionHelper.ConvertToInputSoilProfileType(soilProfileType), Is.EqualTo(inputSoilGeometryType)); } [Test] - [TestCase(0, SoilProfileType.SoilProfile1D)] - [TestCase(1, SoilProfileType.SoilProfile2D)] - public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilProfileType soilProfileType) + [TestCase(SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D, SoilProfileType.SoilProfile1D)] + [TestCase(SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D, SoilProfileType.SoilProfile2D)] + public void CanConvertToSoilGeometryType(SegmentSoilGeometryProbabilitySoilProfileType inputSoilGeometryType, SoilProfileType soilProfileType) { Assert.That(ConversionHelper.ConvertToSoilProfileType(inputSoilGeometryType), Is.EqualTo(soilProfileType)); } [Test] - [TestCase(FailureMechanismSystemType.StabilityInside, ConversionHelper.InputFailureMechanismStabilityInside)] - [TestCase(FailureMechanismSystemType.StabilityOutside, ConversionHelper.InputFailureMechanismStabilityOutside)] - [TestCase(FailureMechanismSystemType.Piping, ConversionHelper.InputFailureMechanismPiping)] - public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) + [TestCase(FailureMechanismSystemType.StabilityInside, InputFailureMechanismSystemType.StabilityInside)] + [TestCase(FailureMechanismSystemType.StabilityOutside, InputFailureMechanismSystemType.StabilityOutside)] + [TestCase(FailureMechanismSystemType.Piping, InputFailureMechanismSystemType.Piping)] + public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, InputFailureMechanismSystemType inputFailureMechanismSystemType) { Assert.That(ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType), Is.EqualTo(inputFailureMechanismSystemType)); } [Test] - [TestCase(ConversionHelper.InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside)] - [TestCase(ConversionHelper.InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside)] - [TestCase(ConversionHelper.InputFailureMechanismPiping, FailureMechanismSystemType.Piping)] - public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) + [TestCase(InputFailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.StabilityInside)] + [TestCase(InputFailureMechanismSystemType.StabilityOutside, FailureMechanismSystemType.StabilityOutside)] + [TestCase(InputFailureMechanismSystemType.Piping, FailureMechanismSystemType.Piping)] + public void CanConvertToFailureMechanismSystemType(InputFailureMechanismSystemType inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { Assert.That(ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType), Is.EqualTo(failureMechanismSystemType)); } [Test] - [TestCase(FailureMechanismSystemType.StabilityInside, ConversionHelper.InputSegmentFailureMechanismStability)] - [TestCase(FailureMechanismSystemType.StabilityOutside, ConversionHelper.InputSegmentFailureMechanismStability)] - [TestCase(FailureMechanismSystemType.Piping, ConversionHelper.InputSegmentFailureMechanismPiping)] - public void CanConvertToInputSegmentFailureMechanismType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) + [TestCase(FailureMechanismSystemType.StabilityInside, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability)] + [TestCase(FailureMechanismSystemType.StabilityOutside, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability)] + [TestCase(FailureMechanismSystemType.Piping, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping)] + public void CanConvertToInputSegmentFailureMechanismType(FailureMechanismSystemType failureMechanismSystemType, SegmentSoilGeometryProbabilitySegmentFailureMechanismType inputFailureMechanismSystemType) { Assert.That(ConversionHelper.ConvertToInputSegmentFailureMechanismType(failureMechanismSystemType), Is.EqualTo(inputFailureMechanismSystemType)); } [Test] - [TestCase(ConversionHelper.InputSegmentFailureMechanismStability, FailureMechanismSystemType.StabilityInside)] - [TestCase(ConversionHelper.InputSegmentFailureMechanismPiping, FailureMechanismSystemType.Piping)] - public void CanConvertToSegmentFailureMechanismType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability, FailureMechanismSystemType.StabilityInside)] + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping, FailureMechanismSystemType.Piping)] + public void CanConvertToSegmentFailureMechanismType(SegmentSoilGeometryProbabilitySegmentFailureMechanismType inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { Assert.That(ConversionHelper.ConvertToSegmentFailureMechanismType(inputFailureMechanismSystemType), Is.EqualTo(failureMechanismSystemType)); } @@ -250,17 +250,17 @@ } [Test] - [TestCase(MStabZonesType.NoZones, ConversionHelper.InputZoneTypeNoZones)] - [TestCase(MStabZonesType.ForbiddenZone, ConversionHelper.InputZoneTypesForbiddenZones)] - public void CanConvertToInputZoneType(MStabZonesType zoneType, int inputZoneType) + [TestCase(MStabZonesType.NoZones, LocationStabilityOptionsZoneType.NoZones)] + [TestCase(MStabZonesType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones)] + public void CanConvertToInputZoneType(MStabZonesType zoneType, LocationStabilityOptionsZoneType inputZoneType) { Assert.That(ConversionHelper.ConvertToInputZoneType(zoneType), Is.EqualTo(inputZoneType)); } [Test] - [TestCase(ConversionHelper.InputZoneTypeNoZones, MStabZonesType.NoZones)] - [TestCase(ConversionHelper.InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone)] - public void CanConvertToZoneType(int inputZoneType, MStabZonesType zoneType) + [TestCase(LocationStabilityOptionsZoneType.NoZones, MStabZonesType.NoZones)] + [TestCase(LocationStabilityOptionsZoneType.ForbiddenZones, MStabZonesType.ForbiddenZone)] + public void CanConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType, MStabZonesType zoneType) { Assert.That(ConversionHelper.ConvertToZoneType(inputZoneType), Is.EqualTo(zoneType)); } @@ -287,53 +287,67 @@ } [Test] - [TestCase(MStabSearchMethod.Grid, ConversionHelper.InputSearchMethodGrid)] - [TestCase(MStabSearchMethod.GeneticAlgorithm, ConversionHelper.InputSearchMethodGenetic)] - [TestCase(MStabSearchMethod.BeeSwarm, ConversionHelper.InputSearchMethodBeeSwarm)] - public void CanConvertToInputSearchMethod(MStabSearchMethod searchMethod, int inputSearchMethod) + [TestCase(MStabSearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid)] + [TestCase(MStabSearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm)] + public void CanConvertToInputSearchMethod(MStabSearchMethod searchMethod, StabilityParametersSearchMethod inputSearchMethod) { Assert.That(ConversionHelper.ConvertToInputSearchMethod(searchMethod), Is.EqualTo(inputSearchMethod)); } [Test] - [TestCase(ConversionHelper.InputSearchMethodGrid, MStabSearchMethod.Grid)] - [TestCase(ConversionHelper.InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm)] - [TestCase(ConversionHelper.InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm)] - public void CanConvertToSearchMethod(int inputSearchMethod, MStabSearchMethod searchMethod) + [TestCase(StabilityParametersSearchMethod.CalculationGrid, MStabSearchMethod.Grid)] + [TestCase(StabilityParametersSearchMethod.BeeSwarm, MStabSearchMethod.BeeSwarm)] + public void CanConvertToSearchMethod(StabilityParametersSearchMethod inputSearchMethod, MStabSearchMethod searchMethod) { Assert.That(ConversionHelper.ConvertToSearchMethod(inputSearchMethod), Is.EqualTo(searchMethod)); } [Test] - [TestCase(GridSizeDetermination.Automatic, ConversionHelper.InputGridTypeAutomatic)] - [TestCase(GridSizeDetermination.Specified, ConversionHelper.InputGridTypeSpecified)] - public void CanConvertToInputGridSizeDetermination(GridSizeDetermination gridDetermination, int inputGridDetermination) + [TestCase(GridSizeDetermination.Automatic, StabilityParametersBishopSearchAreaDetermination.Automatic)] + [TestCase(GridSizeDetermination.Specified, StabilityParametersBishopSearchAreaDetermination.Specified)] + public void CanConvertToInputBishopSearchAreaDetermination(GridSizeDetermination gridDetermination, StabilityParametersBishopSearchAreaDetermination inputGridDetermination) { - Assert.That(ConversionHelper.ConvertToInputGridDetermination(gridDetermination), Is.EqualTo(inputGridDetermination)); + Assert.That(ConversionHelper.ConvertToInputBishopSearchAreaDetermination(gridDetermination), Is.EqualTo(inputGridDetermination)); } [Test] - [TestCase(ConversionHelper.InputGridTypeAutomatic, GridSizeDetermination.Automatic)] - [TestCase(ConversionHelper.InputGridTypeSpecified, GridSizeDetermination.Specified)] - public void CanConvertToGridSizeDetermination(int inputGridDetermination, GridSizeDetermination gridDetermination) + [TestCase(StabilityParametersBishopSearchAreaDetermination.Automatic, GridSizeDetermination.Automatic)] + [TestCase(StabilityParametersBishopSearchAreaDetermination.Specified, GridSizeDetermination.Specified)] + public void CanConvertToBishopSearchAreaDetermination(StabilityParametersBishopSearchAreaDetermination inputGridDetermination, GridSizeDetermination gridDetermination) { - Assert.That(ConversionHelper.ConvertToGridDetermination(inputGridDetermination), Is.EqualTo(gridDetermination)); + Assert.That(ConversionHelper.ConvertToBishopSearchAreaDetermination(inputGridDetermination), Is.EqualTo(gridDetermination)); } + + [Test] + [TestCase(GridSizeDetermination.Automatic, StabilityParametersUpliftVanGridDetermination.Automatic)] + [TestCase(GridSizeDetermination.Specified, StabilityParametersUpliftVanGridDetermination.Specified)] + public void CanConvertToUpliftVanInputGridSizeDetermination(GridSizeDetermination gridDetermination, StabilityParametersUpliftVanGridDetermination inputGridDetermination) + { + Assert.That(ConversionHelper.ConvertToInputUpliftVanGridDetermination(gridDetermination), Is.EqualTo(inputGridDetermination)); + } [Test] - [TestCase(TangentLinesDefinition.OnBoundaryLines, ConversionHelper.InputTangentLinesOnBoundaryLines)] - [TestCase(TangentLinesDefinition.Specified, ConversionHelper.InputTangentLinesSpecified)] - [TestCase(TangentLinesDefinition.Automatic, ConversionHelper.InputTangentLinesAutomatic)] - public void CanConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType, int inputTangentLineType) + [TestCase(StabilityParametersUpliftVanGridDetermination.Automatic, GridSizeDetermination.Automatic)] + [TestCase(StabilityParametersUpliftVanGridDetermination.Specified, GridSizeDetermination.Specified)] + public void CanConvertToUpliftVanGridSizeDetermination(StabilityParametersUpliftVanGridDetermination inputGridDetermination, GridSizeDetermination gridDetermination) { + Assert.That(ConversionHelper.ConvertToUpliftVanGridDetermination(inputGridDetermination), Is.EqualTo(gridDetermination)); + } + + [Test] + [TestCase(TangentLinesDefinition.OnBoundaryLines, StabilityParametersUpliftVanTangentLinesDefinition.OnBoundaryLines)] + [TestCase(TangentLinesDefinition.Specified, StabilityParametersUpliftVanTangentLinesDefinition.Specified)] + [TestCase(TangentLinesDefinition.Automatic, StabilityParametersUpliftVanTangentLinesDefinition.Automatic)] + public void CanConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType, StabilityParametersUpliftVanTangentLinesDefinition inputTangentLineType) + { Assert.That(ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType), Is.EqualTo(inputTangentLineType)); } [Test] - [TestCase(ConversionHelper.InputTangentLinesOnBoundaryLines, TangentLinesDefinition.OnBoundaryLines)] - [TestCase(ConversionHelper.InputTangentLinesSpecified, TangentLinesDefinition.Specified)] - [TestCase(ConversionHelper.InputTangentLinesAutomatic, TangentLinesDefinition.Automatic)] - public void CanConvertToTangentLinesDefinition(int inputTangentLineType, TangentLinesDefinition tangentLineType) + [TestCase(StabilityParametersUpliftVanTangentLinesDefinition.OnBoundaryLines, TangentLinesDefinition.OnBoundaryLines)] + [TestCase(StabilityParametersUpliftVanTangentLinesDefinition.Specified, TangentLinesDefinition.Specified)] + [TestCase(StabilityParametersUpliftVanTangentLinesDefinition.Automatic, TangentLinesDefinition.Automatic)] + public void CanConvertToTangentLinesDefinition(StabilityParametersUpliftVanTangentLinesDefinition inputTangentLineType, TangentLinesDefinition tangentLineType) { Assert.That(ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType), Is.EqualTo(tangentLineType)); } @@ -405,29 +419,21 @@ } [Test] - [TestCase(MStabModelType.Bishop, ConversionHelper.MStabModelTypeBishop)] - [TestCase(MStabModelType.Spencer, ConversionHelper.MStabModelTypeSpencer)] - [TestCase(MStabModelType.Fellenius, ConversionHelper.MStabModelTypeFellenius)] - [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] - [TestCase(MStabModelType.UpliftSpencer, ConversionHelper.MStabModelTypeUpliftSpencer)] - [TestCase(MStabModelType.BishopRandomField, ConversionHelper.MStabModelTypeBishopRandomField)] - [TestCase(MStabModelType.BishopUpliftVan, ConversionHelper.MStabModelTypeBishopUpliftVan)] - public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) + [TestCase(MStabModelType.Bishop, InputStabilityModelType.Bishop)] + [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)] + [TestCase(MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)] + public void CanConvertToInputMStabModelType(MStabModelType mStabModelType, InputStabilityModelType inputMStabModelType) { - Assert.That(ConversionHelper.ConvertToOutputMStabModelType(mStabModelType), Is.EqualTo(outputMStabModelType)); + Assert.That(ConversionHelper.ConvertToInputMStabModelType(mStabModelType), Is.EqualTo(inputMStabModelType)); } [Test] - [TestCase(ConversionHelper.MStabModelTypeBishop, MStabModelType.Bishop)] - [TestCase(ConversionHelper.MStabModelTypeSpencer, MStabModelType.Spencer)] - [TestCase(ConversionHelper.MStabModelTypeFellenius, MStabModelType.Fellenius)] - [TestCase(ConversionHelper.MStabModelTypeUpliftVan, MStabModelType.UpliftVan)] - [TestCase(ConversionHelper.MStabModelTypeUpliftSpencer, MStabModelType.UpliftSpencer)] - [TestCase(ConversionHelper.MStabModelTypeBishopRandomField, MStabModelType.BishopRandomField)] - [TestCase(ConversionHelper.MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan)] - public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) + [TestCase(InputStabilityModelType.Bishop, MStabModelType.Bishop)] + [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] + [TestCase(InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)] + public void CanConvertToMStabModelType(InputStabilityModelType inputMStabModelType, MStabModelType mStabModelType) { - Assert.That(ConversionHelper.ConvertToMStabModelType(outputMStabModelType), Is.EqualTo(mStabModelType)); + Assert.That(ConversionHelper.ConvertToMStabModelType(inputMStabModelType), Is.EqualTo(mStabModelType)); } [Test] @@ -478,8 +484,8 @@ Assert.That(ConversionHelper.ConvertToInputTimeStepUnit(timeStepUnit), Is.EqualTo(inputTimeStepUnit)); } - [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)] - public void CannotConvertToSegmentFailureMechanismType(int inputFailureMechanismSystemType) + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All)] + public void CannotConvertToSegmentFailureMechanismType(SegmentSoilGeometryProbabilitySegmentFailureMechanismType inputFailureMechanismSystemType) { Assert.That(() => ConversionHelper.ConvertToSegmentFailureMechanismType(inputFailureMechanismSystemType), Throws.InstanceOf().With.Message.EqualTo("Couldn't convert '0' to type FailureMechanismSystemType")); } Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll =================================================================== diff -u -r6199 -r6203 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll =================================================================== diff -u -r6199 -r6203 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll =================================================================== diff -u -r6199 -r6203 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll =================================================================== diff -u -r6199 -r6203 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/FactoryForStabilityTests.cs =================================================================== diff -u -r5809 -r6203 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/FactoryForStabilityTests.cs (.../FactoryForStabilityTests.cs) (revision 5809) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/FactoryForStabilityTests.cs (.../FactoryForStabilityTests.cs) (revision 6203) @@ -34,7 +34,7 @@ return new MStabParameters { Model = MStabModelType.Bishop, - SearchMethod = MStabSearchMethod.GeneticAlgorithm, + SearchMethod = MStabSearchMethod.Grid, GridPosition = MStabGridPosition.Right }; } Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll =================================================================== diff -u -r6199 -r6203 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r6114 -r6203 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6114) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6203) @@ -66,11 +66,7 @@ public enum MStabModelType { Bishop, - Spencer, - Fellenius, UpliftVan, - UpliftSpencer, - BishopRandomField, BishopUpliftVan } @@ -81,8 +77,6 @@ public enum PipingModelType { Bligh, - Sellmeijer, - Sellmeijer4Forces, Wti2017 } @@ -102,7 +96,6 @@ public enum MStabSearchMethod { Grid, - GeneticAlgorithm, BeeSwarm } Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll =================================================================== diff -u -r6199 -r6203 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r6160 -r6203 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6160) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6203) @@ -23,7 +23,6 @@ using System.Collections.Generic; using Deltares.DamEngine.Io.XmlInput; using Deltares.DamEngine.Io.XmlOutput; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Standard; @@ -745,15 +744,15 @@ /// /// Type of the soil geometry. /// - public static int ConvertToInputSoilProfileType(SoilProfileType soilProfileType) + public static SegmentSoilGeometryProbabilitySoilProfileType ConvertToInputSoilProfileType(SoilProfileType soilProfileType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - SoilProfileType.SoilProfile1D, 0 + SoilProfileType.SoilProfile1D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D }, { - SoilProfileType.SoilProfile2D, 1 + SoilProfileType.SoilProfile2D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D } }; return translationTable[soilProfileType]; @@ -764,15 +763,15 @@ /// /// Type of the soil geometry. /// - public static SoilProfileType ConvertToSoilProfileType(int soilProfileType) + public static SoilProfileType ConvertToSoilProfileType(SegmentSoilGeometryProbabilitySoilProfileType soilProfileType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - 0, SoilProfileType.SoilProfile1D + SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D, SoilProfileType.SoilProfile1D }, { - 1, SoilProfileType.SoilProfile2D + SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D, SoilProfileType.SoilProfile2D } }; return translationTable[soilProfileType]; @@ -783,18 +782,18 @@ /// /// Type of the segment failure mechanism. /// - public static int ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType segmentFailureMechanismType) + public static InputFailureMechanismSystemType ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType segmentFailureMechanismType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside + FailureMechanismSystemType.StabilityInside, InputFailureMechanismSystemType.StabilityInside }, { - FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside + FailureMechanismSystemType.StabilityOutside, InputFailureMechanismSystemType.StabilityOutside }, { - FailureMechanismSystemType.Piping, InputFailureMechanismPiping + FailureMechanismSystemType.Piping, InputFailureMechanismSystemType.Piping } }; return translationTable[segmentFailureMechanismType]; @@ -805,18 +804,18 @@ /// /// Type of the failure mechanism system. /// - public static FailureMechanismSystemType ConvertToFailureMechanismSystemType(int failureMechanismSystemType) + public static FailureMechanismSystemType ConvertToFailureMechanismSystemType(InputFailureMechanismSystemType failureMechanismSystemType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside + InputFailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.StabilityInside }, { - InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside + InputFailureMechanismSystemType.StabilityOutside, FailureMechanismSystemType.StabilityOutside }, { - InputFailureMechanismPiping, FailureMechanismSystemType.Piping + InputFailureMechanismSystemType.Piping, FailureMechanismSystemType.Piping } }; return translationTable[failureMechanismSystemType]; @@ -827,18 +826,18 @@ /// /// Type of the segment failure mechanism. /// - public static int ConvertToInputSegmentFailureMechanismType(FailureMechanismSystemType segmentFailureMechanismType) + public static SegmentSoilGeometryProbabilitySegmentFailureMechanismType ConvertToInputSegmentFailureMechanismType(FailureMechanismSystemType segmentFailureMechanismType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - FailureMechanismSystemType.StabilityInside, InputSegmentFailureMechanismStability + FailureMechanismSystemType.StabilityInside, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability }, { - FailureMechanismSystemType.StabilityOutside, InputSegmentFailureMechanismStability + FailureMechanismSystemType.StabilityOutside, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability }, { - FailureMechanismSystemType.Piping, InputSegmentFailureMechanismPiping + FailureMechanismSystemType.Piping, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping } }; return translationTable[segmentFailureMechanismType]; @@ -849,20 +848,20 @@ /// /// Type of the failure mechanism system. /// - public static FailureMechanismSystemType ConvertToSegmentFailureMechanismType(int failureMechanismSystemType) + public static FailureMechanismSystemType ConvertToSegmentFailureMechanismType(SegmentSoilGeometryProbabilitySegmentFailureMechanismType failureMechanismSystemType) { - if (failureMechanismSystemType == InputSegmentFailureMechanismAll) + if (failureMechanismSystemType == SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All) { throw new ConversionException(typeof(FailureMechanismSystemType), failureMechanismSystemType); } - var translationTable = new Dictionary + var translationTable = new Dictionary { { - InputSegmentFailureMechanismStability, FailureMechanismSystemType.StabilityInside + SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability, FailureMechanismSystemType.StabilityInside }, { - InputSegmentFailureMechanismPiping, FailureMechanismSystemType.Piping + SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping, FailureMechanismSystemType.Piping } }; return translationTable[failureMechanismSystemType]; @@ -1037,21 +1036,17 @@ /// /// Type of the zone. /// - public static int ConvertToInputZoneType(MStabZonesType zoneType) + public static LocationStabilityOptionsZoneType ConvertToInputZoneType(MStabZonesType zoneType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabZonesType.NoZones, InputZoneTypeNoZones + MStabZonesType.NoZones, LocationStabilityOptionsZoneType.NoZones }, { - MStabZonesType.ForbiddenZone, InputZoneTypesForbiddenZones + MStabZonesType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones } }; - if ((zoneType != MStabZonesType.NoZones) && (zoneType != MStabZonesType.ForbiddenZone)) - { - zoneType = MStabZonesType.NoZones; - } return translationTable[zoneType]; } @@ -1061,15 +1056,15 @@ /// /// Type of the input zone. /// - public static MStabZonesType ConvertToZoneType(int inputZoneType) + public static MStabZonesType ConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - InputZoneTypeNoZones, MStabZonesType.NoZones + LocationStabilityOptionsZoneType.NoZones, MStabZonesType.NoZones }, { - InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone + LocationStabilityOptionsZoneType.ForbiddenZones, MStabZonesType.ForbiddenZone } }; return translationTable[inputZoneType]; @@ -1133,18 +1128,15 @@ /// /// The search method. /// - public static int ConvertToInputSearchMethod(MStabSearchMethod searchMethod) + public static StabilityParametersSearchMethod ConvertToInputSearchMethod(MStabSearchMethod searchMethod) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabSearchMethod.Grid, InputSearchMethodGrid + MStabSearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid }, { - MStabSearchMethod.GeneticAlgorithm, InputSearchMethodGenetic - }, - { - MStabSearchMethod.BeeSwarm, InputSearchMethodBeeSwarm + MStabSearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm } }; return translationTable[searchMethod]; @@ -1155,18 +1147,15 @@ /// /// The search method. /// - public static MStabSearchMethod ConvertToSearchMethod(int searchMethod) + public static MStabSearchMethod ConvertToSearchMethod(StabilityParametersSearchMethod searchMethod) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - InputSearchMethodGrid, MStabSearchMethod.Grid + StabilityParametersSearchMethod.CalculationGrid, MStabSearchMethod.Grid }, { - InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm - }, - { - InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm + StabilityParametersSearchMethod.BeeSwarm, MStabSearchMethod.BeeSwarm } }; return translationTable[searchMethod]; @@ -1177,79 +1166,118 @@ /// /// Type of the grid. /// - public static int ConvertToInputGridDetermination(GridSizeDetermination gridType) + public static StabilityParametersBishopSearchAreaDetermination ConvertToInputBishopSearchAreaDetermination(GridSizeDetermination gridType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - GridSizeDetermination.Automatic, InputGridTypeAutomatic + GridSizeDetermination.Automatic, StabilityParametersBishopSearchAreaDetermination.Automatic }, { - GridSizeDetermination.Specified, InputGridTypeSpecified + GridSizeDetermination.Specified, StabilityParametersBishopSearchAreaDetermination.Specified } }; return translationTable[gridType]; } /// - /// Converts to grid determination. + /// Converts to Bishop search area determination. /// - /// Type of the grid. + /// Type of the search area for Bishop. /// - public static GridSizeDetermination ConvertToGridDetermination(int gridType) + public static GridSizeDetermination ConvertToBishopSearchAreaDetermination(StabilityParametersBishopSearchAreaDetermination gridType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - InputGridTypeAutomatic, GridSizeDetermination.Automatic + StabilityParametersBishopSearchAreaDetermination.Automatic, GridSizeDetermination.Automatic }, { - InputGridTypeSpecified, GridSizeDetermination.Specified + StabilityParametersBishopSearchAreaDetermination.Specified, GridSizeDetermination.Specified } }; return translationTable[gridType]; } + + /// + /// Converts to Uplift-Van grid determination. + /// + /// Type of the grid for Uplift-Van. + /// + public static GridSizeDetermination ConvertToUpliftVanGridDetermination(StabilityParametersUpliftVanGridDetermination gridType) + { + var translationTable = new Dictionary + { + { + StabilityParametersUpliftVanGridDetermination.Automatic, GridSizeDetermination.Automatic + }, + { + StabilityParametersUpliftVanGridDetermination.Specified, GridSizeDetermination.Specified + } + }; + return translationTable[gridType]; + } + + /// + /// Converts to Uplift-Can input grid determination. + /// + /// Type of the grid for Uplift-Van. + /// + public static StabilityParametersUpliftVanGridDetermination ConvertToInputUpliftVanGridDetermination(GridSizeDetermination gridType) + { + var translationTable = new Dictionary + { + { + GridSizeDetermination.Automatic, StabilityParametersUpliftVanGridDetermination.Automatic + }, + { + GridSizeDetermination.Specified, StabilityParametersUpliftVanGridDetermination.Specified + } + }; + return translationTable[gridType]; + } + /// - /// Converts to input tangent lines definition. + /// Converts to input tangent lines definition. /// /// Type of the tangent line. /// - public static int ConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType) + public static StabilityParametersUpliftVanTangentLinesDefinition ConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - TangentLinesDefinition.OnBoundaryLines, InputTangentLinesOnBoundaryLines + TangentLinesDefinition.OnBoundaryLines, StabilityParametersUpliftVanTangentLinesDefinition.OnBoundaryLines }, { - TangentLinesDefinition.Specified, InputTangentLinesSpecified + TangentLinesDefinition.Specified, StabilityParametersUpliftVanTangentLinesDefinition.Specified }, { - TangentLinesDefinition.Automatic, InputTangentLinesAutomatic + TangentLinesDefinition.Automatic, StabilityParametersUpliftVanTangentLinesDefinition.Automatic } }; return translationTable[tangentLineType]; } /// - /// Converts to tangent lines definition. + /// Converts to tangent lines definition. /// /// Type of the tangent line. /// - public static TangentLinesDefinition ConvertToTangentLinesDefinition(int tangentLineType) + public static TangentLinesDefinition ConvertToTangentLinesDefinition(StabilityParametersUpliftVanTangentLinesDefinition tangentLineType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - InputTangentLinesOnBoundaryLines, TangentLinesDefinition.OnBoundaryLines + StabilityParametersUpliftVanTangentLinesDefinition.OnBoundaryLines, TangentLinesDefinition.OnBoundaryLines }, { - InputTangentLinesSpecified, TangentLinesDefinition.Specified + StabilityParametersUpliftVanTangentLinesDefinition.Specified, TangentLinesDefinition.Specified }, { - InputTangentLinesAutomatic, TangentLinesDefinition.Automatic + StabilityParametersUpliftVanTangentLinesDefinition.Automatic, TangentLinesDefinition.Automatic } }; return translationTable[tangentLineType]; @@ -1451,68 +1479,44 @@ } /// - /// Converts to MStab Model Type. + /// Converts to stability model type. /// /// The input MStabModelType. /// - public static MStabModelType ConvertToMStabModelType(int inputMStabModelType) + public static MStabModelType ConvertToMStabModelType(InputStabilityModelType inputMStabModelType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabModelTypeBishop, MStabModelType.Bishop + InputStabilityModelType.Bishop, MStabModelType.Bishop }, { - MStabModelTypeSpencer, MStabModelType.Spencer + InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan }, { - MStabModelTypeFellenius, MStabModelType.Fellenius - }, - { - MStabModelTypeUpliftVan, MStabModelType.UpliftVan - }, - { - MStabModelTypeUpliftSpencer, MStabModelType.UpliftSpencer - }, - { - MStabModelTypeBishopRandomField, MStabModelType.BishopRandomField - }, - { - MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan + InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan } }; return translationTable[inputMStabModelType]; } /// - /// Converts to output MStabModelType. + /// Converts to input stability model type. /// - /// The UpliftType. + /// The stability model type. /// - public static int ConvertToOutputMStabModelType(MStabModelType mStabModelType) + public static InputStabilityModelType ConvertToInputMStabModelType(MStabModelType mStabModelType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabModelType.Bishop, MStabModelTypeBishop + MStabModelType.Bishop, InputStabilityModelType.Bishop }, { - MStabModelType.Spencer, MStabModelTypeSpencer + MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan }, { - MStabModelType.Fellenius, MStabModelTypeFellenius - }, - { - MStabModelType.UpliftVan, MStabModelTypeUpliftVan - }, - { - MStabModelType.UpliftSpencer, MStabModelTypeUpliftSpencer - }, - { - MStabModelType.BishopRandomField, MStabModelTypeBishopRandomField - }, - { - MStabModelType.BishopUpliftVan, MStabModelTypeBishopUpliftVan + MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan } }; return translationTable[mStabModelType]; Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json =================================================================== diff -u -r6199 -r6203 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6199) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6203) @@ -6,11 +6,11 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Interface/24.1.0.6194": { + "Deltares.DamEngine.Interface/24.1.0.6197": { "dependencies": { - "Deltares.DamEngine.Calculators": "24.1.0.6194", - "Deltares.DamEngine.Data": "24.1.0.6194", - "Deltares.DamEngine.Io": "24.1.0.6194" + "Deltares.DamEngine.Calculators": "24.1.0.6197", + "Deltares.DamEngine.Data": "24.1.0.6197", + "Deltares.DamEngine.Io": "24.1.0.6197" }, "runtime": { "Deltares.DamEngine.Interface.dll": {} @@ -574,15 +574,15 @@ } }, "System.Threading.Tasks.Extensions/4.5.4": {}, - "Deltares.DamEngine.Calculators/24.1.0.6194": { + "Deltares.DamEngine.Calculators/24.1.0.6197": { "dependencies": { - "Deltares.DamEngine.Data": "24.1.0.6194", + "Deltares.DamEngine.Data": "24.1.0.6197", "Deltares.StixFileWriter": "24.1.0.118" }, "runtime": { "Deltares.DamEngine.Calculators.dll": { - "assemblyVersion": "24.1.0.6194", - "fileVersion": "24.1.0.6194" + "assemblyVersion": "24.1.0.6197", + "fileVersion": "24.1.0.6197" } }, "resources": { @@ -591,11 +591,11 @@ } } }, - "Deltares.DamEngine.Data/24.1.0.6194": { + "Deltares.DamEngine.Data/24.1.0.6197": { "runtime": { "Deltares.DamEngine.Data.dll": { - "assemblyVersion": "24.1.0.6194", - "fileVersion": "24.1.0.6194" + "assemblyVersion": "24.1.0.6197", + "fileVersion": "24.1.0.6197" } }, "resources": { @@ -604,11 +604,11 @@ } } }, - "Deltares.DamEngine.Io/24.1.0.6194": { + "Deltares.DamEngine.Io/24.1.0.6197": { "runtime": { "Deltares.DamEngine.Io.dll": { - "assemblyVersion": "24.1.0.6194", - "fileVersion": "24.1.0.6194" + "assemblyVersion": "24.1.0.6197", + "fileVersion": "24.1.0.6197" } } }, @@ -631,7 +631,7 @@ } }, "libraries": { - "Deltares.DamEngine.Interface/24.1.0.6194": { + "Deltares.DamEngine.Interface/24.1.0.6197": { "type": "project", "serviceable": false, "sha512": "" @@ -1112,17 +1112,17 @@ "path": "system.threading.tasks.extensions/4.5.4", "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512" }, - "Deltares.DamEngine.Calculators/24.1.0.6194": { + "Deltares.DamEngine.Calculators/24.1.0.6197": { "type": "project", "serviceable": false, "sha512": "" }, - "Deltares.DamEngine.Data/24.1.0.6194": { + "Deltares.DamEngine.Data/24.1.0.6197": { "type": "project", "serviceable": false, "sha512": "" }, - "Deltares.DamEngine.Io/24.1.0.6194": { + "Deltares.DamEngine.Io/24.1.0.6197": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r6199 -r6203 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6199) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6203) @@ -226,8 +226,8 @@ curStabParamas.SearchMethod = ConversionHelper.ConvertToSearchMethod(input.StabilityParameters.SearchMethod); curStabParamas.SlipCircleDefinition = new SlipCircleDefinition(); SlipCircleDefinition slipCircleDefinition = curStabParamas.SlipCircleDefinition; - slipCircleDefinition.UpliftVanGridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.UpliftVanGridDetermination); - slipCircleDefinition.BishopSearchAreaDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.BishopSearchAreaDetermination); + slipCircleDefinition.UpliftVanGridSizeDetermination = ConversionHelper.ConvertToUpliftVanGridDetermination(input.StabilityParameters.UpliftVanGridDetermination); + slipCircleDefinition.BishopSearchAreaDetermination = ConversionHelper.ConvertToBishopSearchAreaDetermination(input.StabilityParameters.BishopSearchAreaDetermination); if (input.StabilityParameters.BishopTangentLinesDistanceSpecified) { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs =================================================================== diff -u -r5807 -r6203 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 5807) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 6203) @@ -628,16 +628,6 @@ }; } - if (SlipCircleDefinition.Specification.FailureMechanismSystemType == - FailureMechanismSystemType.StabilityInside && Model == MStabModelType.Spencer) - { - return new[] - { - MStabSearchMethod.Grid, - MStabSearchMethod.GeneticAlgorithm - }; - } - // Make sure that grid is reset and updated too when needed. if (SearchMethod != MStabSearchMethod.Grid) { Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json =================================================================== diff -u -r6199 -r6203 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6199) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6203) @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Data/24.1.0.6194": { + "Deltares.DamEngine.Data/24.1.0.6197": { "runtime": { "Deltares.DamEngine.Data.dll": {} }, @@ -19,7 +19,7 @@ } }, "libraries": { - "Deltares.DamEngine.Data/24.1.0.6194": { + "Deltares.DamEngine.Data/24.1.0.6197": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll =================================================================== diff -u -r6199 -r6203 Binary files differ