Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs =================================================================== diff -u -r6107 -r6131 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 6107) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 6131) @@ -36,7 +36,8 @@ using Deltares.DamEngine.Data.Standard; using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Data.Standard.Logging; -using Deltares.DamPiping.BlighCalculator; +using Deltares.WTIPiping; +using UpliftLocationAndResult = Deltares.DamEngine.Calculators.Uplift.UpliftLocationAndResult; namespace Deltares.DamEngine.Calculators.KernelWrappers.DamPipingBligh; @@ -57,7 +58,7 @@ /// The kernel data input. /// The kernel data output. /// - /// Result of the prepare + /// Result of the preparation /// public PrepareResult Prepare(DamKernelInput damKernelInput, int iterationIndex, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput) { @@ -97,7 +98,7 @@ public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages) { var damPipingBlighOutput = (DamPipingBlighOutput) kernelDataOutput; - PipingCalculatorBligh calculatorBligh = CreatePipingCalculatorBligh(kernelDataInput); + BlighCalculator calculatorBligh = CreateWtiPipingCalculatorBligh(kernelDataInput); List kernelMessages = calculatorBligh.Validate(); messages = new List(); foreach (string stringMessage in kernelMessages) @@ -336,9 +337,12 @@ { if (damPipingBlighOutput.UpliftSituation.IsUplift) { - PipingCalculatorBligh calculatorBligh = CreatePipingCalculatorBligh(damPipingBlighInput); + BlighCalculator calculatorBligh = CreateWtiPipingCalculatorBligh(damPipingBlighInput); calculatorBligh.Calculate(); - damPipingBlighOutput.FoSp = calculatorBligh.FoSp; + if (!double.IsPositiveInfinity(calculatorBligh.FoSp)) + { + damPipingBlighOutput.FoSp = calculatorBligh.FoSp; + } damPipingBlighOutput.Hc = calculatorBligh.Hc; damPipingBlighOutput.CalculationResult = CalculationResult.Succeeded; } @@ -349,25 +353,26 @@ messages.Add(new LogMessage(LogMessageType.Error, null, e.Message)); } } - + /// - /// Creates the piping calculator bligh based on kernel input. + /// Creates the Bligh piping calculator based on kernel input. /// /// The kernel data input. /// /// No input object defined for Bligh - private PipingCalculatorBligh CreatePipingCalculatorBligh(IKernelDataInput kernelDataInput) + private BlighCalculator CreateWtiPipingCalculatorBligh(IKernelDataInput kernelDataInput) { var damPipingBlighInput = kernelDataInput as DamPipingBlighInput; ThrowWhenKernelInputNull(damPipingBlighInput); - var calculator = new PipingCalculatorBligh + var calculator = new BlighCalculator { HRiver = damPipingBlighInput.HRiver, HExit = damPipingBlighInput.HExit, Rc = damPipingBlighInput.Rc, DTotal = damPipingBlighInput.DTotal, SeepageLength = damPipingBlighInput.SeepageLength, - D70 = damPipingBlighInput.D70 + D50 = 0.81 * damPipingBlighInput.D70 * Physics.FactorMicroMeterToMeter, + ModelFactorPiping = 1 }; return calculator; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighInput.cs =================================================================== diff -u -r4540 -r6131 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighInput.cs (.../DamPipingBlighInput.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighInput.cs (.../DamPipingBlighInput.cs) (revision 6131) @@ -38,7 +38,7 @@ public double HRiver { get; set; } /// - /// Gets or sets the head at exitpoint. + /// Gets or sets the head at exit point. /// /// /// The h exit. @@ -62,7 +62,7 @@ public double DTotal { get; set; } /// - /// Gets or sets the seepagelength. + /// Gets or sets the seepage length. /// /// /// The length of the seepage. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj =================================================================== diff -u -r5861 -r6131 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 5861) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 6131) @@ -12,9 +12,6 @@ - - ..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.BlighCalculator.dll - ..\..\lib\FailureMechanisms\MacroStabilityCSharpWrapperDeterministicSigned\Deltares.MacroStability.CSharpWrapper.dll Index: DamEngine/trunk/lib/FailureMechanisms/DamPiping/Deltares.DamPiping.BlighCalculator.dll =================================================================== diff -u -r4597 -r6131 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/DamPiping/nl-NL/Deltares.DamPiping.BlighCalculator.resources.dll =================================================================== diff -u -r4445 -r6131 Binary files differ Index: DamEngine/trunk/lib/FailureMechanisms/DamPiping/Deltares.DamPiping.BlighCalculator.pdb =================================================================== diff -u -r4271 -r6131 Binary files differ