Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r6202 -r6219 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6202) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6219) @@ -89,9 +89,9 @@ TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection); if (output.Results.OperationalStaticData is { StabilityModel: OperationalStaticDataStabilityModel.Bishop }) { - TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection, TimeSerieParameters.BishopCircleX.ToString()); - TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection, TimeSerieParameters.BishopCircleZ.ToString()); - TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection, TimeSerieParameters.BishopRadius.ToString()); + TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection, TimeSerieParameters.BishopCircleCentreX.ToString()); + TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection, TimeSerieParameters.BishopCircleCentreZ.ToString()); + TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection, TimeSerieParameters.BishopCircleRadius.ToString()); } } @@ -120,15 +120,15 @@ { timeSerieEntry.Value = entry.Value; } - if (parameterId == TimeSerieParameters.BishopCircleX.ToString()) + if (parameterId == TimeSerieParameters.BishopCircleCentreX.ToString()) { timeSerieEntry.Value = entry.BishopCalculatedSlipPlane is { Center: not null } ? entry.BishopCalculatedSlipPlane.Center.X : double.NaN; } - if (parameterId == TimeSerieParameters.BishopCircleZ.ToString()) + if (parameterId == TimeSerieParameters.BishopCircleCentreZ.ToString()) { timeSerieEntry.Value = entry.BishopCalculatedSlipPlane is { Center: not null } ? entry.BishopCalculatedSlipPlane.Center.Z : double.NaN; } - if (parameterId == TimeSerieParameters.BishopRadius.ToString()) + if (parameterId == TimeSerieParameters.BishopCircleRadius.ToString()) { timeSerieEntry.Value = entry.BishopCalculatedSlipPlane?.Radius ?? double.NaN; } Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs =================================================================== diff -u -r6114 -r6219 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs (.../DamLivePulauTekongTests.cs) (revision 6114) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs (.../DamLivePulauTekongTests.cs) (revision 6219) @@ -70,23 +70,23 @@ TimeSerieEntry firstEntry = timeSeries.Entries.First(); Assert.That(firstEntry.Value, Is.EqualTo(1.439).Within(cTolerance), "The computed safety factory is not correct"); } - if (timeSeries.ParameterId == TimeSerieParameters.BishopCircleX.ToString()) + if (timeSeries.ParameterId == TimeSerieParameters.BishopCircleCentreX.ToString()) { isFirstCircleXFound = true; TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(32.875).Within(cTolerance), "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(32.875).Within(cTolerance), "The computed bishop circle centre X is not correct"); } - if (timeSeries.ParameterId == TimeSerieParameters.BishopCircleZ.ToString()) + if (timeSeries.ParameterId == TimeSerieParameters.BishopCircleCentreZ.ToString()) { isFirstCircleZFound = true; TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(109.375).Within(cTolerance), "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(109.375).Within(cTolerance), "The computed bishop circle centre Z is not correct"); } - if (timeSeries.ParameterId == TimeSerieParameters.BishopRadius.ToString()) + if (timeSeries.ParameterId == TimeSerieParameters.BishopCircleRadius.ToString()) { isFirstRadiusFound = true; TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(13.575).Within(cTolerance), "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(13.575).Within(cTolerance), "The computed bishop circle radius is not correct"); } } if (timeSeries.LocationId == "SD CS3 10-10") @@ -105,9 +105,9 @@ Assert.That(seriesCount, Is.EqualTo(20)); Assert.That(isFirstResultFound, Is.True, "The first location has no output for stability inside"); Assert.That(isLastResultFound, Is.True, "The last location has no output for stability inside"); - Assert.That(isFirstCircleXFound, Is.True, "The first location has no output for bishop circle X"); - Assert.That(isFirstCircleZFound, Is.True, "The first location has no output for bishop circle Z"); - Assert.That(isFirstRadiusFound, Is.True, "The first location has no output for bishop radius"); + Assert.That(isFirstCircleXFound, Is.True, "The first location has no output for bishop circle centre X"); + Assert.That(isFirstCircleZFound, Is.True, "The first location has no output for bishop circle centre Z"); + Assert.That(isFirstRadiusFound, Is.True, "The first location has no output for bishop circle radius"); }); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r6203 -r6219 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6203) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6219) @@ -173,19 +173,12 @@ /// public enum TimeSerieParameters { - [Obsolete("Use StabilityInsideFactor instead")] - SafetyFactor, // <- Is same as StabilityInsideFactor, kept for legacy code - PipingFactorWti, - PipingFactorBligh, - PipingFactorSellmeijer, - ProbabilityOfFailurePipingSellmeijer, - OvertoppingErosion, StabilityInsideFactor, StabilityOutsideFactor, PipingFactor, - BishopCircleX, - BishopCircleZ, - BishopRadius + BishopCircleCentreX, + BishopCircleCentreZ, + BishopCircleRadius } public enum UpliftType