Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r64f84fe98cafb36dab06516a92d7aff97405f0ea
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs	(.../DuneLocationCalculationGuiServiceTest.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs	(.../DuneLocationCalculationGuiServiceTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
@@ -165,26 +165,40 @@
         public void Calculate_ValidPathOneCalculation_LogsMessages()
         {
             // Setup
+            const string calculationIdentifier = "1/100";
+            const string duneLocationName = "duneLocationName";
+
+            var duneLocation = new TestDuneLocation(duneLocationName);
+
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
-                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath,
                     UsePreprocessorClosure = true
+                },
+                HydraulicBoundaryDatabases =
+                {
+                    new HydraulicBoundaryDatabase
+                    {
+                        FilePath = validHrdFilePath,
+                        Locations =
+                        {
+                            duneLocation.HydraulicBoundaryLocation
+                        }
+                    }
                 }
             };
 
-            const string calculationIdentifier = "1/100";
-            const string duneLocationName = "duneLocationName";
-
             var mocks = new MockRepository();
             var calculatorFactory = mocks.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryData),
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(
+                                         hydraulicBoundaryData,
+                                         duneLocation.HydraulicBoundaryLocation),
                                      (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(new TestDunesBoundaryConditionsCalculator());
@@ -199,11 +213,13 @@
                 var guiService = new DuneLocationCalculationGuiService(viewParent);
 
                 // Call
-                void Call() =>
+                void Call()
+                {
                     guiService.Calculate(new[]
                     {
-                        new DuneLocationCalculation(new TestDuneLocation(duneLocationName))
+                        new DuneLocationCalculation(duneLocation)
                     }, assessmentSection, 0.01, calculationIdentifier);
+                }
 
                 // Assert
                 TestHelper.AssertLogMessages(Call, messages =>
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs
===================================================================
diff -u -rc9fe0ccb76e6f14d7a4cb891349402a85c856d8b -r64f84fe98cafb36dab06516a92d7aff97405f0ea
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs	(.../DuneLocationCalculationsViewTest.cs)	(revision c9fe0ccb76e6f14d7a4cb891349402a85c856d8b)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs	(.../DuneLocationCalculationsViewTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
@@ -632,13 +632,28 @@
         {
             // Setup
             const double targetProbability = 0.01;
+
+            IObservableEnumerable<DuneLocationCalculation> duneLocationCalculations = GenerateDuneLocationCalculations();
+
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = duneLocationCalculations.First().DuneLocation.HydraulicBoundaryLocation;
+
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
-                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath,
                     UsePreprocessorClosure = usePreprocessorClosure
+                },
+                HydraulicBoundaryDatabases =
+                {
+                    new HydraulicBoundaryDatabase
+                    {
+                        FilePath = validHrdFilePath,
+                        Locations =
+                        {
+                            hydraulicBoundaryLocation
+                        }
+                    }
                 }
             };
 
@@ -655,15 +670,16 @@
                              .WhenCalled(invocation =>
                              {
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryData),
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryData,
+                                                                                                hydraulicBoundaryLocation),
                                      (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(dunesBoundaryConditionsCalculator);
             mocks.ReplayAll();
 
             var failureMechanism = new DuneErosionFailureMechanism();
 
-            using (var view = new DuneLocationCalculationsView(GenerateDuneLocationCalculations(),
+            using (var view = new DuneLocationCalculationsView(duneLocationCalculations,
                                                                failureMechanism,
                                                                assessmentSection,
                                                                () => targetProbability,
@@ -722,15 +738,17 @@
 
         private static IObservableEnumerable<DuneLocationCalculation> GenerateDuneLocationCalculations()
         {
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 1.0, 1.0);
+
             return new ObservableList<DuneLocationCalculation>
             {
-                new DuneLocationCalculation(new DuneLocation("1", new HydraulicBoundaryLocation(1, string.Empty, 1.0, 1.0), new DuneLocation.ConstructionProperties
+                new DuneLocationCalculation(new DuneLocation("1", hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties
                 {
                     CoastalAreaId = 50,
                     Offset = 320,
                     D50 = 0.000837
                 })),
-                new DuneLocationCalculation(new DuneLocation("2", new HydraulicBoundaryLocation(2, string.Empty, 2.0, 2.0), new DuneLocation.ConstructionProperties
+                new DuneLocationCalculation(new DuneLocation("2", hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties
                 {
                     CoastalAreaId = 60,
                     Offset = 230,
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r64f84fe98cafb36dab06516a92d7aff97405f0ea
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
@@ -553,14 +553,26 @@
         public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenAllCalculationsScheduled()
         {
             // Given
+            var duneLocation = new TestDuneLocation("Test");
+
             var assessmentSection = new AssessmentSectionStub
             {
                 HydraulicBoundaryData =
                 {
-                    FilePath = validHrdFilePath,
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = validHrdFilePath,
+                            Locations =
+                            {
+                                duneLocation.HydraulicBoundaryLocation
+                            }
+                        }
                     }
                 }
             };
@@ -574,7 +586,6 @@
                 }
             };
 
-            var duneLocation = new TestDuneLocation("Test");
             failureMechanism.SetDuneLocations(new[]
             {
                 duneLocation
@@ -606,7 +617,9 @@
                                  .WhenCalled(invocation =>
                                  {
                                      HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData),
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(
+                                             assessmentSection.HydraulicBoundaryData,
+                                             duneLocation.HydraulicBoundaryLocation),
                                          (HydraRingCalculationSettings) invocation.Arguments[0]);
                                  })
                                  .Return(dunesBoundaryConditionsCalculator).Repeat.Times(2);
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -r55319647c90efabfada9d4e3dcef3ac041f3a33e -r64f84fe98cafb36dab06516a92d7aff97405f0ea
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 55319647c90efabfada9d4e3dcef3ac041f3a33e)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
@@ -495,11 +495,13 @@
         public void PerformDuneLocationCalculationsFromContextMenu_HydraulicBoundaryDataSet_SendsRightInputToCalculationService(bool usePreprocessorClosure)
         {
             // Setup
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0);
+
             var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01)
             {
                 DuneLocationCalculations =
                 {
-                    new DuneLocationCalculation(new DuneLocation("A", new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0), new DuneLocation.ConstructionProperties
+                    new DuneLocationCalculation(new DuneLocation("A", hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties
                     {
                         CoastalAreaId = 0,
                         Offset = 0,
@@ -514,11 +516,21 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
-                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath,
                     UsePreprocessorClosure = usePreprocessorClosure
+                },
+                HydraulicBoundaryDatabases =
+                {
+                    new HydraulicBoundaryDatabase
+                    {
+                        FilePath = validHrdFilePath,
+                        Locations =
+                        {
+                            hydraulicBoundaryLocation
+                        }
+                    }
                 }
             };
 
@@ -551,7 +563,8 @@
                                  .WhenCalled(invocation =>
                                  {
                                      HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryData),
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryData,
+                                                                                                    hydraulicBoundaryLocation),
                                          (HydraRingCalculationSettings) invocation.Arguments[0]);
                                  })
                                  .Return(dunesBoundaryConditionsCalculator);
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r64f84fe98cafb36dab06516a92d7aff97405f0ea
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
@@ -263,14 +263,26 @@
         public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenAllCalculationsScheduled()
         {
             // Given
+            var duneLocation = new TestDuneLocation("Test");
+
             var assessmentSection = new AssessmentSectionStub
             {
                 HydraulicBoundaryData =
                 {
-                    FilePath = validHrdFilePath,
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = validHrdFilePath,
+                            Locations =
+                            {
+                                duneLocation.HydraulicBoundaryLocation
+                            }
+                        }
                     }
                 }
             };
@@ -284,7 +296,6 @@
                 }
             };
 
-            var duneLocation = new TestDuneLocation("Test");
             failureMechanism.SetDuneLocations(new[]
             {
                 duneLocation
@@ -311,7 +322,9 @@
                                  .WhenCalled(invocation =>
                                  {
                                      HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData),
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(
+                                             assessmentSection.HydraulicBoundaryData,
+                                             duneLocation.HydraulicBoundaryLocation),
                                          (HydraRingCalculationSettings) invocation.Arguments[0]);
                                  })
                                  .Return(dunesBoundaryConditionsCalculator).Repeat.Times(2);
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -r55319647c90efabfada9d4e3dcef3ac041f3a33e -r64f84fe98cafb36dab06516a92d7aff97405f0ea
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision 55319647c90efabfada9d4e3dcef3ac041f3a33e)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
@@ -92,9 +92,13 @@
 
             AssessmentSectionStub assessmentSection = CreateAssessmentSection(usePreprocessorClosure);
 
-            var duneLocation1 = new DuneLocation("locationName1", new HydraulicBoundaryLocation(1, string.Empty, 1, 1), new DuneLocation.ConstructionProperties());
-            var duneLocation2 = new DuneLocation("locationName2", new HydraulicBoundaryLocation(2, string.Empty, 2, 2), new DuneLocation.ConstructionProperties());
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 1, 1);
 
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.First().Locations.Add(hydraulicBoundaryLocation);
+
+            var duneLocation1 = new DuneLocation("locationName1", hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties());
+            var duneLocation2 = new DuneLocation("locationName2", hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties());
+
             // Call
             CalculatableActivity[] activities = DuneLocationCalculationActivityFactory.CreateCalculationActivities(
                 new[]
@@ -165,9 +169,13 @@
                 }
             };
 
-            var duneLocation1 = new DuneLocation("locationName1", new HydraulicBoundaryLocation(1, string.Empty, 1, 1), new DuneLocation.ConstructionProperties());
-            var duneLocation2 = new DuneLocation("locationName2", new HydraulicBoundaryLocation(2, string.Empty, 2, 2), new DuneLocation.ConstructionProperties());
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 1, 1);
 
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.First().Locations.Add(hydraulicBoundaryLocation);
+
+            var duneLocation1 = new DuneLocation("locationName1", hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties());
+            var duneLocation2 = new DuneLocation("locationName2", hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties());
+
             failureMechanism.SetDuneLocations(new[]
             {
                 duneLocation1,
@@ -215,11 +223,17 @@
             {
                 HydraulicBoundaryData =
                 {
-                    FilePath = validHrdFilePath,
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath,
                         UsePreprocessorClosure = usePreprocessorClosure
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = validHrdFilePath
+                        }
                     }
                 }
             };
@@ -241,7 +255,9 @@
                              .WhenCalled(invocation =>
                              {
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryData),
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(
+                                         hydraulicBoundaryData,
+                                         hydraulicBoundaryData.HydraulicBoundaryDatabases.First().Locations.First()),
                                      (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(calculator);