Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs
===================================================================
diff -u -rf5cd3b2ee9b7436f606ee6bc027b795accf0549d -r47e804a6d0ea1747385f7060a01ec262afd969b8
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision f5cd3b2ee9b7436f606ee6bc027b795accf0549d)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision 47e804a6d0ea1747385f7060a01ec262afd969b8)
@@ -81,7 +81,7 @@
 
             calculationService.Calculate(calculation,
                                          failureMechanism.GeneralInput,
-                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase));
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection, calculation.InputParameters.HydraulicBoundaryLocation));
         }
 
         protected override void OnCancel()
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresCalculationActivity.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r47e804a6d0ea1747385f7060a01ec262afd969b8
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresCalculationActivity.cs	(.../HeightStructuresCalculationActivity.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresCalculationActivity.cs	(.../HeightStructuresCalculationActivity.cs)	(revision 47e804a6d0ea1747385f7060a01ec262afd969b8)
@@ -81,7 +81,7 @@
 
             calculationService.Calculate(calculation,
                                          failureMechanism.GeneralInput,
-                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase));
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection, calculation.InputParameters.HydraulicBoundaryLocation));
         }
 
         protected override void OnCancel()
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r47e804a6d0ea1747385f7060a01ec262afd969b8
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs	(.../StabilityPointStructuresCalculationActivity.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs	(.../StabilityPointStructuresCalculationActivity.cs)	(revision 47e804a6d0ea1747385f7060a01ec262afd969b8)
@@ -81,7 +81,7 @@
 
             calculationService.Calculate(calculation,
                                          failureMechanism.GeneralInput,
-                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase));
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection, calculation.InputParameters.HydraulicBoundaryLocation));
         }
 
         protected override void OnCancel()