Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCalculatorInputCreator.cs =================================================================== diff -u -rb2b50ced8da8e297316fed0680bd2ec9db870a29 -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCalculatorInputCreator.cs (.../FailureMechanismAssemblyCalculatorInputCreator.cs) (revision b2b50ced8da8e297316fed0680bd2ec9db870a29) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCalculatorInputCreator.cs (.../FailureMechanismAssemblyCalculatorInputCreator.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -21,7 +21,7 @@ using System; using Assembly.Kernel.Model.FailureMechanismSections; -using FailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult; +using Riskeer.AssemblyTool.Data; namespace Riskeer.AssemblyTool.KernelWrapper.Creators { Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyResultCreator.cs =================================================================== diff -u -rb2b50ced8da8e297316fed0680bd2ec9db870a29 -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyResultCreator.cs (.../FailureMechanismSectionAssemblyResultCreator.cs) (revision b2b50ced8da8e297316fed0680bd2ec9db870a29) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyResultCreator.cs (.../FailureMechanismSectionAssemblyResultCreator.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -24,7 +24,7 @@ using Assembly.Kernel.Model; using Assembly.Kernel.Model.Categories; using Assembly.Kernel.Model.FailureMechanismSections; -using FailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult; +using Riskeer.AssemblyTool.Data; namespace Riskeer.AssemblyTool.KernelWrapper.Creators { Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCalculatorInputCreatorTest.cs =================================================================== diff -u -rb2b50ced8da8e297316fed0680bd2ec9db870a29 -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismAssemblyCalculatorInputCreatorTest.cs) (revision b2b50ced8da8e297316fed0680bd2ec9db870a29) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismAssemblyCalculatorInputCreatorTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -26,7 +26,6 @@ using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.KernelWrapper.Creators; using Riskeer.AssemblyTool.KernelWrapper.TestUtil; -using FailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult; namespace Riskeer.AssemblyTool.KernelWrapper.Test.Creators { Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyResultCreatorTest.cs =================================================================== diff -u -rb2b50ced8da8e297316fed0680bd2ec9db870a29 -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyResultCreatorTest.cs (.../FailureMechanismSectionAssemblyResultCreatorTest.cs) (revision b2b50ced8da8e297316fed0680bd2ec9db870a29) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyResultCreatorTest.cs (.../FailureMechanismSectionAssemblyResultCreatorTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -25,8 +25,8 @@ using Assembly.Kernel.Model.FailureMechanismSections; using Core.Common.TestUtil; using NUnit.Framework; +using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.KernelWrapper.Creators; -using FailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult; namespace Riskeer.AssemblyTool.KernelWrapper.Test.Creators { Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -376,7 +376,7 @@ private void SetTextBoxValue(double probability) { failureMechanismAssemblyProbabilityTextBox.Text = ProbabilityFormattingHelper.FormatWithDiscreteNumbers(probability); - + if (FailureMechanism.AssemblyResult.IsManualProbability()) { ValidateManualInput(FailureMechanism.AssemblyResult); Index: Riskeer/Common/src/Riskeer.Common.IO/SoilProfile/SoilProfileWrapper.cs =================================================================== diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/Common/src/Riskeer.Common.IO/SoilProfile/SoilProfileWrapper.cs (.../SoilProfileWrapper.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f) +++ Riskeer/Common/src/Riskeer.Common.IO/SoilProfile/SoilProfileWrapper.cs (.../SoilProfileWrapper.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -28,7 +28,7 @@ /// Wrapper class to link an with a . /// /// The type of soil profile to wrap. - public class SoilProfileWrapper + public class SoilProfileWrapper where TSoilProfile : ISoilProfile { /// Index: Riskeer/Common/src/Riskeer.Common.IO/SoilProfile/StochasticSoilModelReader.cs =================================================================== diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/Common/src/Riskeer.Common.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f) +++ Riskeer/Common/src/Riskeer.Common.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -39,7 +39,7 @@ { private readonly Dictionary> soilProfile1Ds = new Dictionary>(); - + private readonly Dictionary> soilProfile2Ds = new Dictionary>(); @@ -292,7 +292,7 @@ FailureMechanismType failureMechanismType = ReadFailureMechanismType(); long? soilProfile1D = ReadSoilProfile1DId(); long? soilProfile2D = ReadSoilProfile2DId(); - if (soilProfile1D.HasValue && + if (soilProfile1D.HasValue && soilProfile1Ds.ContainsKey(failureMechanismType) && soilProfile1Ds[failureMechanismType].ContainsKey(soilProfile1D.Value)) { Index: Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs =================================================================== diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs (.../SoilProfile1DReaderTest.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs (.../SoilProfile1DReaderTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -208,7 +208,7 @@ Assert.AreEqual(expectedMessage, exception.Message); } } - + [Test] public void ReadSoilProfile_DatabaseWith1DAnd1DSoilProfileWithoutSoilLayers_ReturnOneProfile() { @@ -744,7 +744,7 @@ Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } - + [Test] public void ReadSoilProfile_SoilProfilePartOfMultipleFailureMechanismTypes_ReturnsProfilesWithExpectedFailureMechanismTypes() { @@ -765,13 +765,13 @@ // Assert Assert.IsFalse(reader.HasNext); Assert.AreEqual(2, readProfiles.Count); - + CollectionAssert.AreEqual(new[] { FailureMechanismType.Stability, FailureMechanismType.Piping }, readProfiles.Select(p => p.FailureMechanismType)); - + Assert.True(readProfiles.All(p => p.SoilProfile.Name == "Segment_41009_1D1")); Assert.True(readProfiles.All(p => p.SoilProfile.Layers.Count() == 3)); Assert.True(readProfiles.All(p => Math.Abs(p.SoilProfile.Bottom + 21) < 1e-6)); Index: Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs =================================================================== diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs (.../SoilProfile2DReaderTest.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs (.../SoilProfile2DReaderTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -199,7 +199,7 @@ Assert.AreEqual(expectedMessage, exception.Message); } } - + [Test] public void ReadSoilProfile_DatabaseWith2DSoilProfile3Layers_ReturnOneProfile() { @@ -968,13 +968,13 @@ // Assert Assert.IsFalse(reader.HasNext); Assert.AreEqual(2, readProfiles.Count); - + CollectionAssert.AreEqual(new[] { FailureMechanismType.Stability, FailureMechanismType.Piping }, readProfiles.Select(p => p.FailureMechanismType)); - + Assert.True(readProfiles.All(p => p.SoilProfile.Name == "Vak_41-123_Segment_41009_1D1")); Assert.True(readProfiles.All(p => p.SoilProfile.Layers.Count() == 3)); Assert.True(readProfiles.All(p => !p.SoilProfile.PreconsolidationStresses.Any())); Index: Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -547,7 +547,7 @@ Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } - + [Test] public void ReadStochasticSoilModel_CompleteDatabase_SixModelsWithProfiles() { Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneLocationCalculationOutput.cs =================================================================== diff -u -r664ea533634f90fcabc7ec85ee0808714936abba -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneLocationCalculationOutput.cs (.../DuneLocationCalculationOutput.cs) (revision 664ea533634f90fcabc7ec85ee0808714936abba) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneLocationCalculationOutput.cs (.../DuneLocationCalculationOutput.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -80,19 +80,19 @@ /// [s] /// public RoundedDouble WavePeriod { get; } - + /// /// Gets the mean tidal amplitude of the calculation. /// [m] /// public RoundedDouble MeanTidalAmplitude { get; } - + /// /// Gets the wave directional spread of the calculation. /// [°] /// public RoundedDouble WaveDirectionalSpread { get; } - + /// /// Gets the tide surge phase difference of the calculation. /// [hrs] @@ -146,7 +146,7 @@ MeanTidalAmplitude = double.NaN; WaveDirectionalSpread = double.NaN; TideSurgePhaseDifference = double.NaN; - + TargetProbability = double.NaN; TargetReliability = double.NaN; CalculatedProbability = double.NaN; @@ -167,17 +167,17 @@ /// Gets the wave period of the calculation. /// public double WavePeriod { internal get; set; } - + /// /// Gets the mean tidal amplitude of the calculation. /// public double MeanTidalAmplitude { internal get; set; } - + /// /// Gets the wave directional spread of the calculation. /// public double WaveDirectionalSpread { internal get; set; } - + /// /// Gets the tide surge phase difference of the calculation. /// Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationProperties.cs =================================================================== diff -u -r3cecf6aa924b24586868d84962d7eb5f45496769 -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationProperties.cs (.../DuneLocationCalculationProperties.cs) (revision 3cecf6aa924b24586868d84962d7eb5f45496769) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationProperties.cs (.../DuneLocationCalculationProperties.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -161,7 +161,7 @@ return data.Output?.MeanTidalAmplitude ?? RoundedDouble.NaN; } } - + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Result))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.DuneLocationCalculationOutput_WaveDirectionalSpread_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.DuneLocationCalculationOutput_WaveDirectionalSpread_Description))] @@ -173,7 +173,7 @@ return data.Output?.WaveDirectionalSpread ?? RoundedDouble.NaN; } } - + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Result))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.DuneLocationCalculationOutput_TideSurgePhaseDifference_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.DuneLocationCalculationOutput_TideSurgePhaseDifference_Description))] @@ -185,7 +185,7 @@ return data.Output?.TideSurgePhaseDifference ?? RoundedDouble.NaN; } } - + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Result))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.CalculationOutput_TargetProbability_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.CalculationOutput_TargetProbability_Description))] Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionLocationsMapLayer.cs =================================================================== diff -u -r664ea533634f90fcabc7ec85ee0808714936abba -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionLocationsMapLayer.cs (.../DuneErosionLocationsMapLayer.cs) (revision 664ea533634f90fcabc7ec85ee0808714936abba) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionLocationsMapLayer.cs (.../DuneErosionLocationsMapLayer.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -292,11 +292,11 @@ public string WaveHeightMetaDataItem { get; set; } public string WavePeriodMetaDataItem { get; set; } - + public string MeanTidalAmplitudeMetaDataItem { get; set; } - + public string WaveDirectionalSpreadMetaDataItem { get; set; } - + public string TideSurgePhaseDifferenceMetaDataItem { get; set; } } } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.TestUtil/DuneLocationsTestHelper.cs =================================================================== diff -u -r664ea533634f90fcabc7ec85ee0808714936abba -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.TestUtil/DuneLocationsTestHelper.cs (.../DuneLocationsTestHelper.cs) (revision 664ea533634f90fcabc7ec85ee0808714936abba) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.TestUtil/DuneLocationsTestHelper.cs (.../DuneLocationsTestHelper.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -97,8 +97,8 @@ { foreach (DuneLocationCalculation duneLocationCalculation in calculations) { - duneLocationCalculation.Output = new TestDuneLocationCalculationOutput(random.NextDouble(),random.NextDouble(),random.NextDouble(), - random.NextDouble(),random.NextDouble(), random.NextDouble()); + duneLocationCalculation.Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble(), + random.NextDouble(), random.NextDouble(), random.NextDouble()); } } } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs =================================================================== diff -u -r664ea533634f90fcabc7ec85ee0808714936abba -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs (.../AggregatedDuneLocationFactoryTest.cs) (revision 664ea533634f90fcabc7ec85ee0808714936abba) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs (.../AggregatedDuneLocationFactoryTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -76,12 +76,12 @@ { new DuneLocationCalculation(duneLocations[0]) { - Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble(), + Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble()) }, new DuneLocationCalculation(duneLocations[1]) { - Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble(), + Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble()) } } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs =================================================================== diff -u -r664ea533634f90fcabc7ec85ee0808714936abba -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision 664ea533634f90fcabc7ec85ee0808714936abba) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -463,7 +463,7 @@ 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); @@ -485,7 +485,7 @@ 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); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/DuneLocationCalculationsExporterTest.cs =================================================================== diff -u -r664ea533634f90fcabc7ec85ee0808714936abba -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/DuneLocationCalculationsExporterTest.cs (.../DuneLocationCalculationsExporterTest.cs) (revision 664ea533634f90fcabc7ec85ee0808714936abba) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/DuneLocationCalculationsExporterTest.cs (.../DuneLocationCalculationsExporterTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -117,7 +117,7 @@ Assert.IsTrue(isExported); Assert.IsTrue(File.Exists(filePath)); string fileContent = File.ReadAllText(filePath); - string expectedText = + string expectedText = $"Kv\tNr\tRp\tHs\tTp\tGetij\tdt\t_BOI2023_Waarde{Environment.NewLine}" + $"* KustvakID\tRaaiID\tRekenpeil\tRekenwaarde significante golfhoogte\tRekenwaarde piekperiode\tGem. getij amplitude\tFaseverschuiving getij\tP_afslag (doelkans){Environment.NewLine}" + $"* [-]\t[dam]\t[m+NAP]\t[m]\t[s]\t[m]\t[hr]\t[1/jaar]{Environment.NewLine}" + Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationActivityFactoryTest.cs =================================================================== diff -u -r937cad85a137a7c77b84dec605916b0b45415169 -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationActivityFactoryTest.cs (.../HeightStructuresCalculationActivityFactoryTest.cs) (revision 937cad85a137a7c77b84dec605916b0b45415169) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationActivityFactoryTest.cs (.../HeightStructuresCalculationActivityFactoryTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -259,7 +259,7 @@ mocks.ReplayAll(); HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(); - + StructuresCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation); StructuresCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation); Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Calculator/IDunesBoundaryConditionsCalculator.cs =================================================================== diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Calculator/IDunesBoundaryConditionsCalculator.cs (.../IDunesBoundaryConditionsCalculator.cs) (revision 594e0982c648dcb6072a3837762ec8c2516cb070) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Calculator/IDunesBoundaryConditionsCalculator.cs (.../IDunesBoundaryConditionsCalculator.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -43,7 +43,7 @@ /// Gets the wave period at a location. /// double WavePeriod { get; } - + /// /// Gets the mean tidal amplitude at a location. /// Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Output/DunesBoundaryConditionsCalculationOutput.cs =================================================================== diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Output/DunesBoundaryConditionsCalculationOutput.cs (.../DunesBoundaryConditionsCalculationOutput.cs) (revision 594e0982c648dcb6072a3837762ec8c2516cb070) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Output/DunesBoundaryConditionsCalculationOutput.cs (.../DunesBoundaryConditionsCalculationOutput.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -36,7 +36,7 @@ /// The calculated wave directional spread. /// The calculated tide surge phase difference. public DunesBoundaryConditionsCalculationOutput( - double waterLevel, double waveHeight, double wavePeriod, + double waterLevel, double waveHeight, double wavePeriod, double meanTidalAmplitude, double waveDirectionalSpread, double tideSurgePhaseDifference) { WaterLevel = waterLevel; @@ -61,17 +61,17 @@ /// Gets the calculated wave period. /// public double WavePeriod { get; } - + /// /// Gets the calculated mean tidal amplitude. /// public double MeanTidalAmplitude { get; } - + /// /// Gets the calculated wave directional spread. /// public double WaveDirectionalSpread { get; } - + /// /// Gets the calculated tide surge phase difference. /// Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -r6d30d383179a17b459287e834a7089cd3ca7e170 -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 6d30d383179a17b459287e834a7089cd3ca7e170) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -539,10 +539,10 @@ IObservableEnumerable mergedDuneLocations = targetAssessmentSection.DuneErosion.DuneLocations; ObservableList mergedDuneLocationCalculations = targetAssessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities; - + sourceAssessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities.Clear(); sourceAssessmentSection.DuneErosion.RemoveDuneLocations(sourceAssessmentSection.DuneErosion.DuneLocations); - + targetAssessmentSection.DuneErosion = sourceAssessmentSection.DuneErosion; targetAssessmentSection.DuneErosion.SetDuneLocations(mergedDuneLocations); targetAssessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities.AddRange(mergedDuneLocationCalculations); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -r5447d74a2dd344fcde21e3e0b54069faa38153bd -re1a5028995598e4c629c8c525d912376873fa0c5 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 5447d74a2dd344fcde21e3e0b54069faa38153bd) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision e1a5028995598e4c629c8c525d912376873fa0c5) @@ -258,7 +258,7 @@ { FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 1") }); - + var calculationScenario = new TestPipingCalculationScenario(); failureMechanism.CalculationsGroup.Children.Add(calculationScenario);