Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresCalculationService.cs =================================================================== diff -u -r1a5e1573a47c879bd50e30ef38e12e8d5a397498 -rd1bd0cbbbde2cf891e0212cdb3ff502902d34105 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 1a5e1573a47c879bd50e30ef38e12e8d5a397498) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision d1bd0cbbbde2cf891e0212cdb3ff502902d34105) @@ -68,7 +68,8 @@ throw new NotSupportedException(); } - HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, hrdFilePath, usePreprocessor); + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, hrdFilePath); + return input; } Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingSettingsDatabaseHelperTest.cs =================================================================== diff -u -rffa3b60875b4ca6a20d7b5aa45c2d6644576f10f -rd1bd0cbbbde2cf891e0212cdb3ff502902d34105 --- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingSettingsDatabaseHelperTest.cs (.../HydraRingSettingsDatabaseHelperTest.cs) (revision ffa3b60875b4ca6a20d7b5aa45c2d6644576f10f) +++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingSettingsDatabaseHelperTest.cs (.../HydraRingSettingsDatabaseHelperTest.cs) (revision d1bd0cbbbde2cf891e0212cdb3ff502902d34105) @@ -38,7 +38,7 @@ public void AssignSettingsFromDatabase_HrdFilePathWithInvalidCharacters_ThrowsArgumentException() { // Call - void Call() => HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(new TestHydraRingCalculationInput(), ">", false); + void Call() => HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(new TestHydraRingCalculationInput(), ">"); // Assert Assert.Throws(Call); @@ -48,7 +48,7 @@ public void AssignSettingsFromDatabase_HrdFileWithoutSettingsDatabase_ThrowsCriticalFileReadException() { // Call - void Call() => HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(new TestHydraRingCalculationInput(), "NoConfig.sqlite", false); + void Call() => HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(new TestHydraRingCalculationInput(), "NoConfig.sqlite"); // Assert Assert.Throws(Call); Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -rdc84763c76e9791dc830f574a91d061e1e4dcacc -rd1bd0cbbbde2cf891e0212cdb3ff502902d34105 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision dc84763c76e9791dc830f574a91d061e1e4dcacc) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision d1bd0cbbbde2cf891e0212cdb3ff502902d34105) @@ -502,7 +502,7 @@ generalInput.FshallowModelFactor.LowerBoundary, generalInput.FshallowModelFactor.UpperBoundary); - HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(overtoppingCalculationInput, hrdFilePath, usePreprocessor); + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(overtoppingCalculationInput, hrdFilePath); return overtoppingCalculationInput; } @@ -556,7 +556,7 @@ generalInput.FshallowModelFactor.LowerBoundary, generalInput.FshallowModelFactor.UpperBoundary); - HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(dikeHeightCalculationInput, hrdFilePath, usePreprocessor); + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(dikeHeightCalculationInput, hrdFilePath); return dikeHeightCalculationInput; } @@ -609,7 +609,7 @@ generalInput.FshallowModelFactor.LowerBoundary, generalInput.FshallowModelFactor.UpperBoundary); - HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(overtoppingRateCalculationInput, hrdFilePath, usePreprocessor); + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(overtoppingRateCalculationInput, hrdFilePath); return overtoppingRateCalculationInput; } Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresCalculationService.cs =================================================================== diff -u -r1a5e1573a47c879bd50e30ef38e12e8d5a397498 -rd1bd0cbbbde2cf891e0212cdb3ff502902d34105 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 1a5e1573a47c879bd50e30ef38e12e8d5a397498) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision d1bd0cbbbde2cf891e0212cdb3ff502902d34105) @@ -64,7 +64,7 @@ structureInput.DeviationWaveDirection, structureInput.StormDuration.Mean, structureInput.StormDuration.CoefficientOfVariation); - HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresOvertoppingCalculationInput, hrdFilePath, usePreprocessor); + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresOvertoppingCalculationInput, hrdFilePath); return structuresOvertoppingCalculationInput; } Index: Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs =================================================================== diff -u -rdc84763c76e9791dc830f574a91d061e1e4dcacc -rd1bd0cbbbde2cf891e0212cdb3ff502902d34105 --- Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs (.../ProbabilisticPipingCalculationService.cs) (revision dc84763c76e9791dc830f574a91d061e1e4dcacc) +++ Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs (.../ProbabilisticPipingCalculationService.cs) (revision d1bd0cbbbde2cf891e0212cdb3ff502902d34105) @@ -448,7 +448,7 @@ generalInput.CriticalHeaveGradient.Mean, generalInput.CriticalHeaveGradient.StandardDeviation); } - HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, hrdFilePath, usePreprocessor); + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, hrdFilePath); return input; } Index: Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsCalculationServiceBase.cs =================================================================== diff -u -rdc84763c76e9791dc830f574a91d061e1e4dcacc -rd1bd0cbbbde2cf891e0212cdb3ff502902d34105 --- Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision dc84763c76e9791dc830f574a91d061e1e4dcacc) +++ Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision d1bd0cbbbde2cf891e0212cdb3ff502902d34105) @@ -368,7 +368,7 @@ b, c); - HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(waveConditionsCosineCalculationInput, calculationSettings.HrdFilePath, false); + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(waveConditionsCosineCalculationInput, calculationSettings.HrdFilePath); return waveConditionsCosineCalculationInput; } Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -r1a5e1573a47c879bd50e30ef38e12e8d5a397498 -rd1bd0cbbbde2cf891e0212cdb3ff502902d34105 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 1a5e1573a47c879bd50e30ef38e12e8d5a397498) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision d1bd0cbbbde2cf891e0212cdb3ff502902d34105) @@ -69,7 +69,8 @@ throw new NotSupportedException(); } - HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, hrdFilePath, usePreprocessor); + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, hrdFilePath); + return input; }