Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs
===================================================================
diff -u -r9b2125ce148137d1b6103557707d81f4771be6bf -rbec4cdb458b713aed1a5a449d3807867764d1706
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs	(.../DuneErosionBoundaryCalculationService.cs)	(revision 9b2125ce148137d1b6103557707d81f4771be6bf)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs	(.../DuneErosionBoundaryCalculationService.cs)	(revision bec4cdb458b713aed1a5a449d3807867764d1706)
@@ -90,20 +90,17 @@
         }
 
         /// <summary>
-        /// Performs a dune erosion calculation based on the supplied <see cref="DuneLocation"/>
-        /// and sets the <see cref="DuneLocationCalculation.Output"/> if the calculation is successful.
+        /// Performs a dune erosion calculation based on the supplied <see cref="DuneLocationCalculation"/>
+        /// and sets its output if the calculation is successful.
         /// Error and status information is logged during the execution of the operation.
         /// </summary>
-        /// <param name="duneLocation">The <see cref="DuneLocation"/> that holds information required 
-        /// to perform the calculation.</param>
         /// <param name="duneLocationCalculation">The <see cref="DuneLocationCalculation"/> to perform.</param>
         /// <param name="norm">The norm to use during the calculation.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The path which points to the hydraulic 
         /// boundary database file.</param>
         /// <param name="preprocessorDirectory">The preprocessor directory.</param>
         /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/> equals <see cref="string.Empty"/>.</remarks>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="duneLocation"/> or
-        /// <paramref name="duneLocationCalculation"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="duneLocationCalculation"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when:
         /// <list type="bullet">
         /// <item>The <paramref name="hydraulicBoundaryDatabaseFilePath"/> contains invalid characters.</item>
@@ -120,23 +117,19 @@
         /// </list></exception>
         /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing 
         /// the calculation.</exception>
-        public void Calculate(DuneLocation duneLocation,
-                              DuneLocationCalculation duneLocationCalculation,
+        public void Calculate(DuneLocationCalculation duneLocationCalculation,
                               double norm,
                               string hydraulicBoundaryDatabaseFilePath,
                               string preprocessorDirectory)
         {
-            if (duneLocation == null)
-            {
-                throw new ArgumentNullException(nameof(duneLocation));
-            }
-
             if (duneLocationCalculation == null)
             {
                 throw new ArgumentNullException(nameof(duneLocationCalculation));
             }
 
             string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
+
+            DuneLocation duneLocation = duneLocationCalculation.DuneLocation;
             string duneLocationName = duneLocation.Name;
 
             CalculationServiceHelper.LogCalculationBegin();
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs
===================================================================
diff -u -rc743d1f229ff553fff9a05964c1adac6e510df4a -rbec4cdb458b713aed1a5a449d3807867764d1706
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs	(.../DuneErosionBoundaryCalculationServiceTest.cs)	(revision c743d1f229ff553fff9a05964c1adac6e510df4a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs	(.../DuneErosionBoundaryCalculationServiceTest.cs)	(revision bec4cdb458b713aed1a5a449d3807867764d1706)
@@ -30,7 +30,6 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.DuneErosion.Data;
-using Ringtoets.DuneErosion.Data.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 using Ringtoets.HydraRing.Calculation.Exceptions;
@@ -132,32 +131,16 @@
         }
 
         [Test]
-        public void Calculate_DuneLocationNull_ThrowArgumentNullException()
+        public void Calculate_DuneLocationCalculationNull_ThrowArgumentNullException()
         {
             // Call
             TestDelegate test = () => new DuneErosionBoundaryCalculationService().Calculate(null,
-                                                                                            new DuneLocationCalculation(new TestDuneLocation()),
                                                                                             1,
                                                                                             validFilePath,
                                                                                             validPreprocessorDirectory);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("duneLocation", exception.ParamName);
-        }
-
-        [Test]
-        public void Calculate_DuneLocationCalculationNull_ThrowArgumentNullException()
-        {
-            // Call
-            TestDelegate test = () => new DuneErosionBoundaryCalculationService().Calculate(new TestDuneLocation(),
-                                                                                            null,
-                                                                                            1,
-                                                                                            validFilePath,
-                                                                                            validPreprocessorDirectory);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("duneLocationCalculation", exception.ParamName);
         }
 
@@ -197,8 +180,7 @@
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                new DuneErosionBoundaryCalculationService().Calculate(duneLocation,
-                                                                      new DuneLocationCalculation(new TestDuneLocation()),
+                new DuneErosionBoundaryCalculationService().Calculate(new DuneLocationCalculation(duneLocation),
                                                                       mechanismSpecificNorm,
                                                                       validFilePath,
                                                                       preprocessorDirectory);
@@ -246,16 +228,15 @@
                                                     Orientation = 0,
                                                     D50 = 0.000007
                                                 });
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
 
             // Precondition
             Assert.IsNull(duneLocation.Calculation.Output);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocation,
-                                                                                          duneLocationCalculation,
+                Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocationCalculation,
                                                                                           mechanismSpecificNorm,
                                                                                           validFilePath,
                                                                                           validPreprocessorDirectory);
@@ -317,13 +298,12 @@
                                                     Orientation = 0,
                                                     D50 = 0.000007
                                                 });
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocation,
-                                                                                          duneLocationCalculation,
+                Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocationCalculation,
                                                                                           failureMechanism.GetMechanismSpecificNorm(1.0 / 200),
                                                                                           validFilePath,
                                                                                           validPreprocessorDirectory);
@@ -371,16 +351,15 @@
                                                     Orientation = 0,
                                                     D50 = 0.000007
                                                 });
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 var service = new DuneErosionBoundaryCalculationService();
                 calculator.CalculationFinishedHandler += (s, e) => service.Cancel();
 
                 // Call
-                service.Calculate(duneLocation,
-                                  duneLocationCalculation,
+                service.Calculate(duneLocationCalculation,
                                   failureMechanism.GetMechanismSpecificNorm(1.0 / 200),
                                   validFilePath,
                                   validPreprocessorDirectory);
@@ -421,7 +400,7 @@
                                                     Orientation = 0,
                                                     D50 = 0.000007
                                                 });
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -432,8 +411,7 @@
                 {
                     try
                     {
-                        new DuneErosionBoundaryCalculationService().Calculate(duneLocation,
-                                                                              duneLocationCalculation,
+                        new DuneErosionBoundaryCalculationService().Calculate(duneLocationCalculation,
                                                                               failureMechanism.GetMechanismSpecificNorm(1.0 / 200),
                                                                               validFilePath,
                                                                               validPreprocessorDirectory);
@@ -492,7 +470,7 @@
                                                     Orientation = 0,
                                                     D50 = 0.000007
                                                 });
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -503,8 +481,7 @@
                 {
                     try
                     {
-                        new DuneErosionBoundaryCalculationService().Calculate(duneLocation,
-                                                                              duneLocationCalculation,
+                        new DuneErosionBoundaryCalculationService().Calculate(duneLocationCalculation,
                                                                               failureMechanism.GetMechanismSpecificNorm(1.0 / 200),
                                                                               validFilePath,
                                                                               validPreprocessorDirectory);
@@ -564,7 +541,7 @@
                                                     Orientation = 0,
                                                     D50 = 0.000007
                                                 });
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -576,8 +553,7 @@
                 {
                     try
                     {
-                        new DuneErosionBoundaryCalculationService().Calculate(duneLocation,
-                                                                              duneLocationCalculation,
+                        new DuneErosionBoundaryCalculationService().Calculate(duneLocationCalculation,
                                                                               failureMechanism.GetMechanismSpecificNorm(1.0 / 200),
                                                                               validFilePath,
                                                                               validPreprocessorDirectory);