Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 4000) @@ -29,6 +29,7 @@ using Deltares.DamEngine.Io.XmlOutput; using DesignResult = Deltares.DamEngine.Io.XmlOutput.DesignResult; using TimeSerie = Deltares.DamEngine.Io.XmlOutput.TimeSerie; +using UpliftSituation = Deltares.DamEngine.Io.XmlOutput.UpliftSituation; namespace Deltares.DamEngine.Interface { @@ -49,27 +50,30 @@ { damProjectData = new DamProjectData(); } + //var damProjectData = new DamProjectData(); if (output != null && output.Results != null && output.Results.CalculationResults != null) { if (output.Results.CalculationResults != null) { CreateDesignResultsOutput(output, damProjectData); - } + } } + if (output != null && output.Results != null && output.Results.OperationalOutputTimeSeries != null) { damProjectData.OutputTimeSerieCollection = new TimeSerieCollection(); TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection); } + return damProjectData; } private static void TransferOutputTimeSeries(TimeSerie[] outputTimeSeries, TimeSerieCollection outputTimeSerieCollection) { - foreach (var outputTimeSerie in outputTimeSeries) + foreach (TimeSerie outputTimeSerie in outputTimeSeries) { - var timeSerie = outputTimeSerieCollection.AddNewSeries(outputTimeSerie.LocationId); + Data.General.TimeSeries.TimeSerie timeSerie = outputTimeSerieCollection.AddNewSeries(outputTimeSerie.LocationId); timeSerie.ParameterId = outputTimeSerie.ParameterId; timeSerie.ForecastDateTime = outputTimeSerie.ForecastDateTime; timeSerie.Type = outputTimeSerie.Type; @@ -88,20 +92,21 @@ timeSerie.TimeStep.MultiplierSpecified = outputTimeSerie.TimeStep.MultiplierSpecified1; timeSerie.TimeStep.DividerSpecified = outputTimeSerie.TimeStep.DividerSpecified1; timeSerie.TimeStep.Unit = ConversionHelper.ConvertToTimeStepUnit(outputTimeSerie.TimeStep.TimeStepUnit); - for (int i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++) + for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++) { - var entry = outputTimeSerie.Entries.TimeSerieEntry[i]; + TimeSerieEntriesTimeSerieEntry entry = outputTimeSerie.Entries.TimeSerieEntry[i]; Stochast stochastValue = null; if (entry.StochastValue != null) { - stochastValue = new Stochast() + stochastValue = new Stochast { Distribution = entry.StochastValue.Distribution, Mean = entry.StochastValue.Mean, StandardDeviation = entry.StochastValue.StandardDeviation }; } - TimeSerieEntry timeSerieEntry = new TimeSerieEntry() + + var timeSerieEntry = new TimeSerieEntry { DateTime = entry.DateTime, Value = entry.Value, @@ -119,9 +124,9 @@ { // Design results damProjectData.DesignCalculations = new List(); - for (int i = 0; i < output.Results.CalculationResults.Length; i++) + for (var i = 0; i < output.Results.CalculationResults.Length; i++) { - var designResult = output.Results.CalculationResults[i]; + DesignResult designResult = output.Results.CalculationResults[i]; var desResult = new Data.General.Results.DesignResult(designResult.LocationName, designResult.ScenarioName) { BaseFileName = designResult.BaseFileName, @@ -130,24 +135,25 @@ CalculationResult = ConversionHelper.ConvertToCalculationResult(designResult.CalculationResult) }; - if (designResult.PipingDesignResults != null) { CreateDesignResultsPipingOutput(designResult, desResult); } + if (designResult.StabilityDesignResults != null) { CreateDesignResultsStabilityOutput(designResult, desResult); } + damProjectData.DesignCalculations.Add(desResult); } if (output.Results.CalculationMessages != null) { damProjectData.CalculationMessages = new List(); - for (int i = 0; i < output.Results.CalculationMessages.Length; i++) + for (var i = 0; i < output.Results.CalculationMessages.Length; i++) { - var validationResult = output.Results.CalculationMessages[i]; + Message validationResult = output.Results.CalculationMessages[i]; var logMessage = new LogMessage { MessageType = ConversionHelper.ConvertToLogMessageType(validationResult.MessageType), @@ -163,11 +169,20 @@ { var model = PipingModelType.Bligh; if (designResult.PipingDesignResults.Sellmeijer4ForcesFactorSpecified) + { model = PipingModelType.Sellmeijer4Forces; + } + if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified) + { model = PipingModelType.SellmeijerVnk; + } + if (designResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified) + { model = PipingModelType.Wti2017; + } + desResult.PipingDesignResults = new PipingDesignResults(model) { ResultMessage = designResult.PipingDesignResults.ResultMessage @@ -181,55 +196,125 @@ desResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Geometry = desResult.PipingDesignResults.RedesignedSurfaceLine.Geometry; AddPointsToSurfaceLine(designResult.PipingDesignResults.RedesignedSurfaceLine, desResult.PipingDesignResults.RedesignedSurfaceLine); } - if (designResult.PipingDesignResults.UpliftFactorSpecified) desResult.PipingDesignResults.UpliftFactor = designResult.PipingDesignResults.UpliftFactor; - if (designResult.PipingDesignResults.HeaveFactorSpecified) desResult.PipingDesignResults.HeaveFactor = designResult.PipingDesignResults.HeaveFactor; + if (designResult.PipingDesignResults.UpliftFactorSpecified) + { + desResult.PipingDesignResults.UpliftFactor = designResult.PipingDesignResults.UpliftFactor; + } - if (designResult.PipingDesignResults.BlighFactorSpecified) desResult.PipingDesignResults.BlighFactor = designResult.PipingDesignResults.BlighFactor; + if (designResult.PipingDesignResults.HeaveFactorSpecified) + { + desResult.PipingDesignResults.HeaveFactor = designResult.PipingDesignResults.HeaveFactor; + } - if (designResult.PipingDesignResults.BlighHcriticalSpecified) desResult.PipingDesignResults.BlighHcritical = designResult.PipingDesignResults.BlighHcritical; + if (designResult.PipingDesignResults.BlighFactorSpecified) + { + desResult.PipingDesignResults.BlighFactor = designResult.PipingDesignResults.BlighFactor; + } - if (designResult.PipingDesignResults.Sellmeijer4ForcesFactorSpecified) desResult.PipingDesignResults.Sellmeijer4ForcesFactor = designResult.PipingDesignResults.Sellmeijer4ForcesFactor; + if (designResult.PipingDesignResults.BlighHcriticalSpecified) + { + desResult.PipingDesignResults.BlighHcritical = designResult.PipingDesignResults.BlighHcritical; + } - if (designResult.PipingDesignResults.Sellmeijer4ForcesHcriticalSpecified) desResult.PipingDesignResults.Sellmeijer4ForcesHcritical = designResult.PipingDesignResults.Sellmeijer4ForcesHcritical; + if (designResult.PipingDesignResults.Sellmeijer4ForcesFactorSpecified) + { + desResult.PipingDesignResults.Sellmeijer4ForcesFactor = designResult.PipingDesignResults.Sellmeijer4ForcesFactor; + } - if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified) desResult.PipingDesignResults.SellmeijerVnkFactor = designResult.PipingDesignResults.SellmeijerVnkFactor; + if (designResult.PipingDesignResults.Sellmeijer4ForcesHcriticalSpecified) + { + desResult.PipingDesignResults.Sellmeijer4ForcesHcritical = designResult.PipingDesignResults.Sellmeijer4ForcesHcritical; + } - if (designResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified) desResult.PipingDesignResults.SellmeijerVnkHcritical = designResult.PipingDesignResults.SellmeijerVnkHcritical; + if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified) + { + desResult.PipingDesignResults.SellmeijerVnkFactor = designResult.PipingDesignResults.SellmeijerVnkFactor; + } - if (designResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor = designResult.PipingDesignResults.Wti2017BackwardErosionFactor; + if (designResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified) + { + desResult.PipingDesignResults.SellmeijerVnkHcritical = designResult.PipingDesignResults.SellmeijerVnkHcritical; + } - if (designResult.PipingDesignResults.Wti2017BackwardErosionHcriticalSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical; + if (designResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified) + { + desResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor = designResult.PipingDesignResults.Wti2017BackwardErosionFactor; + } - if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiCSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC; + if (designResult.PipingDesignResults.Wti2017BackwardErosionHcriticalSpecified) + { + desResult.PipingDesignResults.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical; + } - if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReducedSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced; + if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiCSpecified) + { + desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC; + } - if (designResult.PipingDesignResults.Wti2017UpliftFactorSpecified) desResult.PipingDesignResults.Wti2017UpliftSafetyFactor = designResult.PipingDesignResults.Wti2017UpliftFactor; + if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReducedSpecified) + { + desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced; + } - if (designResult.PipingDesignResults.Wti2017UpliftHcriticalSpecified) desResult.PipingDesignResults.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical; + if (designResult.PipingDesignResults.Wti2017UpliftFactorSpecified) + { + desResult.PipingDesignResults.Wti2017UpliftSafetyFactor = designResult.PipingDesignResults.Wti2017UpliftFactor; + } - if (designResult.PipingDesignResults.Wti2017DeltaPhiCuSpecified) desResult.PipingDesignResults.Wti2017UpliftDeltaPhiC = designResult.PipingDesignResults.Wti2017DeltaPhiCu; + if (designResult.PipingDesignResults.Wti2017UpliftHcriticalSpecified) + { + desResult.PipingDesignResults.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical; + } - if (designResult.PipingDesignResults.Wti2017HeaveFactorSpecified) desResult.PipingDesignResults.Wti2017HeaveSafetyFactor = designResult.PipingDesignResults.Wti2017HeaveFactor; + if (designResult.PipingDesignResults.Wti2017DeltaPhiCuSpecified) + { + desResult.PipingDesignResults.Wti2017UpliftDeltaPhiC = designResult.PipingDesignResults.Wti2017DeltaPhiCu; + } - if (designResult.PipingDesignResults.Wti2017HeaveHcriticalSpecified) desResult.PipingDesignResults.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical; + if (designResult.PipingDesignResults.Wti2017HeaveFactorSpecified) + { + desResult.PipingDesignResults.Wti2017HeaveSafetyFactor = designResult.PipingDesignResults.Wti2017HeaveFactor; + } - if (designResult.PipingDesignResults.Wti2017GradientSpecified) desResult.PipingDesignResults.Wti2017Gradient = designResult.PipingDesignResults.Wti2017Gradient; + if (designResult.PipingDesignResults.Wti2017HeaveHcriticalSpecified) + { + desResult.PipingDesignResults.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical; + } - if (designResult.PipingDesignResults.Wti2017FactorOverallSpecified) desResult.PipingDesignResults.Wti2017SafetyFactorOverall = designResult.PipingDesignResults.Wti2017FactorOverall; + if (designResult.PipingDesignResults.Wti2017GradientSpecified) + { + desResult.PipingDesignResults.Wti2017Gradient = designResult.PipingDesignResults.Wti2017Gradient; + } - if (designResult.PipingDesignResults.Wti2017HcriticalOverallSpecified) desResult.PipingDesignResults.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wti2017HcriticalOverall; + if (designResult.PipingDesignResults.Wti2017FactorOverallSpecified) + { + desResult.PipingDesignResults.Wti2017SafetyFactorOverall = designResult.PipingDesignResults.Wti2017FactorOverall; + } - if (designResult.PipingDesignResults.ExitPointXSpecified) desResult.PipingDesignResults.LocalExitPointX = designResult.PipingDesignResults.ExitPointX; + if (designResult.PipingDesignResults.Wti2017HcriticalOverallSpecified) + { + desResult.PipingDesignResults.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wti2017HcriticalOverall; + } - if (designResult.PipingDesignResults.Wti2017EffectiveStressSpecified) desResult.PipingDesignResults.EffectiveStress = designResult.PipingDesignResults.Wti2017EffectiveStress; + if (designResult.PipingDesignResults.ExitPointXSpecified) + { + desResult.PipingDesignResults.LocalExitPointX = designResult.PipingDesignResults.ExitPointX; + } - if (designResult.PipingDesignResults.Wti2017CCreepSpecified) desResult.PipingDesignResults.CCreep = designResult.PipingDesignResults.Wti2017CCreep; + if (designResult.PipingDesignResults.Wti2017EffectiveStressSpecified) + { + desResult.PipingDesignResults.EffectiveStress = designResult.PipingDesignResults.Wti2017EffectiveStress; + } + if (designResult.PipingDesignResults.Wti2017CCreepSpecified) + { + desResult.PipingDesignResults.CCreep = designResult.PipingDesignResults.Wti2017CCreep; + } + if (designResult.PipingDesignResults.UpliftSituation != null) { - var uplift = designResult.PipingDesignResults.UpliftSituation; + UpliftSituation uplift = designResult.PipingDesignResults.UpliftSituation; var situation = new Data.General.UpliftSituation { IsUplift = uplift.IsUplift, @@ -247,10 +332,10 @@ private static void AddPointsToSurfaceLine(SurfaceLine inputSurfaceLine, SurfaceLine2 surfaceLine) { surfaceLine.Geometry = new GeometryPointString(); - for (int j = 0; j < inputSurfaceLine.Points.Length; j++) + for (var j = 0; j < inputSurfaceLine.Points.Length; j++) { - var inputPoint = inputSurfaceLine.Points[j]; - var geometryPoint = new GeometryPoint() + SurfaceLinePoint inputPoint = inputSurfaceLine.Points[j]; + var geometryPoint = new GeometryPoint { X = inputPoint.X, Y = 0.0, @@ -262,7 +347,7 @@ private static void CreateDesignResultsStabilityOutput(DesignResult designResult, Data.General.Results.DesignResult desResult) { - desResult.StabilityDesignResults = new StabilityDesignResults() + desResult.StabilityDesignResults = new StabilityDesignResults { ResultMessage = designResult.StabilityDesignResults.ResultMessage }; @@ -275,13 +360,20 @@ desResult.StabilityDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Geometry = desResult.StabilityDesignResults.RedesignedSurfaceLine.Geometry; AddPointsToSurfaceLine(designResult.StabilityDesignResults.RedesignedSurfaceLine, desResult.StabilityDesignResults.RedesignedSurfaceLine); } - if (designResult.StabilityDesignResults.SafetyFactorSpecified) desResult.StabilityDesignResults.SafetyFactor = designResult.StabilityDesignResults.SafetyFactor; - if (designResult.StabilityDesignResults.NumberOfIterationsSpecified) desResult.StabilityDesignResults.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; + if (designResult.StabilityDesignResults.SafetyFactorSpecified) + { + desResult.StabilityDesignResults.SafetyFactor = designResult.StabilityDesignResults.SafetyFactor; + } + if (designResult.StabilityDesignResults.NumberOfIterationsSpecified) + { + desResult.StabilityDesignResults.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; + } + if (designResult.StabilityDesignResults.UpliftSituation != null) { - var uplift = designResult.StabilityDesignResults.UpliftSituation; + UpliftSituation uplift = designResult.StabilityDesignResults.UpliftSituation; var situation = new Data.General.UpliftSituation { IsUplift = uplift.IsUplift, @@ -305,12 +397,12 @@ switch (designResult.StabilityDesignResults.StabilityModelType) { case DesignResultStabilityDesignResultsStabilityModelType.Bishop: - var singleSlipCircleDefinition = (SlidingCircleMinimumSafetyCurveType)designResult.StabilityDesignResults.SlipCircleDefinition; + var singleSlipCircleDefinition = (SlidingCircleMinimumSafetyCurveType) designResult.StabilityDesignResults.SlipCircleDefinition; desResult.StabilityDesignResults.ActiveCenterPoint = new Point2D(singleSlipCircleDefinition.Center.X, singleSlipCircleDefinition.Center.Z); desResult.StabilityDesignResults.ActiveCenterPointRadius = singleSlipCircleDefinition.Radius; break; case DesignResultStabilityDesignResultsStabilityModelType.UpliftVan: - var dualSlipCircleDefinition = (DualSlidingCircleMinimumSafetyCurveType)designResult.StabilityDesignResults.SlipCircleDefinition; + var dualSlipCircleDefinition = (DualSlidingCircleMinimumSafetyCurveType) designResult.StabilityDesignResults.SlipCircleDefinition; desResult.StabilityDesignResults.ActiveCenterPoint = new Point2D(dualSlipCircleDefinition.ActiveCircleCenter.X, dualSlipCircleDefinition.ActiveCircleCenter.Z); desResult.StabilityDesignResults.ActiveCenterPointRadius = dualSlipCircleDefinition.ActiveCircleRadius; desResult.StabilityDesignResults.PassiveCenterPoint = new Point2D(dualSlipCircleDefinition.PassiveCircleCenter.X, dualSlipCircleDefinition.PassiveCircleCenter.Z); @@ -326,7 +418,7 @@ if (designResult.StabilityDesignResults.SlipCircleDefinition.Slices != null) { desResult.StabilityDesignResults.ResultSlices = new List(); - foreach (var slice in designResult.StabilityDesignResults.SlipCircleDefinition.Slices) + foreach (MinimumSafetyCurveBaseTypeSlice slice in designResult.StabilityDesignResults.SlipCircleDefinition.Slices) { var resultSlice = new StabilityResultSlice(); resultSlice.TopLeftPoint = new Point2D(slice.TopLeftPoint.X, slice.TopLeftPoint.Z); @@ -339,6 +431,6 @@ } } } - } + } } -} +} \ No newline at end of file