Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql =================================================================== diff -u -r3aae00632d922ad6a995a79de25ff4da07e6b57a -r6aaa21e48ec620055af144f81361ffb176b64fba --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 3aae00632d922ad6a995a79de25ff4da07e6b57a) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 28-Sep-2017 2:48:18 PM */ +/* Created On : 10-Oct-2017 15:22:17 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -129,10 +129,10 @@ DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverSectionResultEntity' ; -DROP TABLE IF EXISTS 'MicrostabilitySectionResultEntity' +DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'MicrostabilitySectionResultEntity' ; DROP TABLE IF EXISTS 'PipingStructureSectionResultEntity' @@ -261,6 +261,12 @@ DROP TABLE IF EXISTS 'FaultTreeSubmechanismIllustrationPointEntity' ; +DROP TABLE IF EXISTS 'MacroStabilityInwardsCalculationEntity' +; + +DROP TABLE IF EXISTS 'MacroStabilityInwardsCalculationOutputEntity' +; + DROP TABLE IF EXISTS 'MacroStabilityInwardsCharacteristicPointEntity' ; @@ -282,6 +288,9 @@ DROP TABLE IF EXISTS 'MacroStabilityInwardsPreconsolidationStressEntity' ; +DROP TABLE IF EXISTS 'MacroStabilityInwardsSemiProbabilisticOutputEntity' +; + /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */ CREATE TABLE 'VersionEntity' @@ -874,6 +883,15 @@ ) ; +CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +( + 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'ForeshoreProfileCollectionSourcePath' TEXT, + CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'MicrostabilitySectionResultEntity' ( 'MicrostabilitySectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -885,15 +903,6 @@ ) ; -CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' -( - 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'PipingStructureSectionResultEntity' ( 'PipingStructureSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1658,6 +1667,127 @@ ) ; +CREATE TABLE 'MacroStabilityInwardsCalculationEntity' +( + 'MacroStabilityInwardsCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'CalculationGroupEntityId' INTEGER NOT NULL, + 'SurfaceLineEntityId' INTEGER, + 'MacroStabilityInwardsStochasticSoilProfileEntityId' INTEGER, + 'HydraulicLocationEntityId' INTEGER, + 'Order' INT (4) NOT NULL, + 'Name' VARCHAR (260), + 'Comment' TEXT, + 'RelevantForScenario' TINYINT (1) NOT NULL, -- true or false + 'ScenarioContribution' REAL, + 'AssessmentLevel' REAL, + 'UseAssessmentLevelManualInput' TINYINT (1) NOT NULL, -- true or false + 'SlipPlaneMinimumDepth' REAL, + 'SlipPlaneMinimumLength' REAL, + 'MaximumSliceWidth' REAL, + 'MoveGrid' TINYINT (1) NOT NULL, -- true or false + 'GridDeterminationType' TINYINT (1) NOT NULL, -- Enumtype: 1 = Automatic, 2 = Manual + 'TangentLineDeterminationType' TINYINT (1) NOT NULL, -- Enumtype: 1 = Specified, 2 = LayerSeparated + 'TangentLineZTop' REAL, + 'TangentLineZBottom' REAL, + 'LeftGridXLeft' REAL, + 'LeftGridXRight' REAL, + 'LeftGridNrOfHorizontalPoints' INT (4) NOT NULL, + 'LeftGridZTop' REAL, + 'LeftGridZBottom' REAL, + 'LeftGridNrOfVerticalPoints' INT (4) NOT NULL, + 'RightGridXLeft' REAL, + 'RightGridXRight' REAL, + 'RightGridNrOfHorizontalPoints' INT (4) NOT NULL, + 'RightGridZTop' REAL, + 'RightGridZBottom' REAL, + 'RightGridNrOfVerticalPoints' INT (4) NOT NULL, + 'DikeSoilScenarioType' TINYINT (1) NOT NULL, -- Enumtype: 1 = ClayDikeOnClay, 2 = SandDikeOnClay, 3 = ClayDikeOnSand, 4 = SandDikeOnSand + 'WaterLevelRiverAverage' REAL, + 'WaterLevelPolder' REAL, + 'DrainageConstructionPresent' TINYINT (1) NOT NULL, -- true or false + 'DrainageConstructionCoordinateX' REAL, + 'DrainageConstructionCoordinateZ' REAL, + 'MinimumLevelPhreaticLineAtDikeTopRiver' REAL, + 'MinimumLevelPhreaticLineAtDikeTopPolder' REAL, + 'UseDefaultOffsets' TINYINT (1) NOT NULL, -- true or false + 'PhreaticLineOffsetBelowDikeTopAtRiver' REAL, + 'PhreaticLineOffsetBelowDikeTopAtPolder' REAL, + 'PhreaticLineOffsetBelowShoulderBaseInside' REAL, + 'PhreaticLineOffsetBelowDikeToeAtPolder' REAL, + 'AdjustPhreaticLine3And4ForUplift' TINYINT (1) NOT NULL, -- true or false + 'LeakageLengthOutwardsPhreaticLine3' REAL, + 'LeakageLengthInwardsPhreaticLine3' REAL, + 'LeakageLengthOutwardsPhreaticLine4' REAL, + 'LeakageLengthInwardsPhreaticLine4' REAL, + 'PiezometricHeadPhreaticLine2Outwards' REAL, + 'PiezometricHeadPhreaticLine2Inwards' REAL, + 'LocationInputExtremeWaterLevelPolder' REAL, + 'LocationInputExtremeUseDefaultOffsets' TINYINT (1) NOT NULL, -- true or false + 'LocationInputExtremePhreaticLineOffsetBelowDikeTopAtRiver' REAL, + 'LocationInputExtremePhreaticLineOffsetBelowDikeTopAtPolder' REAL, + 'LocationInputExtremePhreaticLineOffsetBelowShoulderBaseInside' REAL, + 'LocationInputExtremePhreaticLineOffsetDikeToeAtPolder' REAL, + 'LocationInputExtremePenetrationLength' REAL, + 'LocationInputDailyWaterLevelPolder' REAL, + 'LocationInputDailyUseDefaultOffsets' TINYINT (1) NOT NULL, -- true or false + 'LocationInputDailyPhreaticLineOffsetBelowDikeTopAtRiver' REAL, + 'LocationInputDailyPhreaticLineOffsetBelowDikeTopAtPolder' REAL, + 'LocationInputDailyPhreaticLineOffsetBelowShoulderBaseInside' REAL, + 'LocationInputDailyPhreaticLineOffsetDikeToeAtPolder' REAL, + 'CreateZones' TINYINT (1) NOT NULL, -- true or false + CONSTRAINT 'FK_MacroStabilityInwardsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_MacroStabilityInwardsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade, + CONSTRAINT 'FK_MacroStabilityInwardsCalculationEntity_MacroStabilityInwardsStochasticSoilProfileEntity' FOREIGN KEY ('MacroStabilityInwardsStochasticSoilProfileEntityId') REFERENCES 'MacroStabilityInwardsStochasticSoilProfileEntity' ('MacroStabilityInwardsStochasticSoilProfileEntityId') ON DELETE Set Null ON UPDATE Cascade, + CONSTRAINT 'FK_MacroStabilityInwardsCalculationEntity_SurfaceLineEntity' FOREIGN KEY ('SurfaceLineEntityId') REFERENCES 'SurfaceLineEntity' ('SurfaceLineEntityId') ON DELETE Set Null ON UPDATE Cascade +) +; + +CREATE TABLE 'MacroStabilityInwardsCalculationOutputEntity' +( + 'MacroStabilityInwardsCalculationOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'MacroStabilityInwardsCalculationEntityId' INTEGER NOT NULL, + 'FactorOfStability' REAL, + 'ZValue' REAL, + 'ForbiddenZonesXEntryMin' REAL, + 'ForbiddenZonesXEntryMax' REAL, + 'ForbiddenZonesAutomaticallyCalculated' TINYINT (1) NOT NULL, -- true or false + 'GridAutomaticallyCalculated' TINYINT (1) NOT NULL, -- true or false + 'SlidingCurveLeftSlidingCircleCenterX' REAL, + 'SlidingCurveLeftSlidingCircleCenterY' REAL, + 'SlidingCurveLeftSlidingCircleRadius' REAL, + 'SlidingCurveLeftSlidingCircleIsActive' TINYINT (1) NOT NULL, -- true or false + 'SlidingCurveLeftSlidingCircleNonIteratedForce' REAL, + 'SlidingCurveLeftSlidingCircleIteratedForce' REAL, + 'SlidingCurveLeftSlidingCircleDrivingMoment' REAL, + 'SlidingCurveLeftSlidingCircleResistingMoment' REAL, + 'SlidingCurveRightSlidingCircleCenterX' REAL, + 'SlidingCurveRightSlidingCircleCenterY' REAL, + 'SlidingCurveRightSlidingCircleRadius' REAL, + 'SlidingCurveRightSlidingCircleIsActive' TINYINT (1) NOT NULL, -- true or false + 'SlidingCurveRightSlidingCircleNonIteratedForce' REAL, + 'SlidingCurveRightSlidingCircleIteratedForce' REAL, + 'SlidingCurveRightSlidingCircleDrivingMoment' REAL, + 'SlidingCurveRightSlidingCircleResistingMoment' REAL, + 'SlidingCurveNonIteratedHorizontalForce' REAL, + 'SlidingCurveIteratedHorizontalForce' REAL, + 'SlidingCurveSliceXML' TEXT NOT NULL, -- XML representation of MacroStabilityInwardsSlice + 'SlipPlaneLeftGridXLeft' REAL, + 'SlipPlaneLeftGridXRight' REAL, + 'SlipPlaneLeftGridNrOfHorizontalPoints' INT (4) NOT NULL, + 'SlipPlaneLeftGridZTop' REAL, + 'SlipPlaneLeftGridZBottom' REAL, + 'SlipPlaneLeftGridNrOfVerticalPoints' INT (4) NOT NULL, + 'SlipPlaneRightGridXLeft' REAL, + 'SlipPlaneRightGridXRight' REAL, + 'SlipPlaneRightGridNrOfHorizontalPoints' INT (4) NOT NULL, + 'SlipPlaneRightGridZTop' REAL, + 'SlipPlaneRightGridZBottom' REAL, + 'SlipPlaneRightGridNrOfVerticalPoints' INT (4) NOT NULL, + 'TangentLinesXml' TEXT NOT NULL, -- XML representation of TangentLines + CONSTRAINT 'FK_MacroStabilityInwardsCalculationOutput_MacroStabilityInwardsCalculationEntity' FOREIGN KEY ('MacroStabilityInwardsCalculationEntityId') REFERENCES 'MacroStabilityInwardsCalculationEntity' ('MacroStabilityInwardsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'MacroStabilityInwardsCharacteristicPointEntity' ( 'MacroStabilityInwardsCharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1675,7 +1805,7 @@ 'MacroStabilityInwardsSoilLayerOneDEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'MacroStabilityInwardsSoilProfileOneDEntityId' INTEGER NOT NULL, 'Top' REAL, - 'IsAquifer' TINYINT (1) NOT NULL, + 'IsAquifer' TINYINT (1) NOT NULL, -- true or false 'Color' INTEGER NOT NULL, -- ARGB value of Color. 'MaterialName' TEXT NOT NULL, 'ShearStrengthModel' TINYINT (1) NOT NULL, -- Enumtype: 1 = SuCalculated, 2 = CPhi, 3 = CPhiOrSuCalculated @@ -1713,7 +1843,7 @@ ( 'MacroStabilityInwardsSoilLayerTwoDEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'MacroStabilityInwardsSoilProfileTwoDEntityId' INTEGER NOT NULL, - 'IsAquifer' TINYINT (1) NOT NULL, + 'IsAquifer' TINYINT (1) NOT NULL, -- true or false 'Color' INTEGER, -- ARGB value of Color. 'MaterialName' TEXT NOT NULL, 'ShearStrengthModel' TINYINT (1) NOT NULL, -- Enumtype: 1 = SuCalculated, 2 = CPhi, 3 = CPhiOrSuCalculated @@ -1775,6 +1905,19 @@ ) ; +CREATE TABLE 'MacroStabilityInwardsSemiProbabilisticOutputEntity' +( + 'MacroStabilityInwardsSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'MacroStabilityInwardsCalculationEntityId' INTEGER NOT NULL, + 'RequiredProbability' REAL, + 'RequiredReliability' REAL, + 'MacroStabilityInwardsProbability' REAL, + 'MacroStabilityInwardsReliability' REAL, + 'MacroStabilityInwardsFactorOfSafety' REAL, + CONSTRAINT 'FK_MacroStabilityInwardsSemiProbabilisticOutputEntity_MacroStabilityInwardsCalculationEntity' FOREIGN KEY ('MacroStabilityInwardsCalculationEntityId') REFERENCES 'MacroStabilityInwardsCalculationEntity' ('MacroStabilityInwardsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + /* Create Indexes and Triggers */ CREATE INDEX 'IXFK_GrassCoverErosionInwardsDikeHeightOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' @@ -1992,14 +2135,14 @@ ON 'WaveImpactAsphaltCoverSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_MicrostabilitySectionResultEntity_FailureMechanismSectionEntity' - ON 'MicrostabilitySectionResultEntity' ('FailureMechanismSectionEntityId' ASC) -; - CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_MicrostabilitySectionResultEntity_FailureMechanismSectionEntity' + ON 'MicrostabilitySectionResultEntity' ('FailureMechanismSectionEntityId' ASC) +; + CREATE INDEX 'IXFK_PipingStructureSectionResultEntity_FailureMechanismSectionEntity' ON 'PipingStructureSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; @@ -2387,6 +2530,22 @@ END; ; +CREATE INDEX 'IXFK_MacroStabilityInwardsCalculationEntity_CalculationGroupEntity' + ON 'MacroStabilityInwardsCalculationEntity' ('CalculationGroupEntityId' ASC) +; + +CREATE INDEX 'IXFK_MacroStabilityInwardsCalculationEntity_HydraulicLocationEntity' + ON 'MacroStabilityInwardsCalculationEntity' ('HydraulicLocationEntityId' ASC) +; + +CREATE INDEX 'IXFK_MacroStabilityInwardsCalculationEntity_MacroStabilityInwardsStochasticSoilProfileEntity' + ON 'MacroStabilityInwardsCalculationEntity' ('MacroStabilityInwardsStochasticSoilProfileEntityId' ASC) +; + +CREATE INDEX 'IXFK_MacroStabilityInwardsCalculationOutput_MacroStabilityInwardsCalculationEntity' + ON 'MacroStabilityInwardsCalculationOutputEntity' ('MacroStabilityInwardsCalculationEntityId' ASC) +; + CREATE INDEX 'IXFK_MacroStabilityCharacteristicPointEntity_SurfaceLineEntity' ON 'MacroStabilityInwardsCharacteristicPointEntity' ('SurfaceLineEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -r70e6f175074b3d62532adfda735e6f719602f3b1 -r6aaa21e48ec620055af144f81361ffb176b64fba --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 70e6f175074b3d62532adfda735e6f719602f3b1) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -228,6 +228,12 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + + + RingtoetsEntities.tt + RingtoetsEntities.tt @@ -241,6 +247,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r6aaa21e48ec620055af144f81361ffb176b64fba --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -44,6 +44,7 @@ GrassCoverErosionInwardsCalculationEntities = new HashSet(); GrassCoverErosionOutwardsWaveConditionsCalculationEntities = new HashSet(); HeightStructuresCalculationEntities = new HashSet(); + MacroStabilityInwardsCalculationEntities = new HashSet(); PipingCalculationEntities = new HashSet(); StabilityPointStructuresCalculationEntities = new HashSet(); StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet(); @@ -76,6 +77,9 @@ public virtual ICollection HeightStructuresCalculationEntities { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection MacroStabilityInwardsCalculationEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs =================================================================== diff -u -r43403466c934b16bad9ec2960c884b6fad9c9a18 -r6aaa21e48ec620055af144f81361ffb176b64fba --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision 43403466c934b16bad9ec2960c884b6fad9c9a18) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -42,6 +42,7 @@ GrassCoverErosionInwardsCalculationEntities = new HashSet(); HeightStructuresCalculationEntities = new HashSet(); HydraulicLocationOutputEntities = new HashSet(); + MacroStabilityInwardsCalculationEntities = new HashSet(); PipingCalculationEntities = new HashSet(); StabilityPointStructuresCalculationEntities = new HashSet(); StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet(); @@ -73,6 +74,9 @@ public virtual ICollection HydraulicLocationOutputEntities { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection MacroStabilityInwardsCalculationEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCalculationEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCalculationEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCalculationEntity.cs (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -0,0 +1,123 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; + +namespace Application.Ringtoets.Storage.DbContext +{ + public class MacroStabilityInwardsCalculationEntity + { + [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public MacroStabilityInwardsCalculationEntity() + { + MacroStabilityInwardsCalculationOutputEntities = new HashSet(); + MacroStabilityInwardsSemiProbabilisticOutputEntities = new HashSet(); + } + + public long MacroStabilityInwardsCalculationEntityId { get; set; } + public long CalculationGroupEntityId { get; set; } + public long? SurfaceLineEntityId { get; set; } + public long? MacroStabilityInwardsStochasticSoilProfileEntityId { get; set; } + public long? HydraulicLocationEntityId { get; set; } + public int Order { get; set; } + public string Name { get; set; } + public string Comment { get; set; } + public byte RelevantForScenario { get; set; } + public double? ScenarioContribution { get; set; } + public double? AssessmentLevel { get; set; } + public byte UseAssessmentLevelManualInput { get; set; } + public double? SlipPlaneMinimumDepth { get; set; } + public double? SlipPlaneMinimumLength { get; set; } + public double? MaximumSliceWidth { get; set; } + public byte MoveGrid { get; set; } + public byte GridDeterminationType { get; set; } + public byte TangentLineDeterminationType { get; set; } + public double? TangentLineZTop { get; set; } + public double? TangentLineZBottom { get; set; } + public double? LeftGridXLeft { get; set; } + public double? LeftGridXRight { get; set; } + public int LeftGridNrOfHorizontalPoints { get; set; } + public double? LeftGridZTop { get; set; } + public double? LeftGridZBottom { get; set; } + public int LeftGridNrOfVerticalPoints { get; set; } + public double? RightGridXLeft { get; set; } + public double? RightGridXRight { get; set; } + public int RightGridNrOfHorizontalPoints { get; set; } + public double? RightGridZTop { get; set; } + public double? RightGridZBottom { get; set; } + public int RightGridNrOfVerticalPoints { get; set; } + public byte DikeSoilScenarioType { get; set; } + public double? WaterLevelRiverAverage { get; set; } + public double? WaterLevelPolder { get; set; } + public byte DrainageConstructionPresent { get; set; } + public double? DrainageConstructionCoordinateX { get; set; } + public double? DrainageConstructionCoordinateZ { get; set; } + public double? MinimumLevelPhreaticLineAtDikeTopRiver { get; set; } + public double? MinimumLevelPhreaticLineAtDikeTopPolder { get; set; } + public byte UseDefaultOffsets { get; set; } + public double? PhreaticLineOffsetBelowDikeTopAtRiver { get; set; } + public double? PhreaticLineOffsetBelowDikeTopAtPolder { get; set; } + public double? PhreaticLineOffsetBelowShoulderBaseInside { get; set; } + public double? PhreaticLineOffsetBelowDikeToeAtPolder { get; set; } + public byte AdjustPhreaticLine3And4ForUplift { get; set; } + public double? LeakageLengthOutwardsPhreaticLine3 { get; set; } + public double? LeakageLengthInwardsPhreaticLine3 { get; set; } + public double? LeakageLengthOutwardsPhreaticLine4 { get; set; } + public double? LeakageLengthInwardsPhreaticLine4 { get; set; } + public double? PiezometricHeadPhreaticLine2Outwards { get; set; } + public double? PiezometricHeadPhreaticLine2Inwards { get; set; } + public double? LocationInputExtremeWaterLevelPolder { get; set; } + public byte LocationInputExtremeUseDefaultOffsets { get; set; } + public double? LocationInputExtremePhreaticLineOffsetBelowDikeTopAtRiver { get; set; } + public double? LocationInputExtremePhreaticLineOffsetBelowDikeTopAtPolder { get; set; } + public double? LocationInputExtremePhreaticLineOffsetBelowShoulderBaseInside { get; set; } + public double? LocationInputExtremePhreaticLineOffsetDikeToeAtPolder { get; set; } + public double? LocationInputExtremePenetrationLength { get; set; } + public double? LocationInputDailyWaterLevelPolder { get; set; } + public byte LocationInputDailyUseDefaultOffsets { get; set; } + public double? LocationInputDailyPhreaticLineOffsetBelowDikeTopAtRiver { get; set; } + public double? LocationInputDailyPhreaticLineOffsetBelowDikeTopAtPolder { get; set; } + public double? LocationInputDailyPhreaticLineOffsetBelowShoulderBaseInside { get; set; } + public double? LocationInputDailyPhreaticLineOffsetDikeToeAtPolder { get; set; } + public byte CreateZones { get; set; } + + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } + public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } + public virtual SurfaceLineEntity SurfaceLineEntity { get; set; } + public virtual MacroStabilityInwardsStochasticSoilProfileEntity MacroStabilityInwardsStochasticSoilProfileEntity { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection MacroStabilityInwardsCalculationOutputEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection MacroStabilityInwardsSemiProbabilisticOutputEntities { get; set; } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCalculationOutputEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCalculationOutputEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCalculationOutputEntity.cs (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -0,0 +1,78 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Application.Ringtoets.Storage.DbContext +{ + public class MacroStabilityInwardsCalculationOutputEntity + { + public long MacroStabilityInwardsCalculationOutputEntityId { get; set; } + public long MacroStabilityInwardsCalculationEntityId { get; set; } + public double? FactorOfStability { get; set; } + public double? ZValue { get; set; } + public double? ForbiddenZonesXEntryMin { get; set; } + public double? ForbiddenZonesXEntryMax { get; set; } + public byte ForbiddenZonesAutomaticallyCalculated { get; set; } + public byte GridAutomaticallyCalculated { get; set; } + public double? SlidingCurveLeftSlidingCircleCenterX { get; set; } + public double? SlidingCurveLeftSlidingCircleCenterY { get; set; } + public double? SlidingCurveLeftSlidingCircleRadius { get; set; } + public byte SlidingCurveLeftSlidingCircleIsActive { get; set; } + public double? SlidingCurveLeftSlidingCircleNonIteratedForce { get; set; } + public double? SlidingCurveLeftSlidingCircleIteratedForce { get; set; } + public double? SlidingCurveLeftSlidingCircleDrivingMoment { get; set; } + public double? SlidingCurveLeftSlidingCircleResistingMoment { get; set; } + public double? SlidingCurveRightSlidingCircleCenterX { get; set; } + public double? SlidingCurveRightSlidingCircleCenterY { get; set; } + public double? SlidingCurveRightSlidingCircleRadius { get; set; } + public byte SlidingCurveRightSlidingCircleIsActive { get; set; } + public double? SlidingCurveRightSlidingCircleNonIteratedForce { get; set; } + public double? SlidingCurveRightSlidingCircleIteratedForce { get; set; } + public double? SlidingCurveRightSlidingCircleDrivingMoment { get; set; } + public double? SlidingCurveRightSlidingCircleResistingMoment { get; set; } + public double? SlidingCurveNonIteratedHorizontalForce { get; set; } + public double? SlidingCurveIteratedHorizontalForce { get; set; } + public string SlidingCurveSliceXML { get; set; } + public double? SlipPlaneLeftGridXLeft { get; set; } + public double? SlipPlaneLeftGridXRight { get; set; } + public int SlipPlaneLeftGridNrOfHorizontalPoints { get; set; } + public double? SlipPlaneLeftGridZTop { get; set; } + public double? SlipPlaneLeftGridZBottom { get; set; } + public int SlipPlaneLeftGridNrOfVerticalPoints { get; set; } + public double? SlipPlaneRightGridXLeft { get; set; } + public double? SlipPlaneRightGridXRight { get; set; } + public int SlipPlaneRightGridNrOfHorizontalPoints { get; set; } + public double? SlipPlaneRightGridZTop { get; set; } + public double? SlipPlaneRightGridZBottom { get; set; } + public int SlipPlaneRightGridNrOfVerticalPoints { get; set; } + public string TangentLinesXml { get; set; } + + public virtual MacroStabilityInwardsCalculationEntity MacroStabilityInwardsCalculationEntity { get; set; } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSemiProbabilisticOutputEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSemiProbabilisticOutputEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSemiProbabilisticOutputEntity.cs (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -0,0 +1,45 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Application.Ringtoets.Storage.DbContext +{ + public class MacroStabilityInwardsSemiProbabilisticOutputEntity + { + public long MacroStabilityInwardsSemiProbabilisticOutputEntityId { get; set; } + public long MacroStabilityInwardsCalculationEntityId { get; set; } + public double? RequiredProbability { get; set; } + public double? RequiredReliability { get; set; } + public double? MacroStabilityInwardsProbability { get; set; } + public double? MacroStabilityInwardsReliability { get; set; } + public double? MacroStabilityInwardsFactorOfSafety { get; set; } + + public virtual MacroStabilityInwardsCalculationEntity MacroStabilityInwardsCalculationEntity { get; set; } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsStochasticSoilProfileEntity.cs =================================================================== diff -u -r8e213638a22dd9f04d965d875bb58156db019be5 -r6aaa21e48ec620055af144f81361ffb176b64fba --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsStochasticSoilProfileEntity.cs (.../MacroStabilityInwardsStochasticSoilProfileEntity.cs) (revision 8e213638a22dd9f04d965d875bb58156db019be5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsStochasticSoilProfileEntity.cs (.../MacroStabilityInwardsStochasticSoilProfileEntity.cs) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -28,17 +28,29 @@ // //------------------------------------------------------------------------------ +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; + namespace Application.Ringtoets.Storage.DbContext { public class MacroStabilityInwardsStochasticSoilProfileEntity { + [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public MacroStabilityInwardsStochasticSoilProfileEntity() + { + MacroStabilityInwardsCalculationEntities = new HashSet(); + } + public long MacroStabilityInwardsStochasticSoilProfileEntityId { get; set; } public long StochasticSoilModelEntityId { get; set; } public long? MacroStabilityInwardsSoilProfileOneDEntityId { get; set; } public long? MacroStabilityInwardsSoilProfileTwoDEntityId { get; set; } public double Probability { get; set; } public int Order { get; set; } + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection MacroStabilityInwardsCalculationEntities { get; set; } + public virtual MacroStabilityInwardsSoilProfileOneDEntity MacroStabilityInwardsSoilProfileOneDEntity { get; set; } public virtual MacroStabilityInwardsSoilProfileTwoDEntity MacroStabilityInwardsSoilProfileTwoDEntity { get; set; } public virtual StochasticSoilModelEntity StochasticSoilModelEntity { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -r8e213638a22dd9f04d965d875bb58156db019be5 -r6aaa21e48ec620055af144f81361ffb176b64fba --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 8e213638a22dd9f04d965d875bb58156db019be5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -77,10 +77,13 @@ public virtual DbSet HydraulicLocationEntities { get; set; } public virtual DbSet HydraulicLocationOutputEntities { get; set; } public virtual DbSet IllustrationPointResultEntities { get; set; } + public virtual DbSet MacroStabilityInwardsCalculationEntities { get; set; } + public virtual DbSet MacroStabilityInwardsCalculationOutputEntities { get; set; } public virtual DbSet MacroStabilityInwardsCharacteristicPointEntities { get; set; } public virtual DbSet MacroStabilityInwardsFailureMechanismMetaEntities { get; set; } public virtual DbSet MacroStabilityInwardsPreconsolidationStressEntities { get; set; } public virtual DbSet MacroStabilityInwardsSectionResultEntities { get; set; } + public virtual DbSet MacroStabilityInwardsSemiProbabilisticOutputEntities { get; set; } public virtual DbSet MacroStabilityInwardsSoilLayerOneDEntities { get; set; } public virtual DbSet MacroStabilityInwardsSoilLayerTwoDEntities { get; set; } public virtual DbSet MacroStabilityInwardsSoilProfileOneDEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r3aae00632d922ad6a995a79de25ff4da07e6b57a -r6aaa21e48ec620055af144f81361ffb176b64fba --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 3aae00632d922ad6a995a79de25ff4da07e6b57a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -4,7 +4,7 @@ - + @@ -665,6 +665,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -707,6 +823,18 @@ + + + + + + + + + + + + @@ -2180,6 +2308,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2228,6 +2416,18 @@ + + + + + + + + + + + + @@ -2899,10 +3099,13 @@ + + + @@ -3221,6 +3424,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -3237,6 +3460,10 @@ + + + + @@ -3493,10 +3720,13 @@ + + + @@ -3583,6 +3813,10 @@ + + + + @@ -3899,6 +4133,10 @@ + + + + @@ -3919,6 +4157,22 @@ + + + + + + + + + + + + + + + + @@ -4084,6 +4338,7 @@ + @@ -4777,6 +5032,7 @@ + @@ -4810,6 +5066,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4856,6 +5235,19 @@ + + + + + + + + + + + + + @@ -4949,6 +5341,7 @@ + @@ -5455,6 +5848,7 @@ + @@ -5713,6 +6107,18 @@ + + + + + + + + + + + + @@ -6661,6 +7067,18 @@ + + + + + + + + + + + + @@ -6721,6 +7139,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7677,6 +8143,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7723,6 +8307,19 @@ + + + + + + + + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r3aae00632d922ad6a995a79de25ff4da07e6b57a -r6aaa21e48ec620055af144f81361ffb176b64fba --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 3aae00632d922ad6a995a79de25ff4da07e6b57a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -5,94 +5,97 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + @@ -104,6 +107,7 @@ + @@ -183,11 +187,16 @@ + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs =================================================================== diff -u -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r6aaa21e48ec620055af144f81361ffb176b64fba --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision bd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -38,6 +38,7 @@ [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public SurfaceLineEntity() { + MacroStabilityInwardsCalculationEntities = new HashSet(); MacroStabilityInwardsCharacteristicPointEntities = new HashSet(); PipingCalculationEntities = new HashSet(); PipingCharacteristicPointEntities = new HashSet(); @@ -54,6 +55,9 @@ public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection MacroStabilityInwardsCalculationEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MacroStabilityInwardsCharacteristicPointEntities { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] Index: build/DatabaseStructure.sql =================================================================== diff -u -r3aae00632d922ad6a995a79de25ff4da07e6b57a -r6aaa21e48ec620055af144f81361ffb176b64fba --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 3aae00632d922ad6a995a79de25ff4da07e6b57a) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 6aaa21e48ec620055af144f81361ffb176b64fba) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 28-Sep-2017 2:48:18 PM */ +/* Created On : 10-Oct-2017 15:22:17 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -129,10 +129,10 @@ DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverSectionResultEntity' ; -DROP TABLE IF EXISTS 'MicrostabilitySectionResultEntity' +DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'MicrostabilitySectionResultEntity' ; DROP TABLE IF EXISTS 'PipingStructureSectionResultEntity' @@ -261,6 +261,12 @@ DROP TABLE IF EXISTS 'FaultTreeSubmechanismIllustrationPointEntity' ; +DROP TABLE IF EXISTS 'MacroStabilityInwardsCalculationEntity' +; + +DROP TABLE IF EXISTS 'MacroStabilityInwardsCalculationOutputEntity' +; + DROP TABLE IF EXISTS 'MacroStabilityInwardsCharacteristicPointEntity' ; @@ -282,6 +288,9 @@ DROP TABLE IF EXISTS 'MacroStabilityInwardsPreconsolidationStressEntity' ; +DROP TABLE IF EXISTS 'MacroStabilityInwardsSemiProbabilisticOutputEntity' +; + /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */ CREATE TABLE 'VersionEntity' @@ -874,6 +883,15 @@ ) ; +CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +( + 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'ForeshoreProfileCollectionSourcePath' TEXT, + CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'MicrostabilitySectionResultEntity' ( 'MicrostabilitySectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -885,15 +903,6 @@ ) ; -CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' -( - 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'PipingStructureSectionResultEntity' ( 'PipingStructureSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1658,6 +1667,127 @@ ) ; +CREATE TABLE 'MacroStabilityInwardsCalculationEntity' +( + 'MacroStabilityInwardsCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'CalculationGroupEntityId' INTEGER NOT NULL, + 'SurfaceLineEntityId' INTEGER, + 'MacroStabilityInwardsStochasticSoilProfileEntityId' INTEGER, + 'HydraulicLocationEntityId' INTEGER, + 'Order' INT (4) NOT NULL, + 'Name' VARCHAR (260), + 'Comment' TEXT, + 'RelevantForScenario' TINYINT (1) NOT NULL, -- true or false + 'ScenarioContribution' REAL, + 'AssessmentLevel' REAL, + 'UseAssessmentLevelManualInput' TINYINT (1) NOT NULL, -- true or false + 'SlipPlaneMinimumDepth' REAL, + 'SlipPlaneMinimumLength' REAL, + 'MaximumSliceWidth' REAL, + 'MoveGrid' TINYINT (1) NOT NULL, -- true or false + 'GridDeterminationType' TINYINT (1) NOT NULL, -- Enumtype: 1 = Automatic, 2 = Manual + 'TangentLineDeterminationType' TINYINT (1) NOT NULL, -- Enumtype: 1 = Specified, 2 = LayerSeparated + 'TangentLineZTop' REAL, + 'TangentLineZBottom' REAL, + 'LeftGridXLeft' REAL, + 'LeftGridXRight' REAL, + 'LeftGridNrOfHorizontalPoints' INT (4) NOT NULL, + 'LeftGridZTop' REAL, + 'LeftGridZBottom' REAL, + 'LeftGridNrOfVerticalPoints' INT (4) NOT NULL, + 'RightGridXLeft' REAL, + 'RightGridXRight' REAL, + 'RightGridNrOfHorizontalPoints' INT (4) NOT NULL, + 'RightGridZTop' REAL, + 'RightGridZBottom' REAL, + 'RightGridNrOfVerticalPoints' INT (4) NOT NULL, + 'DikeSoilScenarioType' TINYINT (1) NOT NULL, -- Enumtype: 1 = ClayDikeOnClay, 2 = SandDikeOnClay, 3 = ClayDikeOnSand, 4 = SandDikeOnSand + 'WaterLevelRiverAverage' REAL, + 'WaterLevelPolder' REAL, + 'DrainageConstructionPresent' TINYINT (1) NOT NULL, -- true or false + 'DrainageConstructionCoordinateX' REAL, + 'DrainageConstructionCoordinateZ' REAL, + 'MinimumLevelPhreaticLineAtDikeTopRiver' REAL, + 'MinimumLevelPhreaticLineAtDikeTopPolder' REAL, + 'UseDefaultOffsets' TINYINT (1) NOT NULL, -- true or false + 'PhreaticLineOffsetBelowDikeTopAtRiver' REAL, + 'PhreaticLineOffsetBelowDikeTopAtPolder' REAL, + 'PhreaticLineOffsetBelowShoulderBaseInside' REAL, + 'PhreaticLineOffsetBelowDikeToeAtPolder' REAL, + 'AdjustPhreaticLine3And4ForUplift' TINYINT (1) NOT NULL, -- true or false + 'LeakageLengthOutwardsPhreaticLine3' REAL, + 'LeakageLengthInwardsPhreaticLine3' REAL, + 'LeakageLengthOutwardsPhreaticLine4' REAL, + 'LeakageLengthInwardsPhreaticLine4' REAL, + 'PiezometricHeadPhreaticLine2Outwards' REAL, + 'PiezometricHeadPhreaticLine2Inwards' REAL, + 'LocationInputExtremeWaterLevelPolder' REAL, + 'LocationInputExtremeUseDefaultOffsets' TINYINT (1) NOT NULL, -- true or false + 'LocationInputExtremePhreaticLineOffsetBelowDikeTopAtRiver' REAL, + 'LocationInputExtremePhreaticLineOffsetBelowDikeTopAtPolder' REAL, + 'LocationInputExtremePhreaticLineOffsetBelowShoulderBaseInside' REAL, + 'LocationInputExtremePhreaticLineOffsetDikeToeAtPolder' REAL, + 'LocationInputExtremePenetrationLength' REAL, + 'LocationInputDailyWaterLevelPolder' REAL, + 'LocationInputDailyUseDefaultOffsets' TINYINT (1) NOT NULL, -- true or false + 'LocationInputDailyPhreaticLineOffsetBelowDikeTopAtRiver' REAL, + 'LocationInputDailyPhreaticLineOffsetBelowDikeTopAtPolder' REAL, + 'LocationInputDailyPhreaticLineOffsetBelowShoulderBaseInside' REAL, + 'LocationInputDailyPhreaticLineOffsetDikeToeAtPolder' REAL, + 'CreateZones' TINYINT (1) NOT NULL, -- true or false + CONSTRAINT 'FK_MacroStabilityInwardsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_MacroStabilityInwardsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade, + CONSTRAINT 'FK_MacroStabilityInwardsCalculationEntity_MacroStabilityInwardsStochasticSoilProfileEntity' FOREIGN KEY ('MacroStabilityInwardsStochasticSoilProfileEntityId') REFERENCES 'MacroStabilityInwardsStochasticSoilProfileEntity' ('MacroStabilityInwardsStochasticSoilProfileEntityId') ON DELETE Set Null ON UPDATE Cascade, + CONSTRAINT 'FK_MacroStabilityInwardsCalculationEntity_SurfaceLineEntity' FOREIGN KEY ('SurfaceLineEntityId') REFERENCES 'SurfaceLineEntity' ('SurfaceLineEntityId') ON DELETE Set Null ON UPDATE Cascade +) +; + +CREATE TABLE 'MacroStabilityInwardsCalculationOutputEntity' +( + 'MacroStabilityInwardsCalculationOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'MacroStabilityInwardsCalculationEntityId' INTEGER NOT NULL, + 'FactorOfStability' REAL, + 'ZValue' REAL, + 'ForbiddenZonesXEntryMin' REAL, + 'ForbiddenZonesXEntryMax' REAL, + 'ForbiddenZonesAutomaticallyCalculated' TINYINT (1) NOT NULL, -- true or false + 'GridAutomaticallyCalculated' TINYINT (1) NOT NULL, -- true or false + 'SlidingCurveLeftSlidingCircleCenterX' REAL, + 'SlidingCurveLeftSlidingCircleCenterY' REAL, + 'SlidingCurveLeftSlidingCircleRadius' REAL, + 'SlidingCurveLeftSlidingCircleIsActive' TINYINT (1) NOT NULL, -- true or false + 'SlidingCurveLeftSlidingCircleNonIteratedForce' REAL, + 'SlidingCurveLeftSlidingCircleIteratedForce' REAL, + 'SlidingCurveLeftSlidingCircleDrivingMoment' REAL, + 'SlidingCurveLeftSlidingCircleResistingMoment' REAL, + 'SlidingCurveRightSlidingCircleCenterX' REAL, + 'SlidingCurveRightSlidingCircleCenterY' REAL, + 'SlidingCurveRightSlidingCircleRadius' REAL, + 'SlidingCurveRightSlidingCircleIsActive' TINYINT (1) NOT NULL, -- true or false + 'SlidingCurveRightSlidingCircleNonIteratedForce' REAL, + 'SlidingCurveRightSlidingCircleIteratedForce' REAL, + 'SlidingCurveRightSlidingCircleDrivingMoment' REAL, + 'SlidingCurveRightSlidingCircleResistingMoment' REAL, + 'SlidingCurveNonIteratedHorizontalForce' REAL, + 'SlidingCurveIteratedHorizontalForce' REAL, + 'SlidingCurveSliceXML' TEXT NOT NULL, -- XML representation of MacroStabilityInwardsSlice + 'SlipPlaneLeftGridXLeft' REAL, + 'SlipPlaneLeftGridXRight' REAL, + 'SlipPlaneLeftGridNrOfHorizontalPoints' INT (4) NOT NULL, + 'SlipPlaneLeftGridZTop' REAL, + 'SlipPlaneLeftGridZBottom' REAL, + 'SlipPlaneLeftGridNrOfVerticalPoints' INT (4) NOT NULL, + 'SlipPlaneRightGridXLeft' REAL, + 'SlipPlaneRightGridXRight' REAL, + 'SlipPlaneRightGridNrOfHorizontalPoints' INT (4) NOT NULL, + 'SlipPlaneRightGridZTop' REAL, + 'SlipPlaneRightGridZBottom' REAL, + 'SlipPlaneRightGridNrOfVerticalPoints' INT (4) NOT NULL, + 'TangentLinesXml' TEXT NOT NULL, -- XML representation of TangentLines + CONSTRAINT 'FK_MacroStabilityInwardsCalculationOutput_MacroStabilityInwardsCalculationEntity' FOREIGN KEY ('MacroStabilityInwardsCalculationEntityId') REFERENCES 'MacroStabilityInwardsCalculationEntity' ('MacroStabilityInwardsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'MacroStabilityInwardsCharacteristicPointEntity' ( 'MacroStabilityInwardsCharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1675,7 +1805,7 @@ 'MacroStabilityInwardsSoilLayerOneDEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'MacroStabilityInwardsSoilProfileOneDEntityId' INTEGER NOT NULL, 'Top' REAL, - 'IsAquifer' TINYINT (1) NOT NULL, + 'IsAquifer' TINYINT (1) NOT NULL, -- true or false 'Color' INTEGER NOT NULL, -- ARGB value of Color. 'MaterialName' TEXT NOT NULL, 'ShearStrengthModel' TINYINT (1) NOT NULL, -- Enumtype: 1 = SuCalculated, 2 = CPhi, 3 = CPhiOrSuCalculated @@ -1713,7 +1843,7 @@ ( 'MacroStabilityInwardsSoilLayerTwoDEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'MacroStabilityInwardsSoilProfileTwoDEntityId' INTEGER NOT NULL, - 'IsAquifer' TINYINT (1) NOT NULL, + 'IsAquifer' TINYINT (1) NOT NULL, -- true or false 'Color' INTEGER, -- ARGB value of Color. 'MaterialName' TEXT NOT NULL, 'ShearStrengthModel' TINYINT (1) NOT NULL, -- Enumtype: 1 = SuCalculated, 2 = CPhi, 3 = CPhiOrSuCalculated @@ -1775,6 +1905,19 @@ ) ; +CREATE TABLE 'MacroStabilityInwardsSemiProbabilisticOutputEntity' +( + 'MacroStabilityInwardsSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'MacroStabilityInwardsCalculationEntityId' INTEGER NOT NULL, + 'RequiredProbability' REAL, + 'RequiredReliability' REAL, + 'MacroStabilityInwardsProbability' REAL, + 'MacroStabilityInwardsReliability' REAL, + 'MacroStabilityInwardsFactorOfSafety' REAL, + CONSTRAINT 'FK_MacroStabilityInwardsSemiProbabilisticOutputEntity_MacroStabilityInwardsCalculationEntity' FOREIGN KEY ('MacroStabilityInwardsCalculationEntityId') REFERENCES 'MacroStabilityInwardsCalculationEntity' ('MacroStabilityInwardsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + /* Create Indexes and Triggers */ CREATE INDEX 'IXFK_GrassCoverErosionInwardsDikeHeightOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' @@ -1992,14 +2135,14 @@ ON 'WaveImpactAsphaltCoverSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_MicrostabilitySectionResultEntity_FailureMechanismSectionEntity' - ON 'MicrostabilitySectionResultEntity' ('FailureMechanismSectionEntityId' ASC) -; - CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_MicrostabilitySectionResultEntity_FailureMechanismSectionEntity' + ON 'MicrostabilitySectionResultEntity' ('FailureMechanismSectionEntityId' ASC) +; + CREATE INDEX 'IXFK_PipingStructureSectionResultEntity_FailureMechanismSectionEntity' ON 'PipingStructureSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; @@ -2387,6 +2530,22 @@ END; ; +CREATE INDEX 'IXFK_MacroStabilityInwardsCalculationEntity_CalculationGroupEntity' + ON 'MacroStabilityInwardsCalculationEntity' ('CalculationGroupEntityId' ASC) +; + +CREATE INDEX 'IXFK_MacroStabilityInwardsCalculationEntity_HydraulicLocationEntity' + ON 'MacroStabilityInwardsCalculationEntity' ('HydraulicLocationEntityId' ASC) +; + +CREATE INDEX 'IXFK_MacroStabilityInwardsCalculationEntity_MacroStabilityInwardsStochasticSoilProfileEntity' + ON 'MacroStabilityInwardsCalculationEntity' ('MacroStabilityInwardsStochasticSoilProfileEntityId' ASC) +; + +CREATE INDEX 'IXFK_MacroStabilityInwardsCalculationOutput_MacroStabilityInwardsCalculationEntity' + ON 'MacroStabilityInwardsCalculationOutputEntity' ('MacroStabilityInwardsCalculationEntityId' ASC) +; + CREATE INDEX 'IXFK_MacroStabilityCharacteristicPointEntity_SurfaceLineEntity' ON 'MacroStabilityInwardsCharacteristicPointEntity' ('SurfaceLineEntityId' ASC) ;