Activity DAM/DamEngine/trunk/src

11:28 pm

Esther van Zantvoort

More
2575
changed 20 files
trunk

Made RequiredSafetyFactorStabilityInnerSlope, RequiredSafetyFactorStabilityOuterSlope, RequiredSafetyFactorPiping, UpliftCriterionStability and UpliftCriterionPiping required in xsd/DamLocation.xsd

Related to Issue [MWDAM-1537]

- -7
- +7
./Deltares.DamEngine.Data/Design/DesignScenario.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../DesignScenario.cs
- -4
- +4
./Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DamPipingBlighKernelWrapper.cs
- -83
- +0
./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators.Tests/.../DamMacroStabilityOutwardsKernelWrapperTests.cs
- -5
- +1
./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DamMacroStabilityOutwardsKernelWrapper.cs
- -4
- +4
./Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DamPipingSellmeijerVnkKernelWrapper.cs
- -10
- +5
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- -4
- +4
./Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DamPipingSellmeijer4ForcesKernelWrapper.cs
- -4
- +4
./Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../WtiPipingSellmeijerRevisedKernelWrapper.cs
- -6
- +6
./Deltares.DamEngine.Data/General/ModelFactors.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../ModelFactors.cs
- -1
- +1
./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../MStabXmlDoc.cs
- -2
- +2
./Deltares.DamEngine.Data/General/Location.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../Location.cs
- -3
- +0
./Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../Resources.nl-NL.resx
- -18
- +0
./Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../Resources.Designer.cs
- -5
- +5
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- -20
- +5
./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DesignCalculator.cs
… 5 more files in changeset.

6:34 pm

Esther van Zantvoort

More
2567
changed 7 files
trunk

Made PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtRiver and PlLineOffsetBelowShoulderBaseInside required in xsd/DamLocation.xsd

Related to Issue [MWDAM-1537]

- -12
- +12
./Deltares.DamEngine.Data/Design/DesignScenario.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../DesignScenario.cs
- -4
- +4
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- too large
./Deltares.DamEngine.Io/DamInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Io/DamInput.cs
- -16
- +4
./Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DesignCalculator.cs
- -8
- +4
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
… 2 more files in changeset.

2:58 pm

John Bokma

More
2563
changed 2 files
trunk

Corrected setting DampingFactorPl3 and DampingFactorPl4.

Related to Issue [MWDAM-1533]

- -2
- +2
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- -2
- +2
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs

11:56 pm

Esther van Zantvoort

More
2524
changed 1 file
trunk

Set Run_UsingTestFiles_HasExpectedResultsInOutputFile in OperationalIntegrationTests to Categories.WorkInProgress due to:

Removed ModelFactors from Location in xsd.

Related to Issue [MWDAM-1519]

- -0
- +1
./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs
- History
- Source
- Diff
./Deltares.DamEngine.IntegrationTests/.../OperationalIntegrationTests.cs

11:38 pm

Esther van Zantvoort

More
2523
changed 1 file
trunk

Fixed IO tests, due to Removed ModelFactors.

Related to Issue [MWDAM-1519]

- -10
- +0
./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
- History
- Source
- Diff
./Deltares.DamEngine.TestHelpers/.../FactoryForDamProjectData.cs

11:24 pm

Esther van Zantvoort

More
2522
changed 4 files
trunk

Removed ModelFactors from Location in xsd.

Related to Issue [MWDAM-1519]

- -12
- +0
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- -16
- +0
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- too large
./Deltares.DamEngine.Io/DamInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Io/DamInput.cs
… 1 more file in changeset.

6:45 pm

Set Run_UsingTestFiles_HasExpectedResultsInOutputFile in OperationalPulauTekongTests and Run_UsingTestFiles_HasExpectedResultsInOutputFile in OperationalGrebbedijkTests to Categories.WorkInProgress due to: Removed HeadPl3, HeadPl4, Pl1BelowCrestRiverside, Pl1BelowCrestPolderside, Pl1BelowShoulderCrestPolderside, Pl1BelowToeDikePolderside, Pl1BelowCrestMiddle, Pl1FactorBelowShoulderCrest from WaternetOptions.

Related to Issue [MWDAM-1519]

Tests must be solved in MWDAM-1535

- -0
- +2
./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
- History
- Source
- Diff
./Deltares.DamEngine.IntegrationTests/.../OperationalGrebbedijkTests.cs
- -0
- +1
./Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
- History
- Source
- Diff
./Deltares.DamEngine.IntegrationTests/.../OperationalPulauTekongTests.cs

6:18 pm

Esther van Zantvoort

More
2517
changed 5 files
trunk

Removed HeadPl3, HeadPl4, Pl1BelowCrestRiverside, Pl1BelowCrestPolderside, Pl1BelowShoulderCrestPolderside, Pl1BelowToeDikePolderside, Pl1BelowCrestMiddle, Pl1FactorBelowShoulderCrest from WaternetOptions.

Related to Issue [MWDAM-1519]

- -9
- +0
./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
- History
- Source
- Diff
./Deltares.DamEngine.TestHelpers/.../FactoryForDamProjectData.cs
- too large
./Deltares.DamEngine.Io/DamInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Io/DamInput.cs
- -9
- +0
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- -12
- +0
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
… 1 more file in changeset.

4:24 pm

John Bokma

More
2504
changed 1 file
trunk

Removed obsolete parameters from test file to solve test error.

Related to Issue [MWDAM-1527]

- -1
- +1
./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/Expected1D1.xml
- History
- Source
- Diff
./Deltares.DamEngine.Calculators.Tests/.../Expected1D1.xml

3:53 pm

John Bokma

More
2503
changed 12 files
trunk

Removed SoilType as it is never really used.

Related to Issue [MWDAM-1527]

- -35
- +0
./Deltares.DamEngine.Data/Geotechnics/SoilTypes.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../SoilTypes.cs
- -2
- +1
./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
- History
- Source
- Diff
./Deltares.DamEngine.TestHelpers/.../FactoryForDamProjectData.cs
- too large
./Deltares.DamEngine.Io/DamInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Io/DamInput.cs
- -25
- +2
./Deltares.DamEngine.Data/Geotechnics/Soil.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../Soil.cs
- -42
- +0
./Deltares.DamEngine.Interface/ConversionHelper.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/ConversionHelper.cs
- -68
- +21
./Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs
- History
- Source
- Diff
./Deltares.DamEngine.TestHelpers/.../FactoryForSoilProfiles.cs
- -1
- +0
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- -6
- +3
./Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators.Tests/.../SoilVolumeMassCalculatorEffectiveStressTest.cs
- -22
- +0
./Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
- -1
- +0
./Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
- History
- Source
- Diff
./Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
- -2
- +0
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
… 1 more file in changeset.

2:57 pm

John Bokma

More
2494
changed 9 files
trunk

Removed all probabilistic parameters named under "Added on 9-7-2019" except for SlopeDampingPiezometricHeightPolderSide (used in PlLinesCreator) and SlopeDampingPiezometricHeightPolderSide (used by Delphi D-GeoStability) as these are used in the engine.

Related to Issue [MWDAM-1527]

- -2
- +0
./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DamMStabInputDefinition.xsd
- -40
- +0
./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators.Tests/.../DamMStabAssemblerTest.cs
- -1
- +1
./Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/test.xml
- History
- Source
- Diff
./Deltares.DamEngine.Calculators.Tests/.../test.xml
- -7
- +0
./Deltares.DamEngine.Data/General/MStabParameters.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../MStabParameters.cs
- -6
- +2
./Deltares.DamEngine.Data/General/ModelParameters.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../ModelParameters.cs
- -1
- +0
./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../MStabXmlDoc.cs
- -6
- +0
./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DamMStabAssembler.cs
- too large
./Deltares.DamEngine.Io/DamInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Io/DamInput.cs
… 1 more file in changeset.

2:24 pm

John Bokma

More
2463
changed 7 files
trunk

Removed obsolete parameters from the Engine. Increased version number from 19.1 to 19.2.

Related to Issue [MWDAM-1527]

- -0
- +3
./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../CalculationHelper.cs
- -54
- +12
./Deltares.DamEngine.Data/Design/DesignScenario.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../DesignScenario.cs
- -2
- +2
./Deltares.DamEngine.Version/GlobalAssembly.cs.svn
- History
- Source
- Diff
./Deltares.DamEngine.Version/GlobalAssembly.cs.svn
- -6
- +0
./Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../FailureMechanismParametersMStab.cs
- -3
- +1
./Deltares.DamEngine.Data/General/PlLineEnumerations.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../PlLineEnumerations.cs
- -2
- +0
./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DamMStabInputDefinition.xsd
- -26
- +0
./Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../DamMStabAssembler.cs

12:10 pm

John Bokma

More
2406
changed 2 files
trunk

Implemented DistanceToEntryPoint in design oprion too. Added test to show influence of DistanceToEntryPoint on calculations.

Related to Issue [MWDAM-1361]

- -1
- +1
./Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../WtiPipingSellmeijerRevisedKernelWrapper.cs
- -13
- +20
./Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators.Tests/.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs

6:32 pm

John Bokma

More
2405
changed 8 files
trunk

Added DistanceToEntryPoint to Location (class and xsd), implemented it in the WtiPipingSellmeijerRevisedKernelWrapper. Added it to the Interface code (both FillDamFromXmlInput and FillXmlInputFromDam) with tests.

Related to Issue [MWDAM-1361]

- -1
- +1
./Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
- History
- Source
- Diff
./Deltares.DamEngine.Calculators/.../WtiPipingSellmeijerRevisedKernelWrapper.cs
- -0
- +1
./Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
- History
- Source
- Diff
./Deltares.DamEngine.TestHelpers/.../FactoryForDamProjectData.cs
- -0
- +4
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- -0
- +2
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- -0
- +1
./Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
- History
- Source
- Diff
./Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
- too large
./Deltares.DamEngine.Io/DamInput.cs
- History
- Source
- Diff
./Deltares.DamEngine.Io/DamInput.cs
- -2
- +16
./Deltares.DamEngine.Data/General/Location.cs
- History
- Source
- Diff
./Deltares.DamEngine.Data/.../Location.cs
… 1 more file in changeset.

2:34 pm

John Bokma

More
2404
changed 3 files
trunk

Removed fixed detriment factor 1.05 for Uplift as this is no longer required.

Here I changed the external for DamMacroStability to use the trunk version 19.1.0 instead of the tagged 18.1 as only the new version holds the proper change. Then I adapted all test values for UpliftVan.

Related to Issue [MWDAM-1504]