src

Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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]

    • -1
    • +2
    ./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
    • -0
    • +159
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
    • -23
    • +38
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorCombinedSlopeAndShoulderAdaption.cs
    • -2
    • +3
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.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
  1. … 11 more files in changeset.
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]

Extracted the method as requested.

Related to Issue [MWDAM-1934]

    • -37
    • +12
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
Bump package StixFileWriter to 23.2.1.5

Related to Issue [MAC-1383]

    • -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
Removed the obsolete comments.

Related to Issue [MWDAM-1916]

    • -2
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs
Removed specific version for System.Runtime.CompilerServices.Unsafe from configs to ghet rid of the compiler warning.

Related to Issue [MWDAM-1916]

    • -6
    • +1
    ./Deltares.DamEngine.Data.Tests/App.config
    • -6
    • +1
    ./Deltares.DamEngine.Calculators.Tests/App.config
Moved the tests and test files.

Related to Issue [MWDAM-1922]

    • -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
Made sure to use proper piping model (Wti) in test file.

Related to Issue [MWDAM-1922]

    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_WtiSellmeijerRevisedNoPipingInputFile.xml
Added copying of test files.

Related to Issue [MWDAM-1922]

    • -0
    • +9
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
Adapted to review comment after consulting reviewer for required solution.

Related to Issue [MWDAM-1922]

    • -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
Made sure that the debugging tests are ignored on Team City.

Related to Issue [MWDAM-1934]

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

Related to Issue [MWDAM-1922]

    • -21
    • +0
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
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]

    • -30
    • +0
    ./Deltares.DamEngine.Interface/FillDamFromXmlOutput.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
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]

    • -0
    • +3
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
Remove nuget package Geo.Common

Set to AnyCPU

Related to Issue [MWDAM-1943]

    • -3
    • +0
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
Bump StixFileWriter nuget package

Related to Issue [MWDAM-1943]

    • -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
Added nuget package Geo.Common.Standard

Related to Issue [MWDAM-1943]

    • -0
    • +3
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
Use StixFileWriter nuget package i.s.o. external libraries

Related to Issue [MWDAM-1943]

    • -0
    • +3
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • -3
    • +5
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
    • -0
    • +3
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
  1. … 6 more files in changeset.
Try to fix TC build

Related to Issue [MWDAM-1943]

    • -8
    • +0
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
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