Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -re41f2b63d721ff33c008eb595bffe6cdb2588626
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e41f2b63d721ff33c008eb595bffe6cdb2588626)
@@ -82,6 +82,15 @@
}
///
+ /// Looks up a localized string similar to Faseverschuiving tussen getij en opzet [uur].
+ ///
+ internal static string _DuneLocationCalculationOutput_TideSurgePhaseDifference_DisplayName {
+ get {
+ return ResourceManager.GetString(" DuneLocationCalculationOutput_TideSurgePhaseDifference_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Nummer van het kustvak waar de locatie onderdeel van uitmaakt..
///
internal static string DuneLocation_CoastalAreaId_Description {
@@ -145,6 +154,15 @@
}
///
+ /// Looks up a localized string similar to Gemiddelde getijamplitude [m].
+ ///
+ internal static string DuneLocationCalculationOutput_MeanTidalAmplitude_DisplayName {
+ get {
+ return ResourceManager.GetString("DuneLocationCalculationOutput_MeanTidalAmplitude_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Berekende rekenwaarde voor de waterstand voor het uitvoeren van een sterkteberekening voor het faalmechanisme duinen..
///
internal static string DuneLocationCalculationOutput_WaterLevel_Description {
@@ -163,6 +181,15 @@
}
///
+ /// Looks up a localized string similar to Golfrichtingspreiding [°].
+ ///
+ internal static string DuneLocationCalculationOutput_WaveDirectionalSpread_DisplayName {
+ get {
+ return ResourceManager.GetString("DuneLocationCalculationOutput_WaveDirectionalSpread_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Berekende rekenwaarde voor de significante golfhoogte voor het uitvoeren van een sterkteberekening voor het faalmechanisme duinen..
///
internal static string DuneLocationCalculationOutput_WaveHeight_Description {
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.resx
===================================================================
diff -u -r5e8b21352cfe76480799a139f21d2ef3c1b58ec7 -re41f2b63d721ff33c008eb595bffe6cdb2588626
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5e8b21352cfe76480799a139f21d2ef3c1b58ec7)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.resx (.../Resources.resx) (revision e41f2b63d721ff33c008eb595bffe6cdb2588626)
@@ -174,4 +174,13 @@
Rekenwaarde Tp - {0}
+
+ Gemiddelde getijamplitude [m]
+
+
+ Golfrichtingspreiding [°]
+
+
+ Faseverschuiving tussen getij en opzet [uur]
+
\ No newline at end of file
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -re41f2b63d721ff33c008eb595bffe6cdb2588626
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision e41f2b63d721ff33c008eb595bffe6cdb2588626)
@@ -156,8 +156,12 @@
Resources.DuneLocationCalculationOutput_WaveHeight_DisplayName);
dataGridViewControl.AddTextBoxColumn(nameof(DuneLocationCalculationRow.WavePeriod),
Resources.DuneLocationCalculationOutput_WavePeriod_DisplayName);
- dataGridViewControl.AddTextBoxColumn(nameof(DuneLocationCalculationRow.D50),
- Resources.DuneLocation_D50_DisplayName);
+ dataGridViewControl.AddTextBoxColumn(nameof(DuneLocationCalculationRow.MeanTidalAmplitude),
+ Resources.DuneLocationCalculationOutput_MeanTidalAmplitude_DisplayName);
+ dataGridViewControl.AddTextBoxColumn(nameof(DuneLocationCalculationRow.WaveDirectionalSpread),
+ Resources.DuneLocationCalculationOutput_WaveDirectionalSpread_DisplayName);
+ dataGridViewControl.AddTextBoxColumn(nameof(DuneLocationCalculationRow.TideSurgePhaseDifference),
+ Resources._DuneLocationCalculationOutput_TideSurgePhaseDifference_DisplayName);
}
protected override object CreateSelectedItemFromCurrentRow()
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs
===================================================================
diff -u -r9d3dc341d56c1a4e3f2d1ee02b2b776063cbeccb -re41f2b63d721ff33c008eb595bffe6cdb2588626
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision 9d3dc341d56c1a4e3f2d1ee02b2b776063cbeccb)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision e41f2b63d721ff33c008eb595bffe6cdb2588626)
@@ -56,6 +56,9 @@
private const int waterLevelColumnIndex = 6;
private const int waveHeightColumnIndex = 7;
private const int wavePeriodColumnIndex = 8;
+ private const int meanTidalAmplitudeColumnIndex = 9;
+ private const int waveDirectionalSpreadColumnIndex = 10;
+ private const int tideSurgePhaseDifferenceColumnIndex = 11;
private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData));
private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite");
@@ -222,7 +225,9 @@
"Rekenwaarde waterstand [m+NAP]",
"Rekenwaarde Hs [m]",
"Rekenwaarde Tp [s]",
- "Rekenwaarde d50 [m]"
+ "Gemiddelde getijamplitude [m]",
+ "Golfrichtingspreiding [°]",
+ "Faseverschuiving tussen getij en opzet [uur]"
};
DataGridViewTestHelper.AssertExpectedHeaders(expectedHeaderNames, dataGridView);
Type[] expectedColumnTypes =
@@ -236,6 +241,8 @@
typeof(DataGridViewTextBoxColumn),
typeof(DataGridViewTextBoxColumn),
typeof(DataGridViewTextBoxColumn),
+ typeof(DataGridViewTextBoxColumn),
+ typeof(DataGridViewTextBoxColumn),
typeof(DataGridViewTextBoxColumn)
};
DataGridViewTestHelper.AssertColumnTypes(expectedColumnTypes, dataGridView);
@@ -294,7 +301,9 @@
"-",
"-",
"-",
- 0.000837.ToString(CultureInfo.CurrentCulture)
+ "-",
+ "-",
+ "-"
};
DataGridViewTestHelper.AssertExpectedRowFormattedValues(expectedRow0Values, rows[0]);
@@ -309,7 +318,9 @@
1.23.ToString(CultureInfo.CurrentCulture),
2.34.ToString(CultureInfo.CurrentCulture),
3.45.ToString(CultureInfo.CurrentCulture),
- 0.000123.ToString(CultureInfo.CurrentCulture)
+ 4.35.ToString(CultureInfo.CurrentCulture),
+ 5.54.ToString(CultureInfo.CurrentCulture),
+ 6.45.ToString(CultureInfo.CurrentCulture),
};
DataGridViewTestHelper.AssertExpectedRowFormattedValues(expectedRow1Values, rows[1]);
}
@@ -384,8 +395,7 @@
new DuneLocation.ConstructionProperties
{
CoastalAreaId = 3,
- Offset = 80,
- D50 = 0.000321
+ Offset = 80
});
var duneLocationCalculation = new DuneLocationCalculation(duneLocation)
{
@@ -395,7 +405,10 @@
{
WaterLevel = 3.21,
WaveHeight = 4.32,
- WavePeriod = 5.43
+ WavePeriod = 5.43,
+ MeanTidalAmplitude = 4.35,
+ WaveDirectionalSpread = 5.54,
+ TideSurgePhaseDifference = 6.45
})
};
calculations.Add(duneLocationCalculation);
@@ -415,7 +428,9 @@
3.21.ToString(CultureInfo.CurrentCulture),
4.32.ToString(CultureInfo.CurrentCulture),
5.43.ToString(CultureInfo.CurrentCulture),
- 0.000321.ToString(CultureInfo.CurrentCulture)
+ 4.35.ToString(CultureInfo.CurrentCulture),
+ 5.54.ToString(CultureInfo.CurrentCulture),
+ 6.45.ToString(CultureInfo.CurrentCulture)
};
DataGridViewTestHelper.AssertExpectedRowFormattedValues(expectedRowValues, rows[0]);
}
@@ -445,10 +460,16 @@
Assert.AreEqual("-", firstRow.Cells[waterLevelColumnIndex].FormattedValue);
Assert.AreEqual("-", firstRow.Cells[waveHeightColumnIndex].FormattedValue);
Assert.AreEqual("-", firstRow.Cells[wavePeriodColumnIndex].FormattedValue);
+ Assert.AreEqual("-", firstRow.Cells[meanTidalAmplitudeColumnIndex].FormattedValue);
+ Assert.AreEqual("-", firstRow.Cells[waveDirectionalSpreadColumnIndex].FormattedValue);
+ Assert.AreEqual("-", firstRow.Cells[tideSurgePhaseDifferenceColumnIndex].FormattedValue);
+
Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), secondRow.Cells[waterLevelColumnIndex].FormattedValue);
Assert.AreEqual(2.34.ToString(CultureInfo.CurrentCulture), secondRow.Cells[waveHeightColumnIndex].FormattedValue);
Assert.AreEqual(3.45.ToString(CultureInfo.CurrentCulture), secondRow.Cells[wavePeriodColumnIndex].FormattedValue);
-
+ Assert.AreEqual(4.35.ToString(CultureInfo.CurrentCulture), secondRow.Cells[meanTidalAmplitudeColumnIndex].FormattedValue);
+ Assert.AreEqual(5.54.ToString(CultureInfo.CurrentCulture), secondRow.Cells[waveDirectionalSpreadColumnIndex].FormattedValue);
+ Assert.AreEqual(6.45.ToString(CultureInfo.CurrentCulture), secondRow.Cells[tideSurgePhaseDifferenceColumnIndex].FormattedValue);
// When
calculations.ForEachElementDo(calculation =>
{
@@ -461,9 +482,16 @@
Assert.AreEqual("-", firstRow.Cells[waterLevelColumnIndex].FormattedValue);
Assert.AreEqual("-", firstRow.Cells[waveHeightColumnIndex].FormattedValue);
Assert.AreEqual("-", firstRow.Cells[wavePeriodColumnIndex].FormattedValue);
+ Assert.AreEqual("-", firstRow.Cells[meanTidalAmplitudeColumnIndex].FormattedValue);
+ Assert.AreEqual("-", firstRow.Cells[waveDirectionalSpreadColumnIndex].FormattedValue);
+ Assert.AreEqual("-", firstRow.Cells[tideSurgePhaseDifferenceColumnIndex].FormattedValue);
+
Assert.AreEqual("-", secondRow.Cells[waterLevelColumnIndex].FormattedValue);
Assert.AreEqual("-", secondRow.Cells[waveHeightColumnIndex].FormattedValue);
Assert.AreEqual("-", secondRow.Cells[wavePeriodColumnIndex].FormattedValue);
+ Assert.AreEqual("-", secondRow.Cells[meanTidalAmplitudeColumnIndex].FormattedValue);
+ Assert.AreEqual("-", secondRow.Cells[waveDirectionalSpreadColumnIndex].FormattedValue);
+ Assert.AreEqual("-", secondRow.Cells[tideSurgePhaseDifferenceColumnIndex].FormattedValue);
}
}
@@ -800,21 +828,22 @@
new DuneLocationCalculation(new DuneLocation("1", hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties
{
CoastalAreaId = 50,
- Offset = 320,
- D50 = 0.000837
+ Offset = 320
})),
new DuneLocationCalculation(new DuneLocation("2", hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties
{
CoastalAreaId = 60,
- Offset = 230,
- D50 = 0.000123
+ Offset = 230
}))
{
Output = new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationCalculationOutput.ConstructionProperties
{
WaterLevel = 1.23,
WaveHeight = 2.34,
- WavePeriod = 3.45
+ WavePeriod = 3.45,
+ MeanTidalAmplitude = 4.35,
+ WaveDirectionalSpread = 5.54,
+ TideSurgePhaseDifference = 6.45
})
}
};