Activity DAM/

6:05 pm

John Bokma

More
1065
changed 18 files
trunk

Started with renaming the involved Rwxxxx properties and classes to Regionalxxxxx to improve naming. For the results classes I've put each class in its own file.

Related to Issue [MWDAM-1108]

- -247
- +0
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenarioSelector.cs
- History
- Source
- Diff
/DamEngine/trunk/.../RWScenarioSelector.cs
- -7
- +7
/DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
- History
- Source
- Diff
/DamEngine/trunk/.../DamProjectData.cs
- -0
- +267
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenarioSelector.cs
- History
- Source
- Diff
/DamEngine/.../RegionalScenarioSelector.cs
/DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults
- History
- Source
- Diff
/DamEngine/.../RegionalAssessmentResults
- -3
- +5
/DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Data.csproj
- -0
- +146
/DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/EvaluationJob.cs
- History
- Source
/DamEngine/trunk/.../EvaluationJob.cs
- -0
- +86
/DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalScenariosResult.cs
- History
- Source
- Diff
/DamEngine/.../RegionalScenariosResult.cs
- -20
- +20
/DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs
- History
- Source
- Diff
/DamEngine/trunk/.../General/LocationJob.cs
- -0
- +87
/DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalResult.cs
- History
- Source
- Diff
/DamEngine/trunk/.../RegionalResult.cs
- -5
- +5
/DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs
- History
- Source
- Diff
/DamEngine/trunk/.../LocationResult.cs
- -2
- +2
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.csproj
- -0
- +147
/DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalScenarioResult.cs
- History
- Source
/DamEngine/trunk/.../RegionalScenarioResult.cs
/DamEngine/trunk/src/Deltares.DamEngine.Data/RWScenarios
- History
- Source
- Diff
/DamEngine/trunk/.../RWScenarios
- -0
- +234
/DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalScenarioProfileResult.cs
- History
- Source
/DamEngine/.../RegionalScenarioProfileResult.cs
- -33
- +32
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenariosCalculation.cs
- History
- Source
- Diff
/DamEngine/.../RWScenariosCalculation.cs
… 3 more files in changeset.

5:06 pm

Esther van Zantvoort

More
1064
updated 11 files
trunk

Added dlls to release folder from TC #1060.486

Related to Issue [MWDAM-1056]

- binary
/DamEngine/trunk/release/Deltares.DamEngine.Version.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Version.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Version.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Version.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Calculators.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Interface.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Interface.dll
- binary
/DamEngine/trunk/release/DGeoStability.exe
- History
- Source
- Diff
/DamEngine/trunk/.../DGeoStability.exe
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Interface.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Interface.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Calculators.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Data.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Data.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Data.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Data.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Io.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Io.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Io.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Io.dll

5:01 pm

Esther van Zantvoort

More
1063
changed 3 files
trunk

Added test to use lowest safety factor of zone 1 and zone 2 for overall safety factor.

Related to Issue [MWDAM-1160]

- too large
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijkZoneringInwardsZone2.xml
- History
- Source
/DamEngine/.../DeltaDijkZoneringInwardsZone2.xml
- -0
- +3
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Interface.Tests.csproj
- -0
- +57
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs
- History
- Source
- Diff
/DamEngine/trunk/.../MacroStabilityTests.cs

3:39 pm

John Bokma

More
1062
changed 5 files
trunk

Renamed RWResultType ro RegionalResultType to be in line with the new names. Added Conversion helpers with tests to be able to read/write the scenario assessment results.

Related to Issue [MWDAM-1111]

- -0
- +277
/DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
- History
- Source
- Diff
/DamEngine/trunk/.../ConversionHelper.cs
- -4
- +4
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenariosCalculation.cs
- History
- Source
- Diff
/DamEngine/.../RWScenariosCalculation.cs
- -4
- +4
/DamEngine/trunk/src/Deltares.DamEngine.Data/RWScenarios/RWResult.cs
- History
- Source
- Diff
/DamEngine/trunk/.../RWScenarios/RWResult.cs
- -3
- +171
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
- History
- Source
- Diff
/DamEngine/trunk/.../ConversionHelperTests.cs
- -1
- +1
/DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs
- History
- Source
- Diff
/DamEngine/trunk/.../DAMEnumerations.cs

3:33 pm

John Bokma

More
1061
changed 1 file
trunk

Small correction on results for regional scenarios to reflect the changes in the piping models.

Related to Issue [MWDAM-1111]

- -2
- +1
/DamEngine/trunk/xsd/DamRegionalScenarioResult.xsd
- History
- Source
- Diff
/DamEngine/.../DamRegionalScenarioResult.xsd

3:30 pm

Esther van Zantvoort

More
1060
changed 15 files
trunk

Fixed ZoneAreas. Added tests for Zone Areas and 1D profiles, for Bishop and UpliftVan.

Related to Issue [MWDAM-1056]

- -0
- +24
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Interface.Tests.csproj
- -0
- +9
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijk normal.geometries2D.0/DeltaDijk small.defx
- History
- Source
/DamEngine/trunk/.../DeltaDijk small.defx
- -3
- +4
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs
- History
- Source
- Diff
/DamEngine/.../DamMacroStabilityInwardsKernelWrapper.cs
- binary
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijk normal.geometries2D.0/DeltaDijk small0.soilmaterials.mdb
- History
- Source
/DamEngine/.../DeltaDijk small0.soilmaterials.mdb
- -1
- +2
/DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs
- History
- Source
- Diff
/DamEngine/.../DamMacroStabilityOutwardsKernelWrapperTests.cs
- binary
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijk normal.geometries2D.0/DeltaDijk normal0.soilmaterials.mdb
- History
- Source
/DamEngine/.../DeltaDijk normal0.soilmaterials.mdb
- -0
- +3
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
- History
- Source
- Diff
/DamEngine/trunk/.../MStabXmlDoc.cs
- too large
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijkZoneringInwards.xml
- History
- Source
/DamEngine/trunk/.../DeltaDijkZoneringInwards.xml
- too large
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijk normal.geometries2D.0/DeltaDijk normal.damx
- History
- Source
/DamEngine/trunk/.../DeltaDijk normal.damx
- -1
- +1
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
- History
- Source
- Diff
/DamEngine/.../FillDamFromXmlInputTests.cs
- -0
- +9
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijk normal.geometries2D.0/DeltaDijk normal.defx
- History
- Source
/DamEngine/trunk/.../DeltaDijk normal.defx
- -0
- +141
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs
- History
- Source
- Diff
/DamEngine/trunk/.../MacroStabilityTests.cs
- too large
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijk normal.geometries2D.0/DeltaDijk small.damx
- History
- Source
/DamEngine/trunk/.../DeltaDijk small.damx
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijk normal.geometries2D.0
- History
- Source
/DamEngine/.../DeltaDijk normal.geometries2D.0
- binary
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/DeltaDijk normal0.soilmaterials.mdb
- History
- Source
/DamEngine/.../DeltaDijk normal0.soilmaterials.mdb

1:54 pm

Esther van Zantvoort

More
1059
updated 1 file
trunk

Replaced DGeoStability.exe version 16.2.2.900 by version 18.1.1.3 in Classic

Related to Issue [MWDAM-1157]

- binary
/DamClassic/trunk/src/Dam/Data/DGeoStability.exe
- History
- Source
- Diff
/DamClassic/trunk/.../Data/DGeoStability.exe

11:56 am

Tom The

More
1058
changed 1 file
trunk

Relocate DGeoStability.exe

Related to Issue [MWDAM-1141]

- -0
- +7
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.csproj

11:44 am

Tom The

More
1057
changed 2 files
trunk

Relocate DGeoStability.exe

Related to Issue [MWDAM-1141]

- -4
- +0
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.csproj
- binary
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DGeoStability.exe
- History
- Source
- Diff
/DamEngine/trunk/.../DGeoStability.exe

11:21 am

Tom The

More
1056
deleted 1 file
trunk

Relocate DGeoStability.exe

Related to Issue [MWDAM-1141]

- binary
/DamFailureMechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStability.exe
- History
- Source
- Diff
/DamFailureMechanisms/.../DGeoStability.exe

11:10 am

John Bokma

More
1055
changed 6 files
trunk

Cleaned up dead code.

Related to Issue [MWDAM-1087]

- -4
- +0
/DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Data.csproj
- -8
- +3
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/Evaluator.cs
- History
- Source
- Diff
/DamEngine/trunk/.../Evaluator/Evaluator.cs
- -285
- +0
/DamEngine/trunk/src/Deltares.DamEngine.Data/RWScenarios/HydraulicShortcutRWEvaluator.cs
- History
- Source
- Diff
/DamEngine/.../HydraulicShortcutRWEvaluator.cs
- -46
- +0
/DamEngine/trunk/src/Deltares.DamEngine.Data/RWScenarios/RWEvaluator.cs
- History
- Source
- Diff
/DamEngine/trunk/.../RWEvaluator.cs
- -155
- +0
/DamEngine/trunk/src/Deltares.DamEngine.Data/RWScenarios/AquitardEvaluator.cs
- History
- Source
- Diff
/DamEngine/trunk/.../AquitardEvaluator.cs
- -48
- +0
/DamEngine/trunk/src/Deltares.DamEngine.Data/RWScenarios/DikeMaterialRWEvaluator.cs
- History
- Source
- Diff
/DamEngine/.../DikeMaterialRWEvaluator.cs

10:43 am

Tom The

More
1054
updated 10 files
trunk

Release binaries

Related to Issue [MWDAM-1095]

- binary
/DamEngine/trunk/release/Deltares.DamEngine.Data.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Data.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Version.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Version.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Io.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Io.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Version.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Version.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Data.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Data.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Calculators.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Interface.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Interface.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Interface.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Interface.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Io.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Io.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Calculators.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.pdb

10:30 am

Tom The

More
1053
changed 6 files
trunk

Move translations to resources

Related to Issue [MWDAM-1106]

Related to Issue [MWDAM-1107]

- -10
- +9
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineShoulderAdapter.cs
- History
- Source
- Diff
/DamEngine/.../SurfaceLineShoulderAdapter.cs
- -0
- +54
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx
- History
- Source
- Diff
/DamEngine/trunk/.../Resources.resx
- -0
- +51
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
- History
- Source
- Diff
/DamEngine/trunk/.../Resources.nl-NL.resx
- -0
- +163
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
- History
- Source
- Diff
/DamEngine/trunk/.../Resources.Designer.cs
- -3
- +2
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineSlopeAdapter.cs
- History
- Source
- Diff
/DamEngine/.../SurfaceLineSlopeAdapter.cs
- -21
- +12
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineAdapter.cs
- History
- Source
- Diff
/DamEngine/trunk/.../SurfaceLineAdapter.cs

9:54 am

Tom The

More
1052
changed 9 files
trunk

Working implementation of Design Piping Bligh (celanup to be done)

Related to Issue [MWDAM-1095]

- -0
- +3
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
- History
- Source
- Diff
/DamEngine/trunk/.../Resources.nl-NL.resx
- -2
- +3
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
- History
- Source
- Diff
/DamEngine/.../DamPipingBlighKernelWrapper.cs
- -0
- +9
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
- History
- Source
- Diff
/DamEngine/trunk/.../Resources.Designer.cs
- -1
- +4
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs
- History
- Source
- Diff
/DamEngine/trunk/.../PipingBlighTests.cs
- -0
- +1
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.csproj
- -1
- +1
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineAdapterException.cs
- History
- Source
- Diff
/DamEngine/.../SurfaceLineAdapterException.cs
- -0
- +19
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorException.cs
- History
- Source
/DamEngine/trunk/.../DesignCalculatorException.cs
- -0
- +3
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx
- History
- Source
- Diff
/DamEngine/trunk/.../Resources.resx
- -33
- +114
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
- History
- Source
- Diff
/DamEngine/trunk/.../DesignCalculator.cs

6:38 pm

Esther van Zantvoort

More
1051
changed 1 file
trunk

Added diff to test safety factor because DGeoStability 18.1 writes it with more decimals to the dumpfile

Related to Issue [MWDAM-1157]

- -2
- +2
/DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs
- History
- Source
- Diff
/DamClients/.../FailureMechanismTests.cs

6:37 pm

John Bokma

More
1050
changed 15 files
trunk

Added other evaluators too (including tests) because AquitardEvaluator is used by HydraulicShortcutEvaluator and the others are needed for RegionalAssessment.

Related to Issue [MWDAM-1087]