Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r92210258706d0f57e05552037b676bd941a6fe19 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19) @@ -60,7 +60,6 @@ return ValidateWaveConditionsInput( calculation.InputParameters, - calculation.Name, hydraulicBoundaryDatabaseFilePath, RingtoetsRevetmentsServicesResources.WaveConditionsCalculationService_ValidateInput_default_DesignWaterLevel_name); } @@ -108,10 +107,8 @@ throw new ArgumentNullException(nameof(generalWaveConditionsInput)); } - string calculationName = calculation.Name; + CalculationServiceHelper.LogCalculationBegin(); - CalculationServiceHelper.LogCalculationBegin(calculationName); - RoundedDouble aBlocks = generalWaveConditionsInput.GeneralBlocksWaveConditionsInput.A; RoundedDouble bBlocks = generalWaveConditionsInput.GeneralBlocksWaveConditionsInput.B; RoundedDouble cBlocks = generalWaveConditionsInput.GeneralBlocksWaveConditionsInput.C; @@ -125,16 +122,16 @@ try { - log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_0_for_blocks_started, calculationName); - IEnumerable blocksOutputs = CalculateWaveConditions(calculationName, calculation.InputParameters, aBlocks, bBlocks, cBlocks, norm, hlcdFilePath); - log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_0_for_blocks_finished, calculationName); + log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_for_blocks_started); + IEnumerable blocksOutputs = CalculateWaveConditions(calculation.InputParameters, aBlocks, bBlocks, cBlocks, norm, hlcdFilePath); + log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_for_blocks_finished); IEnumerable columnsOutputs = null; if (!Canceled) { - log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_0_for_columns_started, calculationName); - columnsOutputs = CalculateWaveConditions(calculationName, calculation.InputParameters, aColumns, bColumns, cColumns, norm, hlcdFilePath); - log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_0_for_columns_finished, calculationName); + log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_for_columns_started); + columnsOutputs = CalculateWaveConditions(calculation.InputParameters, aColumns, bColumns, cColumns, norm, hlcdFilePath); + log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_for_columns_finished); } if (!Canceled) @@ -144,7 +141,7 @@ } finally { - CalculationServiceHelper.LogCalculationEnd(calculationName); + CalculationServiceHelper.LogCalculationEnd(); } } }