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) {