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
Thursday 01 Aug 2019
12:41 pm

John Bokma

Added code (with tests) to improve handling of "wrong" segments. To be able to test this properly, added PipingModelType.Wti2017 to supported models so we can actually define an improper test project. Adding this also helps for MWDAM-1393 and thus MWDAM-1145, Piping part.

Related to Issue [MWDAM-1445]

Options
    • -8
    • +13
    ./Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
    • -0
    • +66
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
    • -18
    • +53
    ./Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
11:50 am

Tom The

Set version dam engine to 19.1.0 (19.1.1 has not been released yet)

Removed obsolete file

Related to Issue [MWDAM-1513]

Options
    • -10
    • +0
    ./GlobalAssemblyInfo.cs
    • -2
    • +2
    ./Deltares.DamEngine.Version/GlobalAssembly.cs.svn
Monday 29 Jul 2019
6:09 pm

John Bokma

Ensured deleting of created test data folders at end of tests.

Related to Issue [MWDAM-1554]

Options
    • -0
    • +28
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
4:41 pm

Tom The

Fix bug reported by SonarQube

Related to Issue [MWDAM-1513]

Options
    • -13
    • +1
    ./Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
9:09 am

Tom The

Fix bug reported by SonarQube

Related to Issue [MWDAM-1514]

Options
    • -2
    • +1
    ./Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
Friday 26 Jul 2019
9:00 am

Tom The

Fix bug reported by SonarQube

Related to Issue [MWDAM-1514]

Options
    • -2
    • +1
    ./Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
Thursday 25 Jul 2019
12:56 pm

John Bokma

Replaced two test files by one, rewrote tests to use common code.

Related to Issue [MWDAM-1554]

Options
    • -331
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTHWithNoAdaption.xml
    • -0
    • +331
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTH.xml
    • -103
    • +92
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
    • -331
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTHWithAdaption.xml
    • -4
    • +1
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
Wednesday 24 Jul 2019
4:29 pm

Tom The

Typos fixed and improved formatting

Related to Issue [MWDAM-1554]

Options
    • -12
    • +11
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
3:18 pm

John Bokma

Re-instated deep copy and reset of surface line in PerformDesignCalculation to ensure that correct surface line is used for each individual design step in case of Piping as well as in Stability.

Related to Issue [MWDAM-1554]

Options
    • -21
    • +34
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
1:56 pm

John Bokma

Fixed the issue by taking the adaption of the surface line forward to before kernel Prepare statement. Added tests for it.

Related to Issue [MWDAM-1554]

Options
    • -0
    • +331
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTHWithNoAdaption.xml
    • -78
    • +88
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -0
    • +70
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
    • -0
    • +331
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DesignInputFileWithRiverLevelAboveDikeTopButBelowDTHWithAdaption.xml
    • -0
    • +6
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
Monday 22 Jul 2019
2:59 pm

Tom The

Improved naming of functions for PL3 and PL4

Related to Issue [MWDAM-1555]

Options
    • too large
    ./Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs
Friday 19 Jul 2019
12:05 pm

John Bokma

Whilst investigating this option, came across typo and 2 thing that could easily be fixed when looking at the sonarqube results. So did this whilst waiting for Irene to return her verdict about this issue.

Related to Issue [MWDAM-1554]

Options
    • -7
    • +2
    ./Deltares.DamEngine.Data/Geotechnics/CharacteristicPoint.cs
    • -0
    • +1
    ./Deltares.DamEngine.Data/General/Results/DesignResult.cs
    • too large
    ./Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs
Tuesday 16 Jul 2019
11:28 pm

Esther van Zantvoort

Made RequiredSafetyFactorStabilityInnerSlope, RequiredSafetyFactorStabilityOuterSlope, RequiredSafetyFactorPiping, UpliftCriterionStability and UpliftCriterionPiping required in xsd/DamLocation.xsd

Related to Issue [MWDAM-1537]

Options
    • -7
    • +7
    ./Deltares.DamEngine.Data/Design/DesignScenario.cs
    • -4
    • +4
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
    • -83
    • +0
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs
    • -5
    • +1
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
    • -4
    • +4
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs
    • -10
    • +5
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
    • -4
    • +4
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs
    • -4
    • +4
    ./Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
    • -6
    • +6
    ./Deltares.DamEngine.Data/General/ModelFactors.cs
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
    • -2
    • +2
    ./Deltares.DamEngine.Data/General/Location.cs
    • -3
    • +0
    ./Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
    • -18
    • +0
    ./Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
    • -5
    • +5
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -20
    • +5
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
  16. … 5 more files in changeset.
6:34 pm

Esther van Zantvoort

Made PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtRiver and PlLineOffsetBelowShoulderBaseInside required in xsd/DamLocation.xsd

Related to Issue [MWDAM-1537]

Options
    • -12
    • +12
    ./Deltares.DamEngine.Data/Design/DesignScenario.cs
    • -4
    • +4
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
    • -16
    • +4
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -8
    • +4
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
  6. … 2 more files in changeset.
2:58 pm

John Bokma

Corrected setting DampingFactorPl3 and DampingFactorPl4.

Related to Issue [MWDAM-1533]

Options
    • -2
    • +2
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
    • -2
    • +2
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
Friday 12 Jul 2019
11:56 pm

Esther van Zantvoort

Set Run_UsingTestFiles_HasExpectedResultsInOutputFile in OperationalIntegrationTests to Categories.WorkInProgress due to:

Removed ModelFactors from Location in xsd.

Related to Issue [MWDAM-1519]

Options
    • -0
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs
11:38 pm

Esther van Zantvoort

Fixed IO tests, due to Removed ModelFactors.

Related to Issue [MWDAM-1519]

Options
    • -10
    • +0
    ./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
11:24 pm

Esther van Zantvoort

Removed ModelFactors from Location in xsd.

Related to Issue [MWDAM-1519]

Options
    • -12
    • +0
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -16
    • +0
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
  4. … 1 more file in changeset.
6:45 pm

Esther van Zantvoort

Set Run_UsingTestFiles_HasExpectedResultsInOutputFile in OperationalPulauTekongTests and Run_UsingTestFiles_HasExpectedResultsInOutputFile in OperationalGrebbedijkTests to Categories.WorkInProgress due to: Removed HeadPl3, HeadPl4, Pl1BelowCrestRiverside, Pl1BelowCrestPolderside, Pl1BelowShoulderCrestPolderside, Pl1BelowToeDikePolderside, Pl1BelowCrestMiddle, Pl1FactorBelowShoulderCrest from WaternetOptions.

Related to Issue [MWDAM-1519]

Tests must be solved in MWDAM-1535

Options
    • -0
    • +2
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
    • -0
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
6:18 pm

Esther van Zantvoort

Removed HeadPl3, HeadPl4, Pl1BelowCrestRiverside, Pl1BelowCrestPolderside, Pl1BelowShoulderCrestPolderside, Pl1BelowToeDikePolderside, Pl1BelowCrestMiddle, Pl1FactorBelowShoulderCrest from WaternetOptions.

Related to Issue [MWDAM-1519]

Options
    • -9
    • +0
    ./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
    • -9
    • +0
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -12
    • +0
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
  5. … 1 more file in changeset.
Thursday 11 Jul 2019
4:24 pm

John Bokma

Removed obsolete parameters from test file to solve test error.

Related to Issue [MWDAM-1527]

Options
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/Expected1D1.xml
3:53 pm

John Bokma

Removed SoilType as it is never really used.

Related to Issue [MWDAM-1527]

Options
    • -35
    • +0
    ./Deltares.DamEngine.Data/Geotechnics/SoilTypes.cs
    • -2
    • +1
    ./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
    • -25
    • +2
    ./Deltares.DamEngine.Data/Geotechnics/Soil.cs
    • -42
    • +0
    ./Deltares.DamEngine.Interface/ConversionHelper.cs
    • -68
    • +21
    ./Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs
    • -1
    • +0
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -6
    • +3
    ./Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs
    • -22
    • +0
    ./Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
    • -1
    • +0
    ./Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
    • -2
    • +0
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
  12. … 1 more file in changeset.
2:57 pm

John Bokma

Removed all probabilistic parameters named under "Added on 9-7-2019" except for SlopeDampingPiezometricHeightPolderSide (used in PlLinesCreator) and SlopeDampingPiezometricHeightPolderSide (used by Delphi D-GeoStability) as these are used in the engine.

Related to Issue [MWDAM-1527]

Options
    • -2
    • +0
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd
    • -40
    • +0
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/test.xml
    • -7
    • +0
    ./Deltares.DamEngine.Data/General/MStabParameters.cs
    • -6
    • +2
    ./Deltares.DamEngine.Data/General/ModelParameters.cs
    • -1
    • +0
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
    • -6
    • +0
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
  9. … 1 more file in changeset.
Tuesday 09 Jul 2019
2:24 pm

John Bokma

Removed obsolete parameters from the Engine. Increased version number from 19.1 to 19.2.

Related to Issue [MWDAM-1527]

Options
    • -0
    • +3
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs
    • -54
    • +12
    ./Deltares.DamEngine.Data/Design/DesignScenario.cs
    • -2
    • +2
    ./Deltares.DamEngine.Version/GlobalAssembly.cs.svn
    • -6
    • +0
    ./Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs
    • -3
    • +1
    ./Deltares.DamEngine.Data/General/PlLineEnumerations.cs
    • -2
    • +0
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd
    • -26
    • +0
    ./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
Wednesday 03 Jul 2019
12:10 pm

John Bokma

Implemented DistanceToEntryPoint in design oprion too. Added test to show influence of DistanceToEntryPoint on calculations.

Related to Issue [MWDAM-1361]

Options
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
    • -13
    • +20
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs
Tuesday 02 Jul 2019
6:32 pm

John Bokma

Added DistanceToEntryPoint to Location (class and xsd), implemented it in the WtiPipingSellmeijerRevisedKernelWrapper. Added it to the Interface code (both FillDamFromXmlInput and FillXmlInputFromDam) with tests.

Related to Issue [MWDAM-1361]

Options
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
    • -0
    • +1
    ./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
    • -0
    • +4
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -0
    • +2
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
    • -0
    • +1
    ./Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
    • -2
    • +16
    ./Deltares.DamEngine.Data/General/Location.cs
  8. … 1 more file in changeset.
2:34 pm

John Bokma

Removed fixed detriment factor 1.05 for Uplift as this is no longer required.

Here I changed the external for DamMacroStability to use the trunk version 19.1.0 instead of the tagged 18.1 as only the new version holds the proper change. Then I adapted all test values for UpliftVan.

Related to Issue [MWDAM-1504]

Options
    • -24
    • +24
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
    • -5
    • +5
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs
  3. … 1 more file in changeset.
Wednesday 10 Apr 2019
5:36 pm

John Bokma

Added comment and empty line due to review.

Related to Issue [MWDAM-1452]

Options
    • -0
    • +9
    ./Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs
2:43 pm

Tom The

Fix unit test

Related to Issue [MWDAM-1452]

Options
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/Expected1D1.xml
2:21 pm

Tom The

In DamEngine Degree Of Consolidation is in fraction (and not in percentage)

Related to Issue [MWDAM-1452]

Options
    • -2
    • +2
    ./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/expectedTest.sti