Index: Riskeer/Storage/src/Riskeer.Storage.Core/Riskeer.risk
===================================================================
diff -u -r25b3b72a0a89bd921333361d53b7d6feb4578347 -r551b61761af1f1c19f35365190409ada33eef146
Binary files differ
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r25b3b72a0a89bd921333361d53b7d6feb4578347 -r551b61761af1f1c19f35365190409ada33eef146
--- build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 25b3b72a0a89bd921333361d53b7d6feb4578347)
+++ build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 551b61761af1f1c19f35365190409ada33eef146)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 14.1 		*/
-/*  Created On : 14-sep-2021 12:33:05 				*/
+/*  Created On : 15-sep-2021 09:41:20 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -30,10 +30,10 @@
 DROP TABLE IF EXISTS 'HydraulicLocationEntity'
 ;
 
-DROP TABLE IF EXISTS 'SemiProbabilisticPipingCalculationEntity'
+DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
 ;
 
-DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
+DROP TABLE IF EXISTS 'SemiProbabilisticPipingCalculationEntity'
 ;
 
 DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity'
@@ -171,19 +171,19 @@
 DROP TABLE IF EXISTS 'HydraulicBoundaryDatabaseEntity'
 ;
 
-DROP TABLE IF EXISTS 'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity'
+DROP TABLE IF EXISTS 'HydraulicLocationCalculationCollectionEntity'
 ;
 
-DROP TABLE IF EXISTS 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity'
+DROP TABLE IF EXISTS 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity'
 ;
 
-DROP TABLE IF EXISTS 'HydraulicLocationCalculationCollectionEntity'
+DROP TABLE IF EXISTS 'HydraulicLocationCalculationEntity'
 ;
 
-DROP TABLE IF EXISTS 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity'
+DROP TABLE IF EXISTS 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity'
 ;
 
-DROP TABLE IF EXISTS 'HydraulicLocationCalculationEntity'
+DROP TABLE IF EXISTS 'HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity'
 ;
 
 DROP TABLE IF EXISTS 'HydraulicLocationOutputEntity'
@@ -420,6 +420,16 @@
 )
 ;
 
+CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
+(
+	'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'FailureMechanismEntityId' INTEGER NOT NULL,
+	'N' REAL NOT NULL,
+	'DikeProfileCollectionSourcePath' TEXT NULL,
+	CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
 CREATE TABLE 'SemiProbabilisticPipingCalculationEntity'
 (
 	'SemiProbabilisticPipingCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -447,16 +457,6 @@
 )
 ;
 
-CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
-(
-	'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'FailureMechanismEntityId' INTEGER NOT NULL,
-	'N' REAL NOT NULL,
-	'DikeProfileCollectionSourcePath' TEXT NULL,
-	CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
 CREATE TABLE 'GrassCoverErosionInwardsCalculationEntity'
 (
 	'GrassCoverErosionInwardsCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -1204,26 +1204,6 @@
 )
 ;
 
-CREATE TABLE 'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity'
-(
-	'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'AssessmentSectionEntityId' INTEGER NOT NULL,
-	'HydraulicBoundaryLocationCalculationType' TINYINT (1) NOT NULL,	-- Enum: 1 = Waterlevel 2 = Waveheight
-	'TargetProbability' REAL NOT NULL,
-	CONSTRAINT 'FK_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
-CREATE TABLE 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity'
-(
-	'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' INTEGER NOT NULL,
-	'HydraulicLocationCalculationEntityId' INTEGER NOT NULL,
-	CONSTRAINT 'PK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity' PRIMARY KEY ('HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId','HydraulicLocationCalculationEntityId'),
-	CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' FOREIGN KEY ('HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId') REFERENCES 'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity' ('HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId') ON DELETE No Action ON UPDATE No Action,
-	CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntityId' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE No Action ON UPDATE No Action
-)
-;
-
 CREATE TABLE 'HydraulicLocationCalculationCollectionEntity'
 (
 	'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT
@@ -1250,6 +1230,26 @@
 )
 ;
 
+CREATE TABLE 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity'
+(
+	'HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'AssessmentSectionEntityId' INTEGER NOT NULL,
+	'HydraulicBoundaryLocationCalculationType' TINYINT (1) NOT NULL,	-- Enum: 1 = Waterlevel 2 = Waveheight
+	'TargetProbability' REAL NOT NULL,
+	CONSTRAINT 'FK_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
+CREATE TABLE 'HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity'
+(
+	'HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' INTEGER NOT NULL,
+	'HydraulicLocationCalculationEntityId' INTEGER NOT NULL,
+	CONSTRAINT 'PK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity' PRIMARY KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId','HydraulicLocationCalculationEntityId'),
+	CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' FOREIGN KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') REFERENCES 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') ON DELETE No Action ON UPDATE No Action,
+	CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntityId' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE No Action ON UPDATE No Action
+)
+;
+
 CREATE TABLE 'HydraulicLocationOutputEntity'
 (
 	'HydraulicLocationOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -2147,6 +2147,10 @@
  ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC)
 ;
 
+CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+;
+
 CREATE INDEX 'IXFK_SemiProbabilisticPipingCalculationEntity_PipingStochasticSoilProfileEntity'
  ON 'SemiProbabilisticPipingCalculationEntity' ('PipingStochasticSoilProfileEntityId' ASC)
 ;
@@ -2163,10 +2167,6 @@
  ON 'SemiProbabilisticPipingCalculationEntity' ('CalculationGroupEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
 CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity'
  ON 'GrassCoverErosionInwardsCalculationEntity' ('CalculationGroupEntityId' ASC)
 ;
@@ -2536,20 +2536,16 @@
  ON 'HydraulicBoundaryDatabaseEntity' ('AssessmentSectionEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_AssessmentSectionEntity'
- ON 'HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity' ('AssessmentSectionEntityId' ASC)
+CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntity'
+ ON 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationCollectionEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity'
- ON 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity' ('HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' ASC)
+CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntity'
+ ON 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC)
 ;
-
-CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntity'
- ON 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC)
-;
-CREATE TRIGGER [TR_AfterDeleteHydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_RemoveHydraulicLocationCalculationEntity]
+CREATE TRIGGER [TR_AfterDeleteHydraulicLocationCalculationCollectionEntity_RemoveHydraulicLocationCalculationEntity]
 	AFTER DELETE
-	ON HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity
+	ON HydraulicLocationCalculationCollectionEntity
 	FOR EACH ROW
 BEGIN
 	DELETE 
@@ -2559,16 +2555,24 @@
 END; 
 ;
 
-CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntity'
- ON 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationCollectionEntityId' ASC)
+CREATE INDEX 'IXFK_HydraulicLocationCalculationEntity_HydraulicLocationEntity'
+ ON 'HydraulicLocationCalculationEntity' ('HydraulicLocationEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntity'
- ON 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC)
+CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_AssessmentSectionEntity'
+ ON 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' ('AssessmentSectionEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteHydraulicLocationCalculationCollectionEntity_RemoveHydraulicLocationCalculationEntity]
+
+CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity'
+ ON 'HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntity'
+ ON 'HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC)
+;
+CREATE TRIGGER [TR_AfterDeleteHydraulicLocationCalculationForTargetProbabilityCollectionEntity_RemoveHydraulicLocationCalculationEntity]
 	AFTER DELETE
-	ON HydraulicLocationCalculationCollectionEntity
+	ON HydraulicLocationCalculationForTargetProbabilityCollectionEntity
 	FOR EACH ROW
 BEGIN
 	DELETE 
@@ -2578,10 +2582,6 @@
 END; 
 ;
 
-CREATE INDEX 'IXFK_HydraulicLocationCalculationEntity_HydraulicLocationEntity'
- ON 'HydraulicLocationCalculationEntity' ('HydraulicLocationEntityId' ASC)
-;
-
 CREATE INDEX 'IXFK_HydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity'
  ON 'HydraulicLocationOutputEntity' ('GeneralResultSubMechanismIllustrationPointEntityId' ASC)
 ;
Index: design/DatabaseDesign.eap
===================================================================
diff -u -r0493f016a9c8e76a4e8ed03fa8a206fb6a139b27 -r551b61761af1f1c19f35365190409ada33eef146
Binary files differ