Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs
===================================================================
diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -ra131a156219bcec5b997f17b66db69dbd80b70a6
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs (.../DunesBoundaryConditionsCalculationInput.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs (.../DunesBoundaryConditionsCalculationInput.cs) (revision a131a156219bcec5b997f17b66db69dbd80b70a6)
@@ -26,14 +26,20 @@
///
public class DunesBoundaryConditionsCalculationInput : AssessmentLevelCalculationInput
{
+ private readonly HydraRingSection section;
+
///
/// Creates a new instance of the class.
///
/// The id of the section.
/// The id of the hydraulic boundary location.
/// The norm.
- public DunesBoundaryConditionsCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm)
- : base(sectionId, hydraulicBoundaryLocationId, norm) {}
+ /// The normal of the section
+ public DunesBoundaryConditionsCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm, double sectionNormal)
+ : base(sectionId, hydraulicBoundaryLocationId, norm)
+ {
+ section = new HydraRingSection(1, double.NaN, sectionNormal);
+ }
public override HydraRingFailureMechanismType FailureMechanismType
{
@@ -50,5 +56,13 @@
return 2;
}
}
+
+ public override HydraRingSection Section
+ {
+ get
+ {
+ return section;
+ }
+ }
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs
===================================================================
diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -ra131a156219bcec5b997f17b66db69dbd80b70a6
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision a131a156219bcec5b997f17b66db69dbd80b70a6)
@@ -38,9 +38,10 @@
const double norm = 1.0/10000;
const int sectionId = 1;
const long hydraulicBoundaryLocationId = 1234;
+ const double orientation = 100;
// Call
- var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(sectionId, hydraulicBoundaryLocationId, norm);
+ var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(sectionId, hydraulicBoundaryLocationId, norm, orientation);
// Assert
double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm);
@@ -58,7 +59,7 @@
var section = dunesBoundaryConditionsCalculationInput.Section;
Assert.AreEqual(sectionId, section.SectionId);
Assert.IsNaN(section.SectionLength);
- Assert.IsNaN(section.CrossSectionNormal);
+ Assert.AreEqual(orientation, section.CrossSectionNormal);
HydraRingVariable[] hydraRingVariables = dunesBoundaryConditionsCalculationInput.Variables.ToArray();
Assert.AreEqual(1, hydraRingVariables.Length);
@@ -72,7 +73,7 @@
public void GetSubMechanismModelId_ReturnsExpectedValues()
{
// Call
- var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(1, 1, 2.2);
+ var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(1, 1, 2.2, 3.3);
// Assert
Assert.IsNull(dunesBoundaryConditionsCalculationInput.GetSubMechanismModelId(1));
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -r4fe5c1139999add996f87b25e9baaff542570a30 -ra131a156219bcec5b997f17b66db69dbd80b70a6
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 4fe5c1139999add996f87b25e9baaff542570a30)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision a131a156219bcec5b997f17b66db69dbd80b70a6)
@@ -2042,7 +2042,7 @@
// Setup
var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
- hydraRingConfigurationService.AddHydraRingCalculationInput(new DunesBoundaryConditionsCalculationInput(1, 700004, 1.0/10000)
+ hydraRingConfigurationService.AddHydraRingCalculationInput(new DunesBoundaryConditionsCalculationInput(1, 700004, 1.0/10000, 360)
{
DesignTablesSetting = new DesignTablesSetting(1.1, 2.2),
NumericsSettings = new Dictionary
@@ -2058,7 +2058,7 @@
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [Sections];" + Environment.NewLine +
- "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 0, 0);" + Environment.NewLine +
+ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 360, 0);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine +
"INSERT INTO [SectionCalculationSchemes] VALUES (1, 1, 1);" + Environment.NewLine +