Index: Riskeer/Common/src/Riskeer.Common.Service/HydraRingCalculationSettingsFactory.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r8163318871f2de7e5285a4d1ad15e8da455d9c9a
--- Riskeer/Common/src/Riskeer.Common.Service/HydraRingCalculationSettingsFactory.cs	(.../HydraRingCalculationSettingsFactory.cs)	(revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Service/HydraRingCalculationSettingsFactory.cs	(.../HydraRingCalculationSettingsFactory.cs)	(revision 8163318871f2de7e5285a4d1ad15e8da455d9c9a)
@@ -47,7 +47,8 @@
             }
 
             return new HydraRingCalculationSettings(hydraulicBoundaryCalculationSettings.HlcdFilePath,
-                                                    hydraulicBoundaryCalculationSettings.PreprocessorDirectory);
+                                                    hydraulicBoundaryCalculationSettings.PreprocessorDirectory,
+                                                    hydraulicBoundaryCalculationSettings.UsePreprocessorClosure);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs
===================================================================
diff -u -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5 -r8163318871f2de7e5285a4d1ad15e8da455d9c9a
--- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs	(.../HydraRingCalculationSettingsFactoryTest.cs)	(revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs	(.../HydraRingCalculationSettingsFactoryTest.cs)	(revision 8163318871f2de7e5285a4d1ad15e8da455d9c9a)
@@ -55,6 +55,7 @@
             // Assert
             Assert.AreEqual(hydraulicBoundaryCalculationSettings.HlcdFilePath, hydraRingCalculationSettings.HlcdFilePath);
             Assert.AreEqual(hydraulicBoundaryCalculationSettings.PreprocessorDirectory, hydraRingCalculationSettings.PreprocessorDirectory);
+            Assert.AreEqual(hydraulicBoundaryCalculationSettings.UsePreprocessorClosure, hydraRingCalculationSettings.UsePreprocessorClosure);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Service.TestUtil/HydraRingCalculationSettingsTestHelper.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r8163318871f2de7e5285a4d1ad15e8da455d9c9a
--- Riskeer/Common/test/Riskeer.Common.Service.TestUtil/HydraRingCalculationSettingsTestHelper.cs	(.../HydraRingCalculationSettingsTestHelper.cs)	(revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Service.TestUtil/HydraRingCalculationSettingsTestHelper.cs	(.../HydraRingCalculationSettingsTestHelper.cs)	(revision 8163318871f2de7e5285a4d1ad15e8da455d9c9a)
@@ -48,6 +48,7 @@
         {
             Assert.AreEqual(expectedSettings.HlcdFilePath, actualSettings.HlcdFilePath);
             Assert.AreEqual(expectedSettings.PreprocessorDirectory, actualSettings.PreprocessorDirectory);
+            Assert.AreEqual(expectedSettings.UsePreprocessorClosure, actualSettings.UsePreprocessorClosure);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/HydraRingCalculationSettings.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8163318871f2de7e5285a4d1ad15e8da455d9c9a
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/HydraRingCalculationSettings.cs	(.../HydraRingCalculationSettings.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/HydraRingCalculationSettings.cs	(.../HydraRingCalculationSettings.cs)	(revision 8163318871f2de7e5285a4d1ad15e8da455d9c9a)
@@ -33,9 +33,12 @@
         /// </summary>
         /// <param name="hlcdFilePath">The path which points to the HLCD file.</param>
         /// <param name="preprocessorDirectory">The preprocessor directory to be used for the calculations.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        /// <param name="usePreprocessorClosure">Indicator whether to use the preprocessor closure.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdFilePath"/> or
+        /// <paramref name="preprocessorDirectory"/> is <c>null</c>.</exception>
         public HydraRingCalculationSettings(string hlcdFilePath,
-                                            string preprocessorDirectory)
+                                            string preprocessorDirectory,
+                                            bool usePreprocessorClosure)
         {
             if (hlcdFilePath == null)
             {
@@ -49,6 +52,7 @@
 
             HlcdFilePath = hlcdFilePath;
             PreprocessorDirectory = preprocessorDirectory;
+            UsePreprocessorClosure = usePreprocessorClosure;
         }
 
         /// <summary>
@@ -60,5 +64,10 @@
         /// Gets the preprocessor director.
         /// </summary>
         public string PreprocessorDirectory { get; }
+
+        /// <summary>
+        /// Gets whether to use the preprocessor closure.
+        /// </summary>
+        public bool UsePreprocessorClosure { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8163318871f2de7e5285a4d1ad15e8da455d9c9a
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs	(.../HydraRingCalculatorBaseTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs	(.../HydraRingCalculatorBaseTest.cs)	(revision 8163318871f2de7e5285a4d1ad15e8da455d9c9a)
@@ -54,7 +54,7 @@
         {
             // Setup
             var parser = new TestParser();
-            var settings = new HydraRingCalculationSettings("D:\\hlcd.sqlite", string.Empty);
+            var settings = new HydraRingCalculationSettings("D:\\hlcd.sqlite", string.Empty, false);
             var calculator = new TestHydraRingCalculator(settings, parser);
             var hydraRingCalculationInput = new TestHydraRingCalculationInput();
 
@@ -135,7 +135,7 @@
         public void Calculate_LastErrorFilePresent_LastErrorFileContentSet()
         {
             // Setup
-            var settings = new HydraRingCalculationSettings("D:\\HLCD.sqlite", string.Empty);
+            var settings = new HydraRingCalculationSettings("D:\\HLCD.sqlite", string.Empty, false);
             var calculator = new TestHydraRingCalculator(settings, new TestParser());
 
             // Call
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/HydraRingCalculationSettingsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8163318871f2de7e5285a4d1ad15e8da455d9c9a
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/HydraRingCalculationSettingsTest.cs	(.../HydraRingCalculationSettingsTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/HydraRingCalculationSettingsTest.cs	(.../HydraRingCalculationSettingsTest.cs)	(revision 8163318871f2de7e5285a4d1ad15e8da455d9c9a)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.HydraRing.Calculation.Data.Input;
 
@@ -32,7 +33,7 @@
         public void Constructor_HlcdFilePathNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new HydraRingCalculationSettings(null, string.Empty);
+            TestDelegate call = () => new HydraRingCalculationSettings(null, string.Empty, false);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -43,7 +44,7 @@
         public void Constructor_PreprocessorDirectoryNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new HydraRingCalculationSettings(string.Empty, null);
+            TestDelegate call = () => new HydraRingCalculationSettings(string.Empty, null, false);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -56,13 +57,15 @@
             // Setup
             const string hlcdFilePath = "hlcdFilePath";
             const string preProcessorDirectory = "PreprocessorDirectory";
+            bool usePreprocessorClosure = new Random(21).NextBoolean();
 
             // Call
-            var settings = new HydraRingCalculationSettings(hlcdFilePath, preProcessorDirectory);
+            var settings = new HydraRingCalculationSettings(hlcdFilePath, preProcessorDirectory, usePreprocessorClosure);
 
             // Assert
             Assert.AreEqual(hlcdFilePath, settings.HlcdFilePath);
             Assert.AreEqual(preProcessorDirectory, settings.PreprocessorDirectory);
+            Assert.AreEqual(usePreprocessorClosure, settings.UsePreprocessorClosure);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8163318871f2de7e5285a4d1ad15e8da455d9c9a
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs	(.../HydraRingInitializationServiceTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs	(.../HydraRingInitializationServiceTest.cs)	(revision 8163318871f2de7e5285a4d1ad15e8da455d9c9a)
@@ -56,7 +56,7 @@
         public void ParameteredConstructor_ExpectedValues()
         {
             // Setup
-            var settings = new HydraRingCalculationSettings("D:\\hlcd\\hlcdFilePath", "D:\\preprocessor");
+            var settings = new HydraRingCalculationSettings("D:\\hlcd\\hlcdFilePath", "D:\\preprocessor", false);
 
             // Call
             var hydraRingInitializationService = new HydraRingInitializationService(HydraRingFailureMechanismType.AssessmentLevel,
@@ -79,7 +79,7 @@
             // Setup
             const string hlcdFilePath = "D:\\hlcd\\HlcdFile.sqlite";
 
-            var settings = new HydraRingCalculationSettings(hlcdFilePath, preprocessorDirectory);
+            var settings = new HydraRingCalculationSettings(hlcdFilePath, preprocessorDirectory, false);
             var hydraRingInitializationService = new HydraRingInitializationService(HydraRingFailureMechanismType.StructuresStructuralFailure,
                                                                                     700001,
                                                                                     TestHelper.GetScratchPadPath(),
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/HydraRingCalculationSettingsTestFactory.cs
===================================================================
diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r8163318871f2de7e5285a4d1ad15e8da455d9c9a
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/HydraRingCalculationSettingsTestFactory.cs	(.../HydraRingCalculationSettingsTestFactory.cs)	(revision 2e55afd890468db1b25c734216956ab5c2126e58)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/HydraRingCalculationSettingsTestFactory.cs	(.../HydraRingCalculationSettingsTestFactory.cs)	(revision 8163318871f2de7e5285a4d1ad15e8da455d9c9a)
@@ -15,7 +15,7 @@
         /// <returns>A <see cref="HydraRingCalculationSettings"/>.</returns>
         public static HydraRingCalculationSettings CreateSettings()
         {
-            return new HydraRingCalculationSettings(string.Empty, string.Empty);
+            return new HydraRingCalculationSettings(string.Empty, string.Empty, false);
         }
     }
 }
\ No newline at end of file