Riskeer

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Resolved by: - Discarding their changes on binary files - Merging .sql files

Merge branch 'master' into 1579

# Conflicts:

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

# build/DatabaseStructure.sql

# design/DatabaseDesign.eap

Extended migration script: - Generates 8 calculations based for each hydraulic boundary location and mapped accordingly

Warning:

- Hydraulic Boundary Location output is currently cleared during migration

- Input settings for the HBLs are not migrated yet

WTI-1579

Start renaming MacrostabilityOutwards -> MacroStabilityOutwards Start implementing probability assessment input and properties for macro stability outwards failure mechanism WTI-1531

  1. … 50 more files in changeset.
Introduced factory to create probability assessment output for grass cover erosion inwards. WTI-1589

Introduced factory to create probability assessment output. WTI-1589

Fixed test in storage. WTI-1589

Changed API of DerivedMacroStabilityInwardsOutputFactory. WTI-1581

Fixed test in storage. WTI-1589

Changed API of DerivedPipingOutputFactory. WTI-1581

Improve naming in failure mechanism property classes WTI-1531

  1. … 12 more files in changeset.
Added missing asserts. WTI-1581

Added failure mechanism and assessment section to overtopping output context. WTI-1589

Regenerated context files related to the Ringtoets project files: - Regenerated with digit suffixes instead of written out digits

WTI-1579

    • -2553
    • +2553
    /build/DatabaseStructure.sql
Adapt N parameter in stability point structures failure mechanism to be a double on the data model and storage WTI-1531

Rewired output context for grass cover erosion inwards to resolve probability assessment output dynamically. WTI-1589

Add rounded/derived N property to the closing structures failure mechanism. WTI-1531

Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

Added reliability to output of grass cover erosion inwards calculation. WTI-1589

Improved documentation. WTI-1581

Add N parameter to the grass cover erosion inwards, outwards and height structures failuremechanism database entities WTI-1531

  1. … 9 more files in changeset.
Regenerated context files related to the Ringtoets project files

WTI-1579

Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

Resolved by: - temporarily discarding their changes when concerning a binary file - .sql files were merged accordingly

Merge branch 'master' into 1579

# Conflicts:

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

# build/DatabaseStructure.sql

# design/DatabaseDesign.eap

* Don't remove output when changing the macro stability inwards A value. * Update result and scenario view when changing the macro stability inwards A value. WTI-1581

Reverted observing the failure mechanism in the PipingFailureMechanismResultView as it is already done in the base class. WTI-1581

Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

* Don't remove output when changing the piping A value. * Update result and scenario view when changing the piping A value. WTI-1581

Adapt data model to include an N length effect parameter for the grass cover in/outwards, height structures and dune erosion failure mechanisms. WTI-1531

  1. … 22 more files in changeset.
Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562