Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -rb1f2e25e9f7b32c9bfa81a17d649cfe967e52c4e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision b1f2e25e9f7b32c9bfa81a17d649cfe967e52c4e) @@ -69,7 +69,6 @@ private readonly NumericsSettingsProvider numericsSettingsProvider = new NumericsSettingsProvider(); private readonly DesignTablesSettingsProvider designTablesSettingsProvider = new DesignTablesSettingsProvider(); - private readonly HydraulicModelsSettingsProvider hydraulicModelsSettingsProvider = new HydraulicModelsSettingsProvider(); private readonly HydraRingUncertaintiesType uncertaintiesType; @@ -184,23 +183,12 @@ private IList GetHydraulicModelsConfiguration() { - var timeIntegrationSchemeId = 1; - - if (hydraRingInputsAndSettings.Count > 0) - { - HydraulicModelsSetting hydraulicModelsSetting = hydraulicModelsSettingsProvider.GetHydraulicModelsSetting( - hydraRingInputsAndSettings.First().Input.FailureMechanismType, - ringId); - - timeIntegrationSchemeId = hydraulicModelsSetting.TimeIntegrationSchemeId; - } - return new List { new OrderedDictionary { { - "TimeIntegrationSchemeID", timeIntegrationSchemeId + "TimeIntegrationSchemeID", 1 }, { "UncertaintiesID", (int) UncertaintiesType Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r2d900083e4f3a92af1acc0584aa3e2bc9155b8cb -rb1f2e25e9f7b32c9bfa81a17d649cfe967e52c4e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 2d900083e4f3a92af1acc0584aa3e2bc9155b8cb) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision b1f2e25e9f7b32c9bfa81a17d649cfe967e52c4e) @@ -120,7 +120,7 @@ hydraRingConfigurationService.AddHydraRingCalculationInput(new WaveHeightCalculationInput(1, 700004, 10000)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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 + @@ -228,7 +228,7 @@ exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine + @@ -349,7 +349,7 @@ exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation)); var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine + @@ -486,7 +486,7 @@ stormDurationMean, stormDurationVariation)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine + @@ -594,7 +594,7 @@ 6.6)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 56.23, 0);" + Environment.NewLine + @@ -692,7 +692,7 @@ 7.7)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 86.48, 0);" + Environment.NewLine + @@ -789,7 +789,7 @@ 23.3, 24.4, 25.5, 26.6)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine + @@ -903,7 +903,7 @@ 27.7, 28.8, 29.9, 30.0)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine + @@ -1019,7 +1019,7 @@ 27.7, 28.8, 29.9, 30.0)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine + @@ -1144,7 +1144,7 @@ 59.9)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine + @@ -1291,7 +1291,7 @@ 59.9)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine + @@ -1438,7 +1438,7 @@ 59.9)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine + @@ -1585,7 +1585,7 @@ 59.9)); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (3, 1, 'WTI 2017');" + Environment.NewLine + + "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, 3.3, 2.2);" + Environment.NewLine +