Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r63528bbe6b6682aec44ecd150560fe797ed67a5c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 63528bbe6b6682aec44ecd150560fe797ed67a5c) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -169,24 +169,24 @@ return; } - SubCalculationAssessmentOutput dikeHeightOutput = CalculateDikeHeight(calculation, - assessmentSection, - generalInput, - failureMechanismContribution, - hydraulicBoundaryDatabaseFilePath, - numberOfCalculators); + HydraulicLoadsOutput dikeHeightOutput = CalculateDikeHeight(calculation, + assessmentSection, + generalInput, + failureMechanismContribution, + hydraulicBoundaryDatabaseFilePath, + numberOfCalculators); if (canceled) { return; } - SubCalculationAssessmentOutput overtoppingRateOutput = CalculateOvertoppingRate(calculation, - assessmentSection, - generalInput, - failureMechanismContribution, - hydraulicBoundaryDatabaseFilePath, - numberOfCalculators); + HydraulicLoadsOutput overtoppingRateOutput = CalculateOvertoppingRate(calculation, + assessmentSection, + generalInput, + failureMechanismContribution, + hydraulicBoundaryDatabaseFilePath, + numberOfCalculators); if (canceled) { @@ -261,12 +261,12 @@ Resources.GrassCoverErosionInwardsCalculationService_Overtopping); } - private SubCalculationAssessmentOutput CalculateDikeHeight(GrassCoverErosionInwardsCalculation calculation, - IAssessmentSection assessmentSection, - GeneralGrassCoverErosionInwardsInput generalInput, - double failureMechanismContribution, - string hydraulicBoundaryDatabaseFilePath, - int numberOfCalculators) + private HydraulicLoadsOutput CalculateDikeHeight(GrassCoverErosionInwardsCalculation calculation, + IAssessmentSection assessmentSection, + GeneralGrassCoverErosionInwardsInput generalInput, + double failureMechanismContribution, + string hydraulicBoundaryDatabaseFilePath, + int numberOfCalculators) { if (dikeHeightCalculator == null) { @@ -315,12 +315,12 @@ norm); } - private SubCalculationAssessmentOutput CalculateOvertoppingRate(GrassCoverErosionInwardsCalculation calculation, - IAssessmentSection assessmentSection, - GeneralGrassCoverErosionInwardsInput generalInput, - double failureMechanismContribution, - string hydraulicBoundaryDatabaseFilePath, - int numberOfCalculators) + private HydraulicLoadsOutput CalculateOvertoppingRate(GrassCoverErosionInwardsCalculation calculation, + IAssessmentSection assessmentSection, + GeneralGrassCoverErosionInwardsInput generalInput, + double failureMechanismContribution, + string hydraulicBoundaryDatabaseFilePath, + int numberOfCalculators) { if (overtoppingRateCalculator == null) { @@ -557,14 +557,14 @@ /// The name of the step that is performed. /// The target reliability for the calculation. /// The target probability for the calculation. - /// A . + /// A . /// Thrown when /// or the calculated probability falls outside the [0.0, 1.0] range and is not . - private static SubCalculationAssessmentOutput CreateHydraulicLoadsAssessmentOutput(IHydraulicLoadsCalculator calculator, - string calculationName, - string stepName, - double targetReliability, - double targetProbability) + private static HydraulicLoadsOutput CreateHydraulicLoadsAssessmentOutput(IHydraulicLoadsCalculator calculator, + string calculationName, + string stepName, + double targetReliability, + double targetProbability) { double value = calculator.Value; double reliability = calculator.ReliabilityIndex; @@ -580,9 +580,9 @@ calculationName)); } - return new SubCalculationAssessmentOutput(value, targetProbability, - targetReliability, probability, reliability, - converged); + return new HydraulicLoadsOutput(value, targetProbability, + targetReliability, probability, reliability, + converged); } private static IEnumerable ParseProfilePoints(RoughnessPoint[] roughnessProfilePoints)