Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs
===================================================================
diff -u -r5a19c1544d732696d84f24877303cdfb19122bc7 -r230a4c55f64ec075d4685b046d7e95e4b3e84e25
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 5a19c1544d732696d84f24877303cdfb19122bc7)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
@@ -58,12 +58,12 @@
///
/// Gets the norm which is needed in the calculations within .
///
- /// The to get the failure mechanism norm for.
- /// The which contains the assessment section norm.
- /// The value of the failure mechanism norm.
+ /// The to get the failure mechanism return period for.
+ /// The which contains the assessment section return period.
+ /// The value of the failure mechanism return period.
/// Thrown when is null.
/// Thrown when has no (0) contribution.
- public static double GetMechanismSpecificNorm(this GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+ public static double GetMechanismSpecificReturnPeriod(this GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
{
if (assessmentSection == null)
{
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs
===================================================================
diff -u -r5a19c1544d732696d84f24877303cdfb19122bc7 -r230a4c55f64ec075d4685b046d7e95e4b3e84e25
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 5a19c1544d732696d84f24877303cdfb19122bc7)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
@@ -94,14 +94,14 @@
return;
}
- var mechanismSpecificNorm = GetMechanismSpecificNorm();
+ var mechanismSpecificReturnPeriod = GetMechanismSpecificReturnPeriod();
- if (!double.IsNaN(mechanismSpecificNorm))
+ if (!double.IsNaN(mechanismSpecificReturnPeriod))
{
bool successfulCalculation = CalculationGuiService.CalculateDesignWaterLevels(AssessmentSection.HydraulicBoundaryDatabase.FilePath,
locations,
AssessmentSection.Id,
- mechanismSpecificNorm,
+ mechanismSpecificReturnPeriod,
new GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider());
if (successfulCalculation)
{
@@ -141,18 +141,18 @@
return false;
}
- private double GetMechanismSpecificNorm()
+ private double GetMechanismSpecificReturnPeriod()
{
- var mechanismSpecificNorm = double.NaN;
+ var mechanismSpecificReturnPeriod = double.NaN;
try
{
- mechanismSpecificNorm = FailureMechanism.GetMechanismSpecificNorm(AssessmentSection);
+ mechanismSpecificReturnPeriod = FailureMechanism.GetMechanismSpecificReturnPeriod(AssessmentSection);
}
catch (ArgumentException e)
{
log.ErrorFormat(e.Message);
}
- return mechanismSpecificNorm;
+ return mechanismSpecificReturnPeriod;
}
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs
===================================================================
diff -u -r5a19c1544d732696d84f24877303cdfb19122bc7 -r230a4c55f64ec075d4685b046d7e95e4b3e84e25
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 5a19c1544d732696d84f24877303cdfb19122bc7)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
@@ -94,14 +94,14 @@
return;
}
- var mechanismSpecificNorm = GetMechanismSpecificNorm();
+ var mechanismSpecificReturnPeriod = GetMechanismSpecificReturnPeriod();
- if (!double.IsNaN(mechanismSpecificNorm))
+ if (!double.IsNaN(mechanismSpecificReturnPeriod))
{
bool successFullCalculation = CalculationGuiService.CalculateWaveHeights(AssessmentSection.HydraulicBoundaryDatabase.FilePath,
locations,
AssessmentSection.Id,
- mechanismSpecificNorm,
+ mechanismSpecificReturnPeriod,
new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider());
if (successFullCalculation)
@@ -155,18 +155,18 @@
return false;
}
- private double GetMechanismSpecificNorm()
+ private double GetMechanismSpecificReturnPeriod()
{
- var mechanismSpecificNorm = double.NaN;
+ var mechanismSpecificReturnPeriod = double.NaN;
try
{
- mechanismSpecificNorm = FailureMechanism.GetMechanismSpecificNorm(AssessmentSection);
+ mechanismSpecificReturnPeriod = FailureMechanism.GetMechanismSpecificReturnPeriod(AssessmentSection);
}
catch (ArgumentException e)
{
log.ErrorFormat(e.Message);
}
- return mechanismSpecificNorm;
+ return mechanismSpecificReturnPeriod;
}
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r54fd939cf2a3d8f718dad28faa24373334d4cc2e -r230a4c55f64ec075d4685b046d7e95e4b3e84e25
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 54fd939cf2a3d8f718dad28faa24373334d4cc2e)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
@@ -502,15 +502,15 @@
IAssessmentSection assessmentSection = nodeData.AssessmentSection;
GrassCoverErosionOutwardsFailureMechanism failureMechanism = nodeData.FailureMechanism;
- var mechanismSpecificNorm = GetMechanismSpecificNorm(failureMechanism, assessmentSection);
+ var mechanismSpecificReturnPeriod = GetMechanismSpecificReturnPeriod(failureMechanism, assessmentSection);
- if (!double.IsNaN(mechanismSpecificNorm))
+ if (!double.IsNaN(mechanismSpecificReturnPeriod))
{
bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(
assessmentSection.HydraulicBoundaryDatabase.FilePath,
nodeData.WrappedData,
assessmentSection.Id,
- mechanismSpecificNorm,
+ mechanismSpecificReturnPeriod,
new GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider());
if (successfulCalculation)
@@ -560,15 +560,15 @@
return;
}
- var mechanismSpecificNorm = GetMechanismSpecificNorm(failureMechanism, assessmentSection);
+ var mechanismSpecificReturnPeriod = GetMechanismSpecificReturnPeriod(failureMechanism, assessmentSection);
- if (!double.IsNaN(mechanismSpecificNorm))
+ if (!double.IsNaN(mechanismSpecificReturnPeriod))
{
bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(
assessmentSection.HydraulicBoundaryDatabase.FilePath,
nodeData.WrappedData,
assessmentSection.Id,
- mechanismSpecificNorm,
+ mechanismSpecificReturnPeriod,
new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider());
if (successfulCalculation)
@@ -875,18 +875,18 @@
#endregion
- private static double GetMechanismSpecificNorm(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+ private static double GetMechanismSpecificReturnPeriod(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
{
- var mechanismSpecificNorm = double.NaN;
+ var mechanismSpecificReturnPeriod = double.NaN;
try
{
- mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
+ mechanismSpecificReturnPeriod = failureMechanism.GetMechanismSpecificReturnPeriod(assessmentSection);
}
catch (ArgumentException e)
{
log.ErrorFormat(e.Message);
}
- return mechanismSpecificNorm;
+ return mechanismSpecificReturnPeriod;
}
#endregion
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -rcd7078972189cf51d899754097ef3cbc0ddc26ee -r230a4c55f64ec075d4685b046d7e95e4b3e84e25
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision cd7078972189cf51d899754097ef3cbc0ddc26ee)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
@@ -78,7 +78,7 @@
var b = failureMechanism.GeneralInput.GeneralWaveConditionsInput.B;
var c = failureMechanism.GeneralInput.GeneralWaveConditionsInput.C;
var ringId = assessmentSection.Id;
- var mechanismSpecificReturnPeriod = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
+ var mechanismSpecificReturnPeriod = failureMechanism.GetMechanismSpecificReturnPeriod(assessmentSection);
TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count();
try
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs
===================================================================
diff -u -r5a19c1544d732696d84f24877303cdfb19122bc7 -r230a4c55f64ec075d4685b046d7e95e4b3e84e25
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 5a19c1544d732696d84f24877303cdfb19122bc7)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
@@ -87,21 +87,21 @@
}
[Test]
- public void GetMechanismSpecificNorm_AssessmentSectionNull_ThrowsArgumentNullException()
+ public void GetMechanismSpecificReturnPeriod_AssessmentSectionNull_ThrowsArgumentNullException()
{
// Setup
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
// Call
- TestDelegate test = () => failureMechanism.GetMechanismSpecificNorm(null);
+ TestDelegate test = () => failureMechanism.GetMechanismSpecificReturnPeriod(null);
// Assert
var exception = Assert.Throws(test);
Assert.AreEqual("assessmentSection", exception.ParamName);
}
[Test]
- public void GetMechanismSpecificNorm_WithAssessmentSection_ReturnMechanismSpecificNorm()
+ public void GetMechanismSpecificReturnPeriod_WithAssessmentSection_ReturnMechanismSpecificReturnPeriod()
{
// Setup
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
@@ -122,14 +122,14 @@
mocks.ReplayAll();
// Call
- double mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
+ double mechanismSpecificReturnPeriod = failureMechanism.GetMechanismSpecificReturnPeriod(assessmentSection);
// Assert
- Assert.AreEqual(6000, mechanismSpecificNorm);
+ Assert.AreEqual(6000, mechanismSpecificReturnPeriod);
}
[Test]
- public void GetMechanismSpecificNorm_WithZeroContributionForFailureMechanism_ThrowsArgumentException()
+ public void GetMechanismSpecificReturnPeriod_WithZeroContributionForFailureMechanism_ThrowsArgumentException()
{
// Setup
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
@@ -150,7 +150,7 @@
mocks.ReplayAll();
// Call
- TestDelegate action = () => failureMechanism.GetMechanismSpecificNorm(assessmentSection);
+ TestDelegate action = () => failureMechanism.GetMechanismSpecificReturnPeriod(assessmentSection);
// Assert
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(action, "De bijdrage van dit toetsspoor is nul. Daardoor is de doorsnede-eis onbepaald en kunnen de berekeningen niet worden uitgevoerd.");
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r2aa9661130f20e88c41dac921ffb780573dcf799 -r230a4c55f64ec075d4685b046d7e95e4b3e84e25
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 2aa9661130f20e88c41dac921ffb780573dcf799)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
@@ -206,7 +206,7 @@
var expectedInput = new WaveConditionsCosineCalculationInput(1,
input.Orientation,
input.HydraulicBoundaryLocation.Id,
- assessmentSection.GrassCoverErosionOutwards.GetMechanismSpecificNorm(assessmentSection),
+ assessmentSection.GrassCoverErosionOutwards.GetMechanismSpecificReturnPeriod(assessmentSection),
input.ForeshoreProfile.Geometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)),
new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height),
calculation.InputParameters.WaterLevels.ElementAt(waterLevelIndex++),
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r2aa9661130f20e88c41dac921ffb780573dcf799 -r230a4c55f64ec075d4685b046d7e95e4b3e84e25
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 2aa9661130f20e88c41dac921ffb780573dcf799)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
@@ -419,7 +419,7 @@
var expectedInput = new WaveConditionsCosineCalculationInput(1,
input.Orientation,
input.HydraulicBoundaryLocation.Id,
- grassCoverErosionOutwardsFailureMechanism.GetMechanismSpecificNorm(assessmentSectionStub),
+ grassCoverErosionOutwardsFailureMechanism.GetMechanismSpecificReturnPeriod(assessmentSectionStub),
input.ForeshoreProfile.Geometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)),
new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height),
calculation.InputParameters.WaterLevels.ElementAt(waterLevelIndex++),