Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -rbc4ac80f66ddacc89d279d1260465c63ddee4d58 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision bc4ac80f66ddacc89d279d1260465c63ddee4d58)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -79,7 +79,6 @@
HydraRingCalculationService.PerformCalculation(
hlcdDirectory,
ringId,
- HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta,
HydraRingUncertaintiesType.All,
overtoppingCalculationInput,
new IHydraRingFileParser[]
@@ -123,7 +122,6 @@
HydraRingCalculationService.PerformCalculation(
hlcdDirectory,
ringId,
- HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta,
HydraRingUncertaintiesType.All,
dikeHeightCalculationInput,
new IHydraRingFileParser[]
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r219bf641fa81657e9d154c9cb50245af9b2ebe27 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -80,7 +80,6 @@
HydraRingCalculationService.PerformCalculation(
hlcdDirectory,
ringId,
- HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta,
HydraRingUncertaintiesType.All,
input,
new[]
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/HydraulicModelsSetting.cs
===================================================================
diff -u -rf0275727312791f8b218cb7db12404ec8a8863c8 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/HydraulicModelsSetting.cs (.../HydraulicModelsSetting.cs) (revision f0275727312791f8b218cb7db12404ec8a8863c8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/HydraulicModelsSetting.cs (.../HydraulicModelsSetting.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -26,25 +26,25 @@
///
internal class HydraulicModelsSetting
{
- private readonly int timeIntergrationSchemeId;
+ private readonly int timeIntegrationSchemeId;
///
/// Creates a new instance of .
///
- /// The time integration scheme id to use in a calculation.
- public HydraulicModelsSetting(int timeIntergrationSchemeId)
+ /// The time integration scheme id to use in a calculation.
+ public HydraulicModelsSetting(int timeIntegrationSchemeId)
{
- this.timeIntergrationSchemeId = timeIntergrationSchemeId;
+ this.timeIntegrationSchemeId = timeIntegrationSchemeId;
}
///
/// Gets the time integration scheme id to use in a calculation.
///
- public int TimeIntergrationSchemeId
+ public int TimeIntegrationSchemeId
{
get
{
- return timeIntergrationSchemeId;
+ return timeIntegrationSchemeId;
}
}
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs
===================================================================
diff -u -r69ba8c3394d749398c3f07bd925d805225d7c672 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs (.../HydraRingCalculationService.cs) (revision 69ba8c3394d749398c3f07bd925d805225d7c672)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs (.../HydraRingCalculationService.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -53,15 +53,14 @@
public static void PerformCalculation(
string hlcdDirectory,
string ringId,
- HydraRingTimeIntegrationSchemeType timeIntegrationSchemeType,
HydraRingUncertaintiesType uncertaintiesType,
HydraRingCalculationInput hydraRingCalculationInput,
IEnumerable parsers)
{
var sectionId = hydraRingCalculationInput.Section.SectionId;
var workingDirectory = CreateWorkingDirectory();
- var hydraRingConfigurationService = new HydraRingConfigurationService(ringId, timeIntegrationSchemeType, uncertaintiesType);
+ var hydraRingConfigurationService = new HydraRingConfigurationService(ringId, uncertaintiesType);
hydraRingConfigurationService.AddHydraRingCalculationInput(hydraRingCalculationInput);
var hydraRingInitializationService = new HydraRingInitializationService(hydraRingCalculationInput.FailureMechanismType, sectionId, hlcdDirectory, workingDirectory);
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs
===================================================================
diff -u -r4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -65,23 +65,21 @@
private readonly IList hydraRingCalculationInputs;
private readonly NumericsSettingsProvider numericsSettingsProvider = new NumericsSettingsProvider();
private readonly DesignTablesSettingsProvider designTablesSettingsProvider = new DesignTablesSettingsProvider();
+ private readonly HydraulicModelsSettingsProvider hydraulicModelsSettingsProvider = new HydraulicModelsSettingsProvider();
private readonly FailureMechanismDefaultsProvider failureMechanismDefaultsProvider = new FailureMechanismDefaultsProvider();
private readonly VariableDefaultsProvider variableDefaultsProvider = new VariableDefaultsProvider();
- private readonly HydraRingTimeIntegrationSchemeType timeIntegrationSchemeType;
private readonly HydraRingUncertaintiesType uncertaintiesType;
///
/// Creates a new instance of the class.
///
/// The id of the ring to perform Hydra-Ring calculations for.
- /// The to use while performing Hydra-Ring calculations.
/// The to use while performing Hydra-Ring calculations.
- public HydraRingConfigurationService(string ringId, HydraRingTimeIntegrationSchemeType timeIntegrationSchemeType, HydraRingUncertaintiesType uncertaintiesType)
+ public HydraRingConfigurationService(string ringId, HydraRingUncertaintiesType uncertaintiesType)
{
hydraRingCalculationInputs = new List();
this.ringId = ringId;
- this.timeIntegrationSchemeType = timeIntegrationSchemeType;
this.uncertaintiesType = uncertaintiesType;
}
@@ -97,17 +95,6 @@
}
///
- /// Gets the to use while performing Hydra-Ring calculations.
- ///
- public HydraRingTimeIntegrationSchemeType? TimeIntegrationSchemeType
- {
- get
- {
- return timeIntegrationSchemeType;
- }
- }
-
- ///
/// Gets the to use while performing Hydra-Ring calculations.
///
public HydraRingUncertaintiesType? UncertaintiesType
@@ -131,6 +118,11 @@
throw new ArgumentException(@"Section id is not unique", "hydraRingCalculationInput");
}
+ if (hydraRingCalculationInputs.Any(h => h.FailureMechanismType != hydraRingCalculationInput.FailureMechanismType))
+ {
+ throw new NotSupportedException("Running calculations for multiple failure mechanism types is not supported.");
+ }
+
hydraRingCalculationInputs.Add(hydraRingCalculationInput);
}
@@ -170,12 +162,20 @@
private IList GetHydraulicModelsConfiguration()
{
+ var timeIntegrationSchemeId = 1;
+ var input = hydraRingCalculationInputs.FirstOrDefault();
+
+ if (input != null)
+ {
+ timeIntegrationSchemeId = hydraulicModelsSettingsProvider.GetHydraulicModelsSetting(input.FailureMechanismType, ringId).TimeIntegrationSchemeId;
+ }
+
return new List
{
new OrderedDictionary
{
{
- "TimeIntegrationSchemeID", (int?) TimeIntegrationSchemeType
+ "TimeIntegrationSchemeID", (int?) timeIntegrationSchemeId
},
{
"UncertaintiesID", (int?) UncertaintiesType
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/HydraulicModelsSettingTest.cs
===================================================================
diff -u -rf0275727312791f8b218cb7db12404ec8a8863c8 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/HydraulicModelsSettingTest.cs (.../HydraulicModelsSettingTest.cs) (revision f0275727312791f8b218cb7db12404ec8a8863c8)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/HydraulicModelsSettingTest.cs (.../HydraulicModelsSettingTest.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -31,13 +31,13 @@
public void Constructor_ExpectedValues()
{
// Setup
- const int timeIntergrationSchemeId = 1;
+ const int timeIntegrationSchemeId = 1;
// Call
- var hydraulicModelsSetting = new HydraulicModelsSetting(timeIntergrationSchemeId);
+ var hydraulicModelsSetting = new HydraulicModelsSetting(timeIntegrationSchemeId);
// Assert
- Assert.AreEqual(timeIntergrationSchemeId, hydraulicModelsSetting.TimeIntergrationSchemeId);
+ Assert.AreEqual(timeIntegrationSchemeId, hydraulicModelsSetting.TimeIntegrationSchemeId);
}
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraulicModelsSettingsCsvReaderTest.cs
===================================================================
diff -u -r4e846bf8b8bf69de60d6f0121724720ff5e68e6d -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraulicModelsSettingsCsvReaderTest.cs (.../HydraulicModelsSettingsCsvReaderTest.cs) (revision 4e846bf8b8bf69de60d6f0121724720ff5e68e6d)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraulicModelsSettingsCsvReaderTest.cs (.../HydraulicModelsSettingsCsvReaderTest.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -86,7 +86,7 @@
HydraulicModelsSetting setting = settings[expectedMechanism.Key][expectedDesignTablesSetting.Key];
- Assert.AreEqual(expectedDesignTablesSetting.Value.TimeIntergrationSchemeId, setting.TimeIntergrationSchemeId);
+ Assert.AreEqual(expectedDesignTablesSetting.Value.TimeIntegrationSchemeId, setting.TimeIntegrationSchemeId);
}
}
}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -r499c3c7ddd3e75bc5b908d53e45401d42b66c3a6 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 499c3c7ddd3e75bc5b908d53e45401d42b66c3a6)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -42,7 +42,7 @@
public void GenerateDataBaseCreationScript_HydraRingConfigurationWithAssessmentLevelCalculation_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
hydraRingConfigurationService.AddHydraRingCalculationInput(new AssessmentLevelCalculationInput(1, 700004, 10000));
@@ -114,7 +114,7 @@
public void GenerateDataBaseCreationScript_HydraRingConfigurationWithWaveHeightCalculationInput_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
hydraRingConfigurationService.AddHydraRingCalculationInput(new WaveHeightCalculationInput(1, 700004, 10000));
@@ -186,7 +186,7 @@
public void GenerateDataBaseCreationScript_HydraRingConfigurationWithOvertoppingCalculation_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
const int hydraulicBoundaryLocationId = 700004;
var hydraRingSection = new HydraRingSection(1, 2.2, 3.3);
@@ -305,7 +305,7 @@
public void GenerateDataBaseCreationScript_HydraRingConfigurationWithDikeHeightCalculation_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
const int hydraulicBoundaryLocationId = 700004;
var hydraRingSection = new HydraRingSection(1, 2.2, 3.3);
@@ -422,7 +422,7 @@
public void GenerateDataBaseCreationScript_HydraRingConfigurationWithStructuresOvertoppingCalculationCalculation_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
const int hydraulicBoundaryLocationId = 700004;
var hydraRingSection = new HydraRingSection(1, 2.2, 3.3);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/HydraulicModelsSettingsProviderTest.cs
===================================================================
diff -u -r3c24fd855caa295ba80f887e5da167e43513f66e -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/HydraulicModelsSettingsProviderTest.cs (.../HydraulicModelsSettingsProviderTest.cs) (revision 3c24fd855caa295ba80f887e5da167e43513f66e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/HydraulicModelsSettingsProviderTest.cs (.../HydraulicModelsSettingsProviderTest.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -50,7 +50,7 @@
HydraulicModelsSetting hydraulicModelsSetting = hydraulicModelsSettingsProvider.GetHydraulicModelsSetting(failureMechanismType, ringId);
// Assert
- Assert.AreEqual(expectedTimeIntegrationSchemeId, hydraulicModelsSetting.TimeIntergrationSchemeId);
+ Assert.AreEqual(expectedTimeIntegrationSchemeId, hydraulicModelsSetting.TimeIntegrationSchemeId);
}
[Test]
@@ -74,7 +74,7 @@
HydraulicModelsSetting hydraulicModelsSetting = hydraulicModelsSettingsProvider.GetHydraulicModelsSetting(failureMechanismType, ringId);
// Assert
- Assert.AreEqual(expectedTimeIntegrationSchemeId, hydraulicModelsSetting.TimeIntergrationSchemeId);
+ Assert.AreEqual(expectedTimeIntegrationSchemeId, hydraulicModelsSetting.TimeIntegrationSchemeId);
}
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -40,19 +40,18 @@
public void Constructor_ExpectedValues()
{
// Call
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, HydraRingUncertaintiesType.Model);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model);
// Assert
Assert.AreEqual("34-1", hydraRingConfigurationService.RingId);
- Assert.AreEqual(HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, hydraRingConfigurationService.TimeIntegrationSchemeType);
Assert.AreEqual(HydraRingUncertaintiesType.Model, hydraRingConfigurationService.UncertaintiesType);
}
[Test]
public void AddHydraRingCalculationInput_DuplicateSectionId_ThrowsArgumentException()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, HydraRingUncertaintiesType.Model);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model);
var calculationInput1 = new HydraRingCalculationInputImplementation(1, 2);
var calculationInput2 = new HydraRingCalculationInputImplementation(1, 3);
@@ -67,15 +66,34 @@
}
[Test]
+ public void AddHydraRingCalculationInput_MultipleFailureMechanismTypes_ThrowsNotSupportedException()
+ {
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model);
+ var calculationInput1 = new HydraRingCalculationInputImplementation(1, 2);
+ var calculationInput2 = new HydraRingCalculationInputImplementation(2, 3);
+ calculationInput2.SetFailureMechanismType(HydraRingFailureMechanismType.DikesHeight);
+
+ hydraRingConfigurationService.AddHydraRingCalculationInput(calculationInput1);
+
+ // Call
+ TestDelegate test = () => hydraRingConfigurationService.AddHydraRingCalculationInput(calculationInput2);
+
+ // Assert
+ const string expectedMessage = "Running calculations for multiple failure mechanism types is not supported.";
+ var exception = Assert.Throws(test);
+ Assert.AreEqual(expectedMessage, exception.Message);
+ }
+
+ [Test]
public void GenerateDataBaseCreationScript_SingleHydraRingCalculationInputAddedToConfiguration_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, HydraRingUncertaintiesType.Model);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model);
hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004));
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
- "INSERT INTO [HydraulicModels] VALUES (3, 2, 'WTI 2017');" + Environment.NewLine +
+ "INSERT INTO [HydraulicModels] VALUES (1, 2, '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, 3.3, 2.2);" + Environment.NewLine +
@@ -156,14 +174,14 @@
public void GenerateDataBaseCreationScript_MultipleHydraRingCalculationInputsAddedToConfiguration_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, HydraRingUncertaintiesType.Model);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model);
hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004));
hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(2, 700005));
hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(3, 700006));
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
- "INSERT INTO [HydraulicModels] VALUES (3, 2, 'WTI 2017');" + Environment.NewLine +
+ "INSERT INTO [HydraulicModels] VALUES (1, 2, '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, 3.3, 2.2);" + Environment.NewLine +
@@ -281,17 +299,20 @@
private class HydraRingCalculationInputImplementation : HydraRingCalculationInput
{
private readonly int sectionId;
+ private HydraRingFailureMechanismType failureMechanismType;
public HydraRingCalculationInputImplementation(int sectionId, int hydraulicBoundaryLocationId) : base(hydraulicBoundaryLocationId)
{
this.sectionId = sectionId;
+
+ failureMechanismType = HydraRingFailureMechanismType.AssessmentLevel;
}
public override HydraRingFailureMechanismType FailureMechanismType
{
get
{
- return HydraRingFailureMechanismType.AssessmentLevel;
+ return failureMechanismType;
}
}
@@ -366,6 +387,11 @@
}
}
+ public void SetFailureMechanismType(HydraRingFailureMechanismType type)
+ {
+ failureMechanismType = type;
+ }
+
public override int? GetSubMechanismModelId(int subMechanismId)
{
return 1234;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -rbc4ac80f66ddacc89d279d1260465c63ddee4d58 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision bc4ac80f66ddacc89d279d1260465c63ddee4d58)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -93,7 +93,6 @@
HydraRingCalculationService.PerformCalculation(
hlcdDirectory,
ringId,
- HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta,
HydraRingUncertaintiesType.All,
input,
new[]
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -rbc4ac80f66ddacc89d279d1260465c63ddee4d58 -rf744bb990260662f885d34811a1ea042dae18550
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision bc4ac80f66ddacc89d279d1260465c63ddee4d58)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
@@ -93,7 +93,6 @@
HydraRingCalculationService.PerformCalculation(
hlcdDirectory,
ringId,
- HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta,
HydraRingUncertaintiesType.All,
input,
new[]