Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 -rd326f1b7ab796161d73bb8c565d411f4f460630e --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision d326f1b7ab796161d73bb8c565d411f4f460630e) @@ -96,7 +96,9 @@ { CreateInstance = context => new GrassCoverErosionOutwardsWaveConditionsInputContextProperties( context, - () => context.FailureMechanism.GetNormativeAssessmentLevel(context.AssessmentSection, GetHydraulicBoundaryLocation(context.Calculation)), + () => context.FailureMechanism.GetAssessmentLevel(context.AssessmentSection, + context.Calculation.InputParameters.HydraulicBoundaryLocation, + context.Calculation.InputParameters.CategoryType), new ObservablePropertyChangeHandler(context.Calculation, context.WrappedData)) }; @@ -796,7 +798,8 @@ foreach (GrassCoverErosionOutwardsWaveConditionsCalculation calculation in calculations) { GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, - failureMechanism.GetNormativeAssessmentLevel(assessmentSection, GetHydraulicBoundaryLocation(calculation)), + failureMechanism.GetNormativeAssessmentLevel(assessmentSection, + calculation.InputParameters.HydraulicBoundaryLocation), assessmentSection.HydraulicBoundaryDatabase.FilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); } @@ -936,7 +939,8 @@ private static void Validate(GrassCoverErosionOutwardsWaveConditionsCalculationContext context) { GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(context.WrappedData, - context.FailureMechanism.GetNormativeAssessmentLevel(context.AssessmentSection, GetHydraulicBoundaryLocation(context.WrappedData)), + context.FailureMechanism.GetNormativeAssessmentLevel(context.AssessmentSection, + context.WrappedData.InputParameters.HydraulicBoundaryLocation), context.AssessmentSection.HydraulicBoundaryDatabase.FilePath, context.AssessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); } @@ -1062,11 +1066,6 @@ #region Hydraulic boundary norms - private static HydraulicBoundaryLocation GetHydraulicBoundaryLocation(ICalculation calculation) - { - return calculation.InputParameters.HydraulicBoundaryLocation; - } - private static double GetMechanismSpecificFactorizedSignalingHydraulicBoundaryNorm(IAssessmentSection assessmentSection, GrassCoverErosionOutwardsFailureMechanism failureMechanism) {