DAM / DamEngine / trunk

src

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 7
Last Commit: 17 Dec
Commits this week: 0
Total Lines of Code (LoC): 147,819
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 21 Nov 2023
11:52 am

Tom The

Bump package StixFileWriter to 23.2.1.6

Related to Issue [MAC-1959]

Options
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
11:45 am

Tom The

Add test for 64 bits

Related to Issue [MWDAM-1959]

Options
    • -0
    • +7
    ./DamEngine.sln
10:16 am

John Bokma

Adapted the operational calculator, improved the description of the reason of the ignored test.

Related to Issue [MWDAM-1889]

Options
    • -3
    • +3
    ./Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
10:14 am

John Bokma

Cleaned the multicore tests.

Related to Issue [MWDAM-1948]

Options
    • -8
    • +9
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
Monday 20 Nov 2023
6:06 pm

John Bokma

Now all the multicore adaption tests should succeed.

Related to Issue [MWDAM-1948]

Options
    • -5
    • +5
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
    • -1
    • +2
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -6
    • +14
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
12:48 pm

John Bokma

Corrected some of the tests, now only two fail again,

Related to Issue [MWDAM-1948]

Options
    • -9
    • +7
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • -4
    • +4
    ./Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs
    • -14
    • +5
    ./Deltares.DamEngine.Data/General/Dike.cs
10:24 am

John Bokma

Adapted to review comments.

Related to Issue [MWDAM-1934]

Options
    • -1
    • +2
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -2
    • +2
    ./Deltares.DamEngine.Data/Design/DesignScenario.cs
    • -1
    • +2
    ./Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
Friday 17 Nov 2023
5:23 pm

John Bokma

Corrected all test values in order to make test much more rigid. Now 5 tests fail instead of 2.

Related to Issue [MWDAM-1948]

Options
    • -69
    • +108
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
5:21 pm

John Bokma

Renamed the method and moved it to DesignScenario (where it actually belongs).

Related to Issue [MWDAM-1934]

Options
    • -1
    • +36
    ./Deltares.DamEngine.Data/Design/DesignScenario.cs
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
    • -35
    • +1
    ./Deltares.DamEngine.Data/General/Location.cs
4:17 pm

John Bokma

Added extra test for Adaption (non multicore) as SonarCloud says its not covered (it is, but only in multicore). Added two words to the dictionary to prevent annoying wrong hint/problems. Solve two smells.

Related to Issue [MWDAM-1948]

Options
    • -17
    • +13
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -0
    • +2
    ./common/settings/General.DotSettings
    • -42
    • +205
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
10:15 am

Tom The

Add test for 64 bits

Related to Issue [MWDAM-1959]

Options
    • -0
    • +3
    ./Deltares.DamEngine.ConsoleRun.Tests/Deltares.DamEngine.ConsoleRun.Tests.csproj
    • -0
    • +36
    ./Deltares.DamEngine.ConsoleRun.Tests/EnvironmentTests.cs
  3. ./Deltares.DamEngine.ConsoleRun.Tests
Thursday 16 Nov 2023
6:36 pm

Virginie Trompille

Unused Shear Strength Models are removed from xsd, code and documentation

Related to Issue [MWDAM-1954]

Options
    • -8
    • +0
    ./Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
    • -12
    • +12
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingBlighWithoutUplift.xml
    • -39
    • +3
    ./Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs
    • -2
    • +1
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -12
    • +12
    ./Deltares.DamEngine.IntegrationTests/TestFiles/WtiPipingSellmeijerRevisedWithoutUplift.xml
    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
    • -43
    • +1
    ./Deltares.DamEngine.Interface/ConversionHelper.cs
    • -14
    • +0
    ./Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
    • -3
    • +3
    ./Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml
  10. … 2 more files in changeset.
5:49 pm

John Bokma

Added the missing test file, set the tests expected to fail (2) to WiP.

Related to Issue [MWDAM-1948]

Options
    • -2
    • +2
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • too large
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputFileMultiCoreTestForScenarioAdaption.xml
5:27 pm

John Bokma

Fixed some tests that have no scenarios in the input file.

Related to Issue [MWDAM-1948]

Options
    • -1
    • +1
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
5:18 pm

John Bokma

Made sure that during one calculation (per location per subsoil per scenario) only the CurrentScenario is used. For Design, all scenarios but the Current are removed at the start of the calculation. For Operational, there only ever is one scenario (as this is a demand which is tested). Replaced use of Scenarios[0] with CurrentScenario, removed Scenarios from Dike. Also removed the reference to Location in DesignScenario, added LocationName to DesignScenario.

Adapted all tests for this. I expect two failing (new) tests at the moment.

Related to Issue [MWDAM-1948]

Options
    • -1
    • +2
    ./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
    • -0
    • +159
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • -8
    • +0
    ./Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs
    • -23
    • +38
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorCombinedSlopeAndShoulderAdaption.cs
    • -3
    • +3
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs
    • -2
    • +3
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs
    • -4
    • +4
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs
    • -6
    • +111
    ./Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs
    • -9
    • +18
    ./Deltares.DamEngine.Data/General/Dike.cs
    • -19
    • +14
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -5
    • +10
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs
    • -7
    • +9
    ./Deltares.DamEngine.Data/Design/DesignScenario.cs
    • -3
    • +3
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
    • -2
    • +2
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/TestHelpers/DamEngineDataTestFactory.cs
  16. … 11 more files in changeset.
5:02 pm

John Bokma

First repair some things in Adaption calculations themselves:

- give CircleSurfacePointRightXCoordinate a proper value

- remove unused CircleSurfacePointLeftXCoordinate

- make sure centerOfLeftGridXCoordinate is given a proper value when IsGridAutomatic = true.

Related to Issue [MWDAM-1948]

Options
    • -5
    • +20
    ./Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
    • -8
    • +0
    ./Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs
    • -0
    • +5
    ./Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs
11:08 am

John Bokma

Extracted the method as requested.

Related to Issue [MWDAM-1934]

Options
    • -37
    • +12
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -0
    • +33
    ./Deltares.DamEngine.Data/General/Location.cs
9:04 am

Tom The

Bump package StixFileWriter to 23.2.1.5

Related to Issue [MAC-1383]

Options
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
Monday 13 Nov 2023
1:59 pm

John Bokma

Removed the obsolete comments.

Related to Issue [MWDAM-1916]

Options
    • -2
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs
1:48 pm

John Bokma

Removed specific version for System.Runtime.CompilerServices.Unsafe from configs to ghet rid of the compiler warning.

Related to Issue [MWDAM-1916]

Options
    • -6
    • +1
    ./Deltares.DamEngine.Data.Tests/App.config
    • -6
    • +1
    ./Deltares.DamEngine.Calculators.Tests/App.config
12:34 pm

John Bokma

Moved the tests and test files.

Related to Issue [MWDAM-1922]

Options
  1. ./Deltares.DamEngine.Io.Tests/TestFiles
    • -36
    • +0
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
    • -0
    • +361
    ./Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStability4Forces.xml
    • -0
    • +38
    ./Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs
    • -361
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStabilityVNK.xml
    • -6
    • +0
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • -0
    • +361
    ./Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStabilityVNK.xml
    • -5
    • +14
    ./Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj
    • -361
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStability4Forces.xml
Friday 10 Nov 2023
11:48 am

John Bokma

Made sure to use proper piping model (Wti) in test file.

Related to Issue [MWDAM-1922]

Options
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_WtiSellmeijerRevisedNoPipingInputFile.xml
11:43 am

John Bokma

Added copying of test files.

Related to Issue [MWDAM-1922]

Options
    • -0
    • +9
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
11:34 am

John Bokma

Adapted to review comment after consulting reviewer for required solution.

Related to Issue [MWDAM-1922]

Options
    • -0
    • +5
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -0
    • +361
    ./Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStabilityVNK.xml
    • -17
    • +22
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
    • -0
    • +361
    ./Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStability4Forces.xml
    • -12
    • +0
    ./Deltares.DamEngine.Interface/ConversionHelper.cs
    • -2
    • +0
    ./Deltares.DamEngine.Data/General/PipingEnumerations.cs
    • -4
    • +0
    ./Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
10:11 am

John Bokma

Made sure that the debugging tests are ignored on Team City.

Related to Issue [MWDAM-1934]

Options
    • -2
    • +2
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs
Wednesday 08 Nov 2023
6:18 pm

John Bokma

Removed obsolete refences to a VNK/4Forces test files.

Related to Issue [MWDAM-1922]

Options
    • -21
    • +0
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
6:16 pm

John Bokma

Removed obsolete piping code. Note that reading VNK and 4Forces from input xml is kept in order to be able to give a nice "not implemented error".

Related to Issue [MWDAM-1922]

Options
    • -47
    • +1
    ./Deltares.DamEngine.Data/General/Results/PipingDesignResults.cs
    • -30
    • +0
    ./Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
    • -3
    • +4
    ./Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
    • -50
    • +0
    ./Deltares.DamEngine.Interface/ConversionHelper.cs
    • -24
    • +0
    ./Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
    • -12
    • +0
    ./Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
    • -1
    • +1
    ./Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs
    • -3
    • +2
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
    • -12
    • +0
    ./Deltares.DamEngine.Calculators/Properties/Resources.resx
    • -128
    • +0
    ./Deltares.DamEngine.Io/DamOutput.cs
    • -8
    • +0
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs
    • -20
    • +0
    ./Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
    • -1
    • +3
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
    • -37
    • +0
    ./Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
5:30 pm

Tom The

Re-added nuget package Geo.Common

Merged revision(s) 4354 from DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj:

Related to Issue [MWDAM-1943]

Options
    • -0
    • +3
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
5:24 pm

Tom The

Remove nuget package Geo.Common

Set to AnyCPU

Related to Issue [MWDAM-1943]

Options
    • -46
    • +46
    ./DamEngine.sln
    • -3
    • +3
    ./build/Base.targets
    • -3
    • +0
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
4:41 pm

Tom The

Bump StixFileWriter nuget package

Related to Issue [MWDAM-1943]

Options
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj