Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r6157 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6157) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6196) @@ -53,71 +53,8 @@ public const int CpBottomDitchDikeSide = 17; // Slootbodem dijkzijde public const int CpBottomDitchPolderSide = 18; // Slootbodem polderzijde public const int CpDitchPolderSide = 19; // Insteek sloot polderzijde - public const int CpSurfaceLevelInside = 25; // Maaiveld binnenwaarts + public const int CpSurfaceLevelInside = 25; // Maaiveld binnenwaarts - public const int InputFailureMechanismStabilityInside = 0; - public const int InputFailureMechanismStabilityOutside = 1; - public const int InputFailureMechanismPiping = 2; - - public const int InputSegmentFailureMechanismAll = 0; - public const int InputSegmentFailureMechanismStability = 1; - public const int InputSegmentFailureMechanismPiping = 2; - - /// - /// The input zone type no zones - /// - public const int InputZoneTypeNoZones = 0; - - /// - /// 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 InputZoneTypeOldZoneArea = 1; - - /// - /// The input zone types forbidden zones - /// - public const int InputZoneTypesForbiddenZones = 2; - - /// - /// The input search method grid - /// - public const int InputSearchMethodGrid = 0; - - /// - /// The input search method genetic - /// - public const int InputSearchMethodGenetic = 1; - - /// - /// The input search method BeeSwarm - /// - public const int InputSearchMethodBeeSwarm = 2; - - /// - /// The input grid type automatic - /// - public const int InputGridTypeAutomatic = 0; - - /// - /// The input grid type specified - /// - public const int InputGridTypeSpecified = 1; - - /// - /// The input tangent lines on boundary lines - /// - public const int InputTangentLinesOnBoundaryLines = 0; - - /// - /// The input tangent lines specified - /// - public const int InputTangentLinesSpecified = 1; - - /// - /// The input tangent lines automatic - /// - public const int InputTangentLinesAutomatic = 2; - // Constants for translating to Enums TimeStepUnit public const uint TimeStepUnitSecond = 0; public const uint TimeStepUnitMinute = 1; @@ -559,15 +496,15 @@ /// /// Type of the soil geometry. /// - public static int ConvertToInputSoilGeometryType(SoilProfileType soilProfileType) + public static SegmentSoilGeometryProbabilitySoilProfileType ConvertToInputSoilGeometryType(SoilProfileType soilProfileType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - SoilProfileType.ProfileType1D, 0 + SoilProfileType.ProfileType1D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D }, { - SoilProfileType.ProfileType2D, 1 + SoilProfileType.ProfileType2D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D } }; return translationTable[soilProfileType]; @@ -578,15 +515,15 @@ /// /// Type of the soil geometry. /// - public static SoilProfileType ConvertToSoilGeometryType(int soilGeometryType) + public static SoilProfileType ConvertToSoilGeometryType(SegmentSoilGeometryProbabilitySoilProfileType soilGeometryType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - 0, SoilProfileType.ProfileType1D + SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D, SoilProfileType.ProfileType1D }, { - 1, SoilProfileType.ProfileType2D + SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D, SoilProfileType.ProfileType2D } }; return translationTable[soilGeometryType]; @@ -597,18 +534,18 @@ /// /// Type of the system failure mechanism. /// - public static int ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType) + public static InputFailureMechanismSystemType ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType) { - 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[failureMechanismSystemType]; @@ -619,18 +556,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]; @@ -641,18 +578,18 @@ /// /// Type of the segment failure mechanism. /// - public static int ConvertToInputSegmentFailureMechanismSystemType(SegmentFailureMechanismType segmentFailureMechanismType) + public static SegmentSoilGeometryProbabilitySegmentFailureMechanismType ConvertToInputSegmentFailureMechanismSystemType(SegmentFailureMechanismType segmentFailureMechanismType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - SegmentFailureMechanismType.All, InputSegmentFailureMechanismAll + SegmentFailureMechanismType.All, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All }, { - SegmentFailureMechanismType.Stability, InputSegmentFailureMechanismStability + SegmentFailureMechanismType.Stability, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability }, { - SegmentFailureMechanismType.Piping, InputSegmentFailureMechanismPiping + SegmentFailureMechanismType.Piping, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping } }; return translationTable[segmentFailureMechanismType]; @@ -663,18 +600,18 @@ /// /// Type of the failure mechanism system. /// - public static SegmentFailureMechanismType ConvertToSegmentFailureMechanismSystemType(int segmentFailureMechanismSystemType) + public static SegmentFailureMechanismType ConvertToSegmentFailureMechanismSystemType(SegmentSoilGeometryProbabilitySegmentFailureMechanismType segmentFailureMechanismSystemType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - InputSegmentFailureMechanismAll, SegmentFailureMechanismType.All + SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All, SegmentFailureMechanismType.All }, { - InputSegmentFailureMechanismStability, SegmentFailureMechanismType.Stability + SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability, SegmentFailureMechanismType.Stability }, { - InputSegmentFailureMechanismPiping, SegmentFailureMechanismType.Piping + SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping, SegmentFailureMechanismType.Piping } }; return translationTable[segmentFailureMechanismSystemType]; @@ -849,15 +786,15 @@ /// /// 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 } }; return translationTable[zoneType]; @@ -868,18 +805,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 }, { - InputZoneTypeOldZoneArea, MStabZonesType.NoZones - }, - { - InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone + LocationStabilityOptionsZoneType.ForbiddenZones, MStabZonesType.ForbiddenZone } }; return translationTable[inputZoneType]; @@ -890,15 +824,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.BeeSwarm, InputSearchMethodBeeSwarm + MStabSearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm } }; return translationTable[searchMethod]; @@ -909,15 +843,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 }, { - InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm + StabilityParametersSearchMethod.BeeSwarm, MStabSearchMethod.BeeSwarm } }; return translationTable[searchMethod]; @@ -977,22 +911,42 @@ } /// - /// Converts to input grid determination. + /// Converts to Bishop input search area determination. /// - /// Type of the grid. + /// Type of the search area for Bishop. /// - public static int ConvertToInputGridDetermination(GridSizeDetermination gridType) + public static StabilityParametersBishopSearchAreaDetermination ConvertToInputBishopSearchAreaDetermination(GridSizeDetermination searchAreaType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - GridSizeDetermination.Automatic, InputGridTypeAutomatic + GridSizeDetermination.Automatic, StabilityParametersBishopSearchAreaDetermination.Automatic }, { - GridSizeDetermination.Specified, InputGridTypeSpecified + GridSizeDetermination.Specified, StabilityParametersBishopSearchAreaDetermination.Specified } }; + return translationTable[searchAreaType]; + } + + /// + /// 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]; } @@ -1023,21 +977,40 @@ } /// - /// 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 searchAreaType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - InputGridTypeAutomatic, GridSizeDetermination.Automatic + StabilityParametersBishopSearchAreaDetermination.Automatic, GridSizeDetermination.Automatic }, { - InputGridTypeSpecified, GridSizeDetermination.Specified + StabilityParametersBishopSearchAreaDetermination.Specified, GridSizeDetermination.Specified } }; + return translationTable[searchAreaType]; + } + + /// + /// 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]; } @@ -1046,18 +1019,18 @@ /// /// 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]; @@ -1068,18 +1041,18 @@ /// /// 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]; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r6157 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6157) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6196) @@ -181,53 +181,53 @@ } [Test] - [TestCase(SoilProfileType.ProfileType1D, 0)] - [TestCase(SoilProfileType.ProfileType2D, 1)] - public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, int inputSoilGeometryType) + [TestCase(SoilProfileType.ProfileType1D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D)] + [TestCase(SoilProfileType.ProfileType2D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D)] + public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, SegmentSoilGeometryProbabilitySoilProfileType inputSoilGeometryType) { Assert.That(ConversionHelper.ConvertToInputSoilGeometryType(soilProfileType), Is.EqualTo(inputSoilGeometryType)); } [Test] - [TestCase(0, SoilProfileType.ProfileType1D)] - [TestCase(1, SoilProfileType.ProfileType2D)] - public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilProfileType soilProfileType) + [TestCase(SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D, SoilProfileType.ProfileType1D)] + [TestCase(SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D, SoilProfileType.ProfileType2D)] + public void CanConvertToSoilGeometryType(SegmentSoilGeometryProbabilitySoilProfileType inputSoilGeometryType, SoilProfileType soilProfileType) { Assert.That(ConversionHelper.ConvertToSoilGeometryType(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(SegmentFailureMechanismType.All, ConversionHelper.InputSegmentFailureMechanismAll)] - [TestCase(SegmentFailureMechanismType.Stability, ConversionHelper.InputSegmentFailureMechanismStability)] - [TestCase(SegmentFailureMechanismType.Piping, ConversionHelper.InputSegmentFailureMechanismPiping)] - public void CanConvertToInputFailureMechanismSystemType(SegmentFailureMechanismType failureMechanismSystemType, int inputFailureMechanismSystemType) + [TestCase(SegmentFailureMechanismType.All, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All)] + [TestCase(SegmentFailureMechanismType.Stability, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability)] + [TestCase(SegmentFailureMechanismType.Piping, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping)] + public void CanConvertToInputFailureMechanismSystemType(SegmentFailureMechanismType failureMechanismSystemType, SegmentSoilGeometryProbabilitySegmentFailureMechanismType inputFailureMechanismSystemType) { Assert.That(ConversionHelper.ConvertToInputSegmentFailureMechanismSystemType(failureMechanismSystemType), Is.EqualTo(inputFailureMechanismSystemType)); } [Test] - [TestCase(ConversionHelper.InputSegmentFailureMechanismAll, SegmentFailureMechanismType.All)] - [TestCase(ConversionHelper.InputSegmentFailureMechanismStability, SegmentFailureMechanismType.Stability)] - [TestCase(ConversionHelper.InputSegmentFailureMechanismPiping, SegmentFailureMechanismType.Piping)] - public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, SegmentFailureMechanismType failureMechanismSystemType) + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All, SegmentFailureMechanismType.All)] + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability, SegmentFailureMechanismType.Stability)] + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping, SegmentFailureMechanismType.Piping)] + public void CanConvertToFailureMechanismSystemType(SegmentSoilGeometryProbabilitySegmentFailureMechanismType inputFailureMechanismSystemType, SegmentFailureMechanismType failureMechanismSystemType) { Assert.That(ConversionHelper.ConvertToSegmentFailureMechanismSystemType(inputFailureMechanismSystemType), Is.EqualTo(failureMechanismSystemType)); } @@ -269,34 +269,33 @@ } [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.InputZoneTypeOldZoneArea, 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)); } [Test] - [TestCase(MStabSearchMethod.Grid, ConversionHelper.InputSearchMethodGrid)] - [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.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)); } @@ -332,22 +331,38 @@ } [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 CanConvertToInputUpliftVanGridSizeDetermination(GridSizeDetermination gridDetermination, StabilityParametersUpliftVanGridDetermination inputGridDetermination) + { + Assert.That(ConversionHelper.ConvertToInputUpliftVanGridDetermination(gridDetermination), Is.EqualTo(inputGridDetermination)); + } [Test] + [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(SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi)] [TestCase(SoilShearStrengthModel.SuCalculated, ShearStrengthModel.SuCalculated)] [TestCase(SoilShearStrengthModel.SigmaTauCurve, ShearStrengthModel.SigmaTauCurve)] @@ -357,19 +372,19 @@ } [Test] - [TestCase(TangentLinesDefinition.OnBoundaryLines, ConversionHelper.InputTangentLinesOnBoundaryLines)] - [TestCase(TangentLinesDefinition.Specified, ConversionHelper.InputTangentLinesSpecified)] - [TestCase(TangentLinesDefinition.Automatic, ConversionHelper.InputTangentLinesAutomatic)] - public void CanConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType, int inputTangentLineType) + [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)); } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs =================================================================== diff -u -r6084 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 6084) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 6196) @@ -57,9 +57,9 @@ /// Test for different segmentFailureMechanismType /// The soilprobabilities are set tot the specified segmentFailureMechanismType [Test] - [TestCase(ConversionHelper.InputSegmentFailureMechanismPiping)] - [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)] - public void CanPerformBlighDesignNoAdaptionPipingVoorbeeld1(int segmentFailureMechanismType) + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping)] + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All)] + public void CanPerformBlighDesignNoAdaptionPipingVoorbeeld1(SegmentSoilGeometryProbabilitySegmentFailureMechanismType segmentFailureMechanismType) { // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" // Select Failure mechanism Piping and model Bligh @@ -312,8 +312,8 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used - inputString = XmlAdapter.ChangeValueInXml(inputString, "FailureMechanismSystemType", "2"); // Piping - inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", "2"); // Piping + inputString = XmlAdapter.ChangeValueInXml(inputString, "FailureMechanismSystemType", "Piping"); + inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", "Piping"); inputString = XmlAdapter.ChangeStabilityToPiping(inputString); inputString = XmlAdapter.ChangePipingInputModel(inputString, InputPipingModelType.Bligh); Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r6194 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 6194) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 6196) @@ -9,14 +9,14 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by xsd, Version=4.8.4084.0. +// This source code was auto-generated by xsd, Version=4.8.3928.0. // namespace Deltares.DamEngine.Io.XmlOutput { using System.Xml.Serialization; /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -50,7 +50,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -124,7 +124,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -234,7 +234,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -370,7 +370,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -469,7 +469,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -503,7 +503,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum MessageMessageType { @@ -519,7 +519,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -577,7 +577,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -611,7 +611,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -657,7 +657,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -702,7 +702,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -788,7 +788,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -886,7 +886,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -920,7 +920,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -953,7 +953,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1038,7 +1038,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1073,7 +1073,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1223,7 +1223,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1245,7 +1245,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1366,7 +1366,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1413,7 +1413,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum OperationalStaticDataFailureMechanismSystemType { @@ -1426,7 +1426,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum OperationalStaticDataStabilityModel { @@ -1442,7 +1442,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum OperationalStaticDataSearchAlgorithm { @@ -1455,7 +1455,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2304,7 +2304,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] public enum ShearStrengthModelType { @@ -2322,7 +2322,7 @@ [System.Xml.Serialization.XmlIncludeAttribute(typeof(SlidingPlaneMinimumSafetyCurveType))] [System.Xml.Serialization.XmlIncludeAttribute(typeof(DualSlidingCircleMinimumSafetyCurveType))] [System.Xml.Serialization.XmlIncludeAttribute(typeof(SlidingCircleMinimumSafetyCurveType))] - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2356,7 +2356,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2365,7 +2365,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2386,7 +2386,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2767,7 +2767,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3085,7 +3085,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3119,7 +3119,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3167,7 +3167,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum DesignResultStabilityDesignResultsStabilityModelType { @@ -3183,7 +3183,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3212,22 +3212,6 @@ private bool blighHcriticalFieldSpecified; - private double sellmeijer4ForcesFactorField; - - private bool sellmeijer4ForcesFactorFieldSpecified; - - private double sellmeijer4ForcesHcriticalField; - - private bool sellmeijer4ForcesHcriticalFieldSpecified; - - private double sellmeijerVnkFactorField; - - private bool sellmeijerVnkFactorFieldSpecified; - - private double sellmeijerVnkHcriticalField; - - private bool sellmeijerVnkHcriticalFieldSpecified; - private double wti2017BackwardErosionFactorField; private bool wti2017BackwardErosionFactorFieldSpecified; @@ -3409,94 +3393,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double Sellmeijer4ForcesFactor { - get { - return this.sellmeijer4ForcesFactorField; - } - set { - this.sellmeijer4ForcesFactorField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Sellmeijer4ForcesFactorSpecified { - get { - return this.sellmeijer4ForcesFactorFieldSpecified; - } - set { - this.sellmeijer4ForcesFactorFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Sellmeijer4ForcesHcritical { - get { - return this.sellmeijer4ForcesHcriticalField; - } - set { - this.sellmeijer4ForcesHcriticalField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Sellmeijer4ForcesHcriticalSpecified { - get { - return this.sellmeijer4ForcesHcriticalFieldSpecified; - } - set { - this.sellmeijer4ForcesHcriticalFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double SellmeijerVnkFactor { - get { - return this.sellmeijerVnkFactorField; - } - set { - this.sellmeijerVnkFactorField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool SellmeijerVnkFactorSpecified { - get { - return this.sellmeijerVnkFactorFieldSpecified; - } - set { - this.sellmeijerVnkFactorFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double SellmeijerVnkHcritical { - get { - return this.sellmeijerVnkHcriticalField; - } - set { - this.sellmeijerVnkHcriticalField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool SellmeijerVnkHcriticalSpecified { - get { - return this.sellmeijerVnkHcriticalFieldSpecified; - } - set { - this.sellmeijerVnkHcriticalFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public double Wti2017BackwardErosionFactor { get { return this.wti2017BackwardErosionFactorField; @@ -3827,7 +3723,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3849,7 +3745,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3871,7 +3767,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r6169 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6169) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6196) @@ -417,7 +417,7 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "StabilityDesignMethod", designStrategy); if (stabilityModel == "UpliftVan") { - inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "2"); + inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "BeeSwarm"); } Output output = GeneralHelper.RunAfterInputValidation(inputString); @@ -876,9 +876,9 @@ /// Test for different segmentFailureMechanismType /// The soil probabilities are set tot the specified segmentFailureMechanismType [Test] - [TestCase(ConversionHelper.InputSegmentFailureMechanismStability)] - [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)] - public void TestRunMacroStabilityTutorialDesignBishop(int segmentFailureMechanismType) + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability)] + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All)] + public void TestRunMacroStabilityTutorialDesignBishop(SegmentSoilGeometryProbabilitySegmentFailureMechanismType segmentFailureMechanismType) { // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx" // with Dam Classic rev.1059 @@ -966,7 +966,7 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", - ConversionHelper.InputSegmentFailureMechanismStability.ToString()); + SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability.ToString()); inputString = XmlAdapter.ChangeValueInXml(inputString, "AnalysisType", "AdaptGeometry"); inputString = XmlAdapter.ChangeValueInXml(inputString, "StabilityDesignMethod", designMethod); inputString = XmlAdapter.ChangeValueInXml(inputString, "RequiredSafetyFactorStabilityInnerSlope", @@ -1017,7 +1017,7 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", - ConversionHelper.InputSegmentFailureMechanismStability.ToString()); + SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability.ToString()); inputString = XmlAdapter.ChangeValueInXml(inputString, "AnalysisType", analysisType); inputString = XmlAdapter.ChangeValueInXml(inputString, "DikeTableHeight", "5.9"); inputString = XmlAdapter.ChangeValueInXml(inputString, "RiverLevel", "5.5"); Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r6194 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6194) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6196) @@ -9,14 +9,14 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by xsd, Version=4.8.4084.0. +// This source code was auto-generated by xsd, Version=4.8.3928.0. // namespace Deltares.DamEngine.Io.XmlInput { using System.Xml.Serialization; /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -45,7 +45,7 @@ private InputDamProjectType damProjectTypeField; - private int failureMechanismSystemTypeField; + private InputFailureMechanismSystemType failureMechanismSystemTypeField; private InputPipingModelType pipingModelTypeField; @@ -191,7 +191,7 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int FailureMechanismSystemType { + public InputFailureMechanismSystemType FailureMechanismSystemType { get { return this.failureMechanismSystemTypeField; } @@ -312,7 +312,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -471,7 +471,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -505,7 +505,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -527,7 +527,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -665,7 +665,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -738,7 +738,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -760,7 +760,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -910,7 +910,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -932,7 +932,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -993,7 +993,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1027,15 +1027,15 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class StabilityParameters { - private int searchMethodField; + private StabilityParametersSearchMethod searchMethodField; - private int bishopSearchAreaDeterminationField; + private StabilityParametersBishopSearchAreaDetermination bishopSearchAreaDeterminationField; private double bishopTangentLinesDistanceField; @@ -1057,7 +1057,7 @@ private bool bishopGridHorizontalPointsDistanceFieldSpecified; - private int upliftVanGridDeterminationField; + private StabilityParametersUpliftVanGridDetermination upliftVanGridDeterminationField; private int upliftVanGridLeftVerticalPointsCountField; @@ -1091,7 +1091,7 @@ private bool upliftVanGridRightHorizontalPointsDistanceFieldSpecified; - private int upliftVanTangentLinesDefinitionField; + private StabilityParametersUpliftVanTangentLinesDefinition upliftVanTangentLinesDefinitionField; private bool upliftVanTangentLinesDefinitionFieldSpecified; @@ -1101,7 +1101,7 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int SearchMethod { + public StabilityParametersSearchMethod SearchMethod { get { return this.searchMethodField; } @@ -1112,7 +1112,7 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int BishopSearchAreaDetermination { + public StabilityParametersBishopSearchAreaDetermination BishopSearchAreaDetermination { get { return this.bishopSearchAreaDeterminationField; } @@ -1233,7 +1233,7 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int UpliftVanGridDetermination { + public StabilityParametersUpliftVanGridDetermination UpliftVanGridDetermination { get { return this.upliftVanGridDeterminationField; } @@ -1420,7 +1420,7 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int UpliftVanTangentLinesDefinition { + public StabilityParametersUpliftVanTangentLinesDefinition UpliftVanTangentLinesDefinition { get { return this.upliftVanTangentLinesDefinitionField; } @@ -1464,8 +1464,63 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum StabilityParametersSearchMethod { + + /// + CalculationGrid, + + /// + BeeSwarm, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum StabilityParametersBishopSearchAreaDetermination { + + /// + Automatic, + + /// + Specified, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum StabilityParametersUpliftVanGridDetermination { + + /// + Automatic, + + /// + Specified, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum StabilityParametersUpliftVanTangentLinesDefinition { + + /// + OnBoundaryLines, + + /// + Specified, + + /// + Automatic, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SoilProfile2D { @@ -1511,7 +1566,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1571,7 +1626,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1606,7 +1661,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1641,7 +1696,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1676,7 +1731,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1737,7 +1792,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1784,7 +1839,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1858,7 +1913,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1892,7 +1947,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1901,9 +1956,9 @@ private string soilProfileNameField; - private int soilProfileTypeField; + private SegmentSoilGeometryProbabilitySoilProfileType soilProfileTypeField; - private int segmentFailureMechanismTypeField; + private SegmentSoilGeometryProbabilitySegmentFailureMechanismType segmentFailureMechanismTypeField; private bool segmentFailureMechanismTypeFieldSpecified; @@ -1922,7 +1977,7 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int SoilProfileType { + public SegmentSoilGeometryProbabilitySoilProfileType SoilProfileType { get { return this.soilProfileTypeField; } @@ -1933,7 +1988,7 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int SegmentFailureMechanismType { + public SegmentSoilGeometryProbabilitySegmentFailureMechanismType SegmentFailureMechanismType { get { return this.segmentFailureMechanismTypeField; } @@ -1966,8 +2021,37 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum SegmentSoilGeometryProbabilitySoilProfileType { + + /// + ProfileType1D, + + /// + ProfileType2D, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum SegmentSoilGeometryProbabilitySegmentFailureMechanismType { + + /// + All, + + /// + Stability, + + /// + Piping, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class Soil { @@ -2299,7 +2383,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2334,7 +2418,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2369,7 +2453,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum SoilShearStrengthModel { @@ -2388,7 +2472,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2422,7 +2506,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2470,7 +2554,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2882,7 +2966,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationDesignOptionsStabilityDesignMethod { @@ -2895,7 +2979,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2995,7 +3079,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsPhreaticLineCreationMethod { @@ -3017,7 +3101,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsIntrusionVerticalWaterPressure { @@ -3039,7 +3123,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsDikeSoilScenario { @@ -3058,7 +3142,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3158,7 +3242,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3505,14 +3589,14 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public partial class LocationStabilityOptions { - private int zoneTypeField; + private LocationStabilityOptionsZoneType zoneTypeField; private double forbiddenZoneFactorField; @@ -3532,7 +3616,7 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int ZoneType { + public LocationStabilityOptionsZoneType ZoneType { get { return this.zoneTypeField; } @@ -3631,8 +3715,21 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum LocationStabilityOptionsZoneType { + + /// + NoZones, + + /// + ForbiddenZones, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] @@ -3666,7 +3763,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3714,7 +3811,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputDamProjectType { @@ -3727,26 +3824,36 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public enum InputPipingModelType { + public enum InputFailureMechanismSystemType { /// - Bligh, + StabilityInside, /// - SellmeijerVnk, + StabilityOutside, /// - Sellmeijer4Forces, + Piping, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum InputPipingModelType { /// + Bligh, + + /// WtiSellmeijerRevised, } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputStabilityModelType { @@ -3762,7 +3869,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputAnalysisType { Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/XmlAdapter.cs =================================================================== diff -u -r5915 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/XmlAdapter.cs (.../XmlAdapter.cs) (revision 5915) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/XmlAdapter.cs (.../XmlAdapter.cs) (revision 6196) @@ -102,8 +102,6 @@ { InputPipingModelType.Bligh => "PipingModelType=\"Bligh\"", InputPipingModelType.WtiSellmeijerRevised => "PipingModelType=\"WtiSellmeijerRevised\"", - InputPipingModelType.Sellmeijer4Forces => "PipingModelType=\"Sellmeijer4Forces\"", - InputPipingModelType.SellmeijerVnk => "PipingModelType=\"SellmeijerVnk\"", _ => pattern }; string result = Regex.Replace(input, pattern, replacement); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs =================================================================== diff -u -r6151 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs (.../MultiCoreMacroStabilityInwardsTests.cs) (revision 6151) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs (.../MultiCoreMacroStabilityInwardsTests.cs) (revision 6196) @@ -68,7 +68,7 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", - ConversionHelper.InputSegmentFailureMechanismStability.ToString()); + SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability.ToString()); inputString = XmlAdapter.ChangeValueInXml(inputString, "AnalysisType", "AdaptGeometry"); inputString = XmlAdapter.ChangeValueInXml(inputString, "StabilityDesignMethod", designMethod); inputString = XmlAdapter.ChangeValueInXml(inputString, "MaxCalculationCores", maxCores.ToString()); Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r6194 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6194) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6196) @@ -243,13 +243,13 @@ 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); @@ -268,8 +268,8 @@ SlipCircleDefinition slipCircleDefinition = curSpec.FailureMechanismParametersMStab.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: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs =================================================================== diff -u -r6086 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 6086) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 6196) @@ -27,6 +27,7 @@ using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Interface; using Deltares.DamEngine.Io; +using Deltares.DamEngine.Io.XmlInput; using Deltares.DamEngine.Io.XmlOutput; using Deltares.DamEngine.TestHelpers; using NUnit.Framework; @@ -57,9 +58,9 @@ /// Test for different segmentFailureMechanismType /// The soilprobabilities are set tot the specified segmentFailureMechanismType [Test] - [TestCase(ConversionHelper.InputSegmentFailureMechanismPiping)] - [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)] - public void CanPerformWtiDesignNoAdaptionPipingVoorbeeld1(int segmentFailureMechanismType) + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All)] + [TestCase(SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping)] + public void CanPerformWtiDesignNoAdaptionPipingVoorbeeld1(SegmentSoilGeometryProbabilitySegmentFailureMechanismType segmentFailureMechanismType) { // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" // Set Analysis type to "No Adaption" Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r6194 -r6196 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6194) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6196) @@ -233,12 +233,6 @@ if (input.PipingModelTypeSpecified) { - if (input.PipingModelType == InputPipingModelType.Sellmeijer4Forces || - input.PipingModelType == InputPipingModelType.SellmeijerVnk) - { - throw new NotImplementedException(); - } - calculationSpecification.PipingModelType = ConversionHelper.ConvertToPipingModelType(input.PipingModelType); } @@ -271,9 +265,9 @@ curStabParamas.SlipCircleDefinition = new SlipCircleDefinition(); SlipCircleDefinition slipCircleDefinition = curStabParamas.SlipCircleDefinition; - slipCircleDefinition.UpliftVanGridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.UpliftVanGridDetermination); + slipCircleDefinition.UpliftVanGridSizeDetermination = ConversionHelper.ConvertToUpliftVanGridDetermination(input.StabilityParameters.UpliftVanGridDetermination); slipCircleDefinition.UpliftVanTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.UpliftVanTangentLinesDefinition); - slipCircleDefinition.BishopSearchAreaDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.BishopSearchAreaDetermination); + slipCircleDefinition.BishopSearchAreaDetermination = ConversionHelper.ConvertToBishopSearchAreaDetermination(input.StabilityParameters.BishopSearchAreaDetermination); if (input.StabilityParameters.BishopTangentLinesDistanceSpecified) {