Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r6217 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6217) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6264) @@ -323,9 +323,9 @@ if (designResult.StabilityDesignResults != null) { - bool isBishop = designResult.StabilityDesignResults.StabilityModelType == MStabModelType.Bishop; - bool isUpliftVan = designResult.StabilityDesignResults.StabilityModelType == MStabModelType.UpliftVan; - if (designResult.StabilityDesignResults.StabilityModelType == MStabModelType.BishopUpliftVan) + bool isBishop = designResult.StabilityDesignResults.StabilityModelType == StabilityModelType.Bishop; + bool isUpliftVan = designResult.StabilityDesignResults.StabilityModelType == StabilityModelType.UpliftVan; + if (designResult.StabilityDesignResults.StabilityModelType == StabilityModelType.BishopUpliftVan) { isBishop = designResult.StabilityDesignResults.PassiveCenterPoint == null; isUpliftVan = designResult.StabilityDesignResults.PassiveCenterPoint != null; @@ -372,7 +372,7 @@ } } - if (designResult.StabilityDesignResults.StabilityModelType is MStabModelType.Bishop or MStabModelType.UpliftVan or MStabModelType.BishopUpliftVan) + if (designResult.StabilityDesignResults.StabilityModelType is StabilityModelType.Bishop or StabilityModelType.UpliftVan or StabilityModelType.BishopUpliftVan) { if (designResult.StabilityDesignResults.ResultSlices != null && designResult.StabilityDesignResults.ResultSlices.Count > 0) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs =================================================================== diff -u -r6245 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 6245) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 6264) @@ -106,11 +106,11 @@ SearchAreaConditions preprocessingSearchAreaConditions = macroStabilityInput.PreprocessingInput.SearchAreaConditions; switch (mStabParameters.Model) { - case MStabModelType.Bishop: + case StabilityModelType.Bishop: TransferBishopSearchAreaSettings(preprocessingSearchAreaConditions); TransferBishopCalculationGrid(macroStabilityInput.StabilityModel.BishopCalculationCircle); break; - case MStabModelType.UpliftVan: + case StabilityModelType.UpliftVan: TransferUpliftVanSearchAreaSettings(preprocessingSearchAreaConditions); TransferUpliftVanCalculationGrid(macroStabilityInput.StabilityModel.UpliftVanCalculationGrid); break; @@ -129,7 +129,7 @@ kernelStabilityInput.MoveGrid = true; // is not in DamEngine but MUST be true as we use the brute force approach. kernelStabilityInput.MaximumSliceWidth = 1.0; // is not in DamEngine datamodel // For Bishop, only Grid is possible however if Bishop/UpliftVan was selected, then the SearchAlgorithm concerns only Uplift-Van - kernelStabilityInput.SearchAlgorithm = mStabParameters.Model == MStabModelType.Bishop ? SearchAlgorithm.Grid : ConversionHelper.ConvertToMacroStabilitySearchMethod(mStabParameters.SearchMethod); + kernelStabilityInput.SearchAlgorithm = mStabParameters.Model == StabilityModelType.Bishop ? SearchAlgorithm.Grid : ConversionHelper.ConvertToMacroStabilitySearchMethod(mStabParameters.SearchMethod); if (kernelStabilityInput.SearchAlgorithm == SearchAlgorithm.BeeswarmAndLevenbergMarquardt) { CreateDefaultBeeSwarmOptions(kernelStabilityInput); @@ -148,7 +148,7 @@ return; } slipPlaneConstraints.SlipPlaneMinDepth = location.StabilityOptions.MinimalCircleDepth ?? 0.0; - if ((location.StabilityOptions.StabilityZoneType == MStabZonesType.ForbiddenZone) && + if ((location.StabilityOptions.StabilityZoneType == StabilityZoneType.ForbiddenZone) && location.StabilityOptions.ForbiddenZoneFactor.HasValue) { CharacteristicPointSet characteristicPoints = location.SurfaceLine.CharacteristicPoints; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs =================================================================== diff -u -r6087 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 6087) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/BishopGridCreator.cs (.../BishopGridCreator.cs) (revision 6264) @@ -35,7 +35,7 @@ /// the slip circle definition /// The surface line. /// The Bishop calculation grid - public static BishopCalculationGrid DetermineGridsFromSettings(MStabGridPosition gridPosition, + public static BishopCalculationGrid DetermineGridsFromSettings(StabilityGridPosition gridPosition, SlipCircleDefinition slipCircleDefinition, SurfaceLine2 surfaceLine) { var bishopCalculationGrid = new BishopCalculationGrid @@ -69,7 +69,7 @@ (slipCircleDefinition.BishopGridHorizontalPointCount - 1); double gridHeight = slipCircleDefinition.BishopGridVerticalPointDistance * (slipCircleDefinition.BishopGridVerticalPointCount - 1); - if (gridPosition == MStabGridPosition.Right) + if (gridPosition == StabilityGridPosition.Right) { bishopCalculationGrid.GridXLeft = gridXCoordinate; bishopCalculationGrid.GridXRight = gridXCoordinate + gridWidth; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r6253 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 6253) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 6264) @@ -62,7 +62,7 @@ // Given DamEngine data (DamProjectData) DamProjectData expectedDamProjectData = FactoryForDamProjectData.CreateExampleDamProjectData(); expectedDamProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications[0] - .StabilityModelType = MStabModelType.UpliftVan; + .StabilityModelType = StabilityModelType.UpliftVan; Waternet expectedWaternet = CreateExampleWaternet(); UpliftVanCalculationGrid expectedUpliftVanCalculationGrid = CreateExampleUpliftVanCalculationGrid(); @@ -574,7 +574,7 @@ [Test] public void WithNoZones_WhenTransferSlipPlaneConstraints_ThenXEntryIsNotSet() { - damKernelInput.Location.StabilityOptions.StabilityZoneType = MStabZonesType.NoZones; + damKernelInput.Location.StabilityOptions.StabilityZoneType = StabilityZoneType.NoZones; var macroStabilityInput = new MacroStabilityInput(); // When FillMacroStabilityWrapperInputFromEngine.TransferSlipPlaneConstraints(damKernelInput.Location, macroStabilityInput.StabilityModel.SlipPlaneConstraints); @@ -608,7 +608,7 @@ StabilityOptions = new StabilityOptions { MinimalCircleDepth = 1.5, - StabilityZoneType = MStabZonesType.ForbiddenZone, + StabilityZoneType = StabilityZoneType.ForbiddenZone, ForbiddenZoneFactor = 0.2 } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs =================================================================== diff -u -r6191 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 6191) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 6264) @@ -111,7 +111,7 @@ { SlipCircleDefinition slipCircleDefinition = damKernelInput.DamFailureMechanismeCalculationSpecification .FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition; - MStabGridPosition gridPosition = damKernelInput.DamFailureMechanismeCalculationSpecification + StabilityGridPosition gridPosition = damKernelInput.DamFailureMechanismeCalculationSpecification .FailureMechanismParametersMStab.MStabParameters.GridPosition; BishopCalculationGrid bishopCalculationGrid = BishopGridCreator.DetermineGridsFromSettings(gridPosition, slipCircleDefinition, damKernelInput.Location.SurfaceLine); @@ -147,7 +147,7 @@ /// Index of the iteration. /// The model. /// - public static string GetStabilityInputFileName(DamKernelInput damKernelInput, int iterationIndex, MStabModelType model) + public static string GetStabilityInputFileName(DamKernelInput damKernelInput, int iterationIndex, StabilityModelType model) { // Assume 2D sti-file, then check on type being 1D string soilGeometryName = damKernelInput.SubSoilScenario.SoilProfile2DName; @@ -244,8 +244,8 @@ designResult.StabilityDesignResults.ActiveCenterPointRadius = macroStabilityOutputItem.ActiveCenterPointRadius; designResult.StabilityDesignResults.ResultSlices = macroStabilityOutputItem.ResultSlices; - if (macroStabilityOutputItem.StabilityModelType == MStabModelType.UpliftVan || - macroStabilityOutputItem.StabilityModelType == MStabModelType.BishopUpliftVan) + if (macroStabilityOutputItem.StabilityModelType == StabilityModelType.UpliftVan || + macroStabilityOutputItem.StabilityModelType == StabilityModelType.BishopUpliftVan) { designResult.StabilityDesignResults.PassiveCenterPoint = macroStabilityOutputItem.PassiveCenterPoint; @@ -406,10 +406,10 @@ switch (stabilityOutputItem.StabilityModelType) { - case MStabModelType.Bishop: + case StabilityModelType.Bishop: input.StabilityModel.BishopCalculationCircle = stabilityOutputItem.BishopCalculationCircle; break; - case MStabModelType.UpliftVan: + case StabilityModelType.UpliftVan: input.StabilityModel.UpliftVanCalculationGrid = stabilityOutputItem.UpliftVanCalculationGrid; break; } @@ -551,7 +551,7 @@ /// The model. /// The project working path. /// - private static string GetStabilityCalculationDirectory(MStabModelType model, string projectWorkingPath) + private static string GetStabilityCalculationDirectory(StabilityModelType model, string projectWorkingPath) { string calculationBaseDirectory = projectWorkingPath; string stabilitySubDir = GetCalculationSubDir(model); @@ -569,7 +569,7 @@ /// /// The model. /// - private static string GetCalculationSubDir(MStabModelType model) + private static string GetCalculationSubDir(StabilityModelType model) { const string stabilitySubDir = @"Stability\"; var modelSubDirectory = model.ToString(); @@ -615,14 +615,14 @@ macroStabilityOutputItem.ProjectName, true); switch (macroStabilityOutputItem.StabilityModelType) { - case MStabModelType.UpliftVan: + case StabilityModelType.UpliftVan: resultStixWrite.FillCalculatedDualCircle(macroStabilityOutputItem.ActiveCenterPoint.X, macroStabilityOutputItem.ActiveCenterPoint.Z, macroStabilityOutputItem.ActiveCenterPointRadius, macroStabilityOutputItem.PassiveCenterPoint.X, macroStabilityOutputItem.PassiveCenterPoint.Z); break; - case MStabModelType.Bishop: + case StabilityModelType.Bishop: resultStixWrite.FillCalculatedCircle(macroStabilityOutputItem.ActiveCenterPoint.X, macroStabilityOutputItem.ActiveCenterPoint.Z, macroStabilityOutputItem.ActiveCenterPointRadius); Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r6222 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6222) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6264) @@ -234,23 +234,23 @@ } [Test] - [TestCase(MStabModelType.Bishop, InputStabilityModelType.Bishop)] - [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)] - [TestCase(MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)] - [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)] - public void CanConvertToInputStabilityModelType(MStabModelType mStabModelType, InputStabilityModelType inputStabilityModelType) + [TestCase(StabilityModelType.Bishop, InputStabilityModelType.Bishop)] + [TestCase(StabilityModelType.UpliftVan, InputStabilityModelType.UpliftVan)] + [TestCase(StabilityModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)] + [TestCase(StabilityModelType.UpliftVan, InputStabilityModelType.UpliftVan)] + public void CanConvertToInputStabilityModelType(StabilityModelType stabilityModelType, InputStabilityModelType inputStabilityModelType) { - Assert.That(ConversionHelper.ConvertToInputStabilityModelType(mStabModelType), Is.EqualTo(inputStabilityModelType)); + Assert.That(ConversionHelper.ConvertToInputStabilityModelType(stabilityModelType), Is.EqualTo(inputStabilityModelType)); } [Test] - [TestCase(InputStabilityModelType.Bishop, MStabModelType.Bishop)] - [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] - [TestCase(InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)] - [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] - public void CanConvertToMStabModelType(InputStabilityModelType inputStabilityModelType, MStabModelType mStabModelType) + [TestCase(InputStabilityModelType.Bishop, StabilityModelType.Bishop)] + [TestCase(InputStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)] + [TestCase(InputStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan)] + [TestCase(InputStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)] + public void CanConvertToMStabModelType(InputStabilityModelType inputStabilityModelType, StabilityModelType stabilityModelType) { - Assert.That(ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType), Is.EqualTo(mStabModelType)); + Assert.That(ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType), Is.EqualTo(stabilityModelType)); } [Test] @@ -270,33 +270,33 @@ } [Test] - [TestCase(MStabZonesType.NoZones, LocationStabilityOptionsZoneType.NoZones)] - [TestCase(MStabZonesType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones)] - public void CanConvertToInputZoneType(MStabZonesType zoneType, LocationStabilityOptionsZoneType inputZoneType) + [TestCase(StabilityZoneType.NoZones, LocationStabilityOptionsZoneType.NoZones)] + [TestCase(StabilityZoneType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones)] + public void CanConvertToInputZoneType(StabilityZoneType zoneType, LocationStabilityOptionsZoneType inputZoneType) { Assert.That(ConversionHelper.ConvertToInputZoneType(zoneType), Is.EqualTo(inputZoneType)); } [Test] - [TestCase(LocationStabilityOptionsZoneType.NoZones, MStabZonesType.NoZones)] - [TestCase(LocationStabilityOptionsZoneType.ForbiddenZones, MStabZonesType.ForbiddenZone)] - public void CanConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType, MStabZonesType zoneType) + [TestCase(LocationStabilityOptionsZoneType.NoZones, StabilityZoneType.NoZones)] + [TestCase(LocationStabilityOptionsZoneType.ForbiddenZones, StabilityZoneType.ForbiddenZone)] + public void CanConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType, StabilityZoneType zoneType) { Assert.That(ConversionHelper.ConvertToZoneType(inputZoneType), Is.EqualTo(zoneType)); } [Test] - [TestCase(MStabSearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid)] - [TestCase(MStabSearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm)] - public void CanConvertToInputSearchMethod(MStabSearchMethod searchMethod, StabilityParametersSearchMethod inputSearchMethod) + [TestCase(StabilitySearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid)] + [TestCase(StabilitySearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm)] + public void CanConvertToInputSearchMethod(StabilitySearchMethod searchMethod, StabilityParametersSearchMethod inputSearchMethod) { Assert.That(ConversionHelper.ConvertToInputSearchMethod(searchMethod), Is.EqualTo(inputSearchMethod)); } [Test] - [TestCase(StabilityParametersSearchMethod.CalculationGrid, MStabSearchMethod.Grid)] - [TestCase(StabilityParametersSearchMethod.BeeSwarm, MStabSearchMethod.BeeSwarm)] - public void CanConvertToSearchMethod(StabilityParametersSearchMethod inputSearchMethod, MStabSearchMethod searchMethod) + [TestCase(StabilityParametersSearchMethod.CalculationGrid, StabilitySearchMethod.Grid)] + [TestCase(StabilityParametersSearchMethod.BeeSwarm, StabilitySearchMethod.BeeSwarm)] + public void CanConvertToSearchMethod(StabilityParametersSearchMethod inputSearchMethod, StabilitySearchMethod searchMethod) { Assert.That(ConversionHelper.ConvertToSearchMethod(inputSearchMethod), Is.EqualTo(searchMethod)); } @@ -423,22 +423,22 @@ } [Test] - [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop)] - [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] - [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)] - [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] + [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, StabilityModelType.Bishop)] + [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)] + [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan)] + [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)] public void CanConvertToOutputStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType, - MStabModelType stabilityModelType) + StabilityModelType stabilityModelType) { Assert.That(ConversionHelper.ConvertToOutputStabilityModelType(stabilityModelType), Is.EqualTo(outputStabilityModelType)); } [Test] - [TestCase(MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop)] - [TestCase(MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)] - [TestCase(MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)] - [TestCase(MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)] - public void CanConvertToStabilityModelType(MStabModelType stabilityModelType, + [TestCase(StabilityModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop)] + [TestCase(StabilityModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)] + [TestCase(StabilityModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)] + [TestCase(StabilityModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)] + public void CanConvertToStabilityModelType(StabilityModelType stabilityModelType, DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType) { Assert.That(ConversionHelper.ConvertToStabilityModelType(outputStabilityModelType), Is.EqualTo(stabilityModelType)); @@ -535,10 +535,10 @@ Assert.Throws(() => ConversionHelper.ConvertToOutputOperationalFailureMechanismSystemType(FailureMechanismSystemType.Piping)); } - [TestCase(MStabModelType.Bishop, OperationalStaticDataStabilityModel.Bishop)] - [TestCase(MStabModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan)] - [TestCase(MStabModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan)] - public void CanConvertToOutputOperationalStabilityModel(MStabModelType stabilityModelType, OperationalStaticDataStabilityModel expectedStabilityModel) + [TestCase(StabilityModelType.Bishop, OperationalStaticDataStabilityModel.Bishop)] + [TestCase(StabilityModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan)] + [TestCase(StabilityModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan)] + public void CanConvertToOutputOperationalStabilityModel(StabilityModelType stabilityModelType, OperationalStaticDataStabilityModel expectedStabilityModel) { Assert.That(ConversionHelper.ConvertToOutputOperationalStabilityModel(stabilityModelType), Is.EqualTo(expectedStabilityModel)); } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs =================================================================== diff -u -r5810 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 5810) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 6264) @@ -98,19 +98,19 @@ { public MStabParameters() { - Model = MStabModelType.Bishop; - SearchMethod = MStabSearchMethod.Grid; - GridPosition = MStabGridPosition.Right; + Model = StabilityModelType.Bishop; + SearchMethod = StabilitySearchMethod.Grid; + GridPosition = StabilityGridPosition.Right; SlipCircleDefinition = new SlipCircleDefinition(); } - public MStabModelType Model { get; set; } - public MStabSearchMethod SearchMethod { get; set; } + public StabilityModelType Model { get; set; } + public StabilitySearchMethod SearchMethod { get; set; } public string ProjectFileName { get; set; } [Validate] public SlipCircleDefinition SlipCircleDefinition { get; set; } - public MStabGridPosition GridPosition { get; set; } + public StabilityGridPosition GridPosition { get; set; } public void Assign(MStabParameters mstabParameters) { Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs =================================================================== diff -u -r4540 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs (.../StabilityDesignResults.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs (.../StabilityDesignResults.cs) (revision 6264) @@ -92,7 +92,7 @@ /// /// The type of the stability model. /// - public MStabModelType? StabilityModelType { get; set; } + public StabilityModelType? StabilityModelType { get; set; } /// /// Gets or sets the location (X,Z) of the center point of the active slip circle. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs =================================================================== diff -u -r4540 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs (.../MacroStabilityOutputItem.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs (.../MacroStabilityOutputItem.cs) (revision 6264) @@ -76,7 +76,7 @@ /// /// The type of the stability model. /// - public MStabModelType StabilityModelType { get; set; } + public StabilityModelType StabilityModelType { get; set; } /// /// Gets or sets the location (X,Z) of the center point of the active slip circle. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs =================================================================== diff -u -r6166 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6166) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6264) @@ -127,11 +127,11 @@ #region SearchMethod [Test] - [TestCase(SearchAlgorithm.Grid, MStabSearchMethod.Grid)] - [TestCase(SearchAlgorithm.BeeswarmAndLevenbergMarquardt, MStabSearchMethod.BeeSwarm)] - public void CanConvertToDamSearchMethod(SearchAlgorithm searchAlgorithm, MStabSearchMethod mStabSearchMethod) + [TestCase(SearchAlgorithm.Grid, StabilitySearchMethod.Grid)] + [TestCase(SearchAlgorithm.BeeswarmAndLevenbergMarquardt, StabilitySearchMethod.BeeSwarm)] + public void CanConvertToDamSearchMethod(SearchAlgorithm searchAlgorithm, StabilitySearchMethod stabilitySearchMethod) { - Assert.That(ConversionHelper.ConvertToDamSearchMethod(searchAlgorithm), Is.EqualTo(mStabSearchMethod)); + Assert.That(ConversionHelper.ConvertToDamSearchMethod(searchAlgorithm), Is.EqualTo(stabilitySearchMethod)); } [TestCase(SearchAlgorithm.Beeswarm)] @@ -143,68 +143,68 @@ } [Test] - [TestCase(MStabSearchMethod.Grid, SearchAlgorithm.Grid)] - [TestCase(MStabSearchMethod.BeeSwarm, SearchAlgorithm.BeeswarmAndLevenbergMarquardt)] - public void ConvertToMacroStabilitySearchMethod(MStabSearchMethod mStabSearchMethod, SearchAlgorithm searchAlgorithm) + [TestCase(StabilitySearchMethod.Grid, SearchAlgorithm.Grid)] + [TestCase(StabilitySearchMethod.BeeSwarm, SearchAlgorithm.BeeswarmAndLevenbergMarquardt)] + public void ConvertToMacroStabilitySearchMethod(StabilitySearchMethod stabilitySearchMethod, SearchAlgorithm searchAlgorithm) { - Assert.That(ConversionHelper.ConvertToMacroStabilitySearchMethod(mStabSearchMethod), Is.EqualTo(searchAlgorithm)); + Assert.That(ConversionHelper.ConvertToMacroStabilitySearchMethod(stabilitySearchMethod), Is.EqualTo(searchAlgorithm)); } #endregion #region ModelType [Test] - [TestCase(StabilityModelOptionType.Bishop, MStabModelType.Bishop)] - [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan)] - public void CanConvertToMStabModelType(StabilityModelOptionType modelOption, MStabModelType mStabModelType) + [TestCase(StabilityModelOptionType.Bishop, StabilityModelType.Bishop)] + [TestCase(StabilityModelOptionType.UpliftVan, StabilityModelType.UpliftVan)] + public void CanConvertToMStabModelType(StabilityModelOptionType modelOption, StabilityModelType stabilityModelType) { - Assert.That(ConversionHelper.ConvertToMStabModelType(modelOption), Is.EqualTo(mStabModelType)); + Assert.That(ConversionHelper.ConvertToMStabModelType(modelOption), Is.EqualTo(stabilityModelType)); } [Test] - [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] - public void CanConvertToModelOptions(MStabModelType mStabModelType, StabilityModelOptionType modelOption) + [TestCase(StabilityModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] + public void CanConvertToModelOptions(StabilityModelType stabilityModelType, StabilityModelOptionType modelOption) { - Assert.That(ConversionHelper.ConvertToModelOptions(mStabModelType), Is.EqualTo(modelOption)); + Assert.That(ConversionHelper.ConvertToModelOptions(stabilityModelType), Is.EqualTo(modelOption)); } [Test] - [TestCase(MStabModelType.Bishop, StabilityModelOptionType.Bishop)] - [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] - public void CanConvertToModelOptionsOutput(MStabModelType mStabModelType, StabilityModelOptionType modelOption) + [TestCase(StabilityModelType.Bishop, StabilityModelOptionType.Bishop)] + [TestCase(StabilityModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] + public void CanConvertToModelOptionsOutput(StabilityModelType stabilityModelType, StabilityModelOptionType modelOption) { - Assert.That(ConversionHelper.ConvertToModelOptionsOutput(mStabModelType), Is.EqualTo(modelOption)); + Assert.That(ConversionHelper.ConvertToModelOptionsOutput(stabilityModelType), Is.EqualTo(modelOption)); } - [TestCase(MStabModelType.BishopUpliftVan)] - public void CanConvertToModelOptionsHandleException(MStabModelType mStabModelType) + [TestCase(StabilityModelType.BishopUpliftVan)] + public void CanConvertToModelOptionsHandleException(StabilityModelType stabilityModelType) { - Assert.That(() => ConversionHelper.ConvertToModelOptions(mStabModelType), Throws.InstanceOf()); + Assert.That(() => ConversionHelper.ConvertToModelOptions(stabilityModelType), Throws.InstanceOf()); } - [TestCase(MStabModelType.BishopUpliftVan)] - public void CanConvertToModelOptionsOutputHandleException(MStabModelType mStabModelType) + [TestCase(StabilityModelType.BishopUpliftVan)] + public void CanConvertToModelOptionsOutputHandleException(StabilityModelType stabilityModelType) { - Assert.That(() => ConversionHelper.ConvertToModelOptionsOutput(mStabModelType), Throws.InstanceOf()); + Assert.That(() => ConversionHelper.ConvertToModelOptionsOutput(stabilityModelType), Throws.InstanceOf()); } #endregion #region GridOrientation - [TestCase(Orientation.Outwards, MStabGridPosition.Left)] - [TestCase(Orientation.Inwards, MStabGridPosition.Right)] - public static void CanConvertToMStabGridPosition(Orientation gridOrientation, MStabGridPosition mStabGridPosition) + [TestCase(Orientation.Outwards, StabilityGridPosition.Left)] + [TestCase(Orientation.Inwards, StabilityGridPosition.Right)] + public static void CanConvertToMStabGridPosition(Orientation gridOrientation, StabilityGridPosition stabilityGridPosition) { - Assert.That(ConversionHelper.ConvertToMStabGridPosition(gridOrientation), Is.EqualTo(mStabGridPosition)); + Assert.That(ConversionHelper.ConvertToMStabGridPosition(gridOrientation), Is.EqualTo(stabilityGridPosition)); } - [TestCase(MStabGridPosition.Left, Orientation.Outwards)] - [TestCase(MStabGridPosition.Right, Orientation.Inwards)] - public static void CanConvertToGridOrientation(MStabGridPosition mStabGridPosition, Orientation gridOrientation) + [TestCase(StabilityGridPosition.Left, Orientation.Outwards)] + [TestCase(StabilityGridPosition.Right, Orientation.Inwards)] + public static void CanConvertToGridOrientation(StabilityGridPosition stabilityGridPosition, Orientation gridOrientation) { - Assert.That(ConversionHelper.ConvertToGridOrientation(mStabGridPosition), Is.EqualTo(gridOrientation)); + Assert.That(ConversionHelper.ConvertToGridOrientation(stabilityGridPosition), Is.EqualTo(gridOrientation)); } #endregion Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs =================================================================== diff -u -r5304 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs (.../FillEngineFromMacroStabilityWrapperOutput.cs) (revision 5304) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs (.../FillEngineFromMacroStabilityWrapperOutput.cs) (revision 6264) @@ -63,35 +63,35 @@ UpliftVanCalculationGrid = new MacroStability.CSharpWrapper.UpliftVanCalculationGrid() }; - if (outputItem.StabilityModelType == MStabModelType.Bishop) + if (outputItem.StabilityModelType == StabilityModelType.Bishop) { var slidingCircleMinimumSafetyCurve = (SlidingCircleMinimumSafetyCurve) kernelOutput.StabilityOutput.MinimumSafetyCurve; FillBishopSlipCircle(slidingCircleMinimumSafetyCurve, outputItem); } - if (outputItem.StabilityModelType == MStabModelType.UpliftVan) + if (outputItem.StabilityModelType == StabilityModelType.UpliftVan) { var dualSlidingCircleMinimumSafetyCurve = (DualSlidingCircleMinimumSafetyCurve) kernelOutput.StabilityOutput.MinimumSafetyCurve; FillUpliftVanDualSlipCircle(dualSlidingCircleMinimumSafetyCurve, outputItem); } if (macroStabilityOutput.CalculationResult == CalculationResult.Succeeded) { - if (outputItem.StabilityModelType == MStabModelType.Bishop || outputItem.StabilityModelType == MStabModelType.BishopUpliftVan) + if (outputItem.StabilityModelType == StabilityModelType.Bishop || outputItem.StabilityModelType == StabilityModelType.BishopUpliftVan) { var bishopPreprocessingOutput = (BishopPreprocessingOutput) kernelOutput.PreprocessingOutputBase; outputItem.BishopCalculationCircle = bishopPreprocessingOutput.BishopCalculationCircle; } - if (outputItem.StabilityModelType == MStabModelType.UpliftVan || outputItem.StabilityModelType == MStabModelType.BishopUpliftVan) + if (outputItem.StabilityModelType == StabilityModelType.UpliftVan || outputItem.StabilityModelType == StabilityModelType.BishopUpliftVan) { var upliftVanPreprocessingOutput = (UpliftVanPreprocessingOutput) kernelOutput.PreprocessingOutputBase; outputItem.UpliftVanCalculationGrid = upliftVanPreprocessingOutput.UpliftVanCalculationGrid; } } - if (outputItem.StabilityModelType == MStabModelType.Bishop || - outputItem.StabilityModelType == MStabModelType.UpliftVan) + if (outputItem.StabilityModelType == StabilityModelType.Bishop || + outputItem.StabilityModelType == StabilityModelType.UpliftVan) { MinimumSafetyCurveBase minimumSafetyCurveBase = kernelOutput.StabilityOutput.MinimumSafetyCurve; FillSlices(minimumSafetyCurveBase, outputItem); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r4540 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 6264) @@ -41,7 +41,7 @@ failureMechanismSystemType = FailureMechanismSystemType.StabilityInside; FailureMechanismParametersMStab = new FailureMechanismParametersMStab(); CalculationModel = FailureMechanismParametersMStab.MStabParameters.Model; - FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; + FailureMechanismParametersMStab.MStabParameters.GridPosition = StabilityGridPosition.Right; } /// @@ -75,10 +75,10 @@ switch (failureMechanismSystemType) { case FailureMechanismSystemType.StabilityInside: - FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; + FailureMechanismParametersMStab.MStabParameters.GridPosition = StabilityGridPosition.Right; break; case FailureMechanismSystemType.StabilityOutside: - FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; + FailureMechanismParametersMStab.MStabParameters.GridPosition = StabilityGridPosition.Left; break; case FailureMechanismSystemType.Piping: PipingModelType = oldPipingModelType; @@ -138,7 +138,7 @@ } else { - FailureMechanismParametersMStab.MStabParameters.Model = (MStabModelType) value; + FailureMechanismParametersMStab.MStabParameters.Model = (StabilityModelType) value; } } } @@ -149,7 +149,7 @@ /// /// The type of the stability model. /// - public MStabModelType StabilityModelType + public StabilityModelType StabilityModelType { get { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/BishopGridCreatorTests.cs =================================================================== diff -u -r6086 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/BishopGridCreatorTests.cs (.../BishopGridCreatorTests.cs) (revision 6086) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/BishopGridCreatorTests.cs (.../BishopGridCreatorTests.cs) (revision 6264) @@ -44,11 +44,11 @@ private const double bottomLayerSoilProfile1D = -10; [Test] - [TestCase(MStabGridPosition.Right, true)] - [TestCase(MStabGridPosition.Left, true)] - [TestCase(MStabGridPosition.Right, false)] - [TestCase(MStabGridPosition.Left, false)] - public void GivenSlipCircleDefinition_WhenDetermineGrid_ThenGridIsAsExpected(MStabGridPosition gridPosition, bool isGridSpecified) + [TestCase(StabilityGridPosition.Right, true)] + [TestCase(StabilityGridPosition.Left, true)] + [TestCase(StabilityGridPosition.Right, false)] + [TestCase(StabilityGridPosition.Left, false)] + public void GivenSlipCircleDefinition_WhenDetermineGrid_ThenGridIsAsExpected(StabilityGridPosition gridPosition, bool isGridSpecified) { // Given SlipCircleDefinition slipCircleDefinition = CreateSlipCircleDefinition(isGridSpecified); @@ -83,7 +83,7 @@ }); } - private static void CheckValuesGrid(BishopCalculationGrid bishopCalculationGrid, SurfaceLine2 surfaceLine, MStabGridPosition gridPosition) + private static void CheckValuesGrid(BishopCalculationGrid bishopCalculationGrid, SurfaceLine2 surfaceLine, StabilityGridPosition gridPosition) { var expectedXLeft = 0.0; var expectedXRight = 0.0; @@ -98,11 +98,11 @@ double middleX = 0.5 * (dikeTopAtRiver.X + dikeTopAtPolder.X); switch (gridPosition) { - case MStabGridPosition.Left: + case StabilityGridPosition.Left: expectedXRight = middleX; expectedXLeft = middleX - specifiedGridWidth; break; - case MStabGridPosition.Right: + case StabilityGridPosition.Right: expectedXLeft = middleX; expectedXRight = middleX + specifiedGridWidth; break; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs =================================================================== diff -u -r6171 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 6171) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 6264) @@ -29,7 +29,7 @@ /// /// The type of the stability zone. /// - public MStabZonesType StabilityZoneType { get; set; } = MStabZonesType.NoZones; + public StabilityZoneType StabilityZoneType { get; set; } = StabilityZoneType.NoZones; /// /// Gets or sets the forbidden zone factor. Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs =================================================================== diff -u -r5793 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 5793) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 6264) @@ -24,7 +24,7 @@ /// /// Types of (calculation) model. /// -public enum MStabModelType +public enum StabilityModelType { Bishop, UpliftVan, @@ -46,7 +46,7 @@ /// /// Types of search method. /// -public enum MStabSearchMethod +public enum StabilitySearchMethod { Grid, BeeSwarm @@ -55,7 +55,7 @@ /// /// Types of grid position. /// -public enum MStabGridPosition +public enum StabilityGridPosition { Left, Right @@ -64,7 +64,7 @@ /// /// Types of zone. /// -public enum MStabZonesType +public enum StabilityZoneType { NoZones = 0, ForbiddenZone = 2 Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r6191 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 6191) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 6264) @@ -97,12 +97,12 @@ { try { - bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan; - MStabModelType model = FailureMechanismParametersMStab.MStabParameters.Model; + bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.BishopUpliftVan; + StabilityModelType model = FailureMechanismParametersMStab.MStabParameters.Model; if (isBishopUpliftVan) { // if current model is BishopUpliftVan then set to Bishop for proper name/path for input file - model = MStabModelType.Bishop; + model = StabilityModelType.Bishop; } if (damKernelInput.OriginalSoilProfile2D != null) @@ -133,14 +133,14 @@ TrafficLoad = MacroStabilityCommonHelper.FillTrafficLoad(damKernelInput) }; - if (FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.Bishop || - FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan) + if (FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.Bishop || + FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.BishopUpliftVan) { fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput); } - if (FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan || - FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan) + if (FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.UpliftVan || + FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.BishopUpliftVan) { if (!upliftSituation.IsUplift && !isBishopUpliftVan) { @@ -159,13 +159,13 @@ if (isBishopUpliftVan && upliftSituation.IsUplift && firstPrepareResult == PrepareResult.Successful) { - model = MStabModelType.UpliftVan; + model = StabilityModelType.UpliftVan; FailureMechanismParametersMStab.MStabParameters.Model = model; //C#wrapper hier vervangen door MAC direct macroStabilityInput.Input = fillMacroStabilityWrapperFromEngine.CreateMacroStabilityInput(damKernelInput, FailureMechanismParametersMStab.MStabParameters, waterNet); fileNameForSecondCalculation = MacroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model); // reset model - FailureMechanismParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan; + FailureMechanismParametersMStab.MStabParameters.Model = StabilityModelType.BishopUpliftVan; stabilityCalculatorForSecondCalculation = new Calculator(macroStabilityInput.Input); return MacroStabilityCommonHelper.PrepareKernel(stabilityCalculatorForSecondCalculation, fileNameForSecondCalculation); @@ -174,7 +174,7 @@ if (isBishopUpliftVan) { // reset model - FailureMechanismParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan; + FailureMechanismParametersMStab.MStabParameters.Model = StabilityModelType.BishopUpliftVan; } return firstPrepareResult; @@ -222,7 +222,7 @@ MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput); MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput); - bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan; + bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.BishopUpliftVan; if (isBishopUpliftVan) { macroStabilityKernelDataInput.Input.StabilityModel.ModelOption = StabilityModelOptionType.Bishop; @@ -274,7 +274,7 @@ MacroStabilityOutputItem macroStabilityOutputItem = ProperMacroStabilityResultsItem(macroStabilityOutput, 0); AddDesignResult(damKernelInput, designScenario, designResults, macroStabilityOutputItem, macroStabilityOutput); - bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan; + bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.BishopUpliftVan; if (isBishopUpliftVan) { macroStabilityOutputItem = ProperMacroStabilityResultsItem(macroStabilityOutput, 1); @@ -315,7 +315,7 @@ DesignResult overallResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario); MacroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, overallResult, lastIterationIndex); overallResult.StabilityDesignResults.UpliftSituation = macroStabilityOutput!.UpliftSituation; - overallResult.StabilityDesignResults.StabilityModelType = MStabModelType.BishopUpliftVan; + overallResult.StabilityDesignResults.StabilityModelType = StabilityModelType.BishopUpliftVan; if (macroStabilityOutputItem.CalculationResult != CalculationResult.Succeeded) { SoilGeometryProbability subSoilScenario = damKernelInput.SubSoilScenario; @@ -328,7 +328,7 @@ else { DesignResult overallResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario); - overallResult.StabilityDesignResults.StabilityModelType = MStabModelType.BishopUpliftVan; + overallResult.StabilityDesignResults.StabilityModelType = StabilityModelType.BishopUpliftVan; overallResult.CalculationResult = CalculationResult.UnexpectedError; SoilGeometryProbability subSoilScenario = damKernelInput.SubSoilScenario; overallResult.StabilityDesignResults.ResultMessage = designScenario.GetResultMessage(subSoilScenario.SoilProfile1D, subSoilScenario.SoilProfile2D); @@ -481,11 +481,11 @@ private static void AddDesignResultNoRun(DamKernelInput damKernelInput, DesignScenario designScenario, List designResults, MacroStabilityOutput macroStabilityOutput) { DesignResult designResultUpliftNoRun = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario); - designResultUpliftNoRun.StabilityDesignResults.StabilityModelType = MStabModelType.UpliftVan; + designResultUpliftNoRun.StabilityDesignResults.StabilityModelType = StabilityModelType.UpliftVan; designResultUpliftNoRun.CalculationResult = CalculationResult.NoRun; designResultUpliftNoRun.SafetyFactor = null; designResultUpliftNoRun.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation; - designResultUpliftNoRun.CalculationSubDir = designResults.Count == 1 ? designResults[0].CalculationSubDir.Replace(MStabModelType.Bishop.ToString(), MStabModelType.UpliftVan.ToString()) : ""; + designResultUpliftNoRun.CalculationSubDir = designResults.Count == 1 ? designResults[0].CalculationSubDir.Replace(StabilityModelType.Bishop.ToString(), StabilityModelType.UpliftVan.ToString()) : ""; designResults.Add(designResultUpliftNoRun); } Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r6245 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6245) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6264) @@ -215,7 +215,7 @@ { MStabParameters = new MStabParameters { - SearchMethod = MStabSearchMethod.Grid, + SearchMethod = StabilitySearchMethod.Grid, SlipCircleDefinition = new SlipCircleDefinition { UpliftVanGridSizeDetermination = GridSizeDetermination.Specified, @@ -367,7 +367,7 @@ location.DikeEmbankmentMaterial = "DikeMat"; location.StabilityOptions = new StabilityOptions { - StabilityZoneType = MStabZonesType.ForbiddenZone, + StabilityZoneType = StabilityZoneType.ForbiddenZone, ForbiddenZoneFactor = 10.0 * i + 0.42, TrafficLoad = 10.0 * i + 0.44, TrafficLoadDegreeOfConsolidation = 10.0 * i + 0.45, Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r6191 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 6191) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 6264) @@ -57,7 +57,7 @@ public void TestPrepare(double upliftCriterionStability, bool isInputValid, bool expectedIsUplift, PrepareResult expectedPrepareResult) { // Setup - DamKernelInput kernelInput = CreateDamKernelInputForTest(MStabModelType.UpliftVan); + DamKernelInput kernelInput = CreateDamKernelInputForTest(StabilityModelType.UpliftVan); kernelInput.Location.CurrentScenario.UpliftCriterionStability = upliftCriterionStability; var kernelWrapper = new MacroStabilityInwardsKernelWrapper { @@ -97,7 +97,7 @@ { MStabParameters = { - Model = MStabModelType.UpliftVan + Model = StabilityModelType.UpliftVan } } }; @@ -116,7 +116,7 @@ }); // Validate the input when valid input is provided. Expected no messages. - DamKernelInput kernelInput = CreateDamKernelInputForTest(MStabModelType.UpliftVan); + DamKernelInput kernelInput = CreateDamKernelInputForTest(StabilityModelType.UpliftVan); PrepareResult prepareResult = kernelWrapper.Prepare(kernelInput, 0, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput); Assert.That(prepareResult, Is.EqualTo(PrepareResult.Successful)); messages.Clear(); @@ -130,10 +130,10 @@ } [Test] - [TestCase(MStabModelType.Bishop)] - [TestCase(MStabModelType.UpliftVan)] - [TestCase(MStabModelType.BishopUpliftVan)] - public void TestPostProcess(MStabModelType modelType) + [TestCase(StabilityModelType.Bishop)] + [TestCase(StabilityModelType.UpliftVan)] + [TestCase(StabilityModelType.BishopUpliftVan)] + public void TestPostProcess(StabilityModelType modelType) { DamKernelInput kernelInput = CreateDamKernelInputForTest(modelType); var kernelWrapper = new MacroStabilityInwardsKernelWrapper @@ -159,7 +159,7 @@ { new MacroStabilityOutputItem { - StabilityModelType = modelType != MStabModelType.BishopUpliftVan ? modelType : MStabModelType.Bishop, + StabilityModelType = modelType != StabilityModelType.BishopUpliftVan ? modelType : StabilityModelType.Bishop, CalculationResult = CalculationResult.Succeeded, SafetyFactor = 2.34, CalculationPath = testFolder + "@\testpath", @@ -172,11 +172,11 @@ } }; - if (modelType == MStabModelType.BishopUpliftVan) + if (modelType == StabilityModelType.BishopUpliftVan) { var macroStabilityOutputItem = new MacroStabilityOutputItem { - StabilityModelType = MStabModelType.UpliftVan, + StabilityModelType = StabilityModelType.UpliftVan, CalculationResult = CalculationResult.Succeeded, SafetyFactor = 2.01, ActiveCenterPoint = new Point2D(10, 10), @@ -253,7 +253,7 @@ { resultSlice }; - if (modelType == MStabModelType.BishopUpliftVan) + if (modelType == StabilityModelType.BishopUpliftVan) { macroStabilityOutput.StabilityOutputItems[1].ResultSlices = new List { @@ -264,60 +264,60 @@ kernelWrapper.PostProcess(kernelInput, macroStabilityOutput, designScenario, "", out List results); switch (modelType) { - case MStabModelType.Bishop: - case MStabModelType.UpliftVan: + case StabilityModelType.Bishop: + case StabilityModelType.UpliftVan: Assert.That(results.Count, Is.EqualTo(1)); break; - case MStabModelType.BishopUpliftVan: + case StabilityModelType.BishopUpliftVan: Assert.That(results.Count, Is.EqualTo(3)); break; } var expectedNumberOfIterations = new List(); - var expectedStabilityModelType = new List(); + var expectedStabilityModelType = new List(); var expectedSafetyFactor = new List(); switch (modelType) { - case MStabModelType.Bishop: + case StabilityModelType.Bishop: expectedNumberOfIterations = new List { 0 }; - expectedStabilityModelType = new List + expectedStabilityModelType = new List { - MStabModelType.Bishop + StabilityModelType.Bishop }; expectedSafetyFactor = new List { 2.34 }; break; - case MStabModelType.UpliftVan: + case StabilityModelType.UpliftVan: expectedNumberOfIterations = new List { 0 }; - expectedStabilityModelType = new List + expectedStabilityModelType = new List { - MStabModelType.UpliftVan + StabilityModelType.UpliftVan }; expectedSafetyFactor = new List { 2.34 }; break; - case MStabModelType.BishopUpliftVan: + case StabilityModelType.BishopUpliftVan: expectedNumberOfIterations = new List { 0, 0, 0 }; - expectedStabilityModelType = new List + expectedStabilityModelType = new List { - MStabModelType.Bishop, - MStabModelType.UpliftVan, - MStabModelType.BishopUpliftVan + StabilityModelType.Bishop, + StabilityModelType.UpliftVan, + StabilityModelType.BishopUpliftVan }; expectedSafetyFactor = new List { @@ -357,7 +357,7 @@ Assert.That(result.StabilityDesignResults.ActiveCenterPoint.Z, Is.EqualTo(10)); Assert.That(result.StabilityDesignResults.ActiveCenterPointRadius, Is.EqualTo(8)); }); - if (result.StabilityDesignResults.StabilityModelType != MStabModelType.Bishop) + if (result.StabilityDesignResults.StabilityModelType != StabilityModelType.Bishop) { Assert.Multiple(() => { @@ -442,7 +442,7 @@ { MStabParameters = { - Model = MStabModelType.UpliftVan + Model = StabilityModelType.UpliftVan } } }; @@ -465,7 +465,7 @@ public void TestFullCalculationSucceedsWithWarningsWithBadTangentLines() { // Prepare the wrapper. Result is input for the calculation dll - DamKernelInput kernelInput = CreateDamKernelInputForTest(MStabModelType.UpliftVan); + DamKernelInput kernelInput = CreateDamKernelInputForTest(StabilityModelType.UpliftVan); var kernelWrapper = new MacroStabilityInwardsKernelWrapper { FailureMechanismParametersMStab = new FailureMechanismParametersMStab @@ -506,22 +506,22 @@ /// safety factor than On boundary lines because there are extra tangent lines. /// [Test] - [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 1.4948, 4)] - [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.4421, 2)] - [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 1.3570, 6)] - [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.5784, 3)] - [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.3344, 3)] - [TestCase(MStabSearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.3388, 3)] - [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 2.2428, 3)] - [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.8935, 3)] - [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 2.2109, 3)] - [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.3073, 926)] - [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.2978, 800)] - [TestCase(MStabSearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.2986, 924)] - public void GivenUpliftVanModel_WhenCalculatingWithDifferentSearchAreaSettings_ReturnsLogicalResults(MStabSearchMethod searchMethod, GridSizeDetermination gridSizeDetermination, TangentLinesDefinition tangentLinesDefinition, double expectedSafetyFactor, int expectedLogMessageCount) + [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 1.4948, 4)] + [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.4421, 2)] + [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 1.3570, 6)] + [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.5784, 3)] + [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.3344, 3)] + [TestCase(StabilitySearchMethod.Grid, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.3388, 3)] + [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.OnBoundaryLines, 2.2428, 3)] + [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Automatic, 1.8935, 3)] + [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Specified, TangentLinesDefinition.Specified, 2.2109, 3)] + [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.OnBoundaryLines, 1.3073, 926)] + [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Automatic, 1.2978, 800)] + [TestCase(StabilitySearchMethod.BeeSwarm, GridSizeDetermination.Automatic, TangentLinesDefinition.Specified, 1.2986, 924)] + public void GivenUpliftVanModel_WhenCalculatingWithDifferentSearchAreaSettings_ReturnsLogicalResults(StabilitySearchMethod searchMethod, GridSizeDetermination gridSizeDetermination, TangentLinesDefinition tangentLinesDefinition, double expectedSafetyFactor, int expectedLogMessageCount) { // Prepare the wrapper. Result is input for the calculation dll - DamKernelInput kernelInput = CreateDamKernelInputForTest(MStabModelType.UpliftVan, searchMethod, gridSizeDetermination, tangentLinesDefinition); + DamKernelInput kernelInput = CreateDamKernelInputForTest(StabilityModelType.UpliftVan, searchMethod, gridSizeDetermination, tangentLinesDefinition); var kernelWrapper = new MacroStabilityInwardsKernelWrapper { FailureMechanismParametersMStab = new FailureMechanismParametersMStab @@ -552,7 +552,7 @@ }); Assert.That(macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, Is.EqualTo(expectedSafetyFactor).Within(tolerance4Decimals)); - if (searchMethod == MStabSearchMethod.Grid && + if (searchMethod == StabilitySearchMethod.Grid && gridSizeDetermination == GridSizeDetermination.Specified && tangentLinesDefinition == TangentLinesDefinition.OnBoundaryLines) { @@ -576,7 +576,7 @@ var engineInterface = new EngineInterface(inputString); Assert.That(engineInterface.DamProjectData, Is.Not.Null); engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = - MStabModelType.UpliftVan; + StabilityModelType.UpliftVan; var a = engineInterface.DamProjectData.Dike.Locations[0].CurrentScenario.UpliftCriterionStability; Output output = GeneralHelper.RunAfterInputValidation(engineInterface); @@ -683,7 +683,7 @@ } } - private static DamKernelInput CreateDamKernelInputForTest(MStabModelType modelType, MStabSearchMethod searchMethod = MStabSearchMethod.Grid, GridSizeDetermination gridSizeDetermination = GridSizeDetermination.Specified, TangentLinesDefinition tangentLinesDefinition = TangentLinesDefinition.OnBoundaryLines) + private static DamKernelInput CreateDamKernelInputForTest(StabilityModelType modelType, StabilitySearchMethod searchMethod = StabilitySearchMethod.Grid, GridSizeDetermination gridSizeDetermination = GridSizeDetermination.Specified, TangentLinesDefinition tangentLinesDefinition = TangentLinesDefinition.OnBoundaryLines) { Location location = DamEngineDataTestFactory.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1()); // Correction needed in order to make surface line as lengthy as needed to perform a proper calculation. Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r6210 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6210) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6264) @@ -574,9 +574,9 @@ } [Test, Category(Categories.Slow)] - [TestCase(MStabSearchMethod.BeeSwarm, 4, 1.612, 1.536)] - [TestCase(MStabSearchMethod.Grid, 2, 1.610, 1.535)] - public void TestRunMacroStabilityDeltaDijkUpliftVanWith1DProducesStixFiles(MStabSearchMethod searchMethod, int expectedStixFileCount, double expectedSafetyFactor1, double expectedSafetyFactor2) + [TestCase(StabilitySearchMethod.BeeSwarm, 4, 1.612, 1.536)] + [TestCase(StabilitySearchMethod.Grid, 2, 1.610, 1.535)] + public void TestRunMacroStabilityDeltaDijkUpliftVanWith1DProducesStixFiles(StabilitySearchMethod searchMethod, int expectedStixFileCount, double expectedSafetyFactor1, double expectedSafetyFactor2) { // Expected results are taken as is from the first run with the new kernel // Selected location (6-4-1-A-1-F) @@ -638,7 +638,7 @@ "Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_1_s)_result.stix", "Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_2_s)_result.stix" }; - if (searchMethod == MStabSearchMethod.BeeSwarm) + if (searchMethod == StabilitySearchMethod.BeeSwarm) { fileList.Add("Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_1_s)_input.stix"); fileList.Add("Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_2_s)_input.stix"); @@ -653,9 +653,9 @@ } [Test, Category(Categories.Slow)] - [TestCase(MStabSearchMethod.BeeSwarm, 10, 1.612, 1.536)] - [TestCase(MStabSearchMethod.Grid, 8, 1.610, 1.535)] - public void TestRunMacroStabilityDeltaDijkBishopUpliftVanWith1DWithUpliftProducesStixFiles(MStabSearchMethod searchMethod, int expectedStixFileCount, double expectedSafetyFactor1, double expectedSafetyFactor2) + [TestCase(StabilitySearchMethod.BeeSwarm, 10, 1.612, 1.536)] + [TestCase(StabilitySearchMethod.Grid, 8, 1.610, 1.535)] + public void TestRunMacroStabilityDeltaDijkBishopUpliftVanWith1DWithUpliftProducesStixFiles(StabilitySearchMethod searchMethod, int expectedStixFileCount, double expectedSafetyFactor1, double expectedSafetyFactor2) { // Expected results are taken as is from the first run with the new kernel // This tests use of 1D profiles @@ -727,7 +727,7 @@ "Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_1_s)_result.stix", "Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_2_s)_result.stix" }; - if (searchMethod == MStabSearchMethod.BeeSwarm) + if (searchMethod == StabilitySearchMethod.BeeSwarm) { fileList.Add("Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_1_s)_input.stix"); fileList.Add("Stability\\UpliftVan\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_2_s)_input.stix"); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs =================================================================== diff -u -r6217 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 6217) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 6264) @@ -350,7 +350,7 @@ timeSerieEntry.Value = designResults[0].SafetyFactor.Value; if (damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismSystemType is FailureMechanismSystemType.StabilityInside or FailureMechanismSystemType.StabilityOutside - && designResults[0].StabilityDesignResults is { StabilityModelType: MStabModelType.Bishop }) + && designResults[0].StabilityDesignResults is { StabilityModelType: StabilityModelType.Bishop }) { timeSerieEntry.BishopCircleCentreX = designResults[0].StabilityDesignResults.ActiveCenterPoint.X; timeSerieEntry.BishopCircleCentreZ = designResults[0].StabilityDesignResults.ActiveCenterPoint.Z; @@ -372,7 +372,7 @@ switch (currentSpecification.FailureMechanismSystemType) { case FailureMechanismSystemType.StabilityOutside: - if (currentSpecification.StabilityModelType == MStabModelType.Bishop) + if (currentSpecification.StabilityModelType == StabilityModelType.Bishop) { parameter = TimeSerieParameters.StabilityOutsideFactor.ToString(); break; @@ -382,9 +382,9 @@ case FailureMechanismSystemType.StabilityInside: switch (currentSpecification.StabilityModelType) { - case MStabModelType.Bishop: - case MStabModelType.UpliftVan: - case MStabModelType.BishopUpliftVan: + case StabilityModelType.Bishop: + case StabilityModelType.UpliftVan: + case StabilityModelType.BishopUpliftVan: parameter = TimeSerieParameters.StabilityInsideFactor.ToString(); break; default: Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs =================================================================== diff -u -r6167 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6167) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6264) @@ -114,41 +114,41 @@ /// The MacroStability search algorithm. /// /// - public static MStabSearchMethod ConvertToDamSearchMethod(SearchAlgorithm searchAlgorithm) + public static StabilitySearchMethod ConvertToDamSearchMethod(SearchAlgorithm searchAlgorithm) { if (searchAlgorithm != SearchAlgorithm.Grid && searchAlgorithm != SearchAlgorithm.Genetic && searchAlgorithm != SearchAlgorithm.BeeswarmAndLevenbergMarquardt) { throw new ArgumentException($"Unsupported search algorithm: {searchAlgorithm}"); } - var translationTable = new Dictionary + var translationTable = new Dictionary { { - SearchAlgorithm.Grid, MStabSearchMethod.Grid + SearchAlgorithm.Grid, StabilitySearchMethod.Grid }, { - SearchAlgorithm.BeeswarmAndLevenbergMarquardt, MStabSearchMethod.BeeSwarm + SearchAlgorithm.BeeswarmAndLevenbergMarquardt, StabilitySearchMethod.BeeSwarm } }; return translationTable[searchAlgorithm]; } /// Converts MStabSearchMethod to SearchAlgorithm. - /// The Dam search algorithm. + /// The Dam search algorithm. /// /// - public static SearchAlgorithm ConvertToMacroStabilitySearchMethod(MStabSearchMethod mStabSearchMethod) + public static SearchAlgorithm ConvertToMacroStabilitySearchMethod(StabilitySearchMethod stabilitySearchMethod) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabSearchMethod.Grid, SearchAlgorithm.Grid + StabilitySearchMethod.Grid, SearchAlgorithm.Grid }, { - MStabSearchMethod.BeeSwarm, SearchAlgorithm.BeeswarmAndLevenbergMarquardt + StabilitySearchMethod.BeeSwarm, SearchAlgorithm.BeeswarmAndLevenbergMarquardt } }; - return translationTable[mStabSearchMethod]; + return translationTable[stabilitySearchMethod]; } #endregion @@ -159,67 +159,67 @@ /// This comes back from the kernel side so any model that can be matched is OK. /// The model option. /// the Dam MStabModelType - public static MStabModelType ConvertToMStabModelType(StabilityModelOptionType modelOption) + public static StabilityModelType ConvertToMStabModelType(StabilityModelOptionType modelOption) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - StabilityModelOptionType.Bishop, MStabModelType.Bishop + StabilityModelOptionType.Bishop, StabilityModelType.Bishop }, { - StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan + StabilityModelOptionType.UpliftVan, StabilityModelType.UpliftVan } //{MacroStability.CSharpWrapper.Output.StabilityModelOption.Spencer, MStabModelType.UpliftSpencerWti} }; return translationTable[modelOption]; } /// Converts to ModelOptions type. - /// the MStabModelType. + /// the MStabModelType. /// the MacroStability ModelOption /// - public static StabilityModelOptionType ConvertToModelOptions(MStabModelType mStabModelType) + public static StabilityModelOptionType ConvertToModelOptions(StabilityModelType stabilityModelType) { // For the Macrostability kernel, the only supported options for now are Bishop and UpliftVan. - if (mStabModelType != MStabModelType.UpliftVan && mStabModelType != MStabModelType.Bishop) + if (stabilityModelType != StabilityModelType.UpliftVan && stabilityModelType != StabilityModelType.Bishop) { - throw new ArgumentException($"Unsupported MStabModelType: {mStabModelType}"); + throw new ArgumentException($"Unsupported MStabModelType: {stabilityModelType}"); } - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan + StabilityModelType.UpliftVan, StabilityModelOptionType.UpliftVan }, { - MStabModelType.Bishop, StabilityModelOptionType.Bishop + StabilityModelType.Bishop, StabilityModelOptionType.Bishop } }; - return translationTable[mStabModelType]; + return translationTable[stabilityModelType]; } /// Converts to ModelOptions type. - /// the MStabModelType. + /// the MStabModelType. /// the MacroStability ModelOption /// - public static StabilityModelOptionType ConvertToModelOptionsOutput(MStabModelType mStabModelType) + public static StabilityModelOptionType ConvertToModelOptionsOutput(StabilityModelType stabilityModelType) { // For the Macrostability kernel, the only supported options for now are Bishop and UpliftVan. - if (mStabModelType != MStabModelType.Bishop && mStabModelType != MStabModelType.UpliftVan) + if (stabilityModelType != StabilityModelType.Bishop && stabilityModelType != StabilityModelType.UpliftVan) { - throw new ArgumentException($"Unsupported MStabModelType: {mStabModelType}"); + throw new ArgumentException($"Unsupported MStabModelType: {stabilityModelType}"); } - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabModelType.Bishop, StabilityModelOptionType.Bishop + StabilityModelType.Bishop, StabilityModelOptionType.Bishop }, { - MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan + StabilityModelType.UpliftVan, StabilityModelOptionType.UpliftVan } }; - return translationTable[mStabModelType]; + return translationTable[stabilityModelType]; } #endregion @@ -229,35 +229,35 @@ /// Converts to MStabGridPosition. /// The grid orientation. /// - public static MStabGridPosition ConvertToMStabGridPosition(Orientation gridOrientation) + public static StabilityGridPosition ConvertToMStabGridPosition(Orientation gridOrientation) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - Orientation.Inwards, MStabGridPosition.Right + Orientation.Inwards, StabilityGridPosition.Right }, { - Orientation.Outwards, MStabGridPosition.Left + Orientation.Outwards, StabilityGridPosition.Left } }; return translationTable[gridOrientation]; } /// Converts to GridOrientation. - /// The MStabGridPosition. + /// The MStabGridPosition. /// - public static Orientation ConvertToGridOrientation(MStabGridPosition mStabGridPosition) + public static Orientation ConvertToGridOrientation(StabilityGridPosition stabilityGridPosition) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabGridPosition.Right, Orientation.Inwards + StabilityGridPosition.Right, Orientation.Inwards }, { - MStabGridPosition.Left, Orientation.Outwards + StabilityGridPosition.Left, Orientation.Outwards } }; - return translationTable[mStabGridPosition]; + return translationTable[stabilityGridPosition]; } #endregion Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r6251 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6251) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6264) @@ -661,18 +661,18 @@ /// /// Type of the stability model. /// - public static InputStabilityModelType ConvertToInputStabilityModelType(MStabModelType stabilityModelType) + public static InputStabilityModelType ConvertToInputStabilityModelType(StabilityModelType stabilityModelType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabModelType.Bishop, InputStabilityModelType.Bishop + StabilityModelType.Bishop, InputStabilityModelType.Bishop }, { - MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan + StabilityModelType.UpliftVan, InputStabilityModelType.UpliftVan }, { - MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan + StabilityModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan } }; return translationTable[stabilityModelType]; @@ -683,18 +683,18 @@ /// /// Type of the input stability model. /// - public static MStabModelType ConvertToStabilityModelType(InputStabilityModelType inputStabilityModelType) + public static StabilityModelType ConvertToStabilityModelType(InputStabilityModelType inputStabilityModelType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - InputStabilityModelType.Bishop, MStabModelType.Bishop + InputStabilityModelType.Bishop, StabilityModelType.Bishop }, { - InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan + InputStabilityModelType.UpliftVan, StabilityModelType.UpliftVan }, { - InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan + InputStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan } }; return translationTable[inputStabilityModelType]; @@ -705,18 +705,18 @@ /// /// Type of the stability model. /// - public static DesignResultStabilityDesignResultsStabilityModelType ConvertToOutputStabilityModelType(MStabModelType stabilityModelType) + public static DesignResultStabilityDesignResultsStabilityModelType ConvertToOutputStabilityModelType(StabilityModelType stabilityModelType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop + StabilityModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop }, { - MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan + StabilityModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan }, { - MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan + StabilityModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan } }; return translationTable[stabilityModelType]; @@ -727,18 +727,18 @@ /// /// Type of the output stability model. /// - public static MStabModelType ConvertToStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType) + public static StabilityModelType ConvertToStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop + DesignResultStabilityDesignResultsStabilityModelType.Bishop, StabilityModelType.Bishop }, { - DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan + DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, StabilityModelType.UpliftVan }, { - DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan + DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan } }; return translationTable[outputStabilityModelType]; @@ -787,15 +787,15 @@ /// /// Type of the zone. /// - public static LocationStabilityOptionsZoneType ConvertToInputZoneType(MStabZonesType zoneType) + public static LocationStabilityOptionsZoneType ConvertToInputZoneType(StabilityZoneType zoneType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabZonesType.NoZones, LocationStabilityOptionsZoneType.NoZones + StabilityZoneType.NoZones, LocationStabilityOptionsZoneType.NoZones }, { - MStabZonesType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones + StabilityZoneType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones } }; return translationTable[zoneType]; @@ -806,15 +806,15 @@ /// /// Type of the input zone. /// - public static MStabZonesType ConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType) + public static StabilityZoneType ConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - LocationStabilityOptionsZoneType.NoZones, MStabZonesType.NoZones + LocationStabilityOptionsZoneType.NoZones, StabilityZoneType.NoZones }, { - LocationStabilityOptionsZoneType.ForbiddenZones, MStabZonesType.ForbiddenZone + LocationStabilityOptionsZoneType.ForbiddenZones, StabilityZoneType.ForbiddenZone } }; return translationTable[inputZoneType]; @@ -825,15 +825,15 @@ /// /// The search method. /// - public static StabilityParametersSearchMethod ConvertToInputSearchMethod(MStabSearchMethod searchMethod) + public static StabilityParametersSearchMethod ConvertToInputSearchMethod(StabilitySearchMethod searchMethod) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabSearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid + StabilitySearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid }, { - MStabSearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm + StabilitySearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm } }; return translationTable[searchMethod]; @@ -844,15 +844,15 @@ /// /// The search method. /// - public static MStabSearchMethod ConvertToSearchMethod(StabilityParametersSearchMethod searchMethod) + public static StabilitySearchMethod ConvertToSearchMethod(StabilityParametersSearchMethod searchMethod) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - StabilityParametersSearchMethod.CalculationGrid, MStabSearchMethod.Grid + StabilityParametersSearchMethod.CalculationGrid, StabilitySearchMethod.Grid }, { - StabilityParametersSearchMethod.BeeSwarm, MStabSearchMethod.BeeSwarm + StabilityParametersSearchMethod.BeeSwarm, StabilitySearchMethod.BeeSwarm } }; return translationTable[searchMethod]; @@ -1366,18 +1366,18 @@ /// /// Type of failure mechanism. /// Type of the output object. - public static OperationalStaticDataStabilityModel ConvertToOutputOperationalStabilityModel(MStabModelType stabilityModelType) + public static OperationalStaticDataStabilityModel ConvertToOutputOperationalStabilityModel(StabilityModelType stabilityModelType) { - var translationTable = new Dictionary + var translationTable = new Dictionary { { - MStabModelType.Bishop, OperationalStaticDataStabilityModel.Bishop + StabilityModelType.Bishop, OperationalStaticDataStabilityModel.Bishop }, { - MStabModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan + StabilityModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan }, { - MStabModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan + StabilityModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan } }; return translationTable[stabilityModelType]; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs =================================================================== diff -u -r6191 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs (.../MacroStabilityOutwardsKernelWrapper.cs) (revision 6191) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs (.../MacroStabilityOutwardsKernelWrapper.cs) (revision 6264) @@ -95,7 +95,7 @@ { try { - if (FailureMechanismParametersMStab.MStabParameters.Model != MStabModelType.Bishop) + if (FailureMechanismParametersMStab.MStabParameters.Model != StabilityModelType.Bishop) { throw new NotImplementedException(); } @@ -118,9 +118,9 @@ { TrafficLoad = MacroStabilityCommonHelper.FillTrafficLoad(damKernelInput) }; - FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; + FailureMechanismParametersMStab.MStabParameters.GridPosition = StabilityGridPosition.Left; damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab - .MStabParameters.GridPosition = MStabGridPosition.Left; + .MStabParameters.GridPosition = StabilityGridPosition.Left; fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput); macroStabilityInput.Input = fillMacroStabilityWrapperFromEngine.CreateMacroStabilityInput(damKernelInput, FailureMechanismParametersMStab.MStabParameters, waterNet); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs =================================================================== diff -u -r6132 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 6132) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 6264) @@ -49,7 +49,7 @@ case FailureMechanismSystemType.StabilityOutside: switch (currentSpecification.StabilityModelType) { - case MStabModelType.Bishop: + case StabilityModelType.Bishop: kernelWrapper = new MacroStabilityOutwardsKernelWrapper(); var macroStabilityOutwardsKernelWrapper = (MacroStabilityOutwardsKernelWrapper) kernelWrapper; macroStabilityOutwardsKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab.Copy(); @@ -62,9 +62,9 @@ case FailureMechanismSystemType.StabilityInside: switch (currentSpecification.StabilityModelType) { - case MStabModelType.Bishop: - case MStabModelType.BishopUpliftVan: - case MStabModelType.UpliftVan: + case StabilityModelType.Bishop: + case StabilityModelType.BishopUpliftVan: + case StabilityModelType.UpliftVan: kernelWrapper = new MacroStabilityInwardsKernelWrapper(); var macroStabilityInwardsKernelWrapper = (MacroStabilityInwardsKernelWrapper) kernelWrapper; macroStabilityInwardsKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab.Copy(); Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r6217 -r6264 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6217) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6264) @@ -109,7 +109,7 @@ damProjectData.DamProjectCalculationSpecification = new DamProjectCalculationSpecification(); damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(new DamFailureMechanismeCalculationSpecification()); damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside; - damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.Bishop; + damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = StabilityModelType.Bishop; for (var i = 0; i < designResultsCount; i++) { var result = new DesignResult("location " + i, "Scenario " + (i * 2)) @@ -197,9 +197,9 @@ var stabilityMStabModelTypes = new[] { - MStabModelType.Bishop, - MStabModelType.UpliftVan, - MStabModelType.BishopUpliftVan + StabilityModelType.Bishop, + StabilityModelType.UpliftVan, + StabilityModelType.BishopUpliftVan }; result.StabilityDesignResults = new StabilityDesignResults @@ -242,16 +242,16 @@ { switch (stabilityDesignResults.StabilityModelType) { - case MStabModelType.Bishop: + case StabilityModelType.Bishop: stabilityDesignResults.ActiveCenterPoint = new Point2D { X = 100, Z = -10 }; stabilityDesignResults.ActiveCenterPointRadius = 50; break; - case MStabModelType.UpliftVan: - case MStabModelType.BishopUpliftVan: + case StabilityModelType.UpliftVan: + case StabilityModelType.BishopUpliftVan: stabilityDesignResults.ActiveCenterPoint = new Point2D { X = 100, @@ -267,7 +267,7 @@ break; } - if (stabilityDesignResults.StabilityModelType is MStabModelType.Bishop or MStabModelType.UpliftVan or MStabModelType.BishopUpliftVan) + if (stabilityDesignResults.StabilityModelType is StabilityModelType.Bishop or StabilityModelType.UpliftVan or StabilityModelType.BishopUpliftVan) { stabilityDesignResults.ResultSlices = new List(); for (var i = 0; i < 9; i++) @@ -319,9 +319,9 @@ var supportedModelTypeValues = new[] { - MStabModelType.Bishop, - MStabModelType.UpliftVan, - MStabModelType.BishopUpliftVan + StabilityModelType.Bishop, + StabilityModelType.UpliftVan, + StabilityModelType.BishopUpliftVan }; var stabilityDesignResults = new StabilityDesignResults { @@ -413,7 +413,7 @@ }; } - private static DesignResultStabilityDesignResultsStabilityModelType? Convert(MStabModelType? stabilityModelType) + private static DesignResultStabilityDesignResultsStabilityModelType? Convert(StabilityModelType? stabilityModelType) { if (stabilityModelType.HasValue) {