Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r444796880375992cac66719b2e542a26cbb5edfe -r0d42b32c8be5ac21c68998e449063b8de53e50f5
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 444796880375992cac66719b2e542a26cbb5edfe)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 0d42b32c8be5ac21c68998e449063b8de53e50f5)
@@ -853,6 +853,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Gebruik de preprocessor sluitregime database bij het uitvoeren van een berekening..
+        /// </summary>
+        public static string HydraulicLocationConfigurationSettings_UsePreprocessorClosure_Description {
+            get {
+                return ResourceManager.GetString("HydraulicLocationConfigurationSettings_UsePreprocessorClosure_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Gebruik preprocessor sluitregime database.
+        /// </summary>
+        public static string HydraulicLocationConfigurationSettings_UsePreprocessorClosure_DisplayName {
+            get {
+                return ResourceManager.GetString("HydraulicLocationConfigurationSettings_UsePreprocessorClosure_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Klimaatinformatie met betrekking tot de windrichting..
         /// </summary>
         public static string HydraulicLocationConfigurationSettings_WindDirection_Description {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r444796880375992cac66719b2e542a26cbb5edfe -r0d42b32c8be5ac21c68998e449063b8de53e50f5
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 444796880375992cac66719b2e542a26cbb5edfe)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 0d42b32c8be5ac21c68998e449063b8de53e50f5)
@@ -451,4 +451,10 @@
   <data name="HlcdFileNameEditor_InitializeDialog_FileFilter" xml:space="preserve">
     <value>HLCD bestand|*.sqlite</value>
   </data>
+  <data name="HydraulicLocationConfigurationSettings_UsePreprocessorClosure_Description" xml:space="preserve">
+    <value>Gebruik de preprocessor sluitregime database bij het uitvoeren van een berekening.</value>
+  </data>
+  <data name="HydraulicLocationConfigurationSettings_UsePreprocessorClosure_DisplayName" xml:space="preserve">
+    <value>Gebruik preprocessor sluitregime database</value>
+  </data>
 </root>
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0d42b32c8be5ac21c68998e449063b8de53e50f5
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs	(.../HydraulicBoundaryDatabaseProperties.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs	(.../HydraulicBoundaryDatabaseProperties.cs)	(revision 0d42b32c8be5ac21c68998e449063b8de53e50f5)
@@ -40,17 +40,18 @@
     {
         private const int hrdFilePathPropertyIndex = 0;
         private const int hlcdFilePathPropertyIndex = 1;
-        private const int scenarioNamePropertyIndex = 2;
-        private const int yearPropertyIndex = 3;
-        private const int scopePropertyIndex = 4;
-        private const int seaLevelPropertyIndex = 5;
-        private const int riverDischargePropertyIndex = 6;
-        private const int lakeLevelPropertyIndex = 7;
-        private const int windDirectionPropertyIndex = 8;
-        private const int windSpeedPropertyIndex = 9;
-        private const int commentPropertyIndex = 10;
-        private const int usePreprocessorPropertyIndex = 11;
-        private const int preprocessorDirectoryPropertyIndex = 12;
+        private const int usePreprocessorClosurePropertyIndex = 2;
+        private const int scenarioNamePropertyIndex = 3;
+        private const int yearPropertyIndex = 4;
+        private const int scopePropertyIndex = 5;
+        private const int seaLevelPropertyIndex = 6;
+        private const int riverDischargePropertyIndex = 7;
+        private const int lakeLevelPropertyIndex = 8;
+        private const int windDirectionPropertyIndex = 9;
+        private const int windSpeedPropertyIndex = 10;
+        private const int commentPropertyIndex = 11;
+        private const int usePreprocessorPropertyIndex = 12;
+        private const int preprocessorDirectoryPropertyIndex = 13;
 
         private readonly IHydraulicLocationConfigurationDatabaseImportHandler hydraulicLocationConfigurationDatabaseImportHandler;
 
@@ -121,6 +122,18 @@
             }
         }
 
+        [PropertyOrder(usePreprocessorClosurePropertyIndex)]
+        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_UsePreprocessorClosure_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_UsePreprocessorClosure_Description))]
+        public bool UsePreprocessorClosure
+        {
+            get
+            {
+                return data.HydraulicLocationConfigurationSettings.UsePreprocessorClosure;
+            }
+        }
+
         [PropertyOrder(scenarioNamePropertyIndex)]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_ScenarioName_DisplayName))]
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs
===================================================================
diff -u -r56523c0a7ce1c083093e745596681050ac23d18d -r0d42b32c8be5ac21c68998e449063b8de53e50f5
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision 56523c0a7ce1c083093e745596681050ac23d18d)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision 0d42b32c8be5ac21c68998e449063b8de53e50f5)
@@ -38,17 +38,18 @@
     {
         private const int hrdFilePathPropertyIndex = 0;
         private const int hlcdFilePathPropertyIndex = 1;
-        private const int scenarioNamePropertyIndex = 2;
-        private const int yearPropertyIndex = 3;
-        private const int scopePropertyIndex = 4;
-        private const int seaLevelPropertyIndex = 5;
-        private const int riverDischargePropertyIndex = 6;
-        private const int lakeLevelPropertyIndex = 7;
-        private const int windDirectionPropertyIndex = 8;
-        private const int windSpeedPropertyIndex = 9;
-        private const int commentPropertyIndex = 10;
-        private const int usePreprocessorPropertyIndex = 11;
-        private const int preprocessorDirectoryPropertyIndex = 12;
+        private const int usePreprocessorClosurePropertyIndex = 2;
+        private const int scenarioNamePropertyIndex = 3;
+        private const int yearPropertyIndex = 4;
+        private const int scopePropertyIndex = 5;
+        private const int seaLevelPropertyIndex = 6;
+        private const int riverDischargePropertyIndex = 7;
+        private const int lakeLevelPropertyIndex = 8;
+        private const int windDirectionPropertyIndex = 9;
+        private const int windSpeedPropertyIndex = 10;
+        private const int commentPropertyIndex = 11;
+        private const int usePreprocessorPropertyIndex = 12;
+        private const int preprocessorDirectoryPropertyIndex = 13;
 
         [Test]
         public void Constructor_HydraulicBoundaryDatabaseNull_ThrowsArgumentNullException()
@@ -148,6 +149,7 @@
             Assert.IsEmpty(properties.HrdFilePath);
             Assert.IsEmpty(properties.HlcdFilePath);
             Assert.IsEmpty(properties.HlcdFilePathReadOnly);
+            Assert.IsFalse(properties.UsePreprocessorClosure);
             Assert.IsEmpty(properties.ScenarioName);
             Assert.IsEmpty(properties.Year);
             Assert.IsEmpty(properties.Scope);
@@ -182,6 +184,7 @@
             HydraulicLocationConfigurationSettings configurationSettings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings;
             Assert.AreEqual(configurationSettings.FilePath, properties.HlcdFilePath);
             Assert.AreEqual(configurationSettings.FilePath, properties.HlcdFilePathReadOnly);
+            Assert.AreEqual(configurationSettings.UsePreprocessorClosure, properties.UsePreprocessorClosure);
             Assert.AreEqual(configurationSettings.ScenarioName, properties.ScenarioName);
             Assert.AreEqual(configurationSettings.Year.ToString(), properties.Year);
             Assert.AreEqual(configurationSettings.Scope, properties.Scope);
@@ -216,7 +219,7 @@
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
-            Assert.AreEqual(13, dynamicProperties.Count);
+            Assert.AreEqual(14, dynamicProperties.Count);
 
             const string expectedCategory = "Algemeen";
             PropertyDescriptor hrdFilePathProperty = dynamicProperties[hrdFilePathPropertyIndex];
@@ -233,6 +236,13 @@
                                                                             "Locatie van het HLCD bestand.",
                                                                             true);
 
+            PropertyDescriptor usePreprocessorClosureProperty = dynamicProperties[usePreprocessorClosurePropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(usePreprocessorClosureProperty,
+                                                                            expectedCategory,
+                                                                            "Gebruik preprocessor sluitregime database",
+                                                                            "Gebruik de preprocessor sluitregime database bij het uitvoeren van een berekening.",
+                                                                            true);
+
             PropertyDescriptor scenarioNameProperty = dynamicProperties[scenarioNamePropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(scenarioNameProperty,
                                                                             expectedCategory,
@@ -326,7 +336,7 @@
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
-            Assert.AreEqual(11, dynamicProperties.Count);
+            Assert.AreEqual(12, dynamicProperties.Count);
 
             const string expectedCategory = "Algemeen";
             PropertyDescriptor hrdFilePathProperty = dynamicProperties[hrdFilePathPropertyIndex];
@@ -343,6 +353,13 @@
                                                                             "Locatie van het HLCD bestand.",
                                                                             true);
 
+            PropertyDescriptor usePreprocessorClosureProperty = dynamicProperties[usePreprocessorClosurePropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(usePreprocessorClosureProperty,
+                                                                            expectedCategory,
+                                                                            "Gebruik preprocessor sluitregime database",
+                                                                            "Gebruik de preprocessor sluitregime database bij het uitvoeren van een berekening.",
+                                                                            true);
+
             PropertyDescriptor scenarioNameProperty = dynamicProperties[scenarioNamePropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(scenarioNameProperty,
                                                                             expectedCategory,
@@ -427,7 +444,7 @@
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
-            Assert.AreEqual(11, dynamicProperties.Count);
+            Assert.AreEqual(12, dynamicProperties.Count);
 
             const string expectedCategory = "Algemeen";
             PropertyDescriptor hrdFilePathProperty = dynamicProperties[hrdFilePathPropertyIndex];
@@ -449,6 +466,13 @@
                 Assert.IsInstanceOf<HlcdFileNameEditor>(hlcdFilePathEditor);
             }
 
+            PropertyDescriptor usePreprocessorClosureProperty = dynamicProperties[usePreprocessorClosurePropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(usePreprocessorClosureProperty,
+                                                                            expectedCategory,
+                                                                            "Gebruik preprocessor sluitregime database",
+                                                                            "Gebruik de preprocessor sluitregime database bij het uitvoeren van een berekening.",
+                                                                            true);
+
             PropertyDescriptor scenarioNameProperty = dynamicProperties[scenarioNamePropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(scenarioNameProperty,
                                                                             expectedCategory,