Index: dam kernel/trunk/doc/UML Diagrams/DAM kernel Components.uxf
===================================================================
diff -u -r112 -r114
--- dam kernel/trunk/doc/UML Diagrams/DAM kernel Components.uxf	(.../DAM kernel Components.uxf)	(revision 112)
+++ dam kernel/trunk/doc/UML Diagrams/DAM kernel Components.uxf	(.../DAM kernel Components.uxf)	(revision 114)
@@ -4,8 +4,8 @@
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>540</x>
-      <y>750</y>
+      <x>480</x>
+      <y>1220</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
@@ -17,95 +17,101 @@
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>740</x>
-      <y>100</y>
+      <x>80</x>
+      <y>560</y>
       <w>260</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>symbol=component
 
-Primary design calculation</panel_attributes>
+Primary design calculation
+group=5</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>400</x>
+      <x>440</x>
       <y>100</y>
       <w>240</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>symbol=component
 
-Primary assessment calculation</panel_attributes>
+Primary assessment calculation
+group=4</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLDeployment</id>
     <coordinates>
-      <x>510</x>
-      <y>690</y>
+      <x>450</x>
+      <y>1160</y>
       <w>690</w>
-      <h>480</h>
+      <h>590</h>
     </coordinates>
     <panel_attributes>Common modules</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLDeployment</id>
     <coordinates>
-      <x>380</x>
+      <x>420</x>
       <y>50</y>
       <w>290</w>
       <h>440</h>
     </coordinates>
-    <panel_attributes>Assessment Primary Dikes</panel_attributes>
+    <panel_attributes>Assessment Primary Dikes
+group=4</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>40</x>
+      <x>80</x>
       <y>200</y>
       <w>270</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>symbol=component
 
-Regional scenario selector</panel_attributes>
+Regional scenario selector
+group=3</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>40</x>
+      <x>80</x>
       <y>300</y>
       <w>270</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>symbol=component
 
-Regional schematization factor calculator</panel_attributes>
+Regional schematization factor calculator
+group=3</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>40</x>
+      <x>80</x>
       <y>100</y>
       <w>270</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>symbol=component
 
-Regional assessment calculation</panel_attributes>
+Regional assessment calculation
+group=3</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>540</x>
-      <y>850</y>
+      <x>480</x>
+      <y>1320</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
@@ -117,8 +123,8 @@
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>850</x>
-      <y>850</y>
+      <x>790</x>
+      <y>1320</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
@@ -130,8 +136,8 @@
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>540</x>
-      <y>950</y>
+      <x>480</x>
+      <y>1420</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
@@ -144,79 +150,85 @@
     <id>UMLDeployment</id>
     <coordinates>
       <x>70</x>
-      <y>690</y>
+      <y>1160</y>
       <w>350</w>
-      <h>490</h>
+      <h>590</h>
     </coordinates>
-    <panel_attributes>Failure mechanism wrappers</panel_attributes>
+    <panel_attributes>Failure mechanism wrappers
+group=1</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLDeployment</id>
     <coordinates>
-      <x>30</x>
+      <x>70</x>
       <y>50</y>
       <w>300</w>
       <h>440</h>
     </coordinates>
-    <panel_attributes>Assessment Regional Dikes</panel_attributes>
+    <panel_attributes>Assessment Regional Dikes
+group=3</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLDeployment</id>
     <coordinates>
-      <x>720</x>
-      <y>50</y>
+      <x>60</x>
+      <y>510</y>
       <w>310</w>
       <h>440</h>
     </coordinates>
-    <panel_attributes>Design Primary Dikes</panel_attributes>
+    <panel_attributes>Design Primary Dikes
+group=5</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
       <x>100</x>
-      <y>740</y>
+      <y>1210</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>symbol=component
 
-Inward Macrostability wrapper </panel_attributes>
+Inward Macrostability wrapper 
+group=1</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
       <x>100</x>
-      <y>840</y>
+      <y>1310</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>symbol=component
 
-Outward Macrostability wrapper </panel_attributes>
+Outward Macrostability wrapper 
+group=1</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
       <x>100</x>
-      <y>940</y>
+      <y>1410</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>symbol=component
 
-Piping</panel_attributes>
+Piping
+group=1</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>850</x>
-      <y>750</y>
+      <x>790</x>
+      <y>1220</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
@@ -229,8 +241,8 @@
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>850</x>
-      <y>950</y>
+      <x>790</x>
+      <y>1420</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
@@ -243,8 +255,8 @@
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>540</x>
-      <y>1050</y>
+      <x>790</x>
+      <y>1620</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
@@ -256,8 +268,8 @@
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>850</x>
-      <y>1050</y>
+      <x>790</x>
+      <y>1520</y>
       <w>290</w>
       <h>80</h>
     </coordinates>
@@ -269,59 +281,113 @@
   <element>
     <id>UMLDeployment</id>
     <coordinates>
-      <x>1060</x>
-      <y>50</y>
+      <x>420</x>
+      <y>510</y>
       <w>290</w>
       <h>440</h>
     </coordinates>
-    <panel_attributes>NWO Calculation
-(NEW)</panel_attributes>
+    <panel_attributes>NWO Calculation Primary Dikes
+(NEW)
+group=6</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLGeneric</id>
     <coordinates>
-      <x>1080</x>
-      <y>100</y>
+      <x>440</x>
+      <y>560</y>
       <w>250</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>symbol=component
 
-Primary NWO calculation</panel_attributes>
+Primary NWO calculation
+group=6</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLDeployment</id>
     <coordinates>
-      <x>0</x>
+      <x>40</x>
       <y>0</y>
-      <w>1390</w>
-      <h>530</h>
+      <w>1060</w>
+      <h>980</h>
     </coordinates>
     <panel_attributes>Main modules</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLDeployment</id>
     <coordinates>
-      <x>0</x>
-      <y>630</y>
-      <w>1390</w>
-      <h>590</h>
+      <x>40</x>
+      <y>1100</y>
+      <w>1160</w>
+      <h>730</h>
     </coordinates>
     <panel_attributes>Supporting modules</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>680</x>
-      <y>520</y>
+      <x>410</x>
+      <y>970</y>
       <w>30</w>
-      <h>130</h>
+      <h>150</h>
     </coordinates>
     <panel_attributes>lt=[=]-[&lt;]</panel_attributes>
-    <additional_attributes>10.0;10.0;10.0;110.0</additional_attributes>
+    <additional_attributes>10.0;10.0;10.0;130.0</additional_attributes>
   </element>
+  <element>
+    <id>UMLGeneric</id>
+    <coordinates>
+      <x>480</x>
+      <y>1520</y>
+      <w>290</w>
+      <h>80</h>
+    </coordinates>
+    <panel_attributes>symbol=component
+
+Design Calculation Runner</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLGeneric</id>
+    <coordinates>
+      <x>780</x>
+      <y>100</y>
+      <w>240</w>
+      <h>80</h>
+    </coordinates>
+    <panel_attributes>symbol=component
+
+Primary operation calculation
+group=8</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLDeployment</id>
+    <coordinates>
+      <x>760</x>
+      <y>50</y>
+      <w>290</w>
+      <h>440</h>
+    </coordinates>
+    <panel_attributes>Operational Primary Dikes
+group=8</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLGeneric</id>
+    <coordinates>
+      <x>480</x>
+      <y>1620</y>
+      <w>290</w>
+      <h>80</h>
+    </coordinates>
+    <panel_attributes>symbol=component
+
+Operation Calculation Runner</panel_attributes>
+    <additional_attributes/>
+  </element>
 </diagram>
Index: dam kernel/trunk/doc/Dam kernel - Technical Design/DAM kernel - Technical Design.tex
===================================================================
diff -u -r112 -r114
--- dam kernel/trunk/doc/Dam kernel - Technical Design/DAM kernel - Technical Design.tex	(.../DAM kernel - Technical Design.tex)	(revision 112)
+++ dam kernel/trunk/doc/Dam kernel - Technical Design/DAM kernel - Technical Design.tex	(.../DAM kernel - Technical Design.tex)	(revision 114)
@@ -24,7 +24,7 @@
 
 \keywords{Dike, safety assessment, design, software, macro stability, piping}
 
-\references{Refer to \autoref{chapter5}.}
+\references{Refer to \autoref{chapterLiterature}.}
 
 \summary{This document contains the technical design for \ProgramName, an application that computes the strength of a complete dikering with respect to several failure mechnanisms, such as macro stability and piping.\\
 \\
@@ -38,20 +38,20 @@
 \approvali{Maya Sule}
 
 \status{draft}
+\disclaimer{This is a draft report, intended for discussion purposes only. No part of this report may be relied upon by either principals or third parties.}
 
-
 \deltarestitle
 
 
 %------------------------------------------------------------------------------
 \chapter{Introduction} \label{chapterIntroduction}
 
-\section{Purpose and scope of this document} \label{sec:1.1}
+\section{Purpose and scope of this document} \label{sec:PurposeAndScope}
 
 This document contains the technical design for the standalone program \ProgramName, a software package for the automated calculation of the strength of dikes. DAM was developed by Deltares with and for STOWA for all water authorities.
 
 
-\section{Other system documents} \label{sec:1.2}
+\section{Other system documents} \label{sec:SystemDocuments}
 
 The full documentation on the program comprises the following documents.
 
@@ -69,6 +69,8 @@
 \ProgramNamePlusSpace - Test Plan \newline \citep{DAMKernel_TestPlan} & Description of the different regression and acceptation tests, including target values.  \\ \hline
 \ProgramNamePlusSpace - Test Report \newline \citep{DAMKernel_TestReport} & Description of the test results (benchmarks and test scripts). \\ \hline
 \end{tabular}
+\caption{\small \ProgramNamePlusSpace system documents.}
+\label{table-SystemDocuments}
 \end{table}
 
 
@@ -77,7 +79,7 @@
 
 \section{DAM components} \label{sec:DamComponents}
 
-\ProgramNamePlusSpace is part of the whole DAM system that contains several components. Please see \autoref{fig-DamComponents} for an overview of the components of DAM.
+\ProgramNamePlusSpace is part of the whole DAM system that contains several components. Please see \autoref{fig-DamComponents} for an overview of the components of DAM. In \citep{DAM_ArchitectureOverall} a description of the overall architecture of the DAM system can be found.
 
 \begin{figure}[H]
   \begin{center}
@@ -95,6 +97,9 @@
 The \ProgramNamePlusSpace itself also consists of several modules.
 These can be seen in see \autoref{fig-DAMKernelComponents} 
 
+All of the submodules inside the Main Modules are completely independent.
+All of the submodules inside the Supporting Modules are also independent. But all these submodules can be used by each of the main modules.
+
 \begin{figure}[H]
   \begin{center}
     \includegraphics[width=18cm]{pictures/DAMKernelComponents.pdf}
@@ -109,7 +114,7 @@
 
 \section{Design principles} \label{sec:DesignPrinciples}
 \begin{itemize}
-	\item No circular references between objects. When it is really unavoidable, then do it through a generic interface (e.g. IParentObject)
+	\item No circular references between objects. When it is really unavoidable, then do it through a generic interface (e.g.\ IParentObject)
 	\item The calculation will support parallellization. So do not use global variables and avoid using statics.	
 	\item Failure mechanisms will be connected through wrapper classes, which will share a common IFailureMechanism interface
 	\item Surfaceline adapter classes will share a common ISurfacelineAdapter interface
@@ -118,6 +123,12 @@
 	\item There should be no User Interface elements shown anytime during the calculation.
 \end{itemize}
 
+\section{Programming environment} \label{sec:ProgrammingEnvironment}
+The \ProgramNamePlusSpace will be developed in C\# with the .NET 4.5 framework. The development environment will be Visual Studio 2015.
+
+\section{Error handling} \label{sec:ErrorHandling}
+Errors are handled through the standard exception handling of the .NET framework. Error messages must contain as much information as possible, so a user can trace back the error to the input data.
+
 \section{External libraries and components} \label{sec:ExternalLibrariesAndComponents}
 \ProgramNamePlusSpace uses third-party libraries and components. Only open sources and free components, that are free to redistribute are allowed to be used. 
 
@@ -188,50 +199,106 @@
 
 \subsection{Input}
 \paragraph*{DamProjectType}
+\begin{itemize}
+	\item Assessment
+	\item Design
+	\item Operational
+\end{itemize}
 \paragraph*{DamProjectCalculationSpecification}
+This class specifies which failuremechanism is to be calculated and it also contains the specific options for the selelected mechanism (e.g.\ which calculation model)
 \paragraph*{Locations}
-\paragraph*{Segments}
+This is a collection of locations, with each location containing the location specific data.
+\paragraph*{Soil Segments}
+This is a collection of soil segments, with each segment containing the subsoil data for a specific failure mechanism.\textbf{}
 \paragraph*{Soils}
+This is a collection of soils, with each soil containing the soil parameters needed for the calculation of all failure mechanisms.\textbf{}
 
 \subsection{Output}
 \paragraph*{CalculationResults}
+A calculation result holds the result for a specific location, a specific failure mechanism, and a specific subsoil scenario of a specific segment defined in the location data.
 \paragraph*{CalculationMessages}
+These are all the message that are generated by the calculation. A message must containt as much information as possible to trace back the information tho the input data (e.g.\ a specific location, a specific failure mechanism, and a specific subsoil scenario of a specific segment defined in the location data).
 
 \section{Location} \label{sec:LocationDescription}
-\paragraph*{Segment}
+\paragraph*{SoilSegment}
+A soil segment contains the subsoil data for a specific failure mechanism
 \paragraph*{SurfaceLine}
+A surfaceline is describes the dike profile in a specific location. In the Design calculation it can also be the new dike profile, which can meet design creteria in a specific load scenario.
 \paragraph*{WaternetOptions}
+The options that support the creation of a waternet in a specific location.
 \paragraph*{DesignOptions}
+The options that will be used in the Design calculation (e.g.\ how to design a shoulder when needed).
 \paragraph*{SensorData}
+The sensor data can be used to define a waternet based on live sensor data. This sensor data holds information about ID and location of the sensor. The actaul sensor readings are defined as timeseries readings for each sensor in each location.
 \paragraph*{LoadScenario}
+Used for Design calculation. A load scenario contains the following items:
+\begin{itemize}
+	\item Riverlevel low
+	\item Riverlevel high
+	\item Dike table height
+	\item Required safety factor for each specified failure mechanism
+	\item Uplift criterium for each specified failure mechanism
+	\item Waternet options for each specified failure mechanism
+\end{itemize}
 \paragraph*{IFailureMechanismOptions}
+Specific options for each location for each failure mechanism.
 %------------------------------------------------------------------------------
 \chapter{Module Description}  \label{chapterModuleDescription}
 
 \section{\ProgramNamePlusSpace main modules} \label{sec:DamKernelMainModules}
 
 \subsection{Assessment Regional Dikes}
+This module performs an assessment for regional dikes.
 \paragraph*{Regional assessment calculation}
+This is the main submodule of the regional assessement. This submodule contains the main loop of the calculation.
 \paragraph*{Regional scenario selector}
+This submodule generates all the scenarios that have to be evaluated for a specifi location. The scenarios are selected based on the local conditions.
 \paragraph*{Regional schematization factor calculator}
+This submodule calculates the schematization factor in a location based on all results of all scenarios in a location.
 \subsection{Assessment Primary Dikes}
+This module performs an assessment for primary dikes.
 \paragraph*{Primary assessment calculation}
+This is the main submodule of the primary assessement. This submodule contains the main loop of the calculation.
 \subsection{Design Primary Dikes}
+This module performs an design calculation for primary dikes.
 \paragraph*{Primary design calculation}
+This is the main submodule of the primary design calculation. This submodule contains the main loop of the calculation.
 \subsection{NWO Calculation}
+This module performs an NWO (Niet Waterkerende Objecten) calculation for primary dikes.
 \paragraph*{Primary NWO calculation}
+This is the main submodule of the NWO calculation. This submodule contains the main loop of the calculation.
 
 \section{\ProgramNamePlusSpace supporting modules} \label{sec:DamKernelSupportingModules}
 \subsection{Failure mechanism wrappers}
+These are calculation wrapper for each failure mechanism that is supported by the \ProgramName. Each wrapper should implement the IFailureMechanism interface.
+\paragraph*{Macrostability inwards}
+Calculation wrapper for Macrostability inward. Note that for each specific implementation of a failure mechanism, a separate wrapper has to be build (e.g.\ Slope/W and D-Geo Stability)
+\paragraph*{Macrostability outwards}
+Calculation wrapper for Macrostability outward.
+\paragraph*{Piping}
+Calculation wrapper for Piping.
+\subsection{Surfaceline adapters}
+A collection of surfaceline adapters to support the design calculation. Each adapter should adhere to the ISurfaceLineAdapter interface.
 \paragraph*{Surfaceline Adapter Height}
+Adapts the surfaceline by adding extra height to the dike crest.
 \paragraph*{Surfaceline Adapter Slope}
+Adapts the surfaceline by changing the slope of the dike on the inside.
 \paragraph*{Surfaceline Adapter Shoulder}
+Adapts the surfaceline by adding a shoulder or enlarging the shouldeer on the inside of the dike.
 \paragraph*{Surfaceline Adapter NWO}
-\subsection{Surfaceline adapters}
+Adapts the surfaceline by adding a NWO on a specifi place in the surfaceline.
 \subsection{Failure mechanism Calculation Runner}
+This submodule calculates a specific failure mechanism by calling the IFailureMechanism interface of the wrapper implementation.
+\subsection{Design Calculation Runner}
+This submodule performs a design calculation for a specific failure mechanism by calling the IFailureMechanism interface and several surfaceline adapters through their  ISurfacelineAdaptert interface.
+\subsection{Operation Calculation Runner}
+This submodule can perform a calculation based on sensor readings (as time-series). The load on the systems (the waternet) will be based on those sensor readings. This can be used in operational systems like DamLive.
 \subsection{Geometry creator}
+This submodule combines a surfaceline with a subsoil scenario. The output is a gemetry that can be used by the failure mechanisms to perform a calculation.
 \subsection{Waternet creator}
+This submodule determines the waternet that will be used by the failure mechanisms. At first only the DAM implementation will be used as a waternet creator. Later on new implementations can be made. E.g.\ specific for each failure mechanism, or an implementation based on a numerical model like DgFlow.
 \subsection{Scripting engine}
+To enable advanced users to experiment with how the \ProgramNamePlusSpace works a Python scripting engine is implemented as a submodule. The scripting engine has acces to the data model and the submodules through well defined interfaces. 
 
 %------------------------------------------------------------------------------
 \chapter{Literature}  \label{chapterLiterature}
@@ -240,10 +307,8 @@
 
 
 
-\cleardoublepage
 
 \pagestyle{empty}
-\cleardoublepage
 \mbox{}
 
 %------------------------------------------------------------------------------
Index: dam kernel/trunk/doc/Dam kernel - Technical Design/pictures/DAMKernelComponents.pdf
===================================================================
diff -u -r112 -r114
Binary files differ
Index: dam kernel/trunk/doc/UML Diagrams/DAM kernel Data Model Main.uxf
===================================================================
diff -u -r112 -r114
--- dam kernel/trunk/doc/UML Diagrams/DAM kernel Data Model Main.uxf	(.../DAM kernel Data Model Main.uxf)	(revision 112)
+++ dam kernel/trunk/doc/UML Diagrams/DAM kernel Data Model Main.uxf	(.../DAM kernel Data Model Main.uxf)	(revision 114)
@@ -100,7 +100,7 @@
       <w>260</w>
       <h>100</h>
     </coordinates>
-    <panel_attributes>Segment
+    <panel_attributes>SoilSegment
 --
 + </panel_attributes>
     <additional_attributes/>
Index: dam kernel/trunk/doc/Dam kernel - Technical Design/pictures/DAMKernelDataModelLocation.pdf
===================================================================
diff -u -r112 -r114
Binary files differ
Index: dam kernel/trunk/doc/UML Diagrams/DAM kernel Data Model Location.uxf
===================================================================
diff -u -r112 -r114
--- dam kernel/trunk/doc/UML Diagrams/DAM kernel Data Model Location.uxf	(.../DAM kernel Data Model Location.uxf)	(revision 112)
+++ dam kernel/trunk/doc/UML Diagrams/DAM kernel Data Model Location.uxf	(.../DAM kernel Data Model Location.uxf)	(revision 114)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <diagram program="umlet" version="14.2">
-  <zoom_level>10</zoom_level>
+  <zoom_level>12</zoom_level>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>160</x>
-      <y>350</y>
-      <w>260</w>
-      <h>190</h>
+      <x>96</x>
+      <y>372</y>
+      <w>312</w>
+      <h>228</h>
     </coordinates>
     <panel_attributes>Location
 --
@@ -17,10 +17,10 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>410</x>
-      <y>70</y>
-      <w>310</w>
-      <h>340</h>
+      <x>396</x>
+      <y>36</y>
+      <w>372</w>
+      <h>408</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 m1=*</panel_attributes>
@@ -29,23 +29,23 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>700</x>
-      <y>40</y>
-      <w>260</w>
-      <h>100</h>
+      <x>744</x>
+      <y>0</y>
+      <w>312</w>
+      <h>120</h>
     </coordinates>
-    <panel_attributes>Segment
+    <panel_attributes>SoilSegment
 --
 </panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>700</x>
-      <y>190</y>
-      <w>260</w>
-      <h>100</h>
+      <x>744</x>
+      <y>180</y>
+      <w>312</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>SurfaceLine
 --
@@ -55,10 +55,10 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>410</x>
-      <y>220</y>
-      <w>310</w>
-      <h>210</h>
+      <x>396</x>
+      <y>216</y>
+      <w>372</w>
+      <h>252</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 m1=1</panel_attributes>
@@ -67,10 +67,10 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>700</x>
-      <y>340</y>
-      <w>260</w>
-      <h>100</h>
+      <x>744</x>
+      <y>360</y>
+      <w>312</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>WaternetOptions
 --
@@ -80,10 +80,10 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>700</x>
-      <y>490</y>
-      <w>260</w>
-      <h>100</h>
+      <x>744</x>
+      <y>540</y>
+      <w>312</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>DesignOptions
 --
@@ -93,10 +93,10 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>700</x>
-      <y>630</y>
-      <w>260</w>
-      <h>100</h>
+      <x>744</x>
+      <y>708</y>
+      <w>312</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>SensorData
 --
@@ -106,10 +106,10 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>410</x>
-      <y>370</y>
-      <w>310</w>
-      <h>90</h>
+      <x>396</x>
+      <y>396</y>
+      <w>372</w>
+      <h>108</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 m1=1</panel_attributes>
@@ -118,10 +118,10 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>410</x>
-      <y>450</y>
-      <w>310</w>
-      <h>100</h>
+      <x>396</x>
+      <y>492</y>
+      <w>372</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 m1=1</panel_attributes>
@@ -130,10 +130,10 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>410</x>
-      <y>480</y>
-      <w>310</w>
-      <h>200</h>
+      <x>396</x>
+      <y>528</y>
+      <w>372</w>
+      <h>240</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 m1=1</panel_attributes>
@@ -142,10 +142,10 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>700</x>
-      <y>760</y>
-      <w>260</w>
-      <h>100</h>
+      <x>744</x>
+      <y>864</y>
+      <w>312</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>LoadScenario
 --
@@ -155,10 +155,10 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>410</x>
-      <y>510</y>
-      <w>310</w>
-      <h>290</h>
+      <x>396</x>
+      <y>564</y>
+      <w>372</w>
+      <h>348</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 m1=*</panel_attributes>
@@ -167,10 +167,10 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>700</x>
-      <y>890</y>
-      <w>260</w>
-      <h>100</h>
+      <x>744</x>
+      <y>1020</y>
+      <w>312</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>IFailureMechanismOptions
 --
@@ -180,10 +180,10 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>380</x>
-      <y>530</y>
-      <w>340</w>
-      <h>420</h>
+      <x>360</x>
+      <y>588</y>
+      <w>408</w>
+      <h>504</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 m1=*</panel_attributes>
Index: dam kernel/trunk/doc/Dam kernel - Technical Design/pictures/DAMKernelDataModelMain.pdf
===================================================================
diff -u -r112 -r114
Binary files differ