Activity DAM/

1:16 pm

Aron Noordam

More
2416
changed 112 files
trunk

removed unnecessary files for the tests as stated in the issue. Also removed test BM04Opdrijven04SituatieMetEenSchuineSlootbodemEnOpdrijvenOp1Locatie1D_Using_WTIStabilityKernel, as the wbi kernel is not yet implemented

Related to Issue [MWDAM-1460]

- -1
- +1
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_1_s).sti.xml
- History
- Source
- Diff
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_1_s).sti.xml
- -7
- +0
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/06 Situatie met verschillende opdrijflocaties (1D)/Databronbestand.defx
- History
- Source
- Diff
/DamClients/DamUI/.../Databronbestand.defx
- too large
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/03 Situatie met een labiel evenwicht (1D)/Databronbestand.damx
- History
- Source
/DamClients/DamUI/.../Databronbestand.damx
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/05 Situatie met grondlagen boven en onder het freatisch vlak (1D)/DAM invoerfiles
- History
- Source
- Diff
/DamClients/DamUI/.../DAM invoerfiles
- -1
- +1
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_2_s).sti.xml
- History
- Source
- Diff
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_2_s).sti.xml
- too large
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/02 Situatie met opdrijven (1D)/Databronbestand.damx
- History
- Source
/DamClients/DamUI/.../Databronbestand.damx
- too large
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_3_s).sto
- History
- Source
- Diff
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_3_s).sto
- too large
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/01 Situatie zonder opdrijven (1D)/Databronbestand.damx
- History
- Source
/DamClients/DamUI/.../Databronbestand.damx
- -7
- +0
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/03 Situatie met een labiel evenwicht (1D)/Databronbestand.defx
- History
- Source
- Diff
/DamClients/DamUI/.../Databronbestand.defx
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/06 Situatie met verschillende opdrijflocaties (1D)/DAM invoerfiles
- History
- Source
- Diff
/DamClients/DamUI/.../DAM invoerfiles
- binary
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/02 Situatie met opdrijven (1D)/Databronbestand0.soilmaterials.mdb
- History
- Source
/DamClients/.../Databronbestand0.soilmaterials.mdb
- too large
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_2_s).std
- History
- Source
- Diff
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_2_s).std
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/04 Situatie met een schuine slootbodem en opdrijven op 1 locatie (1D)/DAM invoerfiles
- History
- Source
- Diff
/DamClients/DamUI/.../DAM invoerfiles
- too large
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_3_s).std
- History
- Source
- Diff
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_3_s).std
- -7
- +0
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/02 Situatie met opdrijven (1D)/Databronbestand.defx
- History
- Source
- Diff
/DamClients/DamUI/.../Databronbestand.defx
… 97 more files in changeset.

11:24 am

Esther van Zantvoort

More
2415
updated 1 file
trunk

modified columns csv and Via shape in tab DAM_Input for

UpliftCriterionStability

UpliftCriterionPiping

location_scenario_id

RequiredSafetyFactorPiping

RequiredSafetyFactorStabilityInnerSlope

RequiredSafetyFactorStabilityOuterSlope

DikeTableHeight

water_height

water_height_low

water_height_decimerings_hoogte

max_waterheight

Related to Issue [MWDAM-1514]

- binary
/DamOverall/trunk/doc/DAM General/OverviewDataUIAndEngine.xlsx
- History
- Source
- Diff
/DamOverall/.../OverviewDataUIAndEngine.xlsx

9:56 am

Aron Noordam

More
2414
changed 127 files
trunk

readded test and got the test working for uplift design

Related to Issue [MWDAM-1460]

- binary
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_1_s).wmf
- History
- Source
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_1_s).wmf
- -0
- +2
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/DAM invoerfiles/surfacelines.csv
- History
- Source
/DamClients/DamUI/.../surfacelines.csv
- binary
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/DAM invoerfiles/soilmaterials.mdb
- History
- Source
/DamClients/DamUI/.../soilmaterials.mdb
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability
- History
- Source
/DamClients/DamUI/.../Stability
- -0
- +81
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_1_s).sti.xml
- History
- Source
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_1_s).sti.xml
- too large
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_2_s).sto
- History
- Source
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_2_s).sto
- -0
- +1114
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_1_s).sti
- History
- Source
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_1_s).sti
- -0
- +2
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/DAM invoerfiles/modelparameters.csv
- History
- Source
/DamClients/DamUI/.../modelparameters.csv
- -0
- +1076
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_3_s).sti
- History
- Source
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_3_s).sti
- -0
- +7
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.defx
- History
- Source
/DamClients/DamUI/.../Databronbestand.defx
- -0
- +233
/DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs
- History
- Source
- Diff
/DamClients/.../DamCalculationBenchmarkTest.cs
- -0
- +2
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/06 Situatie met verschillende opdrijflocaties (1D)/DAM invoerfiles/surfacelines.csv
- History
- Source
- Diff
/DamClients/DamUI/.../surfacelines.csv
- too large
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_3_s).sto
- History
- Source
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_3_s).sto
- too large
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc/Stability/Bishop/Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_2_s).std
- History
- Source
/DamClients/.../Loc(13-2-1-B-2-Z)_Sce(1)_Pro(13-2-1-B-2-Z_2_s).std
- -0
- +6
/DamClients/DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/06 Situatie met verschillende opdrijflocaties (1D)/DAM invoerfiles/soilprofiles.csv
- History
- Source
- Diff
/DamClients/DamUI/.../soilprofiles.csv
… 112 more files in changeset.

4:46 pm

tang_ds

More
2413
changed 2 files
trunk

Removed export functionality of calculation images

Related to Issue [MWDAM-1259]

- -1
- +0
/DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml
- History
- Source
- Diff
/DamClients/DamUI/.../Forms/Translations.xml
- -30
- +0
/DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
- History
- Source
- Diff
/DamClients/DamUI/.../Forms/DamPlugin.cs

4:41 pm

tang_ds

More
2412
changed 2 files
trunk

Removed export functionality of Calculations (sti files)

Related to Issue [MWDAM-1258]

- -11
- +0
/DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
- History
- Source
- Diff
/DamClients/DamUI/.../Forms/DamPlugin.cs
- -1
- +0
/DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml
- History
- Source
- Diff
/DamClients/DamUI/.../Forms/Translations.xml

4:14 pm

tang_ds

More
2411
changed 1 file
trunk

Disabled the the export of surfacelines when there's no calculation result available.

Related to Issue [MWDAM-1469]

- -1
- +1
/DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
- History
- Source
- Diff
/DamClients/DamUI/.../Forms/DamPlugin.cs

3:34 pm

John Bokma

More
2410
changed 2 files
trunk

Reverted the change to tutorial file, saved this change using new file. This to fix the buildserver..

Related to Issue [MWDAM-1163]

- too large
/DamClients/DamUI/trunk/data/DamEngineTestProjects/DAM Tutorial Design/DAM Tutorial Design NoTan.damx
- History
- Source
/DamClients/.../DAM Tutorial Design NoTan.damx
- too large
/DamClients/DamUI/trunk/data/DamEngineTestProjects/DAM Tutorial Design/DAM Tutorial Design.damx
- History
- Source
- Diff
/DamClients/.../DAM Tutorial Design.damx

3:16 pm

John Bokma

More
2409
changed 6 files
trunk

Implemented DistanceToEntryPoint in communication with Engine. Added tests to see if it works.

Removed obsolete packages.config from Deltares.Maps.

Related to Issue [MWDAM-1361]

- -0
- +4
/DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
- History
- Source
- Diff
/DamClients/.../FillDamUiFromXmlInput.cs
- -1
- +8
/DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
- History
- Source
- Diff
/DamClients/DamUI/.../CsvExportData.cs
- too large
/DamClients/DamUI/trunk/data/DamEngineTestProjects/Invoer2/DAM Tutorial Design/DAM Tutorial Design.damx
- History
- Source
- Diff
/DamClients/.../DAM Tutorial Design.damx
- -16
- +49
/DamClients/DamUI/trunk/src/Dam/Tests/DamPipingBenchmarkTest.cs
- History
- Source
- Diff
/DamClients/.../DamPipingBenchmarkTest.cs
- -1
- +0
/DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj
- History
- Source
- Diff
/DamClients/DamUI/.../Deltares.Maps.csproj
- -0
- +2
/DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
- History
- Source
- Diff
/DamClients/.../FillXmlInputFromDamUi.cs

12:36 pm

John Bokma

More
2408
updated 14 files
trunk

Interim release of engine to make DistanceToEntryPoint available to UI.

Related to Issue [MWDAM-1361]

- binary
/DamEngine/trunk/release/nl-NL/Deltares.DamEngine.Calculators.resources.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.resources.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Io.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Io.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Interface.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Interface.dll
- binary
/DamEngine/trunk/release/nl-NL/Deltares.DamEngine.Data.resources.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Data.resources.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Interface.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Interface.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Io.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Io.dll
- binary
/DamEngine/trunk/release/Deltares.DamMacroStability.Calculator.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamMacroStability.Calculator.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Version.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Version.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Data.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Data.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/nl-NL/Deltares.DamEngine.Interface.resources.dll
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Interface.resources.dll
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Version.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Version.pdb
- binary
/DamEngine/trunk/release/Deltares.DamEngine.Calculators.pdb
- History
- Source
- Diff
/DamEngine/.../Deltares.DamEngine.Calculators.pdb

12:30 pm

John Bokma

More
2407
changed 1 file
trunk

Added text explaining the determination of the SeepageLength using DistanceToEntryPoint.

Related to Issue [MWDAM-1361]

- -0
- +2
/DamEngine/trunk/doc/Dam Engine - Functional Design/UseWBIPipingKernel.tex
- History
- Source
- Diff
/DamEngine/trunk/.../UseWBIPipingKernel.tex

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
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
- History
- Source
- Diff
/DamEngine/.../WtiPipingSellmeijerRevisedKernelWrapper.cs
- -13
- +20
/DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs
- History
- Source
- Diff
/DamEngine/.../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
/DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
- History
- Source
- Diff
/DamEngine/.../WtiPipingSellmeijerRevisedKernelWrapper.cs
- -0
- +1
/DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
- History
- Source
- Diff
/DamEngine/.../FactoryForDamProjectData.cs
- -0
- +4
/DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
- History
- Source
- Diff
/DamEngine/trunk/.../FillDamFromXmlInput.cs
- -0
- +1
/DamEngine/trunk/xsd/DamLocation.xsd
- History
- Source
- Diff
/DamEngine/trunk/xsd/DamLocation.xsd
- -0
- +2
/DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
- History
- Source
- Diff
/DamEngine/trunk/.../FillXmlInputFromDam.cs
- -0
- +1
/DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
- History
- Source
- Diff
/DamEngine/.../FillXmlOutputFromDamTests.cs
- too large
/DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
- History
- Source
- Diff
/DamEngine/trunk/.../DamInput.cs
- -2
- +16
/DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
- History
- Source
- Diff
/DamEngine/trunk/src/.../General/Location.cs

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]