Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs
===================================================================
diff -u -r5677f0f28cb43bd9fbe0ebe3e5556b841d5d5695 -r5c823d529eb2fcbf28cecd468b056de07fdb1c11
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs)	(revision 5677f0f28cb43bd9fbe0ebe3e5556b841d5d5695)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs)	(revision 5c823d529eb2fcbf28cecd468b056de07fdb1c11)
@@ -49,13 +49,16 @@
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsWaveHeightLocationsView"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism that the locations belong to.</param>
+        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="HydraulicBoundaryLocationCalculation"/>
+        /// based on <see cref="HydraulicBoundaryLocation"/>.</param>
         /// <param name="assessmentSection">The assessment section that the locations belong to.</param>
         /// <param name="getNormFunc"><see cref="Func{TResult}"/> for getting the norm to derive a mechanism specific norm from.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         public GrassCoverErosionOutwardsWaveHeightLocationsView(GrassCoverErosionOutwardsFailureMechanism failureMechanism,
+                                                                Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc,
                                                                 IAssessmentSection assessmentSection,
                                                                 Func<double> getNormFunc)
-            : base(failureMechanism?.HydraulicBoundaryLocations, assessmentSection)
+            : base(failureMechanism?.HydraulicBoundaryLocations, getCalculationFunc, assessmentSection)
         {
             if (getNormFunc == null)
             {
@@ -114,7 +117,7 @@
             CalculationGuiService.CalculateWaveHeights(AssessmentSection.HydraulicBoundaryDatabase.FilePath,
                                                        AssessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
                                                        locations,
-                                                       hbl => hbl.WaveHeightCalculation,
+                                                       getCalculationFunc,
                                                        mechanismSpecificNorm,
                                                        messageProvider);
         }
@@ -128,7 +131,7 @@
 
         protected override HydraulicBoundaryLocationCalculation GetCalculation(HydraulicBoundaryLocation location)
         {
-            return location.WaveHeightCalculation;
+            return getCalculationFunc(location);
         }
     }
 }
\ No newline at end of file