Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs =================================================================== diff -u -r50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3 -rc0060e5ccd71949430c6a348d9c3f7c29e5cd08f --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision c0060e5ccd71949430c6a348d9c3f7c29e5cd08f) @@ -88,64 +88,61 @@ protected override void OnRun() { PerformRun(() => true, - () => GrassCoverErosionOutwardsDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation), - () => - { - log.Info(string.Format(RingtoetsCommonServiceResources.Calculation_Subject_0_started_Time_1_, - calculation.Name, - DateTimeService.CurrentTimeAsString)); + () => GrassCoverErosionOutwardsDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation), + () => + { + log.Info(string.Format(RingtoetsCommonServiceResources.Calculation_Subject_0_started_Time_1_, + calculation.Name, + DateTimeService.CurrentTimeAsString)); - List outputs = new List(); + List outputs = new List(); - var a = failureMechanism.GeneralInput.A; - var b = failureMechanism.GeneralInput.B; - var c = failureMechanism.GeneralInput.C; - var norm = assessmentSection.FailureMechanismContribution.Norm; + var a = failureMechanism.GeneralInput.A; + var b = failureMechanism.GeneralInput.B; + var c = failureMechanism.GeneralInput.C; + var norm = assessmentSection.FailureMechanismContribution.Norm; - foreach (var waterLevel in calculation.InputParameters.WaterLevels) - { - log.Info(string.Format(Resources.GrassCoverErosionOutwardsWaveConditionsCalculationActivity_OnRun_Subject_0_for_waterlevel_1_started_time_2_, - calculation.Name, - waterLevel, - DateTimeService.CurrentTimeAsString)); + foreach (var waterLevel in calculation.InputParameters.WaterLevels) + { + log.Info(string.Format(Resources.GrassCoverErosionOutwardsWaveConditionsCalculationActivity_OnRun_Subject_0_for_waterlevel_1_started_time_2_, + calculation.Name, + waterLevel, + DateTimeService.CurrentTimeAsString)); - ProgressText = string.Format(Resources.GrassCoverErosionOutwardsWaveConditionsCalculationActivity_OnRun_Calculate_waterlevel_0_, waterLevel); + ProgressText = string.Format(Resources.GrassCoverErosionOutwardsWaveConditionsCalculationActivity_OnRun_Calculate_waterlevel_0_, waterLevel); - var output = WaveConditionsCalculationService.Instance.Calculate(waterLevel, - a, - b, - c, - norm, - calculation.InputParameters, - hlcdDirectory, - assessmentSection.Id, - calculation.Name); + var output = WaveConditionsCalculationService.Instance.Calculate(waterLevel, + a, + b, + c, + norm, + calculation.InputParameters, + hlcdDirectory, + assessmentSection.Id, + calculation.Name); - if (output != null) - { - outputs.Add(output); - } + if (output != null) + { + outputs.Add(output); + } - log.Info(string.Format(Resources.GrassCoverErosionOutwardsWaveConditionsCalculationActivity_OnRun_Subject_0_for_waterlevel_1_ended_time_2_, - calculation.Name, - waterLevel, - DateTimeService.CurrentTimeAsString)); - } + log.Info(string.Format(Resources.GrassCoverErosionOutwardsWaveConditionsCalculationActivity_OnRun_Subject_0_for_waterlevel_1_ended_time_2_, + calculation.Name, + waterLevel, + DateTimeService.CurrentTimeAsString)); + } - log.Info(string.Format(RingtoetsCommonServiceResources.Calculation_Subject_0_ended_Time_1_, - calculation.Name, - DateTimeService.CurrentTimeAsString)); + log.Info(string.Format(RingtoetsCommonServiceResources.Calculation_Subject_0_ended_Time_1_, + calculation.Name, + DateTimeService.CurrentTimeAsString)); - return outputs.Any() ? outputs : null; - }); + return outputs.Any() ? outputs : null; + }); } protected override void OnFinish() { - PerformFinish(() => - { - calculation.Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Output); - }); + PerformFinish(() => { calculation.Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Output); }); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/packages.config =================================================================== diff -u -raac499c97ccf17315df116d9d8a962bc1cbd009b -rc0060e5ccd71949430c6a348d9c3f7c29e5cd08f --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/packages.config (.../packages.config) (revision aac499c97ccf17315df116d9d8a962bc1cbd009b) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/packages.config (.../packages.config) (revision c0060e5ccd71949430c6a348d9c3f7c29e5cd08f) @@ -24,4 +24,5 @@ --> + \ No newline at end of file