DAM

DamClients

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 14
Total Committers: 13
Last Commit: 16 Apr
Commits this week: 14
Total Lines of Code (LoC): 159,819
Net change in LoC this week: -3,606

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 17 Jul 2019
12:47 am

Esther van Zantvoort

Reverted revision(s) 2573 from DamClients/DamUI/trunk/src that caused a stack overflow:

Refactored: removed ModelFactors as class.

Related to Issue [MWDAM-1537]

Options
    • -0
    • +1
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -0
    • +50
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs
    • -5
    • +8
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -37
    • +377
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
Tuesday 16 Jul 2019
9:50 pm

Esther van Zantvoort

Refactored: removed ModelFactors as class.

Related to Issue [MWDAM-1537]

Options
    • -50
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs
    • -8
    • +5
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -1
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -377
    • +37
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
9:20 pm

Esther van Zantvoort

Refactored: use type double instead of double? for PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtRiver and PlLineOffsetBelowShoulderBaseInside in UI.

Related to Issue [MWDAM-1537]

Options
    • -4
    • +4
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -38
    • +32
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
7:24 pm

Esther van Zantvoort

Set proper defaults for PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtRiver and PlLineOffsetBelowShoulderBaseInside in UI.

Related to Issue [MWDAM-1537]

Options
    • -4
    • +4
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
    • -5
    • +6
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
7:10 pm

Esther van Zantvoort

Modified UI for: Made PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtRiver and PlLineOffsetBelowShoulderBaseInside required in xsd/DamLocation.xsd

Set default 0.0 when not specified in import (proper defaults in next commit)

Related to Issue [MWDAM-1537]

Options
    • -8
    • +4
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -4
    • +4
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -26
    • +21
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
3:59 pm

Esther van Zantvoort

Removed PL1PlLineOffsetBelowDikeTopAtRiver, PL1PlLineOffsetBelowDikeTopAtPolder, PL1PlLineOffsetBelowShoulderBaseInside, PL1PlLineOffsetBelowDikeToeAtPolder from Translations.xml

Related to Issue [MWDAM-1537]

Options
    • -4
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
3:17 pm

John Bokma

Corrected setting DampingFactorPl3 and DampingFactorPl4.

Removed obsolete ModelParameters.

Related to Issue [MWDAM-1533]

Options
    • -1
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -2
    • +2
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -2
    • +2
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -69
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs
2:02 pm

zwan_ie

changed paragraph Data Format about exception handling

Related to Issue [MWDAM-1512]

Options
    • -6
    • +28
    ./DamUI/trunk/doc/DAM UI - Functional Design/DataFormat.tex
    • binary
    ./DamUI/trunk/doc/DAM UI - Functional Design/DAM UI - Functional Design.pdf
1:51 pm

Esther van Zantvoort

DegreeOfConsolidation default to null. Write DegreeOfConsolidationSpecified=false in xml to Engine when DegreeOfConsolidation is null.

Related to Issue [MWDAM-1539]

Options
    • -3
    • +6
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -1
    • +1
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -2
    • +1
    ./DamUI/trunk/src/Dam/Tests/LocationTest.cs
    • -2
    • +2
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
Monday 15 Jul 2019
11:38 pm

Esther van Zantvoort

small refactoring in ImportDataForDikeRings

Related to Issue [MWDAM-1537]

Options
    • -4
    • +1
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
5:35 pm

John Bokma

Oops, now with the correct seepage length (was not saved yet).

Related to Issue [MWDAM-1361]

Options
    • -1
    • +1
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
5:32 pm

John Bokma

Corrected piping output for entry point and correct seepage length. Made DistanceToEntryPoint visible in the locations table.

Removed obsolete arePlLineCreationExpertKnowledgeParametersNeeded. Added test on RequiredSafetyFactorStabilityInnerSlope to prevent unwanted error.Removed obsolete RequiredSafetyPipingForAssessment.

Related to Issue [MWDAM-1361]

Options
    • -2
    • +2
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -0
    • +2
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
    • -1
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamGlobalConstants.cs
4:47 pm

zwan_ie

extra locations to test issue

Related to Issue [MWDAM-1361]

Options
    • -1
    • +2
    ./DamUI/trunk/data/DamEngineTestProjects/PipingVoorbeeld1/PipingVoorbeeld1/scenarios.csv
    • -0
    • +2
    ./DamUI/trunk/data/DamEngineTestProjects/PipingVoorbeeld1/PipingVoorbeeld1/locations.csv
3:52 pm

Esther van Zantvoort

refactored: Moved CreateLocationsFileWithObsoleteColumn upwards so that all CreateScenarios methods are together.

Related to Issue [MWDAM-1530]

Options
    • -16
    • +16
    ./DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
3:50 pm

Esther van Zantvoort

When expected head pl3 and pl4 headers are not found in the scenarios.csv, check if the old format headers are available.

Related to Issue [MWDAM-1530]

Options
    • -11
    • +74
    ./DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
    • -0
    • +18
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -0
    • +10
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
3:17 pm

Esther van Zantvoort

Added comment at test that can fail on local computer after changing regional settings

Related to Issue [MWDAM-1537]

Options
    • -0
    • +1
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs
1:50 pm

John Bokma

Adapted due to review comments.

Related to Issue [MWDAM-1527]

Options
    • -9
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -4
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs
    • -4
    • +4
    ./DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
    • -15
    • +15
    ./DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs
1:18 pm

Esther van Zantvoort

Removed DamCalculationBenchmarkTest.cs from Deltares.Dam.Tests.csproj, because it is also in Deltares.Dam.BenchmarkTests.csproj

Related to Issue [MWDAM-1519]

Options
    • -1
    • +0
    ./DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
1:16 pm

Esther van Zantvoort

Regenerated damx files for benchmarks, from importing data with defx.

Related to Issue [MWDAM-1519]

Options
    • too large
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/03 Situatie met een labiel evenwicht (1D)/Databronbestand.damx
    • too large
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/01 Situatie zonder opdrijven (1D)/Databronbestand.damx
    • too large
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/05 Situatie met grondlagen boven en onder het freatisch vlak (1D)/Databronbestand.damx
    • too large
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/02 Situatie met opdrijven (1D)/Databronbestand.damx
    • too large
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/06 Situatie met verschillende opdrijflocaties (1D)/Databronbestand.damx
    • too large
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/04 Situatie met een schuine slootbodem en opdrijven op 1 locatie (1D)/Databronbestand.damx
11:38 am

Aron Noordam

readded uplift test files, such that new damx files can be created

Related to Issue [MWDAM-1519]

Options
  1. ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/01 Situatie zonder opdrijven (1D)/DAM invoerfiles
    • -0
    • +7
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/03 Situatie met een labiel evenwicht (1D)/Databronbestand.defx
    • -0
    • +7
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/06 Situatie met verschillende opdrijflocaties (1D)/Databronbestand.defx
  4. ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/05 Situatie met grondlagen boven en onder het freatisch vlak (1D)/DAM invoerfiles
  5. ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/04 Situatie met een schuine slootbodem en opdrijven op 1 locatie (1D)/DAM invoerfiles
    • -0
    • +7
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/04 Situatie met een schuine slootbodem en opdrijven op 1 locatie (1D)/Databronbestand.defx
    • -0
    • +7
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/02 Situatie met opdrijven (1D)/Databronbestand.defx
  8. ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/02 Situatie met opdrijven (1D)/DAM invoerfiles
    • -0
    • +7
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.defx
  10. ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/DAM invoerfiles
  11. ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/03 Situatie met een labiel evenwicht (1D)/DAM invoerfiles
    • -0
    • +7
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/05 Situatie met grondlagen boven en onder het freatisch vlak (1D)/Databronbestand.defx
  13. ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/06 Situatie met verschillende opdrijflocaties (1D)/DAM invoerfiles
    • -0
    • +7
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/01 Situatie zonder opdrijven (1D)/Databronbestand.defx
    • -0
    • +2
    ./DamUI/trunk/data/Dam/Benchmarks/4 Validatie opdrijfberekeningen/Dijkring13-Sec1/DAM invoerfiles/scenarios.csv
  16. … 62 more files in changeset.
11:37 am

zwan_ie

new data to test issue

Related to Issue [MWDAM-1517]

Options
    • -1
    • +5
    ./DamUI/trunk/data/DamEngineTestProjects/Basissom/DAM invoerfiles/scenarios.csv
10:33 am

zwan_ie

reduced # scenarios to test issue

Related to Issue [MWDAM-1514]

Options
    • -25
    • +1
    ./DamUI/trunk/data/DamEngineTestProjects/Basissom/DAM invoerfiles/scenarios.csv
10:26 am

Esther van Zantvoort

Removed parameters from Location that are in Scenario as well.

Related to Issue [MWDAM-1537]

Options
    • -24
    • +23
    ./DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs
    • -4
    • +0
    ./DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs
    • -3
    • +10
    ./DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs
    • -138
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileImporterDotSpatial.cs
    • -8
    • +8
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
    • -70
    • +5
    ./DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs
    • -250
    • +233
    ./DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs
    • -1
    • +0
    ./DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs
    • -1
    • +2
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationAttributeMapping.cs
    • -1
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -13
    • +13
    ./DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
    • -4
    • +4
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -10
    • +10
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LineAttributeImporter.cs
    • too large
    ./DamUI/trunk/src/Dam/Tests/TestData/DamLive/Grebbedijk/input.damx
    • -15
    • +16
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
  16. … 22 more files in changeset.
Saturday 13 Jul 2019
12:05 am

Esther van Zantvoort

Fixed IO tests, due to Removed ModelFactors.

Related to Issue [MWDAM-1519]

Options
    • -11
    • +0
    ./DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
12:02 am

Esther van Zantvoort

Removed ModelFactors from Location in xsd.

Related to Issue [MWDAM-1519]

Options
    • -16
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -12
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
Friday 12 Jul 2019
7:26 pm

Esther van Zantvoort

Fixed IO tests, due to Removed HeadPl3, HeadPl4, Pl1BelowCrestRiverside, Pl1BelowCrestPolderside, Pl1BelowShoulderCrestPolderside, Pl1BelowToeDikePolderside, Pl1BelowCrestMiddle, Pl1FactorBelowShoulderCrest from WaternetOptions.

Related to Issue [MWDAM-1519]

Options
    • -9
    • +0
    ./DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
6:59 pm

Esther van Zantvoort

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

Related to Issue [MWDAM-1519]

Options
    • -12
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -9
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
3:00 pm

Esther van Zantvoort

Fixed tests due to: Renamed WaterHeight back to RiverLevel, except in csv files.

Related to Issue [MWDAM-1521]

Options
    • -0
    • +1
    ./DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs
8:50 am

tang_ds

Fixed failing tests:

- WaterHeight was renamed back to RiverLevel which caused the newly introduced visibility tests to fail.

Related to Issue [MWDAM-1518]

Options
    • -6
    • +6
    ./DamUI/trunk/src/Dam/Tests/LocationTest.cs
Thursday 11 Jul 2019
6:44 pm

John Bokma

Removed obsolete parameters ProbabilisticType and SoilType.

Related to Issue [MWDAM-1527]

Options
    • -42
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
    • -4
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs
    • -72
    • +30
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs
    • -25
    • +7
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs
    • -77
    • +16
    ./DamUI/trunk/src/Dam/Tests/UISupport/ConfigurationManagerTest.cs
    • -32
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs
    • -1
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
    • -2
    • +1
    ./DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
    • -2
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -4
    • +0
    ./DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs
    • -2
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -7
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
    • -23
    • +0
    ./DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs
    • -19
    • +5
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs
    • -13
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
    • -7
    • +0
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs