Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -r89208074af9e942166875097aa38aa77476a5a3a --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision 89208074af9e942166875097aa38aa77476a5a3a) @@ -293,7 +293,6 @@ calculator.PhiPolder = input.PhreaticLevelExit; calculator.RExit = input.DampingFactorExit; calculator.HExit = input.PhreaticLevelExit; - calculator.BottomLevelAquitardAboveExitPointZ = GetBottomAquitardLayerAboveExitPointZ(); return calculator; } Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/HeaveCalculator.cs =================================================================== diff -u -r0dfaf04c32ddd8f2ccfe1e244bdc6efcbb3b6857 -r89208074af9e942166875097aa38aa77476a5a3a --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/HeaveCalculator.cs (.../HeaveCalculator.cs) (revision 0dfaf04c32ddd8f2ccfe1e244bdc6efcbb3b6857) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/HeaveCalculator.cs (.../HeaveCalculator.cs) (revision 89208074af9e942166875097aa38aa77476a5a3a) @@ -86,14 +86,6 @@ } } - public double BottomLevelAquitardAboveExitPointZ - { - set - { - wrappedCalculator.BottomLevelAquitardAboveExitPointZ = value; - } - } - public double Gradient { get Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs =================================================================== diff -u -r5803275ea1237501fd8a9fdd9d1f795d98d0aa4c -r89208074af9e942166875097aa38aa77476a5a3a --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs (.../IHeaveCalculator.cs) (revision 5803275ea1237501fd8a9fdd9d1f795d98d0aa4c) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs (.../IHeaveCalculator.cs) (revision 89208074af9e942166875097aa38aa77476a5a3a) @@ -59,11 +59,6 @@ double RExit { set; } /// - /// Sets the bottom level of the bottommost aquitard that is above the exit point's z-coordinate. - /// - double BottomLevelAquitardAboveExitPointZ { set; } - - /// /// Gets the vertical outflow gradient. /// double Gradient { get; } Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -r89208074af9e942166875097aa38aa77476a5a3a --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision 89208074af9e942166875097aa38aa77476a5a3a) @@ -99,7 +99,6 @@ new PipingCalculator(input, testPipingSubCalculatorFactory).Calculate(); // Assert - Assert.AreEqual(bottomAquitardLayerAboveExitPointZ, testPipingSubCalculatorFactory.LastCreatedHeaveCalculator.BottomLevelAquitardAboveExitPointZ); Assert.AreEqual(bottomAquitardLayerAboveExitPointZ, testPipingSubCalculatorFactory.LastCreatedSellmeijerCalculator.BottomLevelAquitardAboveExitPointZ); } Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/HeaveCalculatorStubTest.cs =================================================================== diff -u -rb7563238aa805cb6207e948a97f6fcc9e52c92b2 -r89208074af9e942166875097aa38aa77476a5a3a --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/HeaveCalculatorStubTest.cs (.../HeaveCalculatorStubTest.cs) (revision b7563238aa805cb6207e948a97f6fcc9e52c92b2) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/HeaveCalculatorStubTest.cs (.../HeaveCalculatorStubTest.cs) (revision 89208074af9e942166875097aa38aa77476a5a3a) @@ -40,7 +40,6 @@ Assert.AreEqual(0, stub.PhiExit); Assert.AreEqual(0, stub.PhiPolder); Assert.AreEqual(0, stub.RExit); - Assert.AreEqual(0, stub.BottomLevelAquitardAboveExitPointZ); Assert.AreEqual(0, stub.Gradient); Assert.AreEqual(0, stub.FoSh); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs =================================================================== diff -u -r603e8bd9a029ad240267e5aec4d89aab7709bb06 -r89208074af9e942166875097aa38aa77476a5a3a --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs (.../HeaveCalculatorStub.cs) (revision 603e8bd9a029ad240267e5aec4d89aab7709bb06) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs (.../HeaveCalculatorStub.cs) (revision 89208074af9e942166875097aa38aa77476a5a3a) @@ -35,7 +35,6 @@ public double PhiExit { get; set; } public double PhiPolder { get; set; } public double RExit { get; set; } - public double BottomLevelAquitardAboveExitPointZ { get; set; } public double Gradient { get; private set; } public double Zh { get; private set; } public double FoSh { get; private set; } Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -r89208074af9e942166875097aa38aa77476a5a3a --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 89208074af9e942166875097aa38aa77476a5a3a) @@ -318,7 +318,7 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); - Assert.AreEqual("Validatie mislukt: Profielschematisch ligt (deels) boven de ondergrondschematisatie.", msgs[1]); + Assert.AreEqual("Validatie mislukt: Hoogtegeometrie ligt (deels) boven de ondergrondschematisatie.", msgs[1]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beƫindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); Index: lib/Plugins/Wti/WTIPiping.dll =================================================================== diff -u -r0dfaf04c32ddd8f2ccfe1e244bdc6efcbb3b6857 -r89208074af9e942166875097aa38aa77476a5a3a Binary files differ