Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationRow.cs
===================================================================
diff -u -r75cdc7840bc359c9cf70795d58297708e48a27b2 -redece3c8789fe858a32c3609d5cc83d33d81ca7e
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationRow.cs	(.../DuneLocationRow.cs)	(revision 75cdc7840bc359c9cf70795d58297708e48a27b2)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationRow.cs	(.../DuneLocationRow.cs)	(revision edece3c8789fe858a32c3609d5cc83d33d81ca7e)
@@ -32,38 +32,26 @@
 namespace Ringtoets.DuneErosion.Forms.Views
 {
     /// <summary>
-    /// This class represents a row of <see cref="DuneLocation"/>.
+    /// This class represents a row of <see cref="DuneLocationCalculation"/>.
     /// </summary>
-    public class DuneLocationRow : CalculatableRow<DuneLocation>
+    public class DuneLocationRow : CalculatableRow<DuneLocationCalculation>
     {
-        private readonly Func<DuneLocation, DuneLocationCalculation> getCalculationFunc;
-
         /// <summary>
         /// Creates a new instance of <see cref="DuneLocationRow"/>.
         /// </summary>
-        /// <param name="duneLocation">The <see cref="DuneLocation"/> to wrap.</param>
-        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="DuneLocationCalculation"/>
-        /// based on <see cref="DuneLocation"/>.</param>
+        /// <param name="duneLocationCalculation">The <see cref="DuneLocationCalculation"/> to wrap.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public DuneLocationRow(DuneLocation duneLocation, Func<DuneLocation, DuneLocationCalculation> getCalculationFunc)
-            : base(duneLocation)
-        {
-            if (getCalculationFunc == null)
-            {
-                throw new ArgumentNullException(nameof(getCalculationFunc));
-            }
+        public DuneLocationRow(DuneLocationCalculation duneLocationCalculation)
+            : base(duneLocationCalculation) {}
 
-            this.getCalculationFunc = getCalculationFunc;
-        }
-
         /// <summary>
         /// Gets the <see cref="DuneLocation.Name"/>.
         /// </summary>
         public string Name
         {
             get
             {
-                return CalculatableObject.Name;
+                return CalculatableObject.DuneLocation.Name;
             }
         }
 
@@ -74,7 +62,7 @@
         {
             get
             {
-                return CalculatableObject.Id;
+                return CalculatableObject.DuneLocation.Id;
             }
         }
 
@@ -85,7 +73,7 @@
         {
             get
             {
-                return CalculatableObject.Location;
+                return CalculatableObject.DuneLocation.Location;
             }
         }
 
@@ -96,7 +84,7 @@
         {
             get
             {
-                return CalculatableObject.CoastalAreaId;
+                return CalculatableObject.DuneLocation.CoastalAreaId;
             }
         }
 
@@ -107,7 +95,7 @@
         {
             get
             {
-                return CalculatableObject.Offset.ToString(DuneErosionDataResources.DuneLocation_Offset_format, CultureInfo.InvariantCulture);
+                return CalculatableObject.DuneLocation.Offset.ToString(DuneErosionDataResources.DuneLocation_Offset_format, CultureInfo.InvariantCulture);
             }
         }
 
@@ -119,7 +107,7 @@
         {
             get
             {
-                return getCalculationFunc(CalculatableObject).Output?.WaterLevel ?? RoundedDouble.NaN;
+                return CalculatableObject.Output?.WaterLevel ?? RoundedDouble.NaN;
             }
         }
 
@@ -131,7 +119,7 @@
         {
             get
             {
-                return getCalculationFunc(CalculatableObject).Output?.WaveHeight ?? RoundedDouble.NaN;
+                return CalculatableObject.Output?.WaveHeight ?? RoundedDouble.NaN;
             }
         }
 
@@ -143,7 +131,7 @@
         {
             get
             {
-                return getCalculationFunc(CalculatableObject).Output?.WavePeriod ?? RoundedDouble.NaN;
+                return CalculatableObject.Output?.WavePeriod ?? RoundedDouble.NaN;
             }
         }
 
@@ -154,7 +142,7 @@
         {
             get
             {
-                return CalculatableObject.D50;
+                return CalculatableObject.DuneLocation.D50;
             }
         }
     }
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationRowTest.cs
===================================================================
diff -u -rc743d1f229ff553fff9a05964c1adac6e510df4a -redece3c8789fe858a32c3609d5cc83d33d81ca7e
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationRowTest.cs	(.../DuneLocationRowTest.cs)	(revision c743d1f229ff553fff9a05964c1adac6e510df4a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationRowTest.cs	(.../DuneLocationRowTest.cs)	(revision edece3c8789fe858a32c3609d5cc83d33d81ca7e)
@@ -37,17 +37,6 @@
     public class DuneLocationRowTest
     {
         [Test]
-        public void Constructor_GetCalculationFuncNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate call = () => new DuneLocationRow(new TestDuneLocation(), null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("getCalculationFunc", exception.ParamName);
-        }
-
-        [Test]
         [TestCase(34.1)]
         [TestCase(34.0)]
         public void Constructor_WithOutput_ExpectedValues(double offSet)
@@ -59,7 +48,7 @@
                 Offset = offSet,
                 D50 = 0.000183
             });
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation())
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation)
             {
                 Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
                 {
@@ -70,11 +59,11 @@
             };
 
             // Call
-            var row = new DuneLocationRow(duneLocation, dl => duneLocationCalculation);
+            var row = new DuneLocationRow(duneLocationCalculation);
 
             // Assert
-            Assert.IsInstanceOf<CalculatableRow<DuneLocation>>(row);
-            Assert.AreSame(duneLocation, row.CalculatableObject);
+            Assert.IsInstanceOf<CalculatableRow<DuneLocationCalculation>>(row);
+            Assert.AreSame(duneLocationCalculation, row.CalculatableObject);
             Assert.AreEqual(duneLocation.Id, row.Id);
             Assert.AreEqual(duneLocation.Name, row.Name);
             Assert.AreSame(duneLocation.Location, row.Location);
@@ -97,11 +86,10 @@
         public void Constructor_WithoutOutput_ExpectedValues()
         {
             // Setup
-            var duneLocation = new DuneLocation(1, "test location", new Point2D(3.3, 4.4), new DuneLocation.ConstructionProperties());
             var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
 
             // Call
-            var row = new DuneLocationRow(duneLocation, dl => duneLocationCalculation);
+            var row = new DuneLocationRow(duneLocationCalculation);
 
             // Assert
             Assert.IsNaN(row.WaterLevel);