Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs	(revision 72d0ea54e92207651a883553d0b55c5eaeed7b7a)
@@ -0,0 +1,92 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions
+{
+    /// <summary>
+    /// Container of all data necessary for performing a cosine based wave conditions calculation (Q-variant) via Hydra-Ring.
+    /// </summary>
+    public class WaveConditionsCosineCalculationInput : WaveConditionsCalculationInput
+    {
+        private readonly double c;
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="WaveConditionsCosineCalculationInput"/> class.
+        /// </summary>
+        /// <param name="sectionId">The id of the section to use during the calculation.</param>
+        /// <param name="hydraulicBoundaryLocationId">The id of the hydraulic station to use during the calculation.</param>
+        /// <param name="norm">The norm to use during the calculation.</param>
+        /// <param name="forelandPoints">The foreland points to use during the calculation.</param>
+        /// <param name="breakWater">The break water to use during the calculation.</param>
+        /// <param name="waterLevel">The water level to calculate the wave conditions for.</param>
+        /// <param name="a">The a-value to use during the calculation.</param>
+        /// <param name="b">The b-value to use during the calculation.</param>
+        /// <param name="c">The c-value to use during the calculation.</param>
+        public WaveConditionsCosineCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm,
+                                                    IEnumerable<HydraRingForelandPoint> forelandPoints,
+                                                    HydraRingBreakWater breakWater,
+                                                    double waterLevel,
+                                                    double a,
+                                                    double b,
+                                                    double c)
+            : base(sectionId,
+                   hydraulicBoundaryLocationId,
+                   norm,
+                   forelandPoints,
+                   breakWater,
+                   waterLevel,
+                   a,
+                   b)
+        {
+            this.c = c;
+        }
+
+        public override IEnumerable<HydraRingVariable> Variables
+        {
+            get
+            {
+                var variables = base.Variables.ToList();
+
+                // c-value
+                variables.Add(new HydraRingVariable(119, HydraRingDistributionType.Deterministic, c,
+                                                    HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN));
+
+                return variables;
+            }
+        }
+
+        public override int? GetSubMechanismModelId(int subMechanismId)
+        {
+            switch (subMechanismId)
+            {
+                case 4:
+                    return 71;
+                case 5:
+                    return 71;
+                default:
+                    return null;
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 72d0ea54e92207651a883553d0b55c5eaeed7b7a refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineInput.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs	(revision 72d0ea54e92207651a883553d0b55c5eaeed7b7a)
@@ -0,0 +1,100 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions
+{
+    /// <summary>
+    /// Container of all data necessary for performing a trapezoid based wave conditions calculation (Q-variant) via Hydra-Ring.
+    /// </summary>
+    public class WaveConditionsTrapezoidCalculationInput : WaveConditionsCalculationInput
+    {
+        private readonly double beta1;
+        private readonly double beta2;
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="WaveConditionsTrapezoidCalculationInput"/> class.
+        /// </summary>
+        /// <param name="sectionId">The id of the section to use during the calculation.</param>
+        /// <param name="hydraulicBoundaryLocationId">The id of the hydraulic station to use during the calculation.</param>
+        /// <param name="norm">The norm to use during the calculation.</param>
+        /// <param name="forelandPoints">The foreland points to use during the calculation.</param>
+        /// <param name="breakWater">The break water to use during the calculation.</param>
+        /// <param name="waterLevel">The water level to calculate the wave conditions for.</param>
+        /// <param name="a">The a-value to use during the calculation.</param>
+        /// <param name="b">The b-value to use during the calculation.</param>
+        /// <param name="beta1">The beta1-value to use during the calculation.</param>
+        /// <param name="beta2">The beta2-value to use during the calculation.</param>
+        public WaveConditionsTrapezoidCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm,
+                                                       IEnumerable<HydraRingForelandPoint> forelandPoints,
+                                                       HydraRingBreakWater breakWater,
+                                                       double waterLevel,
+                                                       double a,
+                                                       double b,
+                                                       double beta1,
+                                                       double beta2)
+            : base(sectionId,
+                   hydraulicBoundaryLocationId,
+                   norm,
+                   forelandPoints,
+                   breakWater,
+                   waterLevel,
+                   a,
+                   b)
+        {
+            this.beta1 = beta1;
+            this.beta2 = beta2;
+        }
+
+        public override IEnumerable<HydraRingVariable> Variables
+        {
+            get
+            {
+                var variables = base.Variables.ToList();
+
+                // beta1-value
+                variables.Add(new HydraRingVariable(117, HydraRingDistributionType.Deterministic, beta1,
+                                                    HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN));
+
+                // beta2-value
+                variables.Add(new HydraRingVariable(118, HydraRingDistributionType.Deterministic, beta2,
+                                                    HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN));
+
+                return variables;
+            }
+        }
+
+        public override int? GetSubMechanismModelId(int subMechanismId)
+        {
+            switch (subMechanismId)
+            {
+                case 4:
+                    return 70;
+                case 5:
+                    return 70;
+                default:
+                    return null;
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 72d0ea54e92207651a883553d0b55c5eaeed7b7a refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidInput.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r8797ed1774bf2255a1370fafe122d9150f79e365 -r72d0ea54e92207651a883553d0b55c5eaeed7b7a
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 8797ed1774bf2255a1370fafe122d9150f79e365)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 72d0ea54e92207651a883553d0b55c5eaeed7b7a)
@@ -57,14 +57,14 @@
     <Compile Include="Data\HydraRingForelandPoint.cs" />
     <Compile Include="Data\HydraRingProfilePoint.cs" />
     <Compile Include="Data\Input\Hydraulics\DikeHeightCalculationInput.cs" />
-    <Compile Include="Data\Input\WaveConditions\WaveConditionsCosineInput.cs" />
+    <Compile Include="Data\Input\WaveConditions\WaveConditionsCosineCalculationInput.cs" />
     <Compile Include="Data\Input\WaveConditions\WaveConditionsCalculationInput.cs" />
     <Compile Include="Data\Input\Hydraulics\WaveHeightCalculationInput .cs" />
     <Compile Include="Data\Input\Overtopping\HydraRingRoughnessProfilePoint.cs" />
     <Compile Include="Data\Input\ExceedanceProbabilityCalculationInput.cs" />
     <Compile Include="Data\Input\Overtopping\OvertoppingCalculationInput.cs" />
     <Compile Include="Data\Input\Structures\StructuresOvertoppingCalculationInput.cs" />
-    <Compile Include="Data\Input\WaveConditions\WaveConditionsTrapezoidInput.cs" />
+    <Compile Include="Data\Input\WaveConditions\WaveConditionsTrapezoidCalculationInput.cs" />
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationAlphaOutput.cs" />
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationOutput.cs" />
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationOutputBase.cs" />
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs
===================================================================
diff -u -r8797ed1774bf2255a1370fafe122d9150f79e365 -r72d0ea54e92207651a883553d0b55c5eaeed7b7a
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs	(.../WaveConditionsCalculationInputTest.cs)	(revision 8797ed1774bf2255a1370fafe122d9150f79e365)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs	(.../WaveConditionsCalculationInputTest.cs)	(revision 72d0ea54e92207651a883553d0b55c5eaeed7b7a)
@@ -47,30 +47,30 @@
             const double b = 7.7;
 
             // Call
-            var waveConditionsInput = new WaveConditionsCalculationInputImplementation(sectionId,
-                                                                                       hydraulicBoundaryLocationId,
-                                                                                       norm,
-                                                                                       forelandPoints,
-                                                                                       breakWater,
-                                                                                       waterLevel,
-                                                                                       a,
-                                                                                       b);
+            var waveConditionsCalculationInput = new WaveConditionsCalculationInputImplementation(sectionId,
+                                                                                                  hydraulicBoundaryLocationId,
+                                                                                                  norm,
+                                                                                                  forelandPoints,
+                                                                                                  breakWater,
+                                                                                                  waterLevel,
+                                                                                                  a,
+                                                                                                  b);
 
             // Assert
             const int expectedCalculationTypeId = 6;
             const int expectedVariableId = 114;
             double expectedBeta = StatisticsConverter.NormToBeta(norm);
-            Assert.IsInstanceOf<HydraRingCalculationInput>(waveConditionsInput);
-            Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsInput.FailureMechanismType);
-            Assert.AreEqual(expectedCalculationTypeId, waveConditionsInput.CalculationTypeId);
-            Assert.AreEqual(expectedVariableId, waveConditionsInput.VariableId);
-            Assert.AreEqual(hydraulicBoundaryLocationId, waveConditionsInput.HydraulicBoundaryLocationId);
-            Assert.IsNotNull(waveConditionsInput.Section);
-            Assert.AreEqual(sectionId, waveConditionsInput.Section.SectionId);
-            HydraRingVariableAssert.AreEqual(GetExpectedVariables(waterLevel, a, b).ToArray(), waveConditionsInput.Variables.ToArray());
-            Assert.AreSame(forelandPoints, waveConditionsInput.ForelandsPoints);
-            Assert.AreSame(breakWater, waveConditionsInput.BreakWater);
-            Assert.AreEqual(expectedBeta, waveConditionsInput.Beta);
+            Assert.IsInstanceOf<HydraRingCalculationInput>(waveConditionsCalculationInput);
+            Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsCalculationInput.FailureMechanismType);
+            Assert.AreEqual(expectedCalculationTypeId, waveConditionsCalculationInput.CalculationTypeId);
+            Assert.AreEqual(expectedVariableId, waveConditionsCalculationInput.VariableId);
+            Assert.AreEqual(hydraulicBoundaryLocationId, waveConditionsCalculationInput.HydraulicBoundaryLocationId);
+            Assert.IsNotNull(waveConditionsCalculationInput.Section);
+            Assert.AreEqual(sectionId, waveConditionsCalculationInput.Section.SectionId);
+            HydraRingVariableAssert.AreEqual(GetExpectedVariables(waterLevel, a, b).ToArray(), waveConditionsCalculationInput.Variables.ToArray());
+            Assert.AreSame(forelandPoints, waveConditionsCalculationInput.ForelandsPoints);
+            Assert.AreSame(breakWater, waveConditionsCalculationInput.BreakWater);
+            Assert.AreEqual(expectedBeta, waveConditionsCalculationInput.Beta);
         }
 
         private class WaveConditionsCalculationInputImplementation : WaveConditionsCalculationInput
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs	(revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs	(revision 72d0ea54e92207651a883553d0b55c5eaeed7b7a)
@@ -0,0 +1,109 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Utils;
+using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
+using Ringtoets.HydraRing.Calculation.TestUtil;
+
+namespace Ringtoets.HydraRing.Calculation.Test.Data.Input.WaveConditions
+{
+    [TestFixture]
+    public class WaveConditionsCosineCalculationInputTest
+    {
+        [Test]
+        public void Constructor_Always_ExpectedValues()
+        {
+            // Setup
+            const int sectionId = 111;
+            const int hydraulicBoundaryLocationId = 222;
+            const int norm = 333;
+            var forelandPoints = Enumerable.Empty<HydraRingForelandPoint>();
+            var breakWater = new HydraRingBreakWater(1, 4.4);
+
+            // Call
+            const double waterLevel = 5.5;
+            const double a = 6.6;
+            const double b = 7.7;
+            const double c = 8.8;
+
+            var waveConditionsCosineCalculationInput = new WaveConditionsCosineCalculationInput(sectionId,
+                                                                                                hydraulicBoundaryLocationId,
+                                                                                                norm,
+                                                                                                forelandPoints,
+                                                                                                breakWater,
+                                                                                                waterLevel,
+                                                                                                a,
+                                                                                                b,
+                                                                                                c);
+
+            // Assert
+            const int expectedCalculationTypeId = 6;
+            const int expectedVariableId = 114;
+            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            Assert.IsInstanceOf<WaveConditionsCalculationInput>(waveConditionsCosineCalculationInput);
+            Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsCosineCalculationInput.FailureMechanismType);
+            Assert.AreEqual(expectedCalculationTypeId, waveConditionsCosineCalculationInput.CalculationTypeId);
+            Assert.AreEqual(expectedVariableId, waveConditionsCosineCalculationInput.VariableId);
+            Assert.AreEqual(hydraulicBoundaryLocationId, waveConditionsCosineCalculationInput.HydraulicBoundaryLocationId);
+            Assert.IsNotNull(waveConditionsCosineCalculationInput.Section);
+            Assert.AreEqual(sectionId, waveConditionsCosineCalculationInput.Section.SectionId);
+            HydraRingVariableAssert.AreEqual(GetExpectedVariables(waterLevel, a, b, c).ToArray(), waveConditionsCosineCalculationInput.Variables.ToArray());
+            Assert.AreSame(forelandPoints, waveConditionsCosineCalculationInput.ForelandsPoints);
+            Assert.AreSame(breakWater, waveConditionsCosineCalculationInput.BreakWater);
+            Assert.AreEqual(expectedBeta, waveConditionsCosineCalculationInput.Beta);
+        }
+
+        [Test]
+        [TestCase(3, null)]
+        [TestCase(4, 71)]
+        [TestCase(5, 71)]
+        [TestCase(6, null)]
+        public void GetSubMechanismModelId_Always_ReturnsExpectedValues(int subMechanismModelId, int? expectedSubMechanismModelId)
+        {
+            // Call
+            var waveConditionsCosineCalculationInput = new WaveConditionsCosineCalculationInput(111,
+                                                                                                222,
+                                                                                                333,
+                                                                                                Enumerable.Empty<HydraRingForelandPoint>(),
+                                                                                                new HydraRingBreakWater(1, 4.4),
+                                                                                                5.5,
+                                                                                                6.6,
+                                                                                                7.7,
+                                                                                                8.8);
+
+            // Assert
+            Assert.AreEqual(expectedSubMechanismModelId, waveConditionsCosineCalculationInput.GetSubMechanismModelId(subMechanismModelId));
+        }
+
+        private static IEnumerable<HydraRingVariable> GetExpectedVariables(double waterLevel, double a, double b, double c)
+        {
+            yield return new HydraRingVariable(113, HydraRingDistributionType.Deterministic, waterLevel, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(114, HydraRingDistributionType.Deterministic, 1.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(115, HydraRingDistributionType.Deterministic, a, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(116, HydraRingDistributionType.Deterministic, b, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(119, HydraRingDistributionType.Deterministic, c, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 72d0ea54e92207651a883553d0b55c5eaeed7b7a refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineInputTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs	(revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs	(revision 72d0ea54e92207651a883553d0b55c5eaeed7b7a)
@@ -0,0 +1,112 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Utils;
+using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
+using Ringtoets.HydraRing.Calculation.TestUtil;
+
+namespace Ringtoets.HydraRing.Calculation.Test.Data.Input.WaveConditions
+{
+    [TestFixture]
+    public class WaveConditionsTrapezoidCalculationInputTest
+    {
+        [Test]
+        public void Constructor_Always_ExpectedValues()
+        {
+            // Setup
+            const int sectionId = 111;
+            const int hydraulicBoundaryLocationId = 222;
+            const int norm = 333;
+            var forelandPoints = Enumerable.Empty<HydraRingForelandPoint>();
+            var breakWater = new HydraRingBreakWater(1, 4.4);
+            const double waterLevel = 5.5;
+            const double a = 6.6;
+            const double b = 7.7;
+            const double beta1 = 8.8;
+            const double beta2 = 9.9;
+
+            // Call
+            var waveConditionsTrapezoidCalculationInput = new WaveConditionsTrapezoidCalculationInput(sectionId,
+                                                                                                      hydraulicBoundaryLocationId,
+                                                                                                      norm,
+                                                                                                      forelandPoints,
+                                                                                                      breakWater,
+                                                                                                      waterLevel,
+                                                                                                      a,
+                                                                                                      b,
+                                                                                                      beta1,
+                                                                                                      beta2);
+
+            // Assert
+            const int expectedCalculationTypeId = 6;
+            const int expectedVariableId = 114;
+            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            Assert.IsInstanceOf<WaveConditionsCalculationInput>(waveConditionsTrapezoidCalculationInput);
+            Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsTrapezoidCalculationInput.FailureMechanismType);
+            Assert.AreEqual(expectedCalculationTypeId, waveConditionsTrapezoidCalculationInput.CalculationTypeId);
+            Assert.AreEqual(expectedVariableId, waveConditionsTrapezoidCalculationInput.VariableId);
+            Assert.AreEqual(hydraulicBoundaryLocationId, waveConditionsTrapezoidCalculationInput.HydraulicBoundaryLocationId);
+            Assert.IsNotNull(waveConditionsTrapezoidCalculationInput.Section);
+            Assert.AreEqual(sectionId, waveConditionsTrapezoidCalculationInput.Section.SectionId);
+            HydraRingVariableAssert.AreEqual(GetExpectedVariables(waterLevel, a, b, beta1, beta2).ToArray(), waveConditionsTrapezoidCalculationInput.Variables.ToArray());
+            Assert.AreSame(forelandPoints, waveConditionsTrapezoidCalculationInput.ForelandsPoints);
+            Assert.AreSame(breakWater, waveConditionsTrapezoidCalculationInput.BreakWater);
+            Assert.AreEqual(expectedBeta, waveConditionsTrapezoidCalculationInput.Beta);
+        }
+
+        [Test]
+        [TestCase(3, null)]
+        [TestCase(4, 70)]
+        [TestCase(5, 70)]
+        [TestCase(6, null)]
+        public void GetSubMechanismModelId_Always_ReturnsExpectedValues(int subMechanismModelId, int? expectedSubMechanismModelId)
+        {
+            // Call
+            var waveConditionsTrapezoidCalculationInput = new WaveConditionsTrapezoidCalculationInput(111,
+                                                                                                      222,
+                                                                                                      333,
+                                                                                                      Enumerable.Empty<HydraRingForelandPoint>(),
+                                                                                                      new HydraRingBreakWater(1, 4.4),
+                                                                                                      5.5,
+                                                                                                      6.6,
+                                                                                                      7.7,
+                                                                                                      8.8,
+                                                                                                      9.9);
+
+            // Assert
+            Assert.AreEqual(expectedSubMechanismModelId, waveConditionsTrapezoidCalculationInput.GetSubMechanismModelId(subMechanismModelId));
+        }
+
+        private static IEnumerable<HydraRingVariable> GetExpectedVariables(double waterLevel, double a, double b, double beta1, double beta2)
+        {
+            yield return new HydraRingVariable(113, HydraRingDistributionType.Deterministic, waterLevel, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(114, HydraRingDistributionType.Deterministic, 1.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(115, HydraRingDistributionType.Deterministic, a, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(116, HydraRingDistributionType.Deterministic, b, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(117, HydraRingDistributionType.Deterministic, beta1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(118, HydraRingDistributionType.Deterministic, beta2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 72d0ea54e92207651a883553d0b55c5eaeed7b7a refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidInputTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -r983308d8296d6186910073ed2a61371c4b992c06 -r72d0ea54e92207651a883553d0b55c5eaeed7b7a
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs	(.../HydraRingConfigurationServiceIntegrationTest.cs)	(revision 983308d8296d6186910073ed2a61371c4b992c06)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs	(.../HydraRingConfigurationServiceIntegrationTest.cs)	(revision 72d0ea54e92207651a883553d0b55c5eaeed7b7a)
@@ -551,7 +551,7 @@
         }
 
         [Test]
-        public void GenerateDataBaseCreationScript_HydraRingConfigurationWithWaveConditionsCosineInput_ReturnsExpectedCreationScript()
+        public void GenerateDataBaseCreationScript_HydraRingConfigurationWithWaveConditionsCosineCalculationInput_ReturnsExpectedCreationScript()
         {
             // Setup
             var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
@@ -564,15 +564,15 @@
             var breakWater = new HydraRingBreakWater(1, 2.2);
 
             hydraRingConfigurationService.AddHydraRingCalculationInput(
-                new WaveConditionsCosineInput(1,
-                                              hydraulicBoundaryLocationId,
-                                              10000,
-                                              forelandPoints,
-                                              breakWater,
-                                              3.3,
-                                              4.4,
-                                              5.5,
-                                              6.6));
+                new WaveConditionsCosineCalculationInput(1,
+                                                         hydraulicBoundaryLocationId,
+                                                         10000,
+                                                         forelandPoints,
+                                                         breakWater,
+                                                         3.3,
+                                                         4.4,
+                                                         5.5,
+                                                         6.6));
 
             string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
                                             "INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -647,7 +647,7 @@
         }
 
         [Test]
-        public void GenerateDataBaseCreationScript_HydraRingConfigurationWithWaveConditionsTrapezoidInput_ReturnsExpectedCreationScript()
+        public void GenerateDataBaseCreationScript_HydraRingConfigurationWithWaveConditionsTrapezoidCalculationInput_ReturnsExpectedCreationScript()
         {
             // Setup
             var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
@@ -660,16 +660,16 @@
             var breakWater = new HydraRingBreakWater(1, 2.2);
 
             hydraRingConfigurationService.AddHydraRingCalculationInput(
-                new WaveConditionsTrapezoidInput(1,
-                                                 hydraulicBoundaryLocationId,
-                                                 10000,
-                                                 forelandPoints,
-                                                 breakWater,
-                                                 3.3,
-                                                 4.4,
-                                                 5.5,
-                                                 6.6,
-                                                 7.7));
+                new WaveConditionsTrapezoidCalculationInput(1,
+                                                            hydraulicBoundaryLocationId,
+                                                            10000,
+                                                            forelandPoints,
+                                                            breakWater,
+                                                            3.3,
+                                                            4.4,
+                                                            5.5,
+                                                            6.6,
+                                                            7.7));
 
             string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
                                             "INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r8797ed1774bf2255a1370fafe122d9150f79e365 -r72d0ea54e92207651a883553d0b55c5eaeed7b7a
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 8797ed1774bf2255a1370fafe122d9150f79e365)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 72d0ea54e92207651a883553d0b55c5eaeed7b7a)
@@ -58,15 +58,15 @@
     <Compile Include="Data\HydraRingBreakWaterTest.cs" />
     <Compile Include="Data\HydraRingForelandPointTest.cs" />
     <Compile Include="Data\Input\Hydraulics\DikeHeightCalculationInputTest.cs" />
-    <Compile Include="Data\Input\WaveConditions\WaveConditionsCosineInputTest.cs" />
+    <Compile Include="Data\Input\WaveConditions\WaveConditionsCosineCalculationInputTest.cs" />
     <Compile Include="Data\Input\WaveConditions\WaveConditionsCalculationInputTest.cs" />
     <Compile Include="Data\Input\Hydraulics\WaveHeightCalculationInputTest.cs" />
     <Compile Include="Data\Input\Overtopping\HydraRingRoughnessProfilePointTest.cs" />
     <Compile Include="Data\Input\ExceedanceProbabilityCalculationInputTest.cs" />
     <Compile Include="Data\Input\HydraRingCalculationInputTest.cs" />
     <Compile Include="Data\Input\Overtopping\OvertoppingCalculationInputTest.cs" />
     <Compile Include="Data\Input\Structures\StructuresOvertoppingCalculationInputTest.cs" />
-    <Compile Include="Data\Input\WaveConditions\WaveConditionsTrapezoidInputTest.cs" />
+    <Compile Include="Data\Input\WaveConditions\WaveConditionsTrapezoidCalculationInputTest.cs" />
     <Compile Include="Data\Output\OvertoppingCalculationWaveHeightOutputTest.cs" />
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationAlphaOutputTest.cs" />
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationOutputBaseTest.cs" />