Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r1926 -r1935 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 1926) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 1935) @@ -1788,6 +1788,18 @@ private bool wbi2017EffectiveStressFieldSpecified; + private double wbi2017BackwardErosionDeltaPhiCField; + + private bool wbi2017BackwardErosionDeltaPhiCFieldSpecified; + + private double wbi2017CCreepField; + + private bool wbi2017CCreepFieldSpecified; + + private double wbi2017BackwardErosionDeltaPhiReducedField; + + private bool wbi2017BackwardErosionDeltaPhiReducedFieldSpecified; + /// public UpliftSituation UpliftSituation { get { @@ -2258,6 +2270,72 @@ this.wbi2017EffectiveStressFieldSpecified = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Wbi2017BackwardErosionDeltaPhiC { + get { + return this.wbi2017BackwardErosionDeltaPhiCField; + } + set { + this.wbi2017BackwardErosionDeltaPhiCField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool Wbi2017BackwardErosionDeltaPhiCSpecified { + get { + return this.wbi2017BackwardErosionDeltaPhiCFieldSpecified; + } + set { + this.wbi2017BackwardErosionDeltaPhiCFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Wbi2017CCreep { + get { + return this.wbi2017CCreepField; + } + set { + this.wbi2017CCreepField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool Wbi2017CCreepSpecified { + get { + return this.wbi2017CCreepFieldSpecified; + } + set { + this.wbi2017CCreepFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Wbi2017BackwardErosionDeltaPhiReduced { + get { + return this.wbi2017BackwardErosionDeltaPhiReducedField; + } + set { + this.wbi2017BackwardErosionDeltaPhiReducedField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool Wbi2017BackwardErosionDeltaPhiReducedSpecified { + get { + return this.wbi2017BackwardErosionDeltaPhiReducedFieldSpecified; + } + set { + this.wbi2017BackwardErosionDeltaPhiReducedFieldSpecified = value; + } + } } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs =================================================================== diff -u -r1926 -r1935 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs (.../WbiPipingSellmeijerRevisedOutput.cs) (revision 1926) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs (.../WbiPipingSellmeijerRevisedOutput.cs) (revision 1935) @@ -56,15 +56,15 @@ public double FoSh { get; set; } /// - /// Gets or sets the H-critical (critical head difference for backward erosion). + /// Gets or sets the H-critical (critical water level for backward erosion). /// /// /// The hc. /// public double Hcbe { get; set; } /// - /// Gets or sets the H-critical (critical head difference for uplift). + /// Gets or sets the H-critical (critical water level for uplift). /// /// /// The hc. @@ -128,11 +128,36 @@ public double EffectiveStress { get; set; } /// - /// Gets or sets the delta phi cu (the critical head difference for uplift). + /// Gets or sets the delta phi c u (the critical head difference for uplift). /// /// /// The delta phi cu. /// public double DeltaPhiCu { get; set; } + + /// + /// Gets or sets the delta phi c be (the critical head difference for backward erosion). + /// + /// + /// The delta phi cbe. + /// + public double DeltaPhiCbe { get; set; } + + /// + /// Gets or sets the delta phi be (the reduced head difference for backward erosion). + /// + /// + /// The delta phi cbe. + /// + public double DeltaPhibe { get; set; } + + /// + /// Gets or sets the length of the seepage. + /// + /// + /// The length of the seepage. + /// + public double SeepageLength { get; set; } + } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/PipingDesignResults.cs =================================================================== diff -u -r1926 -r1935 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/PipingDesignResults.cs (.../PipingDesignResults.cs) (revision 1926) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/PipingDesignResults.cs (.../PipingDesignResults.cs) (revision 1935) @@ -38,7 +38,9 @@ private double? wti2017BackwardErosionHcritical; private double? wti2017UpliftSafetyFactor; private double? wti2017UpliftHcritical; - private double? wti2017DeltaPhiCu; + private double? wti2017BackwardErosionDeltaPhiC; + private double? wti2017BackwardErosionDeltaPhiReduced; + private double? wti2017UpliftDeltaPhiC; private double? wti2017HeaveSafetyFactor; private double? wti2017HeaveHcritical; private double? wti2017Gradient; @@ -50,6 +52,7 @@ private SurfaceLine2 redesignedSurfaceLine; private readonly PipingModelType pipingModelType; private double? effectiveStress; + private double? cCreep; public PipingDesignResults(PipingModelType aPipingModelType) { @@ -338,7 +341,7 @@ } /// - /// Gets or sets the wti2017 hcritical for backward erosion. + /// Gets or sets the wti2017 critical waterlevel for backward erosion. /// /// /// The wti2017 hcritical backward erosion. @@ -356,7 +359,7 @@ } /// - /// Gets or sets the wti2017 hcritical for Uplift. + /// Gets or sets the wti2017 critical waterlevel for Uplift. /// /// /// The wti2017 hcritical uplift. @@ -374,7 +377,7 @@ } /// - /// Gets or sets the wti2017 hcritical for Heave. + /// Gets or sets the wti2017 critical waterlevel for Heave. /// /// /// The wti2017 hcritical heave. @@ -392,7 +395,7 @@ } /// - /// Gets or sets the wti2017 hcritical overall (see MWDAM-1299). + /// Gets or sets the wti2017 critical waterlevel overall (see MWDAM-1299). /// /// /// The wti2017 hcritical overall. @@ -410,20 +413,56 @@ } /// - /// Gets or sets the wti2017 delta phi cu (Uplift). + /// Gets or sets the wti2017 delta phi c be (backward erosion, critical head difference). /// /// + /// The wti2017 delta phi c be. + /// + public double? Wti2017BackwardErosionDeltaPhiC + { + get + { + return wti2017BackwardErosionDeltaPhiC; + } + set + { + wti2017BackwardErosionDeltaPhiC = value; + } + } + + /// + /// Gets or sets the wti2017 delta phi c be (backward erosion, reduced head difference). + /// + /// + /// The wti2017 delta phi c be. + /// + public double? Wti2017BackwardErosionDeltaPhiReduced + { + get + { + return wti2017BackwardErosionDeltaPhiReduced; + } + set + { + wti2017BackwardErosionDeltaPhiReduced = value; + } + } + + /// + /// Gets or sets the wti2017 delta phi cu (Uplift, critical head difference). + /// + /// /// The wti2017 delta phi cu. /// - public double? Wti2017DeltaPhiCu + public double? Wti2017UpliftDeltaPhiC { get { - return wti2017DeltaPhiCu; + return wti2017UpliftDeltaPhiC; } set { - wti2017DeltaPhiCu = value; + wti2017UpliftDeltaPhiC = value; } } @@ -516,5 +555,23 @@ redesignedSurfaceLine = value; } } + + /// + /// Gets or sets the c creep (Creep coefficient). + /// + /// + /// The c creep. + /// + public double? CCreep + { + get + { + return cCreep; + } + set + { + cCreep = value; + } + } } } Index: DamEngine/trunk/xsd/DamDesignResult.xsd =================================================================== diff -u -r1926 -r1935 --- DamEngine/trunk/xsd/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 1926) +++ DamEngine/trunk/xsd/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 1935) @@ -58,6 +58,9 @@ + + + Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r1926 -r1935 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1926) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1935) @@ -173,14 +173,20 @@ desResult.PipingDesignResults.Wbi2017BackwardErosionHcriticalSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue; if (designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue) desResult.PipingDesignResults.Wbi2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.Value; + desResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiCSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.HasValue; + if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.HasValue) desResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.Value; + + desResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReducedSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.HasValue; + if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.HasValue) desResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.Value; + desResult.PipingDesignResults.Wbi2017UpliftFactorSpecified = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue; if (designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue) desResult.PipingDesignResults.Wbi2017UpliftFactor = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.Value; desResult.PipingDesignResults.Wbi2017UpliftHcriticalSpecified = designResult.PipingDesignResults.Wti2017UpliftHcritical.HasValue; if (designResult.PipingDesignResults.Wti2017UpliftHcritical.HasValue) desResult.PipingDesignResults.Wbi2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical.Value; - desResult.PipingDesignResults.Wbi2017DeltaPhiCuSpecified = designResult.PipingDesignResults.Wti2017DeltaPhiCu.HasValue; - if (designResult.PipingDesignResults.Wti2017DeltaPhiCu.HasValue) desResult.PipingDesignResults.Wbi2017DeltaPhiCu = designResult.PipingDesignResults.Wti2017DeltaPhiCu.Value; + desResult.PipingDesignResults.Wbi2017DeltaPhiCuSpecified = designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.HasValue; + if (designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.HasValue) desResult.PipingDesignResults.Wbi2017DeltaPhiCu = designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.Value; desResult.PipingDesignResults.Wbi2017HeaveFactorSpecified = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue; if (designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue) desResult.PipingDesignResults.Wbi2017HeaveFactor = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.Value; @@ -203,6 +209,9 @@ desResult.PipingDesignResults.Wbi2017EffectiveStressSpecified = designResult.PipingDesignResults.EffectiveStress.HasValue; if (designResult.PipingDesignResults.EffectiveStress.HasValue) desResult.PipingDesignResults.Wbi2017EffectiveStress = designResult.PipingDesignResults.EffectiveStress.Value; + desResult.PipingDesignResults.Wbi2017CCreepSpecified = designResult.PipingDesignResults.CCreep.HasValue; + if (designResult.PipingDesignResults.CCreep.HasValue) desResult.PipingDesignResults.Wbi2017CCreep = designResult.PipingDesignResults.CCreep.Value; + if (designResult.PipingDesignResults.UpliftSituation.HasValue) { var uplift = designResult.PipingDesignResults.UpliftSituation.Value; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs =================================================================== diff -u -r1932 -r1935 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs (.../WbiPipingSellmeijerRevisedKernelWrapper.cs) (revision 1932) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs (.../WbiPipingSellmeijerRevisedKernelWrapper.cs) (revision 1935) @@ -188,17 +188,19 @@ // Make sure defaultMaxReturnValue is limit. pipingDesignResults.Wti2017BackwardErosionSafetyFactor = Math.Min(damPipingOutput.FoSbe, defaultMaxReturnValue); pipingDesignResults.Wti2017BackwardErosionHcritical = damPipingOutput.Hcbe; + pipingDesignResults.Wti2017BackwardErosionDeltaPhiC = damPipingOutput.DeltaPhiCbe; pipingDesignResults.LocalExitPointX = damPipingOutput.ExitPointX; pipingDesignResults.UpliftFactor = damPipingOutput.UpliftFactor; pipingDesignResults.UpliftSituation = damPipingOutput.UpliftSituation; // Add results of the wbi-uplift calculation pipingDesignResults.Wti2017UpliftSafetyFactor = Math.Min(damPipingOutput.FoSu, defaultMaxReturnValue); pipingDesignResults.Wti2017UpliftHcritical = damPipingOutput.Hcu; - pipingDesignResults.Wti2017DeltaPhiCu = damPipingOutput.DeltaPhiCu; + pipingDesignResults.Wti2017UpliftDeltaPhiC = damPipingOutput.DeltaPhiCu; // Add results of the wbi-heave calculation pipingDesignResults.Wti2017HeaveSafetyFactor = Math.Min(damPipingOutput.FoSh, defaultMaxReturnValue); ; pipingDesignResults.Wti2017HeaveHcritical = damPipingOutput.Hch; pipingDesignResults.Wti2017Gradient = damPipingOutput.Gradient; + pipingDesignResults.EffectiveStress = damPipingOutput.EffectiveStress; // Add the overall results for WBI piping kernel (FoS = highest value of FoSh, FoSu and FoSbe; HcO is Hcbe belonging to FoS), see MWDAM-1370 var maxFoS = damPipingOutput.FoSbe; var overallHc = damPipingOutput.Hcbe; @@ -216,6 +218,10 @@ maxFoS = Math.Min(maxFoS, defaultMaxReturnValue); pipingDesignResults.Wti2017SafetyFactorOverall = maxFoS; pipingDesignResults.Wti2017HcriticalOverall = overallHc; + + // Determine the values for the additional output parameters as requested in MWDAM-1370 + pipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced = damPipingOutput.DeltaPhibe; + pipingDesignResults.CCreep = damPipingOutput.SeepageLength / damPipingOutput.DeltaPhiCbe; designResults.Add(designResult); } @@ -251,6 +257,7 @@ double xEntry = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X; double xExit = upliftLocationAndResult.X; damPipingInput.SeepageLength = xExit - xEntry; + damPipingOutput.SeepageLength = damPipingInput.SeepageLength; var topLevelAquifer = soilProfile.GetLayerWithName(upliftLocationAndResult.LayerWhereUpliftOccuresId).TopLevel; // The following 2 parameters are dependent on the position of the point and have to be recalculated for the current point @@ -442,6 +449,8 @@ damPipingOutput.ExitPointX = xExit; damPipingOutput.UpliftFactor = upliftFactor; damPipingOutput.UpliftSituation = upliftSituation; + damPipingOutput.DeltaPhibe = waterLevel - referenceLevel - defaultFluidisationGradient * dCoverLayer; + damPipingOutput.SeepageLength = seepageLength; } /// @@ -624,7 +633,8 @@ var calculator = CreatePipingCalculatorWbiSellmeijerRevised(wbiPipingInput); calculator.Calculate(); wbiPipingOutput.FoSbe = calculator.FoSp; - wbiPipingOutput.Hcbe = calculator.Hc; + wbiPipingOutput.Hcbe = calculator.Hcp; + wbiPipingOutput.DeltaPhiCbe = calculator.Hc; wbiPipingOutput.CalculationResult = CalculationResult.Succeeded; } catch (Exception e) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs =================================================================== diff -u -r1932 -r1935 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WbiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 1932) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WbiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 1935) @@ -108,10 +108,13 @@ var damPipingOutput = (WbiPipingSellmeijerRevisedOutput)kernelDataOutput; Assert.AreEqual(0, messages.Count); Assert.AreEqual(1860.9050036726026, damPipingOutput.FoSbe, diff); - Assert.AreEqual(1302.6335025708217, damPipingOutput.Hcbe, diff); + Assert.AreEqual(1302.9335025708217, damPipingOutput.Hcbe, diff); + Assert.AreEqual(1302.6335025708217, damPipingOutput.DeltaPhiCbe, diff); Assert.AreEqual(0.56948691811077123, damPipingOutput.FoSu, diff); Assert.AreEqual(0.56948691811077123, damPipingOutput.Hcu, diff); Assert.AreEqual(0.4271151885830784, damPipingOutput.DeltaPhiCu, diff); + Assert.AreEqual(4.19, damPipingOutput.EffectiveStress, diff); + Assert.AreEqual(49.5, damPipingOutput.SeepageLength, diff); // Fill the design results List results; @@ -124,16 +127,20 @@ Assert.IsNotNullOrEmpty(result.ScenarioName); Assert.IsNotNullOrEmpty(result.ProfileName); Assert.AreEqual(90, result.PipingDesignResults.Wti2017BackwardErosionSafetyFactor, diff); - Assert.AreEqual(1302.6335025708217, result.PipingDesignResults.Wti2017BackwardErosionHcritical, diff); + Assert.AreEqual(1302.9335025708217, result.PipingDesignResults.Wti2017BackwardErosionHcritical, diff); + Assert.AreEqual(1302.6335025708217, result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC, diff); + Assert.AreEqual(0.70, result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced, diff); Assert.AreEqual(0.56948691811077123, result.PipingDesignResults.Wti2017UpliftSafetyFactor, diff); Assert.AreEqual(0.56948691811077123, result.PipingDesignResults.Wti2017UpliftHcritical, diff); - Assert.AreEqual(0.4271151885830784, result.PipingDesignResults.Wti2017DeltaPhiCu, diff); + Assert.AreEqual(0.4271151885830784, result.PipingDesignResults.Wti2017UpliftDeltaPhiC, diff); Assert.AreEqual(0.40, result.PipingDesignResults.Wti2017HeaveSafetyFactor, diff); Assert.AreEqual(0.40, result.PipingDesignResults.Wti2017HeaveHcritical, diff); Assert.AreEqual(0.75, result.PipingDesignResults.Wti2017Gradient, diff); + Assert.AreEqual(4.19, result.PipingDesignResults.EffectiveStress, diff); + Assert.AreEqual(0.037999943884683543, result.PipingDesignResults.CCreep, diff); Assert.AreEqual(90, result.PipingDesignResults.Wti2017SafetyFactorOverall, diff); - Assert.AreEqual(1302.6335025708217, result.PipingDesignResults.Wti2017HcriticalOverall, diff); + Assert.AreEqual(1302.9335025708217, result.PipingDesignResults.Wti2017HcriticalOverall, diff); Assert.AreEqual(59.5, result.PipingDesignResults.LocalExitPointX); Assert.AreEqual(0.88258734130293759, result.PipingDesignResults.UpliftFactor); @@ -273,8 +280,11 @@ var calculationResult = CalculationResult.Succeeded; var output = new WbiPipingSellmeijerRevisedOutput() { + SeepageLength = 30, FoSbe = 1.1, Hcbe = 2.2, + DeltaPhiCbe = 1.3, + DeltaPhibe = 11.3, ExitPointX = 3.3, UpliftFactor = 4.4, UpliftSituation = upliftSituation, @@ -298,12 +308,16 @@ { Assert.AreEqual(output.FoSbe, result.PipingDesignResults.Wti2017BackwardErosionSafetyFactor); Assert.AreEqual(output.Hcbe, result.PipingDesignResults.Wti2017BackwardErosionHcritical); + Assert.AreEqual(output.DeltaPhiCbe, result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC); + Assert.AreEqual(output.DeltaPhibe, result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced); Assert.AreEqual(output.FoSu, result.PipingDesignResults.Wti2017UpliftSafetyFactor); Assert.AreEqual(output.Hcu, result.PipingDesignResults.Wti2017UpliftHcritical); - Assert.AreEqual(output.DeltaPhiCu, result.PipingDesignResults.Wti2017DeltaPhiCu); + Assert.AreEqual(output.DeltaPhiCu, result.PipingDesignResults.Wti2017UpliftDeltaPhiC); Assert.AreEqual(output.FoSh, result.PipingDesignResults.Wti2017HeaveSafetyFactor); Assert.AreEqual(output.Hch, result.PipingDesignResults.Wti2017HeaveHcritical); Assert.AreEqual(output.Gradient, result.PipingDesignResults.Wti2017Gradient); + Assert.AreEqual(output.EffectiveStress, result.PipingDesignResults.EffectiveStress); + Assert.AreEqual(23.076923076923077, result.PipingDesignResults.CCreep); // Decise is FoSu thus these must be overall. Assert.AreEqual(output.FoSu, result.PipingDesignResults.Wti2017SafetyFactorOverall); Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r1926 -r1935 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 1926) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 1935) @@ -94,17 +94,20 @@ BlighFactor = 1.03 * i, BlighHcritical = 0.4, LocalExitPointX = 34.21, - Wti2017DeltaPhiCu = 1.09 * i, + Wti2017UpliftDeltaPhiC = 1.09 * i, EffectiveStress = 13.23 * i, Wti2017UpliftHcritical = 1.19 * i, Wti2017BackwardErosionHcritical = 1.29 * i, + Wti2017BackwardErosionDeltaPhiC = 1.34 * i, + Wti2017BackwardErosionDeltaPhiReduced = 1.27 * i, Wti2017HeaveHcritical = 1.24 * i, Wti2017BackwardErosionSafetyFactor = 1.39 * i, Wti2017UpliftSafetyFactor = 1.49 * i, Wti2017HeaveSafetyFactor = 1.59 * i, Wti2017Gradient = 1.69 * i, Wti2017HcriticalOverall = 1.79 * i, - Wti2017SafetyFactorOverall = 3.21 * i + Wti2017SafetyFactorOverall = 3.21 * i, + CCreep = 234.1 *i }; var situation = new UpliftSituation { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r1926 -r1935 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 1926) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 1935) @@ -208,11 +208,15 @@ if (designResult.PipingDesignResults.Wbi2017BackwardErosionHcriticalSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wbi2017BackwardErosionHcritical; + if (designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiCSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiC; + + if (designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReducedSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReduced; + if (designResult.PipingDesignResults.Wbi2017UpliftFactorSpecified) desResult.PipingDesignResults.Wti2017UpliftSafetyFactor = designResult.PipingDesignResults.Wbi2017UpliftFactor; if (designResult.PipingDesignResults.Wbi2017UpliftHcriticalSpecified) desResult.PipingDesignResults.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wbi2017UpliftHcritical; - if (designResult.PipingDesignResults.Wbi2017DeltaPhiCuSpecified) desResult.PipingDesignResults.Wti2017DeltaPhiCu = designResult.PipingDesignResults.Wbi2017DeltaPhiCu; + if (designResult.PipingDesignResults.Wbi2017DeltaPhiCuSpecified) desResult.PipingDesignResults.Wti2017UpliftDeltaPhiC = designResult.PipingDesignResults.Wbi2017DeltaPhiCu; if (designResult.PipingDesignResults.Wbi2017HeaveFactorSpecified) desResult.PipingDesignResults.Wti2017HeaveSafetyFactor = designResult.PipingDesignResults.Wbi2017HeaveFactor; @@ -228,6 +232,8 @@ if (designResult.PipingDesignResults.Wbi2017EffectiveStressSpecified) desResult.PipingDesignResults.EffectiveStress = designResult.PipingDesignResults.Wbi2017EffectiveStress; + if (designResult.PipingDesignResults.Wbi2017CCreepSpecified) desResult.PipingDesignResults.CCreep = designResult.PipingDesignResults.Wbi2017CCreep; + if (designResult.PipingDesignResults.UpliftSituation != null) { var uplift = designResult.PipingDesignResults.UpliftSituation;