Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs
===================================================================
diff -u -r6833 -r6873
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 6833)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 6873)
@@ -42,8 +42,8 @@
 {
     public readonly double MissValStabilitySafetyFactor = -1.0;
     private readonly List<LocationJob> jobs = new List<LocationJob>();
-    private WaterBoard waterBoard;
-    private WaterBoardJob waterBoardJob;
+    private Dike dike;
+    private DikeJob dikeJob;
     private DamProjectType damProjectType = DamProjectType.Design;
     private string damDataSourceFileName = "";
     private List<CsvExportData> designCalculations;
@@ -54,8 +54,8 @@
     public DamProjectData()
     {
         VersionInfo = new VersionInfo();
-        waterBoard = new WaterBoard();
-        waterBoardJob = null;
+        dike = new Dike();
+        dikeJob = null;
         DamProjectCalculationSpecification = new DamProjectCalculationSpecification();
     }
 
@@ -100,21 +100,21 @@
     public int MaxCalculationCores { get; set; } = 1;
 
     /// <summary>
-    /// Toplevel object to hold waterboard data
+    /// Toplevel object to hold dike data
     /// </summary>
     [Validate]
-    public virtual WaterBoard WaterBoard
+    public virtual Dike Dike
     {
         get
         {
-            return waterBoard;
+            return dike;
         }
         set
         {
-            waterBoard = value;
-            if (waterBoardJob != null && waterBoardJob.Subject != value)
+            dike = value;
+            if (dikeJob != null && dikeJob.Subject != value)
             {
-                waterBoardJob = null;
+                dikeJob = null;
             }
         }
     }
@@ -127,33 +127,32 @@
     public DamProjectCalculationSpecification DamProjectCalculationSpecification { get; set; }
 
     [Child]
-    public virtual DamJob WaterBoardJob
+    public virtual DamJob DikeJob
     {
         get
         {
-            if (waterBoardJob == null)
+            if (dikeJob == null)
             {
-                waterBoardJob = new WaterBoardJob(waterBoard);
-                waterBoardJob.Subject = waterBoard;
-
-                if (waterBoard.Dike != null)
+                dikeJob = new DikeJob(dike)
                 {
-                    CompositeJob dikeJob = new DikeJob(waterBoard.Dike);
-                    waterBoardJob.Jobs.Add(dikeJob);
+                    Subject = dike
+                };
 
-                    foreach (Location location in waterBoard.Dike.Locations)
+                if (dike != null)
+                {
+                    foreach (Location location in dike.Locations)
                     {
                         var locationJob = new LocationJob(location);
                         dikeJob.Jobs.Add(locationJob);
                     }
                 }
             }
 
-            return waterBoardJob;
+            return dikeJob;
         }
         set
         {
-            waterBoardJob = value as WaterBoardJob;
+            dikeJob = value as DikeJob;
         }
     }
 
@@ -243,16 +242,12 @@
         {
             if (jobs.Count == 0)
             {
-                var waterboardJob = WaterBoardJob as CompositeJob;
-                foreach (CompositeJob dijkJob in waterboardJob.Jobs)
+                var dikeJob = DikeJob as CompositeJob;
+                foreach (LocationJob locationJob in dikeJob.Jobs)
                 {
-                    foreach (LocationJob locationJob in dijkJob.Jobs)
-                    {
-                        jobs.Add(locationJob);
-                    }
+                    jobs.Add(locationJob);
                 }
             }
-
             return jobs;
         }
     }
@@ -282,11 +277,11 @@
     [Browsable(false)]
     [ReadOnly(true)]
     [Label("Locations")]
-    public List<Location> Locations
+    public IList<Location> Locations
     {
         get
         {
-            return WaterBoard.Locations;
+            return Dike.Locations;
         }
     }
 
@@ -378,12 +373,12 @@
     public void DeleteResults()
     {
         LogManager.Messages.Clear();
-        if (waterBoardJob != null && waterBoardJob.Jobs != null)
+        if (dikeJob != null && dikeJob.Jobs != null)
         {
-            waterBoardJob.Jobs.Clear();
+            dikeJob.Jobs.Clear();
         }
 
-        waterBoardJob = null;
+        dikeJob = null;
         if (jobs != null)
         {
             jobs.Clear();
@@ -421,7 +416,7 @@
 
     public bool HasResults()
     {
-        bool hasResults = waterBoard.Dike != null && waterBoardJob != null && waterBoardJob.Jobs.Count > 0;
+        bool hasResults = dike != null && dikeJob != null && dikeJob.Jobs.Count > 0;
         if (hasResults)
         {
             hasResults = GetNumberOfCalculatedJobs() > 0;
@@ -459,9 +454,9 @@
     {
         const string sourceName = "DamSoil";
         var validationResults = new List<ValidationResult>();
-        if (WaterBoard != null && WaterBoard.Dike != null)
+        if (Dike != null)
         {
-            foreach (DamSoil damSoil in WaterBoard.Dike.DamSoils)
+            foreach (DamSoil damSoil in Dike.DamSoils)
             {
                 validationResults.AddRange(Validator.ValidateProperty(damSoil, "AbovePhreaticLevel", sourceName));
                 validationResults.AddRange(Validator.ValidateProperty(damSoil, "BelowPhreaticLevel", sourceName));
@@ -549,12 +544,12 @@
 
     public override string ToString()
     {
-        return WaterBoard != null ? WaterBoard.Name : "";
+        return Dike != null ? Dike.Name : "";
     }
 
     public void Dispose()
     {
-        WaterBoard.Dispose();
+        Dike.Dispose();
         DamProjectCalculationSpecification.Dispose();
     }
 
@@ -632,9 +627,9 @@
         {
             if (locationJob.HasDesignScenarioResults)
             {
-                if (WaterBoard.Dike.Locations.Contains(locationJob.Location))
+                if (Dike.Locations.Contains(locationJob.Location))
                 {
-                    WaterBoard.Dike.UpdateLocation(locationJob.Location);
+                    Dike.UpdateLocation(locationJob.Location);
                 }
 
                 numberOfCalculatedJobs++;