Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs =================================================================== diff -u -r1919 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 1919) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 1926) @@ -43,8 +43,8 @@ { // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 190 // reducedFall = HRiver - HExit - (Rc * DTotal) = 1.0 - 0.0 - (0.3 * 2.0) = 0.4 - // FoSp = Hc / reducedFall = 4.7596 / 0.4 = 11.899 - // For calculation of Hc see TestCanCalculateHCritical + // FoSbe = Hcbe / reducedFall = 4.7596 / 0.4 = 11.899 + // For calculation of Hcbe see TestCanCalculateHCritical // See also "..\..\doc\Evaluation Piping\Nieuwe rekenregel bligh Sellmeijeruli.xls" const double diff = 0.0001; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs =================================================================== diff -u -r1921 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WbiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 1921) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WbiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 1926) @@ -105,8 +105,8 @@ kernelWrapper.Execute(damPipingInput, kernelDataOutput, out messages); var damPipingOutput = (WbiPipingSellmeijerRevisedOutput)kernelDataOutput; Assert.AreEqual(0, messages.Count); - Assert.AreEqual(1860.9050036726026, damPipingOutput.FoSp, diff); - Assert.AreEqual(1302.6335025708217, damPipingOutput.Hc, diff); + Assert.AreEqual(1860.9050036726026, damPipingOutput.FoSbe, diff); + Assert.AreEqual(1302.6335025708217, damPipingOutput.Hcbe, diff); Assert.AreEqual(0.56948691811077123, damPipingOutput.FoSu, diff); Assert.AreEqual(0.56948691811077123, damPipingOutput.Hcu, diff); Assert.AreEqual(0.4271151885830784, damPipingOutput.DeltaPhiCu, diff); @@ -121,13 +121,13 @@ Assert.IsNotNullOrEmpty(result.LocationName); Assert.IsNotNullOrEmpty(result.ScenarioName); Assert.IsNotNullOrEmpty(result.ProfileName); - Assert.AreEqual(90, result.PipingDesignResults.Wti2017SafetyFactorPiping, diff); - Assert.AreEqual(1302.6335025708217, result.PipingDesignResults.Wti2017HcriticalPiping, diff); - Assert.AreEqual(0.56948691811077123, result.PipingDesignResults.Wti2017SafetyFactorUplift, diff); - Assert.AreEqual(0.56948691811077123, result.PipingDesignResults.Wti2017HcriticalUplift, diff); + Assert.AreEqual(90, result.PipingDesignResults.Wti2017BackwardErosionSafetyFactor, diff); + Assert.AreEqual(1302.6335025708217, result.PipingDesignResults.Wti2017BackwardErosionHcritical, 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.40, result.PipingDesignResults.Wti2017SafetyFactorHeave, diff); - Assert.AreEqual(0.40, result.PipingDesignResults.Wti2017HcriticalHeave, 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(90, result.PipingDesignResults.Wti2017SafetyFactorOverall, diff); @@ -271,8 +271,8 @@ var calculationResult = CalculationResult.Succeeded; var output = new WbiPipingSellmeijerRevisedOutput() { - FoSp = 1.1, - Hc = 2.2, + FoSbe = 1.1, + Hcbe = 2.2, ExitPointX = 3.3, UpliftFactor = 4.4, UpliftSituation = upliftSituation, @@ -294,13 +294,13 @@ kernelWrapper.PostProcess(input, output, designScenario, "", out results); foreach (var result in results) { - Assert.AreEqual(output.FoSp, result.PipingDesignResults.Wti2017SafetyFactorPiping); - Assert.AreEqual(output.Hc, result.PipingDesignResults.Wti2017HcriticalPiping); - Assert.AreEqual(output.FoSu, result.PipingDesignResults.Wti2017SafetyFactorUplift); - Assert.AreEqual(output.Hcu, result.PipingDesignResults.Wti2017HcriticalUplift); + Assert.AreEqual(output.FoSbe, result.PipingDesignResults.Wti2017BackwardErosionSafetyFactor); + Assert.AreEqual(output.Hcbe, result.PipingDesignResults.Wti2017BackwardErosionHcritical); + Assert.AreEqual(output.FoSu, result.PipingDesignResults.Wti2017UpliftSafetyFactor); + Assert.AreEqual(output.Hcu, result.PipingDesignResults.Wti2017UpliftHcritical); Assert.AreEqual(output.DeltaPhiCu, result.PipingDesignResults.Wti2017DeltaPhiCu); - Assert.AreEqual(output.FoSh, result.PipingDesignResults.Wti2017SafetyFactorHeave); - Assert.AreEqual(output.Hch, result.PipingDesignResults.Wti2017HcriticalHeave); + Assert.AreEqual(output.FoSh, result.PipingDesignResults.Wti2017HeaveSafetyFactor); + Assert.AreEqual(output.Hch, result.PipingDesignResults.Wti2017HeaveHcritical); Assert.AreEqual(output.Gradient, result.PipingDesignResults.Wti2017Gradient); // Decise is FoSu thus these must be overall. Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r1921 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 1921) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 1926) @@ -173,7 +173,7 @@ model = PipingModelType.Sellmeijer4Forces; if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified) model = PipingModelType.SellmeijerVnk; - if (designResult.PipingDesignResults.Wbi2017FactorPipingSpecified) + if (designResult.PipingDesignResults.Wbi2017BackwardErosionFactorSpecified) model = PipingModelType.Wti2017; desResult.PipingDesignResults = new PipingDesignResults(model) { @@ -204,19 +204,19 @@ if (designResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified) desResult.PipingDesignResults.SellmeijerVnkHcritical = designResult.PipingDesignResults.SellmeijerVnkHcritical; - if (designResult.PipingDesignResults.Wbi2017FactorPipingSpecified) desResult.PipingDesignResults.Wti2017SafetyFactorPiping = designResult.PipingDesignResults.Wbi2017FactorPiping; + if (designResult.PipingDesignResults.Wbi2017BackwardErosionFactorSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor = designResult.PipingDesignResults.Wbi2017BackwardErosionFactor; - if (designResult.PipingDesignResults.Wbi2017HcriticalPipingSpecified) desResult.PipingDesignResults.Wti2017HcriticalPiping = designResult.PipingDesignResults.Wbi2017HcriticalPiping; + if (designResult.PipingDesignResults.Wbi2017BackwardErosionHcriticalSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wbi2017BackwardErosionHcritical; - if (designResult.PipingDesignResults.Wbi2017FactorUpliftSpecified) desResult.PipingDesignResults.Wti2017SafetyFactorUplift = designResult.PipingDesignResults.Wbi2017FactorUplift; + if (designResult.PipingDesignResults.Wbi2017UpliftFactorSpecified) desResult.PipingDesignResults.Wti2017UpliftSafetyFactor = designResult.PipingDesignResults.Wbi2017UpliftFactor; - if (designResult.PipingDesignResults.Wbi2017HcriticalUpliftSpecified) desResult.PipingDesignResults.Wti2017HcriticalUplift = designResult.PipingDesignResults.Wbi2017HcriticalUplift; + if (designResult.PipingDesignResults.Wbi2017UpliftHcriticalSpecified) desResult.PipingDesignResults.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wbi2017UpliftHcritical; if (designResult.PipingDesignResults.Wbi2017DeltaPhiCuSpecified) desResult.PipingDesignResults.Wti2017DeltaPhiCu = designResult.PipingDesignResults.Wbi2017DeltaPhiCu; - if (designResult.PipingDesignResults.Wbi2017FactorHeaveSpecified) desResult.PipingDesignResults.Wti2017SafetyFactorHeave = designResult.PipingDesignResults.Wbi2017FactorHeave; + if (designResult.PipingDesignResults.Wbi2017HeaveFactorSpecified) desResult.PipingDesignResults.Wti2017HeaveSafetyFactor = designResult.PipingDesignResults.Wbi2017HeaveFactor; - if (designResult.PipingDesignResults.Wbi2017HcriticalHeaveSpecified) desResult.PipingDesignResults.Wti2017HcriticalHeave = designResult.PipingDesignResults.Wbi2017HcriticalHeave; + if (designResult.PipingDesignResults.Wbi2017HeaveHcriticalSpecified) desResult.PipingDesignResults.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wbi2017HeaveHcritical; if (designResult.PipingDesignResults.Wbi2017GradientSpecified) desResult.PipingDesignResults.Wti2017Gradient = designResult.PipingDesignResults.Wbi2017Gradient; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r1921 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1921) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1926) @@ -167,26 +167,26 @@ desResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified = designResult.PipingDesignResults.SellmeijerVnkHcritical.HasValue; if (designResult.PipingDesignResults.SellmeijerVnkHcritical.HasValue) desResult.PipingDesignResults.SellmeijerVnkHcritical = designResult.PipingDesignResults.SellmeijerVnkHcritical.Value; - desResult.PipingDesignResults.Wbi2017FactorPipingSpecified = designResult.PipingDesignResults.Wti2017SafetyFactorPiping.HasValue; - if (designResult.PipingDesignResults.Wti2017SafetyFactorPiping.HasValue) desResult.PipingDesignResults.Wbi2017FactorPiping = designResult.PipingDesignResults.Wti2017SafetyFactorPiping.Value; + desResult.PipingDesignResults.Wbi2017BackwardErosionFactorSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.HasValue; + if (designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.HasValue) desResult.PipingDesignResults.Wbi2017BackwardErosionFactor = designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.Value; - desResult.PipingDesignResults.Wbi2017HcriticalPipingSpecified = designResult.PipingDesignResults.Wti2017HcriticalPiping.HasValue; - if (designResult.PipingDesignResults.Wti2017HcriticalPiping.HasValue) desResult.PipingDesignResults.Wbi2017HcriticalPiping = designResult.PipingDesignResults.Wti2017HcriticalPiping.Value; + desResult.PipingDesignResults.Wbi2017BackwardErosionHcriticalSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue; + if (designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue) desResult.PipingDesignResults.Wbi2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.Value; - desResult.PipingDesignResults.Wbi2017FactorUpliftSpecified = designResult.PipingDesignResults.Wti2017SafetyFactorUplift.HasValue; - if (designResult.PipingDesignResults.Wti2017SafetyFactorUplift.HasValue) desResult.PipingDesignResults.Wbi2017FactorUplift = designResult.PipingDesignResults.Wti2017SafetyFactorUplift.Value; + desResult.PipingDesignResults.Wbi2017UpliftFactorSpecified = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue; + if (designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue) desResult.PipingDesignResults.Wbi2017UpliftFactor = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.Value; - desResult.PipingDesignResults.Wbi2017HcriticalUpliftSpecified = designResult.PipingDesignResults.Wti2017HcriticalUplift.HasValue; - if (designResult.PipingDesignResults.Wti2017HcriticalUplift.HasValue) desResult.PipingDesignResults.Wbi2017HcriticalUplift = designResult.PipingDesignResults.Wti2017HcriticalUplift.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.Wbi2017FactorHeaveSpecified = designResult.PipingDesignResults.Wti2017SafetyFactorHeave.HasValue; - if (designResult.PipingDesignResults.Wti2017SafetyFactorHeave.HasValue) desResult.PipingDesignResults.Wbi2017FactorHeave = designResult.PipingDesignResults.Wti2017SafetyFactorHeave.Value; + desResult.PipingDesignResults.Wbi2017HeaveFactorSpecified = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue; + if (designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue) desResult.PipingDesignResults.Wbi2017HeaveFactor = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.Value; - desResult.PipingDesignResults.Wbi2017HcriticalHeaveSpecified = designResult.PipingDesignResults.Wti2017HcriticalHeave.HasValue; - if (designResult.PipingDesignResults.Wti2017HcriticalHeave.HasValue) desResult.PipingDesignResults.Wbi2017HcriticalHeave = designResult.PipingDesignResults.Wti2017HcriticalHeave.Value; + desResult.PipingDesignResults.Wbi2017HeaveHcriticalSpecified = designResult.PipingDesignResults.Wti2017HeaveHcritical.HasValue; + if (designResult.PipingDesignResults.Wti2017HeaveHcritical.HasValue) desResult.PipingDesignResults.Wbi2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical.Value; desResult.PipingDesignResults.Wbi2017GradientSpecified = designResult.PipingDesignResults.Wti2017Gradient.HasValue; if (designResult.PipingDesignResults.Wti2017Gradient.HasValue) desResult.PipingDesignResults.Wbi2017Gradient = designResult.PipingDesignResults.Wti2017Gradient.Value; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r1921 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 1921) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 1926) @@ -85,7 +85,7 @@ ProfileName = "profile" + i }; result.CalculationResult = CalculationResult.RunFailed; - // Note : as Wti2017HcriticalPiping is in use in this test, the modeltype MUST be Wti2017. + // Note : as Wti2017BackwardErosionHcritical is in use in this test, the modeltype MUST be Wti2017. result.PipingDesignResults = new PipingDesignResults(PipingModelType.Wti2017) { ResultMessage = "no run made", @@ -96,12 +96,12 @@ LocalExitPointX = 34.21, Wti2017DeltaPhiCu = 1.09 * i, EffectiveStress = 13.23 * i, - Wti2017HcriticalUplift = 1.19 * i, - Wti2017HcriticalPiping = 1.29 * i, - Wti2017HcriticalHeave = 1.24 * i, - Wti2017SafetyFactorPiping = 1.39 * i, - Wti2017SafetyFactorUplift = 1.49 * i, - Wti2017SafetyFactorHeave = 1.59 * i, + Wti2017UpliftHcritical = 1.19 * i, + Wti2017BackwardErosionHcritical = 1.29 * 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 Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r1921 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 1921) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 1926) @@ -1740,37 +1740,37 @@ private bool sellmeijerVnkHcriticalFieldSpecified; - private double wbi2017FactorPipingField; + private double wbi2017BackwardErosionFactorField; - private bool wbi2017FactorPipingFieldSpecified; + private bool wbi2017BackwardErosionFactorFieldSpecified; - private double wbi2017HcriticalPipingField; + private double wbi2017BackwardErosionHcriticalField; - private bool wbi2017HcriticalPipingFieldSpecified; + private bool wbi2017BackwardErosionHcriticalFieldSpecified; private double exitPointXField; private bool exitPointXFieldSpecified; - private double wbi2017FactorUpliftField; + private double wbi2017UpliftFactorField; - private bool wbi2017FactorUpliftFieldSpecified; + private bool wbi2017UpliftFactorFieldSpecified; - private double wbi2017HcriticalUpliftField; + private double wbi2017UpliftHcriticalField; - private bool wbi2017HcriticalUpliftFieldSpecified; + private bool wbi2017UpliftHcriticalFieldSpecified; private double wbi2017DeltaPhiCuField; private bool wbi2017DeltaPhiCuFieldSpecified; - private double wbi2017FactorHeaveField; + private double wbi2017HeaveFactorField; - private bool wbi2017FactorHeaveFieldSpecified; + private bool wbi2017HeaveFactorFieldSpecified; - private double wbi2017HcriticalHeaveField; + private double wbi2017HeaveHcriticalField; - private bool wbi2017HcriticalHeaveFieldSpecified; + private bool wbi2017HeaveHcriticalFieldSpecified; private double wbi2017GradientField; @@ -1997,45 +1997,45 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double Wbi2017FactorPiping { + public double Wbi2017BackwardErosionFactor { get { - return this.wbi2017FactorPipingField; + return this.wbi2017BackwardErosionFactorField; } set { - this.wbi2017FactorPipingField = value; + this.wbi2017BackwardErosionFactorField = value; } } /// [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Wbi2017FactorPipingSpecified { + public bool Wbi2017BackwardErosionFactorSpecified { get { - return this.wbi2017FactorPipingFieldSpecified; + return this.wbi2017BackwardErosionFactorFieldSpecified; } set { - this.wbi2017FactorPipingFieldSpecified = value; + this.wbi2017BackwardErosionFactorFieldSpecified = value; } } /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double Wbi2017HcriticalPiping { + public double Wbi2017BackwardErosionHcritical { get { - return this.wbi2017HcriticalPipingField; + return this.wbi2017BackwardErosionHcriticalField; } set { - this.wbi2017HcriticalPipingField = value; + this.wbi2017BackwardErosionHcriticalField = value; } } /// [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Wbi2017HcriticalPipingSpecified { + public bool Wbi2017BackwardErosionHcriticalSpecified { get { - return this.wbi2017HcriticalPipingFieldSpecified; + return this.wbi2017BackwardErosionHcriticalFieldSpecified; } set { - this.wbi2017HcriticalPipingFieldSpecified = value; + this.wbi2017BackwardErosionHcriticalFieldSpecified = value; } } @@ -2063,45 +2063,45 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double Wbi2017FactorUplift { + public double Wbi2017UpliftFactor { get { - return this.wbi2017FactorUpliftField; + return this.wbi2017UpliftFactorField; } set { - this.wbi2017FactorUpliftField = value; + this.wbi2017UpliftFactorField = value; } } /// [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Wbi2017FactorUpliftSpecified { + public bool Wbi2017UpliftFactorSpecified { get { - return this.wbi2017FactorUpliftFieldSpecified; + return this.wbi2017UpliftFactorFieldSpecified; } set { - this.wbi2017FactorUpliftFieldSpecified = value; + this.wbi2017UpliftFactorFieldSpecified = value; } } /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double Wbi2017HcriticalUplift { + public double Wbi2017UpliftHcritical { get { - return this.wbi2017HcriticalUpliftField; + return this.wbi2017UpliftHcriticalField; } set { - this.wbi2017HcriticalUpliftField = value; + this.wbi2017UpliftHcriticalField = value; } } /// [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Wbi2017HcriticalUpliftSpecified { + public bool Wbi2017UpliftHcriticalSpecified { get { - return this.wbi2017HcriticalUpliftFieldSpecified; + return this.wbi2017UpliftHcriticalFieldSpecified; } set { - this.wbi2017HcriticalUpliftFieldSpecified = value; + this.wbi2017UpliftHcriticalFieldSpecified = value; } } @@ -2129,45 +2129,45 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double Wbi2017FactorHeave { + public double Wbi2017HeaveFactor { get { - return this.wbi2017FactorHeaveField; + return this.wbi2017HeaveFactorField; } set { - this.wbi2017FactorHeaveField = value; + this.wbi2017HeaveFactorField = value; } } /// [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Wbi2017FactorHeaveSpecified { + public bool Wbi2017HeaveFactorSpecified { get { - return this.wbi2017FactorHeaveFieldSpecified; + return this.wbi2017HeaveFactorFieldSpecified; } set { - this.wbi2017FactorHeaveFieldSpecified = value; + this.wbi2017HeaveFactorFieldSpecified = value; } } /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double Wbi2017HcriticalHeave { + public double Wbi2017HeaveHcritical { get { - return this.wbi2017HcriticalHeaveField; + return this.wbi2017HeaveHcriticalField; } set { - this.wbi2017HcriticalHeaveField = value; + this.wbi2017HeaveHcriticalField = value; } } /// [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool Wbi2017HcriticalHeaveSpecified { + public bool Wbi2017HeaveHcriticalSpecified { get { - return this.wbi2017HcriticalHeaveFieldSpecified; + return this.wbi2017HeaveHcriticalFieldSpecified; } set { - this.wbi2017HcriticalHeaveFieldSpecified = value; + this.wbi2017HeaveHcriticalFieldSpecified = value; } } Index: DamEngine/trunk/xsd/DamDesignResult.xsd =================================================================== diff -u -r1921 -r1926 --- DamEngine/trunk/xsd/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 1921) +++ DamEngine/trunk/xsd/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 1926) @@ -46,14 +46,14 @@ - - + + - - + + - - + + Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs =================================================================== diff -u -r1141 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 1141) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 1926) @@ -42,10 +42,10 @@ public void TestFullCalculation() { // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 190 - // Hc = SeepageLength / CreepFactor = 40.5 / 18 = 2.25 + // Hcbe = SeepageLength / CreepFactor = 40.5 / 18 = 2.25 // CreepFactor is calculated with D70 // reducedFall = HRiver - HExit - (Rc * DTotal) = 2.0 - 0.0 - (0.3 * 5.0) = 0.5 - // FoSp = Hc / reducedFall = 2.25 / 0.5 + // FoSbe = Hcbe / reducedFall = 2.25 / 0.5 const double diff = 0.0001; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs =================================================================== diff -u -r1921 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs (.../WbiPipingSellmeijerRevisedKernelWrapper.cs) (revision 1921) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs (.../WbiPipingSellmeijerRevisedKernelWrapper.cs) (revision 1926) @@ -62,7 +62,7 @@ { var damPipingOutput = new WbiPipingSellmeijerRevisedOutput() { - FoSp = defaultMaxReturnValue, + FoSbe = defaultMaxReturnValue, FoSu = defaultMaxReturnValue, FoSh = defaultMaxReturnValue }; @@ -186,23 +186,23 @@ pipingDesignResults.ResultMessage = resultMessage; pipingDesignResults.RedesignedSurfaceLine = damKernelInput.Location.SurfaceLine; // Make sure defaultMaxReturnValue is limit. - pipingDesignResults.Wti2017SafetyFactorPiping = Math.Min(damPipingOutput.FoSp, defaultMaxReturnValue); - pipingDesignResults.Wti2017HcriticalPiping = damPipingOutput.Hc; + pipingDesignResults.Wti2017BackwardErosionSafetyFactor = Math.Min(damPipingOutput.FoSbe, defaultMaxReturnValue); + pipingDesignResults.Wti2017BackwardErosionHcritical = damPipingOutput.Hcbe; pipingDesignResults.LocalExitPointX = damPipingOutput.ExitPointX; pipingDesignResults.UpliftFactor = damPipingOutput.UpliftFactor; pipingDesignResults.UpliftSituation = damPipingOutput.UpliftSituation; // Add results of the wbi-uplift calculation - pipingDesignResults.Wti2017SafetyFactorUplift = Math.Min(damPipingOutput.FoSu, defaultMaxReturnValue); - pipingDesignResults.Wti2017HcriticalUplift = damPipingOutput.Hcu; + pipingDesignResults.Wti2017UpliftSafetyFactor = Math.Min(damPipingOutput.FoSu, defaultMaxReturnValue); + pipingDesignResults.Wti2017UpliftHcritical = damPipingOutput.Hcu; pipingDesignResults.Wti2017DeltaPhiCu = damPipingOutput.DeltaPhiCu; // Add results of the wbi-heave calculation - pipingDesignResults.Wti2017SafetyFactorHeave = Math.Min(damPipingOutput.FoSh, defaultMaxReturnValue); ; - pipingDesignResults.Wti2017HcriticalHeave = damPipingOutput.Hch; + pipingDesignResults.Wti2017HeaveSafetyFactor = Math.Min(damPipingOutput.FoSh, defaultMaxReturnValue); ; + pipingDesignResults.Wti2017HeaveHcritical = damPipingOutput.Hch; pipingDesignResults.Wti2017Gradient = damPipingOutput.Gradient; - // Add the overall results for WBI piping kernel (FoS = highest value of FoSh, FoSu and FoSp; HcO is Hc belonging to FoS), see MWDAM-1370 - var maxFoS = damPipingOutput.FoSp; - var overallHc = damPipingOutput.Hc; - if (damPipingOutput.FoSu > damPipingOutput.FoSp) + // 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; + if (damPipingOutput.FoSu > damPipingOutput.FoSbe) { maxFoS = damPipingOutput.FoSu; overallHc = damPipingOutput.Hcu; @@ -275,7 +275,7 @@ messages.AddRange(pipingMessages); // If too low, then determine required height and length (from uplift) - if (damPipingOutput.FoSp < requiredFoS) + if (damPipingOutput.FoSbe < requiredFoS) { // Finally, determine the required shoulderheight double currentShoulderHeight = upliftLocationAndResult.Z - @@ -308,7 +308,7 @@ ThrowWhenDamKernelInputNull(damKernelInput); ThrowWhenKernelOutputNull(damPipingOutput); double fosRequiered = damKernelInput.Location.ModelFactors.RequiredSafetyFactorPiping.Value; - double fosAchieved = damPipingOutput.FoSp; + double fosAchieved = damPipingOutput.FoSbe; evaluationMessage = String.Format(Resources.FactorAchievedVsFactorRequired, fosAchieved, fosRequiered); designAdvise = DesignAdvise.None; return (fosAchieved >= fosRequiered); @@ -620,14 +620,14 @@ private static void PerformSingleCalculationWbiSellmeijerRevised(out List messages, WbiPipingSellmeijerRevisedOutput wbiPipingOutput, WbiPipingSellmeijerRevisedInput wbiPipingInput) { - wbiPipingOutput.FoSp = defaultMaxReturnValue; + wbiPipingOutput.FoSbe = defaultMaxReturnValue; messages = new List(); try { var calculator = CreatePipingCalculatorWbiSellmeijerRevised(wbiPipingInput); calculator.Calculate(); - wbiPipingOutput.FoSp = calculator.FoSp; - wbiPipingOutput.Hc = calculator.Hc; + wbiPipingOutput.FoSbe = calculator.FoSp; + wbiPipingOutput.Hcbe = calculator.Hc; wbiPipingOutput.CalculationResult = CalculationResult.Succeeded; } catch (Exception e) Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/PipingDesignResults.cs =================================================================== diff -u -r1921 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/PipingDesignResults.cs (.../PipingDesignResults.cs) (revision 1921) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/PipingDesignResults.cs (.../PipingDesignResults.cs) (revision 1926) @@ -34,13 +34,13 @@ private double? sellmeijer4ForcesHcritical; private double? sellmeijerVnkFactor; private double? sellmeijerVnkHcritical; - private double? wti2017SafetyFactorPiping; - private double? wti2017HcriticalPiping; - private double? wti2017SafetyFactorUplift; - private double? wti2017HcriticalUplift; + private double? wti2017BackwardErosionSafetyFactor; + private double? wti2017BackwardErosionHcritical; + private double? wti2017UpliftSafetyFactor; + private double? wti2017UpliftHcritical; private double? wti2017DeltaPhiCu; - private double? wti2017SafetyFactorHeave; - private double? wti2017HcriticalHeave; + private double? wti2017HeaveSafetyFactor; + private double? wti2017HeaveHcritical; private double? wti2017Gradient; private double? wti2017SafetyFactorOverall; private double? wti2017HcriticalOverall; @@ -93,7 +93,8 @@ case PipingModelType.Sellmeijer4Forces: return sellmeijer4ForcesFactor; case PipingModelType.Wti2017: - return wti2017SafetyFactorPiping; + // for wti, use the overall result, not the backward erorsion result (as decided by Kin Sun) + return wti2017SafetyFactorOverall; default: return null; } @@ -114,7 +115,8 @@ } if (pipingModelType == PipingModelType.Wti2017) { - wti2017SafetyFactorPiping = value; + // for wti, use the overall result, not the backward erorsion result + wti2017SafetyFactorOverall = value; } } } @@ -264,20 +266,20 @@ } /// - /// Gets or sets the wti2017 safety factor for Piping. + /// Gets or sets the wti2017 safety factor for backward erosion. /// /// - /// The wti2017 safety factor for Piping. + /// The wti2017 safety factor for backward erosion. /// - public double? Wti2017SafetyFactorPiping + public double? Wti2017BackwardErosionSafetyFactor { get { - return wti2017SafetyFactorPiping; + return wti2017BackwardErosionSafetyFactor; } set { - wti2017SafetyFactorPiping = value; + wti2017BackwardErosionSafetyFactor = value; } } @@ -287,15 +289,15 @@ /// /// The wti2017 safety factor for Uplift. /// - public double? Wti2017SafetyFactorUplift + public double? Wti2017UpliftSafetyFactor { get { - return wti2017SafetyFactorUplift; + return wti2017UpliftSafetyFactor; } set { - wti2017SafetyFactorUplift = value; + wti2017UpliftSafetyFactor = value; } } @@ -305,15 +307,15 @@ /// /// The wti2017 safety factor heave. /// - public double? Wti2017SafetyFactorHeave + public double? Wti2017HeaveSafetyFactor { get { - return wti2017SafetyFactorHeave; + return wti2017HeaveSafetyFactor; } set { - wti2017SafetyFactorHeave = value; + wti2017HeaveSafetyFactor = value; } } @@ -336,20 +338,20 @@ } /// - /// Gets or sets the wti2017 hcritical for Piping. + /// Gets or sets the wti2017 hcritical for backward erosion. /// /// - /// The wti2017 hcritical piping. + /// The wti2017 hcritical backward erosion. /// - public double? Wti2017HcriticalPiping + public double? Wti2017BackwardErosionHcritical { get { - return wti2017HcriticalPiping; + return wti2017BackwardErosionHcritical; } set { - wti2017HcriticalPiping = value; + wti2017BackwardErosionHcritical = value; } } @@ -359,15 +361,15 @@ /// /// The wti2017 hcritical uplift. /// - public double? Wti2017HcriticalUplift + public double? Wti2017UpliftHcritical { get { - return wti2017HcriticalUplift; + return wti2017UpliftHcritical; } set { - wti2017HcriticalUplift = value; + wti2017UpliftHcritical = value; } } @@ -377,15 +379,15 @@ /// /// The wti2017 hcritical heave. /// - public double? Wti2017HcriticalHeave + public double? Wti2017HeaveHcritical { get { - return wti2017HcriticalHeave; + return wti2017HeaveHcritical; } set { - wti2017HcriticalHeave = value; + wti2017HeaveHcritical = value; } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs =================================================================== diff -u -r1921 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs (.../WbiPipingSellmeijerRevisedOutput.cs) (revision 1921) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs (.../WbiPipingSellmeijerRevisedOutput.cs) (revision 1926) @@ -32,12 +32,12 @@ public class WbiPipingSellmeijerRevisedOutput: IKernelDataOutput { /// - /// Gets or sets the piping safetyfactor. + /// Gets or sets the backward erosion safetyfactor. /// /// /// The fo sp. /// - public double FoSp { get; set; } + public double FoSbe { get; set; } /// /// Gets or sets the uplift safetyfactor. @@ -56,12 +56,12 @@ public double FoSh { get; set; } /// - /// Gets or sets the H-critical (critical head difference for piping). + /// Gets or sets the H-critical (critical head difference for backward erosion). /// /// /// The hc. /// - public double Hc { get; set; } + public double Hcbe { get; set; } /// /// Gets or sets the H-critical (critical head difference for uplift). Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs =================================================================== diff -u -r1205 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs (.../DamPipingSellmeijerVnkKernelWrapperTests.cs) (revision 1205) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs (.../DamPipingSellmeijerVnkKernelWrapperTests.cs) (revision 1926) @@ -63,8 +63,8 @@ // =========== // reducedFall = HRiver - HExit = 1.0 - 0.0 = 1.0 - // FoSp = Hc / reducedFall = 3.65 / 1.0 = 3.65 - // Hc is calculated with external dll + // FoSbe = Hcbe / reducedFall = 3.65 / 1.0 = 3.65 + // Hcbe is calculated with external dll const double diff = 0.01; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs =================================================================== diff -u -r1919 -r1926 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs (.../PipingSellmeijerRevisedTests.cs) (revision 1919) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs (.../PipingSellmeijerRevisedTests.cs) (revision 1926) @@ -57,8 +57,8 @@ Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - Assert.AreEqual(0.432, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017FactorPiping, tolerance); - Assert.AreEqual(1.383, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017HcriticalPiping, tolerance); + Assert.AreEqual(0.432, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionFactor, tolerance); + Assert.AreEqual(1.383, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionHcritical, tolerance); Assert.AreEqual(35.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance); // The following values are not the same as in the classic UI // The upliftfactor there is 0.351, but that is the Wti Upliftfactor @@ -109,9 +109,9 @@ Assert.AreEqual(93.986, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance); // expected value = 1.280 - Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017FactorPiping, tolerance); + Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionFactor, tolerance); // expected value = 4.097 - Assert.AreEqual(4.097, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017HcriticalPiping, tolerance); + Assert.AreEqual(4.097, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionHcritical, tolerance); // expected value = 0.582 Assert.AreEqual(0.582, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftFactor, tolerance); @@ -152,8 +152,8 @@ Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, tolerance); Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, tolerance); Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, tolerance); - Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017FactorPiping, tolerance); - Assert.AreEqual(4.097, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017HcriticalPiping, tolerance); + Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionFactor, tolerance); + Assert.AreEqual(4.097, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionHcritical, tolerance); Assert.AreEqual(0.582, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftFactor, tolerance); } }