DAM / DamEngine / trunk / src

Deltares.DamEngine.Calculators

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 7
Last Commit: 08 Apr
Commits this week: 0
Total Lines of Code (LoC): 19,025
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
Monday 17 Feb 2020
3:39 pm

John Bokma

Added conversion for SoilProfile2D and PreconcolidationStress (as these are part of the SoilProfile2D in DamEngine) with test. Improved the Factory to rpovide the correct data needed for a FULL test of the SoilProfile2D, so with Points next to CalcPoints.

Related to Issue [MWDAM-1397]

Options
    • -94
    • +76
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs
    • -91
    • +88
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
  3. … 2 more files in changeset.
2:10 pm

John Bokma

Adapted to review comments.

Related to Issue [MWDAM-1633]

Options
    • -1
    • +1
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
  2. … 1 more file in changeset.
11:21 am

John Bokma

Corrected MoveGrid parameter for kernel. It really is NOT in the DamEngine data model but is must be set to true as we want the brute force approach.

Related to Issue [MWDAM-1633]

Options
    • -7
    • +1
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs
    • -1
    • +1
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
Friday 14 Feb 2020
5:04 pm

John Bokma

Added code and test for this. But is depends on some parameters thta are still to be added in MWDAM-1625.

Related to Issue [MWDAM-1632]

Options
    • -28
    • +11
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
    • -4
    • +3
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
    • -7
    • +11
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs
  4. … 2 more files in changeset.
3:46 pm

John Bokma

Checked the correctness of the GridSizeDetermination parameter. This is indeed the correct one as this parameter gets filled with GridDetermination parameter when serializing the engine data from the given xml.

Related to Issue [MWDAM-1633]

Options
    • -1
    • +1
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
3:40 pm

John Bokma

Added the properties for Stability model with test. Also prepared IO tests a little better for the other items still to be transferred.

Related to Issue [MWDAM-1633]

Options
    • -9
    • +15
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs
    • -8
    • +43
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
    • -7
    • +4
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
  4. … 2 more files in changeset.
Thursday 13 Feb 2020
6:55 pm

John Bokma

Implemented review comments.

Related to Issue [MWDAM-1623]

Options
    • -9
    • +3
    ./KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
    • -12
    • +2
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs
    • -77
    • +81
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
    • too large
    ./PlLinesCreator/PlLinesCreator.cs
    • -28
    • +14
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
  6. … 9 more files in changeset.
Wednesday 12 Feb 2020
6:35 pm

John Bokma

Fixed failing conversion tests. Made sure Only CSharpWrapper types are used.

Related to Issue [MWDAM-1623]

Options
    • -78
    • +77
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
  2. … 1 more file in changeset.
5:01 pm

John Bokma

Added the missing file.

Related to Issue [MWDAM-1623]

Options
    • -0
    • +37
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperOutputFromEngine.cs
4:55 pm

John Bokma

Removed old wti-libraries from the lib folder and replaced any references that were not yet done.

Related to Issue [MWDAM-1623]

Options
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.csproj
  2. … 2 more files in changeset.
4:36 pm

John Bokma

Added skeletons for FillEngineFromMacroStabilityWrapperInput, FillEngineFromMacroStabilityWrapperOutput, FillMacroStabilityWrapperInputFromEngine, FillMacroStabilityWrapperOutputFromEngine to replace wti serialization which is now removed. Started with adaptation of the kernelwrapper to no longer use wti-kernel but the full macro stability kernel via the C# wrapper (Issue [MWDAM-1627]). This latest issue can only be finished when all depending issues to actually fill in the data in the provided skeletons (and their belonging tests) are handled.

Made some tests WiP to reflect their proper status.

Removed remaining DAMMacroStability(xxx) files as these are now really no longer required.

Related to Issue [MWDAM-1623]

Options
    • -0
    • +322
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs
    • -30
    • +51
    ./Deltares.DamEngine.Calculators.csproj
    • -1162
    • +0
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIDeserializer.cs
    • -60
    • +0
    ./KernelWrappers/MacroStabilityCommon/DamMacroStabilityOutput.cs
    • -66
    • +0
    ./KernelWrappers/MacroStabilityCommon/DamMacroStabilityInput.cs
    • -13
    • +5
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
    • -0
    • +50
    ./KernelWrappers/MacroStabilityInwards/MacroStabilityKernelDataInput.cs
    • -0
    • +327
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
    • -341
    • +0
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillWtiKernelData.cs
    • -0
    • +39
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs
    • -100
    • +88
    ./KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
    • -88
    • +0
    ./KernelWrappers/MacroStabilityCommon/DamMacroStabilityOutputItem.cs
    • -39
    • +0
    ./KernelWrappers/MacroStabilityInwards/MacroStabilityInput.cs
    • -326
    • +0
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillDamEngineFromWti.cs
    • -1079
    • +0
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTISerializer.cs
  16. … 4 more files in changeset.
11:35 am

tang_ds

Renamed assembler:

- Should operate independently of whatever kernel is involved

Related to Issue [MWDAM-1629]

Options
    • -0
    • +202
    ./KernelWrappers/Assemblers/Geometry2DSectionAssembler.cs
    • -1
    • +1
    ./General/Geometry2DTo1DConverter.cs
    • -202
    • +0
    ./KernelWrappers/Assemblers/DAMMStabGeometry2DSectionAssembler.cs
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.csproj
11:34 am

tang_ds

Fixed typo

Related to Issue [MWDAM-1629]

Options
    • -8
    • +8
    ./KernelWrappers/Assemblers/DtoHelperServices.cs
    • -6
    • +6
    ./KernelWrappers/Assemblers/FileIdentificationAssembler.cs
    • -1
    • +1
    ./KernelWrappers/Assemblers/DtoAssembler.cs
    • -3
    • +3
    ./KernelWrappers/Assemblers/DtoPropertyAttributeMapping.cs
    • -30
    • +30
    ./KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs
    • -6
    • +2
    ./KernelWrappers/Assemblers/XMLAttributes.cs
11:27 am

tang_ds

Removed DamMStabAssembler:

- Decoupling the Geometry2DSectionAssembler from the DAMMacroStability kernel. Extracted used XML keywords to a separate file

Related to Issue [MWDAM-1629]

Options
    • -679
    • +0
    ./KernelWrappers/Assemblers/DamMStabAssembler.cs
    • -23
    • +23
    ./KernelWrappers/Assemblers/DAMMStabGeometry2DSectionAssembler.cs
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.csproj
    • -0
    • +51
    ./KernelWrappers/Assemblers/XMLAttributes.cs
10:38 am

tang_ds

Removed DamMacroStabilityCommon.

Related to Issue [MWDAM-1629]

Options
    • -1
    • +0
    ./KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
    • -28
    • +1
    ./Deltares.DamEngine.Calculators.csproj
  3. ./KernelWrappers/DamMacroStabilityCommon
    • -255
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
    • -35
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Xsd/FileIdentificationDefinition.xsd
  6. ./KernelWrappers/DamMacroStabilityCommon/Xsd
    • -270
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd
  8. ./KernelWrappers/DamMacroStabilityCommon/Assemblers
    • -65
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabDocDefinition.xsd
    • -78
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs
    • -137
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityUtils.cs
    • -145
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/DGSMStabDAMInterface.cs
    • -132
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/DGSStandardDLLInterface.cs
    • -58
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Xsd/ProfileDefinition.xsd
    • -38
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/MStabXmlDocException.cs
  16. … 1 more file in changeset.
10:33 am

tang_ds

Moved Assemblers upward, as these are used by the Geometry2DTo1DConverter. These components are still used and should not be deleted.

Related to Issue [MWDAM-1629]

Options
    • -0
    • +679
    ./KernelWrappers/Assemblers/DamMStabAssembler.cs
    • -39
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyMapException.cs
    • -679
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
    • -0
    • +39
    ./KernelWrappers/Assemblers/DtoAssemblerException.cs
    • -585
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoHelperServices.cs
    • -20
    • +22
    ./Deltares.DamEngine.Calculators.csproj
    • -342
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyAttributeMap.cs
    • -0
    • +267
    ./KernelWrappers/Assemblers/DtoAssembler.cs
    • -0
    • +161
    ./KernelWrappers/Assemblers/SoilProfileAssembler.cs
    • -0
    • +188
    ./KernelWrappers/Assemblers/DtoDocumentAssembler.cs
    • -0
    • +138
    ./KernelWrappers/Assemblers/IDtoAssembler.cs
    • -0
    • +39
    ./KernelWrappers/Assemblers/MissingRequiredFieldValueException.cs
    • -48
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Assemblers/EmbeddedResourceNotFoundException.cs
    • -267
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssembler.cs
    • -76
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/Assemblers/Common.cs
  16. … 27 more files in changeset.
10:32 am

tang_ds

Moved general components to MacroStabilityCommon:

- These components are still used and should not be deleted

Related to Issue [MWDAM-1629]

Options
    • -0
    • +1
    ./KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityUtils.cs
    • -0
    • +38
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityException.cs
    • -0
    • +66
    ./KernelWrappers/MacroStabilityCommon/DamMacroStabilityInput.cs
    • -66
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs
    • -88
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs
    • -0
    • +60
    ./KernelWrappers/MacroStabilityCommon/DamMacroStabilityOutput.cs
    • -38
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/MacroStabilityException.cs
    • -4
    • +4
    ./Deltares.DamEngine.Calculators.csproj
    • -0
    • +88
    ./KernelWrappers/MacroStabilityCommon/DamMacroStabilityOutputItem.cs
    • -60
    • +0
    ./KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutput.cs
  11. … 1 more file in changeset.
Tuesday 11 Feb 2020
4:45 pm

tang_ds

Removed DamMacroStabilityHorizontalBalance:

- Adjusted the KernelWrapperHelper

Related to Issue [MWDAM-1629]

Options
    • -7
    • +2
    ./KernelWrappers/Common/KernelWrapperHelper.cs
  2. ./KernelWrappers/DamMacroStabilityHorizontalBalance
    • -1
    • +0
    ./Deltares.DamEngine.Calculators.csproj
    • -318
    • +0
    ./KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs
  5. … 3 more files in changeset.
4:28 pm

tang_ds

Removed DamMacroStabilityInwards:

- Adjusted the KernelWrapperHelper

Related to Issue [MWDAM-1629]

Options
  1. ./KernelWrappers/DamMacroStabilityInwards
    • -4
    • +1
    ./KernelWrappers/Common/KernelWrapperHelper.cs
    • -1
    • +0
    ./Deltares.DamEngine.Calculators.csproj
    • -660
    • +0
    ./KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs
  5. … 3 more files in changeset.
4:14 pm

tang_ds

Removed DamMacroStabilityOutwards:

- Adjusted the KernelWrapperHelper

Related to Issue [MWDAM-1629]

Options
    • -1
    • +0
    ./Deltares.DamEngine.Calculators.csproj
    • -12
    • +0
    ./KernelWrappers/Common/KernelWrapperHelper.cs
  3. ./KernelWrappers/DamMacroStabilityOutwards
    • -357
    • +0
    ./KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
  5. … 3 more files in changeset.
Wednesday 05 Feb 2020
7:04 pm

John Bokma

Adapted to comments some more.

Related to Issue [MWDAM-1383]

Options
    • -2
    • +5
    ./KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
  2. … 1 more file in changeset.
Tuesday 04 Feb 2020
2:59 pm

John Bokma

Moved HeadPl2 within Location from WaternetOptions to DesignScenario. Also removed HeadPl3 and HeadPl4 from Location.

Started fixing failing tests.

Related to Issue [MWDAM-1618]

Options
    • -6
    • +6
    ./KernelWrappers/Common/PlLinesHelper.cs
    • -9
    • +1
    ./DikesDesign/DesignCalculator.cs
  3. … 17 more files in changeset.
1:16 pm

Tom The

Fixed failing unit test

Related to Issue [MWDAM-1617]

Options
    • too large
    ./PlLinesCreator/PlLinesCreator.cs
  2. … 2 more files in changeset.
12:11 pm

John Bokma

Moved PolderLevel within Location from WaternetOptions to DesignScenario.

Related to Issue [MWDAM-1618]

Options
    • -2
    • +2
    ./KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
    • -2
    • +2
    ./KernelWrappers/Common/PlLinesHelper.cs
    • -1
    • +2
    ./DikesDesign/SurfaceLineShoulderAdapter.cs
    • -3
    • +3
    ./KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs
    • -2
    • +2
    ./DikesDesign/DesignCalculatorCombinedSlopeAndShoulderAdaption.cs
    • -1
    • +2
    ./DikesDesign/SurfaceLineHeightAdapter.cs
    • -2
    • +2
    ./DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs
    • -2
    • +3
    ./DikesDesign/SurfaceLineSlopeAdapter.cs
    • -3
    • +3
    ./KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
    • -1
    • +1
    ./DikesDesign/DesignCalculatorShoulderPerPoint.cs
    • -3
    • +6
    ./DikesDesign/SurfaceLineAdapter.cs
    • -2
    • +2
    ./KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs
    • -1
    • +1
    ./DikesDesign/DesignCalculator.cs
  14. … 17 more files in changeset.
Friday 02 Aug 2019
11:36 am

John Bokma

Fixed problem 1 as stated by PO in issue, just throw error when water level (high/low) at riverside is below dike toe. Added tests for this.

Related to Issue [MWDAM-1345]

Options
    • too large
    ./PlLinesCreator/PlLinesCreator.cs
    • -2
    • +2
    ./PlLinesCreator/SensorPlLine1Creator.cs
  3. … 3 more files in changeset.
Thursday 01 Aug 2019
5:25 pm

Tom The

I improved some code (code was correct, but prevent SonarQube message and improved exception testing in the tests)

Related to Issue [MWDAM-1445]

Options
    • -2
    • +0
    ./DikesOperational/OperationalCalculator.cs
  2. … 2 more files in changeset.
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
    ./KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
    • -18
    • +53
    ./DikesOperational/OperationalCalculator.cs
  3. … 1 more file in changeset.
Monday 29 Jul 2019
4:41 pm

Tom The

Fix bug reported by SonarQube

Related to Issue [MWDAM-1513]

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

Tom The

Fix bug reported by SonarQube

Related to Issue [MWDAM-1514]

Options
    • -2
    • +1
    ./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
    ./KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs