Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r6194 -r6217 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6194) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6217) @@ -90,9 +90,9 @@ }; if (entry.BishopCalculatedSlipPlane != null) { - timeSerieEntry.BishopCircleX = entry.BishopCalculatedSlipPlane.Center.X; - timeSerieEntry.BishopCircleZ = entry.BishopCalculatedSlipPlane.Center.Z; - timeSerieEntry.BishopRadius = entry.BishopCalculatedSlipPlane.Radius; + timeSerieEntry.BishopCircleCentreX = entry.BishopCalculatedSlipPlane.Center.X; + timeSerieEntry.BishopCircleCentreZ = entry.BishopCalculatedSlipPlane.Center.Z; + timeSerieEntry.BishopCircleRadius = entry.BishopCalculatedSlipPlane.Radius; } timeSerie.Entries.Add(timeSerieEntry); } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r6194 -r6217 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6194) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6217) @@ -482,17 +482,17 @@ DateTime = timestepEntry.DateTime, Value = timestepEntry.Value }; - if (timestepEntry.BishopCircleX.HasValue && timestepEntry.BishopCircleZ.HasValue && timestepEntry.BishopRadius.HasValue) + if (timestepEntry.BishopCircleCentreX.HasValue && timestepEntry.BishopCircleCentreZ.HasValue && timestepEntry.BishopCircleRadius.HasValue) { timeStep.BishopCalculatedSlipPlane = new BishopCalculatedSlipPlaneType { SafetyFactor = timestepEntry.Value, Center = new Point2DType { - X = (double) timestepEntry.BishopCircleX, - Z = (double) timestepEntry.BishopCircleZ + X = (double) timestepEntry.BishopCircleCentreX, + Z = (double) timestepEntry.BishopCircleCentreZ }, - Radius = (double) timestepEntry.BishopRadius + Radius = (double) timestepEntry.BishopCircleRadius }; } outputTimeSerie.Entries.TimeSerieEntryOutput[timeSerieEntryIndex] = timeStep; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r6194 -r6217 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6194) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6217) @@ -21,8 +21,6 @@ using System; using System.Collections.Generic; -using System.IO; -using System.Xml.Serialization; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.General.TimeSeries; @@ -307,9 +305,9 @@ { DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0), Value = 1 + j * 0.1, - BishopCircleX = 2 + j * 0.2, - BishopCircleZ = 3 + j * 0.3, - BishopRadius = 4 + j * 0.4 + BishopCircleCentreX = 2 + j * 0.2, + BishopCircleCentreZ = 3 + j * 0.3, + BishopCircleRadius = 4 + j * 0.4 }); } } @@ -488,10 +486,13 @@ private static void AssertCharacteristicPoint(CharacteristicPoint expected, SurfaceLinePoint actual) { - Assert.That(actual.X, Is.EqualTo(expected.Point.X)); - Assert.That(actual.Z, Is.EqualTo(expected.Point.Z)); - Assert.That(actual.PointType, - Is.EqualTo(ConversionHelper.ConvertToInputPointType(expected.CharacteristicPointType))); + Assert.Multiple(() => + { + Assert.That(actual.X, Is.EqualTo(expected.Point.X)); + Assert.That(actual.Z, Is.EqualTo(expected.Point.Z)); + Assert.That(actual.PointType, + Is.EqualTo(ConversionHelper.ConvertToInputPointType(expected.CharacteristicPointType))); + }); } private void CompareDamProjectData(DamProjectData actual, DamProjectData expected) Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs =================================================================== diff -u -r6194 -r6217 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs (.../TimeSerieEntry.cs) (revision 6194) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs (.../TimeSerieEntry.cs) (revision 6217) @@ -36,9 +36,9 @@ public virtual DateTime DateTime { get; set; } public virtual double Value { get; set; } - public virtual double? BishopCircleX { get; set; } - public virtual double? BishopCircleZ { get; set; } - public virtual double? BishopRadius { get; set; } + public virtual double? BishopCircleCentreX { get; set; } + public virtual double? BishopCircleCentreZ { get; set; } + public virtual double? BishopCircleRadius { get; set; } public TimeSerieEntry GetShallowCopy() { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs =================================================================== diff -u -r6191 -r6217 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 6191) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 6217) @@ -352,9 +352,9 @@ FailureMechanismSystemType.StabilityInside or FailureMechanismSystemType.StabilityOutside && designResults[0].StabilityDesignResults is { StabilityModelType: MStabModelType.Bishop }) { - timeSerieEntry.BishopCircleX = designResults[0].StabilityDesignResults.ActiveCenterPoint.X; - timeSerieEntry.BishopCircleZ = designResults[0].StabilityDesignResults.ActiveCenterPoint.Z; - timeSerieEntry.BishopRadius = designResults[0].StabilityDesignResults.ActiveCenterPointRadius; + timeSerieEntry.BishopCircleCentreX = designResults[0].StabilityDesignResults.ActiveCenterPoint.X; + timeSerieEntry.BishopCircleCentreZ = designResults[0].StabilityDesignResults.ActiveCenterPoint.Z; + timeSerieEntry.BishopCircleRadius = designResults[0].StabilityDesignResults.ActiveCenterPointRadius; } } }