Index: doc/trunk/DAM - Architecture Overall/DAM - Architecture Overall.pdf
===================================================================
diff -u -r204 -r210
Binary files differ
Index: doc/trunk/DAM - Architecture Overall/DAM - Architecture Overall.tex
===================================================================
diff -u -r204 -r210
--- doc/trunk/DAM - Architecture Overall/DAM - Architecture Overall.tex (.../DAM - Architecture Overall.tex) (revision 204)
+++ doc/trunk/DAM - Architecture Overall/DAM - Architecture Overall.tex (.../DAM - Architecture Overall.tex) (revision 210)
@@ -280,7 +280,7 @@
The failure mechanisms are not part of \ProgramName itself and thus not of the \ProgramName repository. Instead, the failure mechanisms will be stored in their own repositories. \ProgramName will refer to the failure mechanisms as external libraries.
-\section{\ProgramName repository main layout} \label{sec:4.1}
+\section{\ProgramName repository main layout} \label{sec:RepositoryMainLayout}
In \autoref{fig-SVNMainLayout} the main layout is shown.
@@ -311,7 +311,7 @@
\ProgramName uses Jira as issuetracking system, which supports attachments, but \ProgramName attachments can be very large, so it is better to save the attachments in this location.
The attachments are stored in a map with the name of the issue number (e.g. MWDAM-982)
-\section{\ProgramName repository clients layout} \label{sec:4.2}
+\section{\ProgramName repository clients layout} \label{sec:RepositoryClientsLayout}
Each \ProgramName client has its own entry in the clients map. In \autoref{fig-SVNClientLayout} the layout of the \ProgramName clients map is shown.
@@ -333,9 +333,9 @@
\item KernelComparisonRunner - a commandline utility for comparing the results of different macrostability kernels.
\end{itemize}
-\section{\ProgramName repository clients library layout} \label{sec:4.3}
+\section{\ProgramName repository clients library layout} \label{sec:RepositoryClientsLibrary}
-In \autoref{fig-SVNClientLibraryLayout} the layout of the \ProgramName clients library map is shown.
+In \autoref{fig-SVNClientLibraryLayout} the layout of the DAMUI clients library map is shown.
\begin{figure}[H]
\begin{flushleft}
@@ -345,15 +345,32 @@
\label{fig-SVNClientLibraryLayout}
\end{figure}
-At this moment only one project is foreseen to be put in the "`dam clients library"' map is:
+At this moment only one project is foreseen to be put in the "`dam clients library"' src map is:
\begin{itemize}
- \item Deltares.Dam.Data: this map contains pure data classes.
- \item Deltares.Dam.Controllers: this map contains classea to manipulate above data classes.
- \item Deltares.Dam.Calculators: this map contains classes to perform the actual calculations for the \ProgramName Engine.
+ \item Deltares.Dam.Data: this map contains the business layer.
\end{itemize}
-\section{\ProgramName repository full layout} \label{sec:4.4}
+\section{\ProgramName repository \ProgramName Engine} \label{sec:RepositoryDamEngine}
+In \autoref{fig-SVNDamEngineLayout} the layout of the \ProgramName Engine map is shown.
+
+\begin{figure}[H]
+ \begin{flushleft}
+ \includegraphics{pictures/DamSVNDamEngineLayout.png}
+ \end{flushleft}
+ \caption{\small \ProgramName Engine layout.}
+ \label{fig-SVNDamEngineLayout}
+\end{figure}
+
+At this moment the project foreseen to be put in the "`dam engine"' src map are:
+\begin{itemize}
+ \item Deltares.DamEngine.Data: this map contains pure data classes.
+ \item Deltares.DamEngine.Controllers: this map contains classea to manipulate above data classes.
+ \item Deltares.DamEngine.Calculators: this map contains classes to perform the actual calculations for the \ProgramName Engine.
+\end{itemize}
+
+\section{\ProgramName repository full layout} \label{sec:RepositoryFullLayout}
+
The full layout of the \ProgramName repository will be as shown in \autoref{fig-SVNLayout}.
\begin{figure}[H]
\begin{flushleft}
Index: doc/trunk/UML diagrams/DAM Components.uxf
===================================================================
diff -u -r199 -r210
--- doc/trunk/UML diagrams/DAM Components.uxf (.../DAM Components.uxf) (revision 199)
+++ doc/trunk/UML diagrams/DAM Components.uxf (.../DAM Components.uxf) (revision 210)
@@ -77,39 +77,39 @@
UMLGeneric
490
- 270
+ 340
200
- 80
+ 60
symbol=component
-Assessment Regional Dikes
+Dikes Assessment Regional
UMLGeneric
490
- 370
+ 480
200
- 80
+ 60
symbol=component
-Design Primary Dikes
+Dikes Design
UMLGeneric
490
- 470
+ 410
200
- 80
+ 60
symbol=component
-Operational Module
+Dikes Operational
@@ -197,4 +197,30 @@
lt=<.
90.0;10.0;10.0;10.0
+
+ UMLGeneric
+
+ 490
+ 550
+ 200
+ 60
+
+ symbol=component
+
+Dikes NWO
+
+
+
+ UMLGeneric
+
+ 490
+ 270
+ 200
+ 60
+
+ symbol=component
+
+Dikes Assessment
+
+
Index: doc/trunk/DAM - Architecture Overall/pictures/DamSVNClientLibraryLayout.png
===================================================================
diff -u -r204 -r210
Binary files differ
Index: doc/trunk/DAM - Architecture Overall/pictures/DamSVNDamEngineLayout.png
===================================================================
diff -u
Binary files differ
Index: doc/trunk/DAM - Architecture Overall/pictures/DAMComponents.pdf
===================================================================
diff -u -r199 -r210
Binary files differ
Index: doc/trunk/DAM - Architecture Overall/pictures/DamSVNClientLayout.png
===================================================================
diff -u -r204 -r210
Binary files differ
Index: doc/trunk/DAM - Architecture Overall/pictures/DamSVNLayout.png
===================================================================
diff -u -r204 -r210
Binary files differ