Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs =================================================================== diff -u -r6128 -r6147 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 6128) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 6147) @@ -390,24 +390,27 @@ // asserts PlLinePoint lastPoint = actual.Points.Last(); Assert.That(actual.Points, Has.Count.EqualTo(9)); - Assert.That(actual.Points[0].X, Is.EqualTo(0)); - Assert.That(actual.Points[0].Z, Is.EqualTo(5)); - Assert.That(actual.Points[1].X, Is.EqualTo(71.875)); - Assert.That(actual.Points[1].Z, Is.EqualTo(5)); - Assert.That(actual.Points[2].X, Is.EqualTo(85)); - Assert.That(actual.Points[2].Z, Is.EqualTo(4.5)); - Assert.That(actual.Points[3].X, Is.EqualTo(90)); - Assert.That(actual.Points[3].Z, Is.EqualTo(sensor2Value)); - Assert.That(actual.Points[4].X, Is.EqualTo(95)); - Assert.That(actual.Points[4].Z, Is.EqualTo(3.5)); - Assert.That(actual.Points[5].X, Is.EqualTo(104)); - Assert.That(actual.Points[5].Z, Is.EqualTo(sensor3Value)); - Assert.That(actual.Points[6].X, Is.EqualTo(108)); - Assert.That(actual.Points[6].Z, Is.EqualTo(3.9)); - Assert.That(actual.Points[7].X, Is.EqualTo(123.3)); - Assert.That(actual.Points[7].Z, Is.EqualTo(sensor4Value)); - Assert.That(actual.Points[8].X, Is.EqualTo(190)); - Assert.That(actual.Points[8].Z, Is.EqualTo(sensor4Value)); + Assert.Multiple(() => + { + Assert.That(actual.Points[0].X, Is.EqualTo(0)); + Assert.That(actual.Points[0].Z, Is.EqualTo(5)); + Assert.That(actual.Points[1].X, Is.EqualTo(71.875)); + Assert.That(actual.Points[1].Z, Is.EqualTo(5)); + Assert.That(actual.Points[2].X, Is.EqualTo(85)); + Assert.That(actual.Points[2].Z, Is.EqualTo(4.5)); + Assert.That(actual.Points[3].X, Is.EqualTo(90)); + Assert.That(actual.Points[3].Z, Is.EqualTo(sensor2Value)); + Assert.That(actual.Points[4].X, Is.EqualTo(95)); + Assert.That(actual.Points[4].Z, Is.EqualTo(3.5)); + Assert.That(actual.Points[5].X, Is.EqualTo(104)); + Assert.That(actual.Points[5].Z, Is.EqualTo(sensor3Value)); + Assert.That(actual.Points[6].X, Is.EqualTo(108)); + Assert.That(actual.Points[6].Z, Is.EqualTo(3.9)); + Assert.That(actual.Points[7].X, Is.EqualTo(123.3)); + Assert.That(actual.Points[7].Z, Is.EqualTo(sensor4Value)); + Assert.That(actual.Points[8].X, Is.EqualTo(190)); + Assert.That(actual.Points[8].Z, Is.EqualTo(sensor4Value)); + }); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingBligh/WtiPipingBlighKernelWrapper.cs =================================================================== diff -u -r6136 -r6147 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingBligh/WtiPipingBlighKernelWrapper.cs (.../WtiPipingBlighKernelWrapper.cs) (revision 6136) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingBligh/WtiPipingBlighKernelWrapper.cs (.../WtiPipingBlighKernelWrapper.cs) (revision 6147) @@ -49,6 +49,7 @@ { private const double defaultFluidisationGradient = 0.3; private const double defaultMaxReturnValue = 90.0; + private const double d50DividedByD70 = 0.81; /// /// Create the kernel input. @@ -237,7 +238,7 @@ /// The design advise. /// The evaluation message. /// - /// if the design was succesful + /// if the design was successful /// /// public bool EvaluateDesign(DamKernelInput damKernelInput, IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, @@ -371,29 +372,29 @@ Rc = wtiPipingBlighInput.Rc, DTotal = wtiPipingBlighInput.DTotal, SeepageLength = wtiPipingBlighInput.SeepageLength, - D50 = 0.81 * wtiPipingBlighInput.D70, + D50 = d50DividedByD70 * wtiPipingBlighInput.D70, ModelFactorPiping = 1 }; return calculator; } - private void ThrowWhenKernelInputNull(WtiPipingBlighInput wtiPipingBlighInput) + private static void ThrowWhenKernelInputNull(WtiPipingBlighInput wtiPipingBlighInput) { if (wtiPipingBlighInput == null) { throw new NoNullAllowedException(Resources.WtiPipingBlighKernelWrapper_NoInputObjectDefinedForBligh); } } - private void ThrowWhenKernelOutputNull(WtiPipingBlighOutput wtiPipingBlighOutput) + private static void ThrowWhenKernelOutputNull(WtiPipingBlighOutput wtiPipingBlighOutput) { if (wtiPipingBlighOutput == null) { throw new NoNullAllowedException(Resources.WtiPipingBlighKernelWrapper_NoOutputObjectDefinedForBligh); } } - private void ThrowWhenDamKernelInputNull(DamKernelInput damKernelInput) + private static void ThrowWhenDamKernelInputNull(DamKernelInput damKernelInput) { if (damKernelInput == null) {