src

Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Implemented the improvements for Multi Core as found solving MWDAM-1906 and MWDAM-1925.

Related to Issue [MWDAM-1934]

    • -6
    • +35
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
    • -2
    • +147
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • -22
    • +15
    ./Deltares.DamEngine.Data/Design/DesignScenario.cs
    • too large
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputFileMultiCoreTestForScenario.xml
    • -7
    • +0
    ./Deltares.DamEngine.Calculators/General/Parallel.cs
    • -0
    • +6
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
Obsolete merged dll replaced with last WTI piping dll from artifact of DikesPiping trunk #13337.66.

Related to Issue [MWDAM-1927]

    • -2
    • +5
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
    • -2
    • +2
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
  1. … 5 more files in changeset.
Removed obsolete tests and test files.

Related to Issue [MWDAM-1916]

    • -116
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerVNKInputFile.xml
    • -117
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_Sellmeijer4ForcesInputFile.xml
    • -10
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs
    • -121
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_Sellmeijer4ForcesDesignHeightInputFile.xml
    • -119
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml
    • -119
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerVNKDesignInputFile.xml
    • -208
    • +0
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs
    • -200
    • +0
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs
    • -119
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerVNKDesignInputFileFail.xml
    • too large
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DeltaDijkInvoer3VNKAdaptionShoulderLength.xml
Reverted the unintended commit.

Related to Issue [MWDAM-1916]

    • -468
    • +1180
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebugging.xml
Removed the obsolete piping models from the DAM Engine.

Related to Issue [MWDAM-1916]

    • -13
    • +0
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
    • -3
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
    • -1180
    • +468
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebugging.xml
  1. … 3 more files in changeset.
Added the copying of the test files for piping multicore as based o the project by Onno (Rijnland).

Related to Issue [MWDAM-1889]

    • -0
    • +6
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
Added the test files for piping multicore as based o the project by Onno (Rijnland).

Related to Issue [MWDAM-1889]

    • -0
    • +1162
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputFileOnnoWbiSellmeijer.xml
    • -0
    • +1162
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputFileOnnoBligh.xml
Removed some static methods.

Related to Issue [MWDAM-1889]

    • -10
    • +13
    ./Deltares.DamEngine.Data/Geometry/LineHelper.cs
    • -3
    • +5
    ./Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineHeightAdapter.cs
    • -4
    • +4
    ./Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs
    • -1
    • +3
    ./Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Extensions.cs
    • -2
    • +4
    ./Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineShoulderAdapter.cs
    • -2
    • +3
    ./Deltares.DamEngine.Data/Geometry/GeometryPointString.cs
    • -20
    • +20
    ./Deltares.DamEngine.Data/Geometry/Routines2D.cs
Update stix file writer in Dam Engine

Related to Issue [MWDAM-1910]

    • -1
    • +1
    ./Deltares.DamEngine.Interface.Tests/App.config
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/App.config
    • -1
    • +1
    ./Deltares.DamEngine.Data.Tests/App.config
    • -1
    • +1
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/App.config
  1. … 7 more files in changeset.
Adapt to review

Related to Issue [MWDAM-1907]

    • -2
    • +2
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • -5
    • +2
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • -1167
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DAMSUP169Bligh.xml
    • -3
    • +3
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
    • -0
    • +1167
    ./Deltares.DamEngine.IntegrationTests/TestFiles/WtiPipingSellmeijerRevisedWithoutUplift.xml
    • -8
    • +4
    ./Deltares.DamEngine.Data/Design/DesignScenario.cs
    • -0
    • +1167
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingBlighWithoutUplift.xml
    • -1167
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DAMSUP169WtiSellmeijerRevised.xml
Copy testfiles to testdir.

Related to Issue [MWDAM-1907]

    • -1
    • +14
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
Made sure of correct working dir for tests, part 2.

Related to Issue [MWDAM-1907]

    • -2
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • -0
    • +15
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs
    • -1
    • +16
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs
    • -8
    • +19
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
    • -5
    • +17
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs
Made sure of correct working dir for tests.

Related to Issue [MWDAM-1907]

    • -4
    • +17
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
    • -4
    • +18
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
Prevented no uplift cases to be calculated (with unit tests).

Related to Issue [MWDAM-1907]

    • -0
    • +36
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
    • -0
    • +1167
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DAMSUP169Bligh.xml
    • -0
    • +36
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
    • -0
    • +1167
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DAMSUP169WtiSellmeijerRevised.xml
Fixed the problem for CurrentScenario = null.

Related to Issue [MWDAM-1906]

Improved code lay out.

Related to Issue [MWDAM-1906]

    • -1
    • +20
    ./Deltares.DamEngine.Data/Design/DesignScenario.cs
Fixed the scenario Head problems for trunk version.

Related to Issue [MWDAM-1906]

Added getting back more error information for failed preparations (Stability).

Related to Issue [MWDAM-1889]

    • -0
    • +12
    ./Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
Fixed the scenario Head problems for trunk version.

Related to Issue [MWDAM-1906]

    • -1
    • +1
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
Made sure that file is copied as it is supposed to be.

Related to Issue [MWDAM-1889]

    • -0
    • +3
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
Reversed accidental full commit.

Related to Issue [MWDAM-1889]

    • -16
    • +12
    ./Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj
    • -13
    • +10
    ./Deltares.DamEngine.Data/Geometry/LineHelper.cs
    • -4
    • +2
    ./Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineShoulderAdapter.cs
    • -0
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • -12
    • +8
    ./Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj
    • -12
    • +8
    ./Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
    • -9
    • +5
    ./Deltares.DamEngine.Io/Deltares.DamEngine.Io.csproj
    • -11
    • +7
    ./Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj
    • -4
    • +0
    ./Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj
    • -3
    • +2
    ./Deltares.DamEngine.Data/Geometry/GeometryPointString.cs
    • -4
    • +0
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
  1. … 12 more files in changeset.
Made sure that file is copied as it is supposed to be.

Related to Issue [MWDAM-1889]

    • -1
    • +3
    ./Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Extensions.cs
    • -2
    • +3
    ./Deltares.DamEngine.Data/Geometry/GeometryPointString.cs
    • -9
    • +13
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
    • -0
    • +4
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
    • -5
    • +9
    ./Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj
    • -3
    • +5
    ./Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineHeightAdapter.cs
    • -8
    • +12
    ./Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj
    • -0
    • +3
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • -8
    • +12
    ./Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
    • -20
    • +20
    ./Deltares.DamEngine.Data/Geometry/Routines2D.cs
    • -7
    • +11
    ./Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj
    • -4
    • +4
    ./Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs
  1. … 12 more files in changeset.
Made sure that multi core tests are run using the multicore category.

Related to Issue [MWDAM-1889]

    • -3
    • +2
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
Added permanent test for stability operational, UpliftVan, BeeSwarm.

Related to Issue [MWDAM-1889]

    • -0
    • +618
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebuggingBeeSwarm.xml
    • -0
    • +129
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
Improved tests to check more; extended the error messages with stack trace information.

Added check on null in Routines2D to prevent errors.

Related to Issue [MWDAM-1889]

    • -0
    • +42
    ./Deltares.DamEngine.TestHelpers/GeneralHelper.cs
    • -24
    • +28
    ./Deltares.DamEngine.Data/Geometry/Routines2D.cs
    • -2
    • +10
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • -4
    • +10
    ./Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
Adpted MultiCoreMacroStabilityTests to review comments. Reverted changes on GeometryGenerator as it did not really help.

Related to Issue [MWDAM-1866]

    • -140
    • +3
    ./Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs
    • -2
    • +2
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
Made Static class/methods in MacroStabilityCommonHelper non static.

Related to Issue [MWDAM-1889]

Made sure cleaning working directory happens only once per test class. Also moved test to WiP.

Related to Issue [MWDAM-1866]

    • -9
    • +6
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
Added Category Multicore for Design Multicore tests too. Made sure that the generator no longer uses static methods. This is a bit slower but prevents multicore problems.

Related to Issue [MWDAM-1866]

    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • -3
    • +140
    ./Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs
Added Category Multicore for Multicore tests.

Related to Issue [MWDAM-1866]

    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs