src

Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Split existing WIP into two parts, one working single core, one still WIP failing multi core.

Related to Issue [MWDAM-1111]

    • -5
    • +13
    ./Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs
Fix unit test

Related to Issue [MWDAM-1141]

    • -0
    • +2
    ./Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineAdapter.cs
Corrected typo.

Related to Issue [MWDAM-1111]

    • -3
    • +3
    ./Deltares.DamEngine.Interface/ConversionHelper.cs
Fix unit test

Related to Issue [MWDAM-1141]

    • -1
    • +1
    ./Deltares.DamEngine.Interface.Tests/TestFiles/MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml
    • -1
    • +0
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs
    • -1
    • +2
    ./Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
Added location results for serialization tests. Added extra parameter damProjectData for writing Dam from xml as location results need the original data to retrace location, segment and soil probability data.

Related to Issue [MWDAM-1111]

    • -5
    • +57
    ./Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
    • -1
    • +1
    ./Deltares.DamEngine.Interface.Tests/PipingSellmeijer4ForcesTests.cs
    • -2
    • +2
    ./Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
    • -2
    • +2
    ./Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs
    • -77
    • +97
    ./Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
Cleaned code.

Related to Issue [MWDAM-1111]

    • -66
    • +76
    ./Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
Refactored

Related to Issue [MWDAM-1141]

    • -2
    • +2
    ./Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs
Implemented PerformDesignCalculationCombinedSlopeAdaptionAndShoulderAdaption()

Moved shared methods to new class DesignCalculatorUtils

Cleanup code

Related to Issue [MWDAM-1178]

    • -84
    • +11
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs
    • -0
    • +115
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorUtils.cs
    • -2
    • +141
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorCombinedSlopeAndShoulderAdaption.cs
    • -0
    • +1
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
    • -1
    • +4
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
Improved GetDesignStrategy() method

Related to Issue [MWDAM-1141]

    • -1
    • +1
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorCombinedSlopeAndShoulderAdaption.cs
Finished shoulder part of PerformDesignCalculationFirstSlopeAdaptionThenShoulderAdaption()

Added resource translations

Added (failing) test for OptimizedSlopeAndShoulderAdaption design method

Related to Issue [MWDAM-1141]

    • -0
    • +9
    ./Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
    • -84
    • +129
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs
    • -43
    • +68
    ./Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
    • -0
    • +27
    ./Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
Finished slope part of PerformDesignCalculationFirstSlopeAdaptionThenShoulderAdaption()

Added methods to SurfaceLine2Extensions, needed for Slope Design calculation

Related to Issue [MWDAM-1141]

    • -0
    • +6
    ./Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
    • -0
    • +18
    ./Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
    • -1
    • +1
    ./Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
    • -0
    • +30
    ./Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Extensions.cs
    • -0
    • +18
    ./Deltares.DamEngine.Data/Properties/Resources.Designer.cs
    • -128
    • +95
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs
    • -97
    • +122
    ./Deltares.DamEngine.Data/Properties/Resources.resx
Implemented proper use of regional assessment scenario job settings throughout all wrappers, kernels and helpers to ensure correct pl-lines and results for test.

Single core now works fully for regional assessment.

Related to Issue [MWDAM-1111]

    • -0
    • +87
    ./Deltares.DamEngine.Data/General/RegionalAssessmentScenarioJobSettings.cs
    • -45
    • +32
    ./Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs
    • -2
    • +22
    ./Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs
    • -0
    • +1
    ./Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
  1. … 3 more files in changeset.
Add parameters to IKernelWrapper interface methods

Refactored: better names

More work on PerformDesignCalculationFirstSlopeAdaptionThenShoulderAdaption()

Related to Issue [MWDAM-1141]

    • -64
    • +60
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs
    • -1
    • +2
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs
typo

Related to Issue [MWDAM-1139]

    • -1
    • +1
    ./Deltares.DamEngine.Interface.Tests/PipingSellmeijer4ForcesTests.cs
Placed MPipingCalc2.dll in same location as other dlls instead of in subfolder CalcDlls

Related to Issue [MWDAM-1177]

    • -3
    • +3
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
Start of implementation of Macrostability Inwards Design

Related to Issue [MWDAM-1141]

    • -17
    • +0
    ./Deltares.DamEngine.Data/General/MStabParameters.cs
    • -1
    • +82
    ./Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
    • -0
    • +36
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorCombinedSlopeAndShoulderAdaption.cs
    • -0
    • +50
    ./Deltares.DamEngine.Calculators/DikesDesign/ShoulderDesignHelper.cs
    • -0
    • +332
    ./Deltares.DamEngine.Interface.Tests/TestFiles/MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml
    • -0
    • +250
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs
    • -0
    • +39
    ./Deltares.DamEngine.Calculators/DikesDesign/ShoulderDesign.cs
    • -1
    • +1
    ./Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs
    • -0
    • +1
    ./Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
  1. … 9 more files in changeset.
Refactored. Move throwhelpers to DamMacroStabilityUtils

Related to Issue [MWDAM-1141]

    • -0
    • +10
    ./Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
    • -0
    • +3
    ./Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
Added Design for Piping Sellmeijer 4 Forces with interface test.

Related to Issue [MWDAM-1139]

    • -0
    • +56
    ./Deltares.DamEngine.Interface.Tests/TestFiles/PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml
    • -0
    • +3
    ./Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
    • -0
    • +55
    ./Deltares.DamEngine.Interface.Tests/PipingSellmeijer4ForcesTests.cs
Refactored. Move kernel creation into deepest loop, to anticipate for parallel calculation

Related to Issue [MWDAM-1141]

    • -8
    • +8
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
Updated test file: now with proper type (regional assessment) and with the soil types per soil.

Related to Issue [MWDAM-1111]

    • too large
    ./Deltares.DamEngine.Calculators.Tests/TestFiles/RegionalAssessment.xml
Remove redundant DamProjectType.Assessment

Related to Issue [MWDAM-1172]

    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
    • -2
    • +0
    ./Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
    • -3
    • +2
    ./Deltares.DamEngine.Interface/ConversionHelper.cs
    • -2
    • +1
    ./Deltares.DamEngine.Data/General/DAMEnumerations.cs
    • -1
    • +0
    ./Deltares.DamEngine.Interface/EngineInterface.cs
    • -1
    • +1
    ./Deltares.DamEngine.Data/General/StabilityOptions.cs
  1. … 1 more file in changeset.
Improve tests

Fix unit tests

Related to Issue [MWDAM-1172]

    • -1
    • +4
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -0
    • +1
    ./Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
    • -0
    • +3
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
Interim commit. Improved implementation piping by passing correct failure mechanism for wrapper and correct water level.

Related to Issue [MWDAM-1111]

    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs
Interim commit. Extended test and implemented piping.

Related to Issue [MWDAM-1111]

    • -3
    • +38
    ./Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs
Added SoilType to Soil properties

Refactored, that DikeMaterialType in IO is an int and not of type SoilType

DikeMaterialType in IO is also renamed to DikeSoilType

Related to Issue [MWDAM-1172]

    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
    • -14
    • +14
    ./Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
    • -14
    • +20
    ./Deltares.DamEngine.Interface/ConversionHelper.cs
    • -1
    • +1
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
    • -1
    • +1
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
  1. … 2 more files in changeset.
Added ModelType to Outwards test

Related to Issue [MWDAM-1169]

    • -0
    • +4
    ./Deltares.DamEngine.Interface.Tests/MacroStabilityOutwardsTests.cs
Interim commit. Stability part working, also in multi processor mode. Answers still wrong because of missing soil type.

Related to Issue [MWDAM-1111]

    • -0
    • +3
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
    • -8
    • +10
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -25
    • +34
    ./Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs
    • -42
    • +45
    ./Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
    • -51
    • +48
    ./Deltares.DamEngine.Data/General/DamProjectData.cs
    • -216
    • +116
    ./Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs
    • -2
    • +2
    ./Deltares.DamEngine.Interface/EngineInterface.cs
Updated test file again, now for model factors.

Related to Issue [MWDAM-1111]

    • too large
    ./Deltares.DamEngine.Calculators.Tests/TestFiles/RegionalAssessment.xml
Updated test files.

Related to Issue [MWDAM-1111]

    • too large
    ./Deltares.DamEngine.Calculators.Tests/TestFiles/RegionalAssessment.xml
    • binary
    ./Deltares.DamEngine.Calculators.Tests/TestFiles/RegionalAssessment.soilmaterials.mdb
Added StabilityModelType to StabilityDesignResults

Related to Issue [MWDAM-1169]

    • -0
    • +5
    ./Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
    • -0
    • +42
    ./Deltares.DamEngine.Io/DamOutput.cs
    • -0
    • +6
    ./Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
    • -0
    • +14
    ./Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
    • -0
    • +32
    ./Deltares.DamEngine.Interface/ConversionHelper.cs
    • -1
    • +2
    ./Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
  1. … 1 more file in changeset.