Deltares.Dam.Data

Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Added tests for import of parameters that can be imported from scenarios.csv but also from locations.csv and shapefiles.

Related to Issue [MWDAM-1541]

    • -6
    • +6
    ./Importers/LocationShapeFileAttributeMap.cs
  1. … 44 more files in changeset.
Add import of uplift criteria and safety factors from locations.csv of shapefile to scenario.

Related to Issue [MWDAM-1521]

    • -6
    • +6
    ./CsvImporters/CsvImporterScenarios.cs
  1. … 1 more file in changeset.
Prepare to implement DamLicense object for DamLive

Related to Issue [MWDAM-890]

  1. … 2 more files in changeset.
2nd part of commit (oops not saved)

Modified UI for: Made RequiredSafetyFactorStabilityInnerSlope, RequiredSafetyFactorStabilityOuterSlope, RequiredSafetyFactorPiping, UpliftCriterionStability and UpliftCriterionPiping required in xsd/DamLocation.xsd

Set defaults when not specified in import.

Related to Issue [MWDAM-1537]

    • -34
    • +5
    ./CsvImporters/CsvImporterScenarios.cs
Modified UI for: Made RequiredSafetyFactorStabilityInnerSlope, RequiredSafetyFactorStabilityOuterSlope, RequiredSafetyFactorPiping, UpliftCriterionStability and UpliftCriterionPiping required in xsd/DamLocation.xsd

Set defaults when not specified in import.

Related to Issue [MWDAM-1537]

    • -5
    • +5
    ./DamEngineIo/FillDamUiFromXmlInput.cs
    • -10
    • +5
    ./DamEngineIo/FillXmlInputFromDamUi.cs
Reverted revision(s) 2573 from DamClients/DamUI/trunk/src that caused a stack overflow:

Refactored: removed ModelFactors as class.

Related to Issue [MWDAM-1537]

Refactored: removed ModelFactors as class.

Related to Issue [MWDAM-1537]

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

Related to Issue [MWDAM-1537]

    • -4
    • +4
    ./DamEngineIo/FillXmlInputFromDamUi.cs
Set proper defaults for PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtRiver and PlLineOffsetBelowShoulderBaseInside in UI.

Related to Issue [MWDAM-1537]

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]

    • -8
    • +4
    ./DamEngineIo/FillXmlInputFromDamUi.cs
    • -4
    • +4
    ./DamEngineIo/FillDamUiFromXmlInput.cs
Removed PL1PlLineOffsetBelowDikeTopAtRiver, PL1PlLineOffsetBelowDikeTopAtPolder, PL1PlLineOffsetBelowShoulderBaseInside, PL1PlLineOffsetBelowDikeToeAtPolder from Translations.xml

Related to Issue [MWDAM-1537]

Corrected setting DampingFactorPl3 and DampingFactorPl4.

Removed obsolete ModelParameters.

Related to Issue [MWDAM-1533]

    • -2
    • +2
    ./DamEngineIo/FillDamUiFromXmlInput.cs
    • -2
    • +2
    ./DamEngineIo/FillXmlInputFromDamUi.cs
DegreeOfConsolidation default to null. Write DegreeOfConsolidationSpecified=false in xml to Engine when DegreeOfConsolidation is null.

Related to Issue [MWDAM-1539]

    • -2
    • +2
    ./DamEngineIo/FillXmlInputFromDamUi.cs
  1. … 1 more file in changeset.
small refactoring in ImportDataForDikeRings

Related to Issue [MWDAM-1537]

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

Related to Issue [MWDAM-1361]

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]

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]

    • -0
    • +18
    ./CsvImporters/CsvImporterScenarios.cs
  1. … 1 more file in changeset.
Adapted due to review comments.

Related to Issue [MWDAM-1527]

  1. … 2 more files in changeset.
Removed parameters from Location that are in Scenario as well.

Related to Issue [MWDAM-1537]

    • -138
    • +0
    ./Importers/LocationShapeFileImporterDotSpatial.cs
    • -1
    • +2
    ./Importers/LocationAttributeMapping.cs
    • -10
    • +10
    ./Importers/LineAttributeImporter.cs
    • -15
    • +16
    ./Importers/LocationShapeFileAttributeMap.cs
    • -134
    • +58
    ./DataPlugins/DataPluginImporter.cs
    • -23
    • +30
    ./Importers/LocationShapeFileImporter.cs
  1. … 22 more files in changeset.
Removed ModelFactors from Location in xsd.

Related to Issue [MWDAM-1519]

    • -16
    • +0
    ./DamEngineIo/FillXmlInputFromDamUi.cs
    • -12
    • +0
    ./DamEngineIo/FillDamUiFromXmlInput.cs
Removed HeadPl3, HeadPl4, Pl1BelowCrestRiverside, Pl1BelowCrestPolderside, Pl1BelowShoulderCrestPolderside, Pl1BelowToeDikePolderside, Pl1BelowCrestMiddle, Pl1FactorBelowShoulderCrest from WaternetOptions.

Related to Issue [MWDAM-1519]

    • -12
    • +0
    ./DamEngineIo/FillXmlInputFromDamUi.cs
    • -9
    • +0
    ./DamEngineIo/FillDamUiFromXmlInput.cs
Removed obsolete parameters ProbabilisticType and SoilType.

Related to Issue [MWDAM-1527]

    • -4
    • +0
    ./DamProjectCalculationSpecification.cs
    • -72
    • +30
    ./UISupport/ConfigurationManager.cs
    • -32
    • +0
    ./Importers/LocationImportHelper.cs
    • -1
    • +0
    ./DamEngineIo/FillDamUiFromXmlOutput.cs
    • -2
    • +0
    ./DamEngineIo/FillDamUiFromXmlInput.cs
    • -2
    • +0
    ./DamEngineIo/FillXmlInputFromDamUi.cs
    • -19
    • +5
    ./DamFailureMechanismeCalculationSpecification.cs
  1. … 4 more files in changeset.
Renamed WaterHeight back to RiverLevel, except in csv files.

Related to Issue [MWDAM-1521]

    • -8
    • +8
    ./Importers/LocationShapeFileAttributeMap.cs
    • -10
    • +10
    ./CsvImporters/CsvImporterLocations.cs
    • -11
    • +11
    ./CsvImporters/CsvImporterScenarios.cs
  1. … 8 more files in changeset.
Removed obsolete parameter IsUseOriginalCalculationOptions, cleaned up text references for previous obsolete parameters and removed obsolete Overtopping calculator.

Related to Issue [MWDAM-1527]

    • -126
    • +0
    ./OvertoppingErosionCalculator.cs
  1. … 4 more files in changeset.
Raise exception when river level is not defined in ValidateDamProjectData

Related to Issue [MWDAM-1521]

    • -1
    • +12
    ./DamEngineIo/FillXmlInputFromDamUi.cs
  1. … 1 more file in changeset.
Removed obsolete parameters GrassQuality, Direction, LevelReductionInside, LevelReductionOutside, LayerHeightDeviation, LayerHeightDistribution and IsUseOriginalPLLineAssignments.

Related to Issue [MWDAM-1527]

    • -69
    • +2
    ./Importers/LocationShapeFileAttributeMap.cs
    • -57
    • +1
    ./CsvImporters/CsvImporterLocations.cs
    • -31
    • +0
    ./Importers/LocationImportHelper.cs
    • -19
    • +0
    ./DamProjectCalculationSpecification.cs
  1. … 13 more files in changeset.
Reordered properties that are related to the scenarios tab:

- Visibility should however be maintained when the program is not in DesignMode

-- Added tests to verify behaviour of the parameters that are also displayed in the scenariostab

-- Optimized the switch-case logic by using fall-through

Related to Issue [MWDAM-1518]

  1. … 1 more file in changeset.
Restored removed properties as the context should determine the visibility and not the object itself

---

Merged revision(s) 2447 from DamClients/DamUI/trunk:

Removed obsolete properties from the Location:

- Removed the UpliftCriteria for Piping and Stability as these are already presented by the scenario

Related to Issue [MWDAM-1518]

Updated comments about required properties in scenarios.csv

Related to Issue [MWDAM-1531]

    • -15
    • +15
    ./CsvImporters/CsvImporterScenarios.cs
  1. … 1 more file in changeset.
Removed all probabilistic parameters except for type. Also removed obsolete SchematizationFactorData and control.

Related to Issue [MWDAM-1527]

    • -21
    • +0
    ./CsvImporters/CsvImporterLocations.cs
    • -21
    • +0
    ./CsvImporters/CsvImporterScenarios.cs
    • -30
    • +0
    ./Importers/LocationShapeFileAttributeMap.cs
    • -16
    • +14
    ./FailureMechanismeParamatersMStab.cs
  1. … 15 more files in changeset.