Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs
===================================================================
diff -u -r19f983eab8eac43d27e39f6eb9de019bad677652 -r85044dce4efb54671dc0606a96248e1f11867db5
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs	(.../HydraRingCalculatorFactory.cs)	(revision 19f983eab8eac43d27e39f6eb9de019bad677652)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs	(.../HydraRingCalculatorFactory.cs)	(revision 85044dce4efb54671dc0606a96248e1f11867db5)
@@ -46,45 +46,45 @@
             }
         }
 
-        public IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory)
+        public IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory, string preprocessorDirectory)
         {
-            return new DesignWaterLevelCalculator(hlcdDirectory);
+            return new DesignWaterLevelCalculator(hlcdDirectory, preprocessorDirectory);
         }
 
-        public IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory)
+        public IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory, string preprocessorDirectory)
         {
-            return new OvertoppingCalculator(hlcdDirectory);
+            return new OvertoppingCalculator(hlcdDirectory, preprocessorDirectory);
         }
 
-        public IHydraulicLoadsCalculator CreateDikeHeightCalculator(string hlcdDirectory)
+        public IHydraulicLoadsCalculator CreateDikeHeightCalculator(string hlcdDirectory, string preprocessorDirectory)
         {
-            return new HydraulicLoadsCalculator(hlcdDirectory);
+            return new HydraulicLoadsCalculator(hlcdDirectory, preprocessorDirectory);
         }
 
-        public IHydraulicLoadsCalculator CreateOvertoppingRateCalculator(string hlcdDirectory)
+        public IHydraulicLoadsCalculator CreateOvertoppingRateCalculator(string hlcdDirectory, string preprocessorDirectory)
         {
-            return new HydraulicLoadsCalculator(hlcdDirectory);
+            return new HydraulicLoadsCalculator(hlcdDirectory, preprocessorDirectory);
         }
 
-        public IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory)
+        public IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory, string preprocessorDirectory)
         {
-            return new WaveConditionsCosineCalculator(hlcdDirectory);
+            return new WaveConditionsCosineCalculator(hlcdDirectory, preprocessorDirectory);
         }
 
-        public IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory)
+        public IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory, string preprocessorDirectory)
         {
-            return new WaveHeightCalculator(hlcdDirectory);
+            return new WaveHeightCalculator(hlcdDirectory, preprocessorDirectory);
         }
 
-        public IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory)
+        public IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory, string preprocessorDirectory)
         {
-            return new DunesBoundaryConditionsCalculator(hlcdDirectory);
+            return new DunesBoundaryConditionsCalculator(hlcdDirectory, preprocessorDirectory);
         }
 
-        public IStructuresCalculator<TCalculationInput> CreateStructuresCalculator<TCalculationInput>(string hlcdDirectory)
+        public IStructuresCalculator<TCalculationInput> CreateStructuresCalculator<TCalculationInput>(string hlcdDirectory, string preprocessorDirectory)
             where TCalculationInput : ExceedanceProbabilityCalculationInput
         {
-            return new StructuresCalculator<TCalculationInput>(hlcdDirectory);
+            return new StructuresCalculator<TCalculationInput>(hlcdDirectory, preprocessorDirectory);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs
===================================================================
diff -u -r19f983eab8eac43d27e39f6eb9de019bad677652 -r85044dce4efb54671dc0606a96248e1f11867db5
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs	(.../IHydraRingCalculatorFactory.cs)	(revision 19f983eab8eac43d27e39f6eb9de019bad677652)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs	(.../IHydraRingCalculatorFactory.cs)	(revision 85044dce4efb54671dc0606a96248e1f11867db5)
@@ -34,66 +34,98 @@
         /// Creates a calculator for calculating a design water level.
         /// </summary>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="preprocessorDirectory">The preprocessor directory.</param>
+        /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/>
+        /// equals <see cref="string.Empty"/>.</remarks>
         /// <returns>A new <see cref="IDesignWaterLevelCalculator"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
-        IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory);
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/>
+        /// or <paramref name="preprocessorDirectory"/> is <c>null</c>.</exception>
+        IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory, string preprocessorDirectory);
 
         /// <summary>
         /// Creates a calculator for performing an overtopping calculation.
         /// </summary>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="preprocessorDirectory">The preprocessor directory.</param>
+        /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/>
+        /// equals <see cref="string.Empty"/>.</remarks>
         /// <returns>A new <see cref="IOvertoppingCalculator"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
-        IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory);
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/>
+        /// or <paramref name="preprocessorDirectory"/> is <c>null</c>.</exception>
+        IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory, string preprocessorDirectory);
 
         /// <summary>
         /// Creates a calculator for calculating a dike height.
         /// </summary>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="preprocessorDirectory">The preprocessor directory.</param>
+        /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/>
+        /// equals <see cref="string.Empty"/>.</remarks>
         /// <returns>A new <see cref="IHydraulicLoadsCalculator"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
-        IHydraulicLoadsCalculator CreateDikeHeightCalculator(string hlcdDirectory);
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/>
+        /// or <paramref name="preprocessorDirectory"/> is <c>null</c>.</exception>
+        IHydraulicLoadsCalculator CreateDikeHeightCalculator(string hlcdDirectory, string preprocessorDirectory);
 
         /// <summary>
         /// Creates a calculator for calculating an overtopping rate.
         /// </summary>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="preprocessorDirectory">The preprocessor directory.</param>
+        /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/>
+        /// equals <see cref="string.Empty"/>.</remarks>
         /// <returns>A new <see cref="IHydraulicLoadsCalculator"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
-        IHydraulicLoadsCalculator CreateOvertoppingRateCalculator(string hlcdDirectory);
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/>
+        /// or <paramref name="preprocessorDirectory"/> is <c>null</c>.</exception>
+        IHydraulicLoadsCalculator CreateOvertoppingRateCalculator(string hlcdDirectory, string preprocessorDirectory);
 
         /// <summary>
         /// Creates a calculator for calculating wave conditions.
         /// </summary>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="preprocessorDirectory">The preprocessor directory.</param>
+        /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/>
+        /// equals <see cref="string.Empty"/>.</remarks>
         /// <returns>A new <see cref="IWaveConditionsCosineCalculator"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
-        IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory);
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/>
+        /// or <paramref name="preprocessorDirectory"/> is <c>null</c>.</exception>
+        IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory, string preprocessorDirectory);
 
         /// <summary>
         /// Creates a calculator for calculating a wave height.
         /// </summary>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="preprocessorDirectory">The preprocessor directory.</param>
+        /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/>
+        /// equals <see cref="string.Empty"/>.</remarks>
         /// <returns>A new <see cref="IWaveHeightCalculator"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
-        IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory);
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/>
+        /// or <paramref name="preprocessorDirectory"/> is <c>null</c>.</exception>
+        IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory, string preprocessorDirectory);
 
         /// <summary>
         /// Creates a calculator for performing a calculation for dunes boundary conditions.
         /// </summary>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="preprocessorDirectory">The preprocessor directory.</param>
+        /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/>
+        /// equals <see cref="string.Empty"/>.</remarks>
         /// <returns>A new <see cref="IDunesBoundaryConditionsCalculator"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
-        IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory);
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/>
+        /// or <paramref name="preprocessorDirectory"/> is <c>null</c>.</exception>
+        IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory, string preprocessorDirectory);
 
         /// <summary>
         /// Creates a calculator for performing a calculation for structures.
         /// </summary>
         /// <typeparam name="TCalculationInput">The type of the input.</typeparam>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="preprocessorDirectory">The preprocessor directory.</param>
+        /// <remarks>Preprocessing is disabled when <paramref name="preprocessorDirectory"/>
+        /// equals <see cref="string.Empty"/>.</remarks>
         /// <returns>A new <see cref="IStructuresCalculator{T}"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
-        IStructuresCalculator<TCalculationInput> CreateStructuresCalculator<TCalculationInput>(string hlcdDirectory) 
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/>
+        /// or <paramref name="preprocessorDirectory"/> is <c>null</c>.</exception>
+        IStructuresCalculator<TCalculationInput> CreateStructuresCalculator<TCalculationInput>(string hlcdDirectory, string preprocessorDirectory)
             where TCalculationInput : ExceedanceProbabilityCalculationInput;
     }
 }
\ No newline at end of file