Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r586 -r591 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 586) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 591) @@ -180,12 +180,27 @@ { desResult.PipingDesignResults = new DesignResultPipingDesignResults { - ResultMessage = designResult.PipingDesignResults.ResultMessage, - //RedesignedSurfaceLine2 = designResult.PipingDesignResults.RedesignedSurfaceLine, - FailureProbabilitySpecified = designResult.PipingDesignResults.FailureProbability.HasValue + ResultMessage = designResult.PipingDesignResults.ResultMessage }; - if (designResult.PipingDesignResults.FailureProbability.HasValue) desResult.PipingDesignResults.FailureProbability = designResult.PipingDesignResults.FailureProbability.Value; - + if (designResult.PipingDesignResults.RedesignedSurfaceLine != null) + { + desResult.PipingDesignResults.RedesignedSurfaceLine = new SurfaceLine(); + desResult.PipingDesignResults.RedesignedSurfaceLine.Name = designResult.PipingDesignResults.RedesignedSurfaceLine.Name; + desResult.PipingDesignResults.RedesignedSurfaceLine.Points = + new SurfaceLinePoint[designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count]; + for (int j = 0; j < designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count; j++) + { + var characteristicPoint = designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints[j]; + var inputPoint = new SurfaceLinePoint() + { + PointType = ConversionHelper.ConvertToInputPointType(characteristicPoint.CharacteristicPointType), + X = characteristicPoint.X, + Z = characteristicPoint.Z + }; + desResult.PipingDesignResults.RedesignedSurfaceLine.Points[j] = inputPoint; + } + } + desResult.PipingDesignResults.UpliftFactorSpecified = designResult.PipingDesignResults.UpliftFactor.HasValue; if (designResult.PipingDesignResults.UpliftFactor.HasValue) desResult.PipingDesignResults.UpliftFactor = designResult.PipingDesignResults.UpliftFactor.Value; @@ -210,14 +225,14 @@ desResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified = designResult.PipingDesignResults.SellmeijerVnkHcritical.HasValue; if (designResult.PipingDesignResults.SellmeijerVnkHcritical.HasValue) desResult.PipingDesignResults.SellmeijerVnkHcritical = designResult.PipingDesignResults.SellmeijerVnkHcritical.Value; - desResult.PipingDesignResults.Wti2017FactorSpecified = designResult.PipingDesignResults.Wti2017Factor.HasValue; - if (designResult.PipingDesignResults.Wti2017Factor.HasValue) desResult.PipingDesignResults.Wti2017Factor = designResult.PipingDesignResults.Wti2017Factor.Value; + desResult.PipingDesignResults.Wbi2017FactorSpecified = designResult.PipingDesignResults.Wti2017Factor.HasValue; + if (designResult.PipingDesignResults.Wti2017Factor.HasValue) desResult.PipingDesignResults.Wbi2017Factor = designResult.PipingDesignResults.Wti2017Factor.Value; - desResult.PipingDesignResults.Wti2017HcriticalSpecified = designResult.PipingDesignResults.Wti2017Hcritical.HasValue; - if (designResult.PipingDesignResults.Wti2017Hcritical.HasValue) desResult.PipingDesignResults.Wti2017Hcritical = designResult.PipingDesignResults.Wti2017Hcritical.Value; + desResult.PipingDesignResults.Wbi2017HcriticalSpecified = designResult.PipingDesignResults.Wti2017Hcritical.HasValue; + if (designResult.PipingDesignResults.Wti2017Hcritical.HasValue) desResult.PipingDesignResults.Wbi2017Hcritical = designResult.PipingDesignResults.Wti2017Hcritical.Value; - desResult.PipingDesignResults.LocalExitPointXSpecified = designResult.PipingDesignResults.LocalExitPointX.HasValue; - if (designResult.PipingDesignResults.LocalExitPointX.HasValue) desResult.PipingDesignResults.LocalExitPointX = designResult.PipingDesignResults.LocalExitPointX.Value; + desResult.PipingDesignResults.ExitPointXSpecified = designResult.PipingDesignResults.LocalExitPointX.HasValue; + if (designResult.PipingDesignResults.LocalExitPointX.HasValue) desResult.PipingDesignResults.ExitPointX = designResult.PipingDesignResults.LocalExitPointX.Value; if (designResult.PipingDesignResults.UpliftSituation.HasValue) { @@ -226,10 +241,10 @@ desResult.PipingDesignResults.UpliftSituation.IsUplift = uplift.IsUplift; desResult.PipingDesignResults.UpliftSituation.Pl3MinUplift = uplift.Pl3MinUplift; desResult.PipingDesignResults.UpliftSituation.Pl3HeadAdjusted = uplift.Pl3HeadAdjusted; - desResult.PipingDesignResults.UpliftSituation.Pl3LocalLocationXMinUplift = uplift.Pl3LocationXMinUplift; + desResult.PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift = uplift.Pl3LocationXMinUplift; desResult.PipingDesignResults.UpliftSituation.Pl4MinUplift = uplift.Pl4MinUplift; desResult.PipingDesignResults.UpliftSituation.Pl4HeadAdjusted = uplift.Pl4HeadAdjusted; - desResult.PipingDesignResults.UpliftSituation.Pl4LocalLocationXMinUplift = uplift.Pl4LocationXMinUplift; + desResult.PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift = uplift.Pl4LocationXMinUplift; } } }