src

Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed the two failing tests that were due to the corrected waternet lines.

Related to Issue [MWDAM-1757]

    • -2
    • +2
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
Corrected the points for the waternet lines. These are now too written/passed on from Engine to kernel.

Related to Issue [MWDAM-1757]

Made sure this test project uses the proper version information.

Related to Issue [MWDAM-1730]

    • -30
    • +1
    ./Deltares.DamEngine.IntegrationTests/Properties/AssemblyInfo.cs
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
Updated version and copyright of DamEngine to 21.

Related to Issue [MWDAM-1730]

    • -3
    • +3
    ./Deltares.DamEngine.Version/GlobalAssembly.cs.svn
Adapted to review comments.

Related to Issue [MWDAM-1670]

Update all DAMEngine projects to .Net 4.6.1 in preparation for using the Stix Writer.

Related to Issue [MWDAM-1722]

    • -1
    • +2
    ./Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj
    • -2
    • +2
    ./Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
    • -1
    • +1
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
    • -1
    • +1
    ./Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj
    • -1
    • +2
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • -2
    • +2
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
    • -1
    • +1
    ./Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj
    • -1
    • +1
    ./Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj
    • -1
    • +2
    ./Deltares.DamEngine.Version/Deltares.DamEngine.Version.csproj
    • -3
    • +3
    ./Deltares.DamEngine.ConsoleRun/App.config
    • -1
    • +1
    ./Deltares.DamEngine.Interface/Properties/Resources.Designer.cs
    • -1
    • +1
    ./build/Deltares.DamEngine.Version.targets
    • -1
    • +2
    ./Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
Adapted to review comments.

Related to Issue [MWDAM-1712]

Added setting proper name for xml file. Adapted exiting test(s) by adding missing path/name parameters to example data. Also improved null testing to get rid of warnings.

Related to Issue [MWDAM-1670]

    • -0
    • +3
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • too large
    ./Deltares.DamEngine.IntegrationTests/TestFiles/DeltaDijkInputFile.xml
    • -0
    • +17
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
Rename variable to be more descriptive

Related to Issue [MWDAM-1706]

    • -9
    • +8
    ./Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
    • -8
    • +8
    ./Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
Added the points that define the slices of the resulting slide circle/dual slide circle. This enables drawing the slices as part minimum results picture.

Related to Issue [MWDAM-1712]

    • -0
    • +28
    ./Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
    • -0
    • +15
    ./Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
    • -1
    • +22
    ./Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
Renamed test file to less common name in order to solve the flipping test.

Related to Issue [MWDAM-1711]

    • -0
    • +397
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputFileForDGeoStability.xml
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
    • -397
    • +0
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputFile.xml
Added extra testing for filling the slice data for Bishop and UpliftVan from kernel to engine.

Related to Issue [MWDAM-1712]

Added filling the slice data for Bishop and UpliftVan from kernel to engine. Note that this is not (yet) to be made part of the DamEngine output interface (not yet in interface code and not yet in output xsd).

Related to Issue [MWDAM-1712]

    • -0
    • +1
    ./Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
    • -0
    • +304
    ./Deltares.DamEngine.Data/General/Results/StabilityResultSlice.cs
Added info to test when it fails (locally it works fine all the time, on Team City this test fails sometimes).

Related to Issue [MWDAM-1711]

    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
Made sure slip circle data flows from kernel via DamEngine to the interface of DAMEngine.

Related to Issue [MWDAM-1712]

Check if slip circle exists before filling the xml to fix unit test

Related to Issue [MWDAM-1706]

    • -14
    • +24
    ./Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
fill xml with slip circle results

Related to Issue [MWDAM-1706]

    • -0
    • +37
    ./Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
    • -2
    • +53
    ./Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
    • too large
    ./Deltares.DamEngine.Io/DamInput.cs
    • too large
    ./Deltares.DamEngine.Io/DamOutput.cs
    • -1
    • +19
    ./Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
  1. … 1 more file in changeset.
Added extra precondition to solve failing test.

Related to Issue [MWDAM-1711]

    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
    • -2
    • +3
    ./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
Set WorkInProgress tests to Ignore for now in order to be able to get a green Team City DAM project.

Related to Issue [MWDAM-1711]

    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs
Fixed the issue by replacing soil as dictionary key by soilname as key for the Aquifer dictionary. Now the aquifers can be found.

Related to Issue [MWDAM-1697]

    • -3
    • +3
    ./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
    • -0
    • +17
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
    • -2
    • +2
    ./Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs
    • -0
    • +397
    ./Deltares.DamEngine.IntegrationTests/TestFiles/InputFile.xml
    • -1
    • +1
    ./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
    • -4
    • +4
    ./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
    • -0
    • +3
    ./Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
Update C# wrapper

Related to Issue [MWDAM-1694]

    • -2
    • +2
    ./Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
  1. … 26 more files in changeset.
Add error message if sensor data has an invalid (negative) value

Merge from 19.2 branch

Related to Issue [MWDAM-1605]

    • -3
    • +21
    ./Deltares.DamEngine.Data/General/Dike.cs
Revert changes from rev 3339

Related to Issue [MWDAM-1605]

    • -142
    • +0
    ./Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SensorPlLineCreatorBaseTest.cs
    • -20
    • +1
    ./Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLineCreatorBase.cs
    • -1
    • +0
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
Merged solution from 19.2 branch:

Fixed error generated by MStabDamDll:

- Offset the sensor X locations with the origin of the surfaceline

Related to Issue [MWDAM-1605]

    • -0
    • +142
    ./Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SensorPlLineCreatorBaseTest.cs
    • -1
    • +20
    ./Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLineCreatorBase.cs
    • -0
    • +1
    ./Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
Incorporated comments CR-DAM55:

- Changed enum values back to original values and fixed failing tests

-- Initialize WaterpressureInterpolationModel for tests that fail and make use of soil layers

-- Initialize the DikeEmbankmentMaterial soil layer with HydroStatic when it is needed

Related to Issue [MWDAM-1650]

    • -2
    • +2
    ./Deltares.DamEngine.Data/Geotechnics/WaterpressureInterpolationModel.cs
    • -1
    • +1
    ./Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs
Incorporated comments CR-DAM55:

- Adjust test name as zones are not longer supported

Related to Issue [MWDAM-1650]

    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
Adapted to review comments + added comment for bishop test + some small improvements to code (typo's and correcting signature for CalculateOneTimeEntry). Finally added PipingFactor to enum as we need that for the next step (piping in DamLive).

Related to Issue [MWDAM-1627]

    • -1
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
    • -2
    • +2
    ./Deltares.DamEngine.Data/General/Dike.cs
    • -8
    • +11
    ./Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
Small improvement in check (removed obsolete identical precondition).

Related to Issue [MWDAM-1627]

Replace UpliftVanWti Stability Model Type with UpliftVan Stability Model Type

Related to Issue [MWDAM-1685]

    • -1
    • +0
    ./Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
    • -6
    • +5
    ./Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
    • -1
    • +0
    ./Deltares.DamEngine.Data/General/StabilityEnumerations.cs
    • -11
    • +0
    ./Deltares.DamEngine.Interface/ConversionHelper.cs
Set this test to Wip for now.

Related to Issue [MWDAM-1677]

    • -0
    • +1
    ./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs