Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs
===================================================================
diff -u -rcc5f7db9f71388c14c7da37300e3948794120199 -r90a3d02f7bc7099392894aceb93b9261579e7137
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs)	(revision cc5f7db9f71388c14c7da37300e3948794120199)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs)	(revision 90a3d02f7bc7099392894aceb93b9261579e7137)
@@ -61,12 +61,17 @@
         {
             if (calculationConfiguration.CategoryType.HasValue)
             {
-                calculation.InputParameters.CategoryType = (FailureMechanismCategoryType) calculationConfiguration.CategoryType;
+                calculation.InputParameters.CategoryType = (FailureMechanismCategoryType) calculationConfiguration.CategoryType.Value;
             }
             else
             {
                 WaveConditionsInputHelper.SetCategoryType(calculation.InputParameters, normType);
             }
+
+            if (calculationConfiguration.CalculationType.HasValue)
+            {
+                calculation.InputParameters.CalculationType = (GrassCoverErosionOutwardsWaveConditionsCalculationType) calculationConfiguration.CalculationType.Value;
+            }
         }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90a3d02f7bc7099392894aceb93b9261579e7137
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs)	(revision 90a3d02f7bc7099392894aceb93b9261579e7137)
@@ -120,12 +120,13 @@
                         Height = (RoundedDouble) 6.6,
                         Type = BreakWaterType.Caisson
                     },
-                    CategoryType = FailureMechanismCategoryType.FactorizedLowerLimitNorm
+                    CategoryType = FailureMechanismCategoryType.FactorizedLowerLimitNorm,
+                    CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUp
                 }
             };
 
             Assert.AreEqual(1, calculationGroup.Children.Count);
-            AssertWaveConditionsCalculation(expectedCalculation, (ICalculation<FailureMechanismCategoryWaveConditionsInput>) calculationGroup.Children[0]);
+            AssertWaveConditionsCalculation(expectedCalculation, (GrassCoverErosionOutwardsWaveConditionsCalculation) calculationGroup.Children[0]);
         }
 
         [Test]
@@ -188,16 +189,17 @@
                         Height = (RoundedDouble) 6.6,
                         Type = BreakWaterType.Caisson
                     },
-                    CategoryType = expectedCategory
+                    CategoryType = expectedCategory,
+                    CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.Both
                 }
             };
 
             Assert.AreEqual(1, calculationGroup.Children.Count);
-            AssertWaveConditionsCalculation(expectedCalculation, (ICalculation<FailureMechanismCategoryWaveConditionsInput>) calculationGroup.Children[0]);
+            AssertWaveConditionsCalculation(expectedCalculation, (GrassCoverErosionOutwardsWaveConditionsCalculation) calculationGroup.Children[0]);
         }
 
-        private static void AssertWaveConditionsCalculation(ICalculation<FailureMechanismCategoryWaveConditionsInput> expectedCalculation,
-                                                            ICalculation<FailureMechanismCategoryWaveConditionsInput> actualCalculation)
+        private static void AssertWaveConditionsCalculation(GrassCoverErosionOutwardsWaveConditionsCalculation expectedCalculation,
+                                                            GrassCoverErosionOutwardsWaveConditionsCalculation actualCalculation)
         {
             Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name);
             Assert.AreSame(expectedCalculation.InputParameters.HydraulicBoundaryLocation, actualCalculation.InputParameters.HydraulicBoundaryLocation);
@@ -213,6 +215,7 @@
             Assert.AreEqual(expectedCalculation.InputParameters.BreakWater.Height, actualCalculation.InputParameters.BreakWater.Height);
             Assert.AreEqual(expectedCalculation.InputParameters.BreakWater.Type, actualCalculation.InputParameters.BreakWater.Type);
             Assert.AreEqual(expectedCalculation.InputParameters.CategoryType, actualCalculation.InputParameters.CategoryType);
+            Assert.AreEqual(expectedCalculation.InputParameters.CalculationType, actualCalculation.InputParameters.CalculationType);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r90a3d02f7bc7099392894aceb93b9261579e7137
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml	(.../validConfigurationFullCalculation.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml	(.../validConfigurationFullCalculation.xml)	(revision 90a3d02f7bc7099392894aceb93b9261579e7137)
@@ -16,5 +16,6 @@
       <damhoogte>6.6</damhoogte>
       <voorlandgebruiken>false</voorlandgebruiken>
     </golfreductie>
+    <typebelasting>Gras (golfoploop)</typebelasting>
   </berekening>
 </configuratie>