Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/DikesOvertopping.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/DllLinearizedBetaAlpha.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/DynamicLib-DaF.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Database.Test.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Database.TestUtils.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Database.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.DuneErosionWrapper.Tests.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.DuneErosionWrapper.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.IO.Native.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.IO.TestUtils.Native.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.MacroStability.Wrapper.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Piping2017Wrapper.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.PluginShared.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/MechanismComputation.exe =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/StructuresStructuralFailure2017wrapper.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/dikesOverflow.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/dllHydraulicDunes.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/duneErosion.Native.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/exeRingComputation.exe =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/feedbackDLL.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/hydraring_computation.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/linearizedBetaAlpha.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/macroStability.Native.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/piping2017.Native.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/structuresClosure2017.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/structuresOvertopping2017.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/structuresStructuralFailure2017.Native.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/winapi.dll =================================================================== diff -u -rbafcd3618c36c38f37d56f8da48056313185ef3f -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs =================================================================== diff -u -rf30b8c5f2138a96e620167c61bcf48dfae53e8b9 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision f30b8c5f2138a96e620167c61bcf48dfae53e8b9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision 32e9b5ed73b6c798055ab4c87c4db703fb3d866e) @@ -39,19 +39,19 @@ private readonly string query = $"SELECT Value as {waveHeightColumn}," + $"(case when SubMechanismId is 102 then 1 else 0 end) as {isOvertoppingDominantColumn} FROM " + - "(SELECT d.OuterIterationId, TidalPeriod, BetaValue, ClosingSituation, WindDirection, LevelType, SubMechanismId " + + "(SELECT d.OuterIterationId, d.PeriodId, BetaValue, ClosingSituation, WindDirection, LevelType, SubMechanismId " + "FROM GoverningWind g " + - "JOIN DesignBeta d ON d.WindDirection = g.GoverningWind AND d.OuterIterationId = g.OuterIterationId AND d.TidalPeriod = g.PeriodId " + + "JOIN DesignBeta d ON d.WindDirection = g.GoverningWind AND d.OuterIterationId = g.OuterIterationId AND d.PeriodId = g.PeriodId " + $"WHERE LevelType = 7 AND d.SubMechanismId = 102 AND SectionId = {sectionIdParameterName} " + - "ORDER BY d.OuterIterationId DESC, TidalPeriod, BetaValue " + + "ORDER BY d.OuterIterationId DESC, d.PeriodId, BetaValue " + "LIMIT 1) as g " + "JOIN " + "(SELECT Value FROM GoverningWind g " + - "JOIN DesignPointResults d ON d.WindDirection = g.GoverningWind AND d.OuterIterationId = g.OuterIterationId AND d.TidalPeriod = g.PeriodId " + + "JOIN DesignPointResults d ON d.WindDirection = g.GoverningWind AND d.OuterIterationId = g.OuterIterationId AND d.PeriodId = g.PeriodId " + "JOIN DesignBeta db ON db.WindDirection = d.WindDirection AND db.ClosingSituation = d.ClosingSituation AND db.OuterIterationId = d.OuterIterationId " + - "AND db.TidalPeriod = d.TidalPeriod " + + "AND db.PeriodId = d.PeriodId " + $"WHERE OutputVarId = 3 AND db.LevelType = 7 AND db.SectionId = {sectionIdParameterName} " + - "ORDER BY d.OuterIterationId DESC, d.TidalPeriod, db.BetaValue " + + "ORDER BY d.OuterIterationId DESC, d.PeriodId, db.BetaValue " + "LIMIT 1) " + "Order By g.BetaValue " + "LIMIT 1;"; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs =================================================================== diff -u -r07ff9cdf4b5f0a16b695306518ed9019020983c6 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs (.../WaveConditionsCalculationParser.cs) (revision 07ff9cdf4b5f0a16b695306518ed9019020983c6) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs (.../WaveConditionsCalculationParser.cs) (revision 32e9b5ed73b6c798055ab4c87c4db703fb3d866e) @@ -34,7 +34,7 @@ { private const string waveHeightColumnName = "WaveHeight"; private const string wavePeriodColumnName = "WavePeriod"; - private const string waveDirectionColumnName = "waveDirection"; + private const string waveDirectionColumnName = "WaveDirection"; private const string waveAngleColumnName = "WaveAngle"; private readonly string query = $"SELECT {waveHeightColumnName}, {wavePeriodColumnName}, {waveAngleColumnName}, {waveDirectionColumnName} " + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/DunesBoundaryConditionsCalculationParser/EmptyDatabase/output.sqlite =================================================================== diff -u -raaba4b75a68957cc119907739669b990275f4ca4 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/DunesBoundaryConditionsCalculationParser/ResultsOnAllButLastIteration/output.sqlite =================================================================== diff -u -rc8e3b0d129da33a9966b263d244a7492b5144c77 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/DunesBoundaryConditionsCalculationParser/ValidFile/output.sqlite =================================================================== diff -u -rc8e3b0d129da33a9966b263d244a7492b5144c77 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/DunesBoundaryConditionsCalculationParser/ValidFileNoWaterLevel/output.sqlite =================================================================== diff -u -rc8e3b0d129da33a9966b263d244a7492b5144c77 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/DunesBoundaryConditionsCalculationParser/ValidFileNoWaveHeight/output.sqlite =================================================================== diff -u -rc8e3b0d129da33a9966b263d244a7492b5144c77 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/DunesBoundaryConditionsCalculationParser/ValidFileNoWavePeriod/output.sqlite =================================================================== diff -u -rc8e3b0d129da33a9966b263d244a7492b5144c77 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/ExceedanceProbabilityCalculationParser/BetaNull/output.sqlite =================================================================== diff -u -rb253fd5ebc5d5800f5757be8b04820cb4ca05724 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/ExceedanceProbabilityCalculationParser/EmptyDatabase/output.sqlite =================================================================== diff -u -rb253fd5ebc5d5800f5757be8b04820cb4ca05724 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/ExceedanceProbabilityCalculationParser/ValidFile/output.sqlite =================================================================== diff -u -rb253fd5ebc5d5800f5757be8b04820cb4ca05724 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OvertoppingCalculationWaveHeightParser/EmptyDatabase/output.sqlite =================================================================== diff -u -raff302727cbdd19c159e29ffe359487e3479d982 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OvertoppingCalculationWaveHeightParser/EmptyTableDesignBeta/output.sqlite =================================================================== diff -u -raff302727cbdd19c159e29ffe359487e3479d982 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OvertoppingCalculationWaveHeightParser/EmptyTableDesignPointResults/output.sqlite =================================================================== diff -u -raff302727cbdd19c159e29ffe359487e3479d982 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OvertoppingCalculationWaveHeightParser/EmptyTableGoverningWind/output.sqlite =================================================================== diff -u -raff302727cbdd19c159e29ffe359487e3479d982 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OvertoppingCalculationWaveHeightParser/MissingTableDesignBeta/output.sqlite =================================================================== diff -u -raff302727cbdd19c159e29ffe359487e3479d982 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OvertoppingCalculationWaveHeightParser/MissingTableDesignPointResults/output.sqlite =================================================================== diff -u -raff302727cbdd19c159e29ffe359487e3479d982 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OvertoppingCalculationWaveHeightParser/MissingTableGoverningWind/output.sqlite =================================================================== diff -u -raff302727cbdd19c159e29ffe359487e3479d982 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OvertoppingCalculationWaveHeightParser/ValidFile/output.sqlite =================================================================== diff -u -raff302727cbdd19c159e29ffe359487e3479d982 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OvertoppingCalculationWaveHeightParser/ValidFileNoWaveHeight/output.sqlite =================================================================== diff -u -raff302727cbdd19c159e29ffe359487e3479d982 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/WaveConditionsCalculationParser/EmptyDatabase/output.sqlite =================================================================== diff -u -rb22ebfa1f38daadd1bd4f79ac846057e7ee27976 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/WaveConditionsCalculationParser/ValidFile/output.sqlite =================================================================== diff -u -rb22ebfa1f38daadd1bd4f79ac846057e7ee27976 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/WaveConditionsCalculationParser/ValidFileNoWaveAngle/output.sqlite =================================================================== diff -u -rb22ebfa1f38daadd1bd4f79ac846057e7ee27976 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/WaveConditionsCalculationParser/ValidFileNoWaveDirection/output.sqlite =================================================================== diff -u -rb22ebfa1f38daadd1bd4f79ac846057e7ee27976 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/WaveConditionsCalculationParser/ValidFileNoWaveHeight/output.sqlite =================================================================== diff -u -rb22ebfa1f38daadd1bd4f79ac846057e7ee27976 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/WaveConditionsCalculationParser/ValidFileNoWavePeriod/output.sqlite =================================================================== diff -u -rb22ebfa1f38daadd1bd4f79ac846057e7ee27976 -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e Binary files differ