Index: DamOverall/trunk/doc/DAM - Architecture Overall/DAM - Architecture Overall.tex
===================================================================
diff -u -r6663 -r6707
--- DamOverall/trunk/doc/DAM - Architecture Overall/DAM - Architecture Overall.tex	(.../DAM - Architecture Overall.tex)	(revision 6663)
+++ DamOverall/trunk/doc/DAM - Architecture Overall/DAM - Architecture Overall.tex	(.../DAM - Architecture Overall.tex)	(revision 6707)
@@ -413,7 +413,6 @@
 	\item Geo Common (optional), see section 6.2 of BOI release document
 	\item Waternet Creator (optional), see section 6.3 of BOI release document
 	\item Macrostability kernel, see section 6.4 of BOI release document
-	\item Macrostability Reliability kernel, see section 6.5 of BOI release document
 	\item CSharpWrapper, see section 6.6 of BOI release document
 \end{itemize}
 
@@ -473,15 +472,39 @@
 \end{enumerate}
 
 \section{Dam UI}
-This application is dependent on the \ProgramName Engine (see \autoref{app:DamUI}).
+This application depends on the following components (see \autoref{app:DamUI}):
+\begin{itemize}
+	\item Deltares.DamEngine.Data (DamEngine)
+	\item Deltares.DamEngine.Io (DamEngine)
+	\item Deltares.DamEngine.Interface (DamEngine)
+	\item Deltares.Geotechnics (DSL)
+	\item Deltares.Geotechnics.Forms (DSL)
+	\item Deltares.Geotechnics.Io (DSL)
+	\item Deltares.Standard (DSL)
+	\item Deltares.Standard.Maps (DSL)
+	\item Deltares.Standard.Forms.Maps (DSL)
+\end{itemize}
+\Note{Some other libraries will be implicitly referenced:
+\begin{itemize}
+	\item Deltares.DamEngine.Calculators (DamEngine)
+	\item Deltares.StixFileWriter
+	\item Deltares.WTIPiping
+	\item Deltares.Geometry (DSL)
+	\item Deltares.Geometry.Forms (DSL)
+	\item Deltares.Mathematics.DSL (DSL)
+	\item Deltares.Probabilistic (DSL)
+	\item Deltares.Standard.Forms (DSL)
+	\item Deltares.Standard.Forms.DExpress (DSL)
+\end{itemize}}
 
 \subsection{Step 1: Create branch}
 The following steps are needed to release this application.
 \begin{enumerate}
 	\item In the trunk, update the Tutorials in the release folder.
-	\item In the trunk, update the .$\backslash$lib$\backslash$DamEngine$\backslash$ folder with the artifacts of the latest pin of the signing DamEngine.
-	\item In the trunk, update the .$\backslash$lib$\backslash$DSL$\backslash$ folders with the artifacts of the latest pin of the DSL dll's.
-	\item In the trunk, update all File Headers for CopyRight to the current year.
+	\item In the trunk, update the update the nuget packages of the DamEngine with the artifacts of the latest pin of the DamEngine package (in the Teamcity "Create Release" pipeline).
+	\item In the trunk, update the nuget packages of the artifacts of the latest pin of the DSL packages.
+	\item In the trunk, make sure lib/Authorization contains the new version.
+	\item In the trunk, update all File Headers for CopyRight to the current year.\\
 	\Note{This can be done with the ``Reformat and Cleanup'' Deltares command.}	
 	\item In the trunk, update version number in file .$\backslash$src$\backslash$build$\backslash$Base.targets to XX.YY.0.
 	\item In the trunk, update version number in file .$\backslash$src$\backslash$DamClientsLibrary$\backslash$build$\backslash$Base.targets to XX.YY.0.
@@ -544,8 +567,8 @@
 
 The following steps are needed to release this application.
 \begin{enumerate}
-	\item In the trunk, update the .$\backslash$lib$\backslash$DamEngine$\backslash$ folder with the artifacts of the latest pin of the signing DamEngine.
-	\item In the trunk, update the .$\backslash$lib$\backslash$DSL$\backslash$ folders with the artifacts of the latest pin of the DSL dll's.
+	\item In the trunk, update the nuget packages of the DamEngine with the artifacts of the latest pin of the DamEngine packages (in the Teamcity "Create Release" pipeline).
+	\item In the trunk, update the nuget packages of the artifacts of the latest pin of the DSL packages.
 	\item In the trunk, make sure lib/Authorization contains the new version.
 	\item In the trunk, update all File Headers for CopyRight to the current year. \\
 	\Note{This can be done with the ``Reformat and Cleanup'' Deltares command.}
@@ -595,40 +618,22 @@
 	Deltares.WaternetCreator & & nuget \\ \hline 
 \end{tabularx}
 
-\section{Deltares.MacroStability.Reliability}
-git: Macrostability-Reliability-Kernel
-\renewcommand{\arraystretch}{1.2}
-\begin{tabularx}{\textwidth}{|X|p{1.5cm}|p{4.1cm}|} \hline
-	\textbf{dll} & \textbf{version} & \textbf{location} \\ \hline
-	Deltares.MacroStability & & extern\textbackslash MacroStability \\ \hline 
-	Deltares.SearchAlgorithms & & extern\textbackslash MacroStability \\ \hline 
-	Deltares.SoilStress & & extern\textbackslash MacroStability \\ \hline 
-	Deltares.Geo.Common & & extern\textbackslash MacroStability \\ \hline 
-	Deltares.WaternetCreator & & extern\textbackslash MacroStability \\ \hline 
-	Deltares.Reliability & & nuget \\ \hline 
-	Deltares.Mathematics & & nuget (implicit) \\ \hline 
-	Deltares.Optimization & & nuget (implicit) \\ \hline 
-	Deltares.Statistics & & nuget (implicit) \\ \hline 
-	MathNet.Numerics & & nuget (implicit) \\ \hline 
-\end{tabularx}
-
 \section{Deltares.MacroStability.CSharpWrapper}
 git: Macrostability-CSharpWrapper
 \renewcommand{\arraystretch}{1.2}
 \begin{tabularx}{\textwidth}{|X|p{1.5cm}|p{4.1cm}|} \hline
 	\textbf{dll} & \textbf{version} & \textbf{location} \\ \hline
-	Deltares.MacroStability.Reliability & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	Deltares.MacroStability & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	Deltares.SearchAlgorithms & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	Deltares.SoilStress & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	Deltares.Geo.Common & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	Deltares.WaternetCreator & & lib\textbackslash MacroStabilityReliability \\ \hline 
-	Deltares.Reliability & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	Deltares.Mathematics & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	Deltares.Optimization & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	Deltares.Statistics & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	MathNet.Numerics & & lib\textbackslash MacroStabilityReliability \\ \hline 
 \end{tabularx}
+\Note{The CSharpWrapper (deterministic) is merged into one dll: Deltares.MacroStability.CSharpWrapper.dll}
 
 \section{Deltares.StixFileWriter}
 git: Macrostability-StixFileWriter
@@ -637,8 +642,8 @@
 	\textbf{dll} & \textbf{version} & \textbf{location} \\ \hline
 	Deltares.MacroStability.CSharpWrapper & & lib\textbackslash MacrostabilityCSharp \newline WrapperDeterministic \\ \hline 
 	Components.Persistence.Stability.Version2 & & nuget \\ \hline 
-	DGeoSuite & & nuget (implicit) \\ \hline 
-	Components.Persistence.Stability.Version1 & & nuget (implicit) \\ \hline 
+	DGeoSuite.Common & & nuget (implicit) \\ \hline 
+	DGeoSuite.Common.Persistence & & nuget (implicit) \\ \hline 
 \end{tabularx}
 
 \section{Deltares.WTIPiping}
@@ -649,49 +654,40 @@
 	Deltares.Geo.Common & & nuget \\ \hline 
 \end{tabularx}
 
-\section{DamPiping}
-svn: dam\textbackslash DamFailureMechanisms\textbackslash damPiping
-
 \section{DamEngine}
 \label{app:DamEngine}
 svn: dam\textbackslash DamEngine
 \renewcommand{\arraystretch}{1.2}
 \begin{tabularx}{\textwidth}{|X|p{1.5cm}|p{4.1cm}|} \hline
 	\textbf{dll} & \textbf{version} & \textbf{location} \\ \hline
-	Deltares.DamPiping.BlighCalculator & & lib\textbackslash FailureMechanisms  \newline\textbackslash DamPiping \\ \hline 
-	Deltares.WTIPiping & & lib\textbackslash FailureMechanisms \newline\textbackslash WtiPiping \\ \hline 
-	Deltares.Geo.Common & & lib\textbackslash FailureMechanisms \newline\textbackslash WtiPiping \\ \hline 
-	Deltares.Geo.Common & & nuget \\ \hline 
+	Deltares.WTIPiping & & nuget \\ \hline 
+	Deltares.Geo.Common & & nuget (impicit via WTIPiping) \\ \hline 
 	Deltares.StixFileWriter & & nuget \\ \hline 
-	Components.Persistence.Stability.Version2 & & nuget (implicit) \\ \hline 
-	DGeoSuite & & nuget (implicit) \\ \hline 
-	Components.Persistence.Stability.Version1 & & nuget (implicit) \\ \hline 
-	Deltares.MacroStability.CSharpWrapper & & implicit via StixFileWriter \\ \hline 
+	Components.Persistence.Stability.Version2 & & nuget (implicit via StixFileWriter) \\ \hline 
+	DGeoSuite.Common & & nuget (implicit via StixFileWriter)\\ \hline 
+	DGeoSuite.Common.Persistence & & nuget (implicit via StixFileWriter) \\ \hline 
+	Deltares.MacroStability.CSharpWrapper & & nuget (implicit via StixFileWriter) \\ \hline 
 \end{tabularx}
 
-Note that the Deltares.Geo.Common.dll is both copied in the lib folder and collected with nuget.
-
 \section{DamUI}
 \label{app:DamUI}
 svn: dam\textbackslash DamClients\textbackslash DamUI
 \renewcommand{\arraystretch}{1.2}
 \begin{tabularx}{\textwidth}{|X|p{1.5cm}|p{4.1cm}|} \hline
 	\textbf{dll} & \textbf{version} & \textbf{location} \\ \hline
-	Deltares.Engine & & lib\textbackslash DamEngine \\ \hline 
-	Deltares.DamPiping.BlighCalculator & & lib\textbackslash DamEngine \\ \hline 
-	Deltares.WTIPiping & & lib\textbackslash DamEngine \\ \hline 
-	Deltares.Geo.Common & & lib\textbackslash DamEngine \\ \hline 
-	Deltares.StixFileWriter & & lib\textbackslash DamEngine \\ \hline 
-	Deltares.MacroStability.CSharpWrapper & & lib\textbackslash DamEngine \\ \hline 
-	Components.Persistence.Stability.Version2 & & lib\textbackslash DamEngine \\ \hline 
-	Components.Persistence.Stability.Version2 & & nuget \\ \hline 
-	DGeoSuite & & lib\textbackslash DamEngine \\ \hline 
-	DGeoSuite & & nuget (implicit) \\ \hline 
+	Deltares.Engine & & nuget \\ \hline 
+	Deltares.WTIPiping & & nuget (implicit) \\ \hline 
+	Deltares.Geo.Common & & nuget (implicit) \\ \hline 
+	Deltares.StixFileWriter & & nuget (implicit) \\ \hline 
+	Deltares.MacroStability.CSharpWrapper & & nuget (implicit) \\ \hline 
+	Components.Persistence.Stability.Version2 & & nuget (implicit)\\ \hline 
+	DGeoSuite.Common & & nuget (implicit)\\ \hline 
+    DGeoSuite.Common.Persistence & & nuget (implicit) \\ \hline 
 	Components.Persistence.Stability.Version1 & & nuget (implicit) \\ \hline 
-	\textit{Authorization} & & lib \\ \hline 
-	\textit{DevExpress} & & lib \\ \hline 
-	\textit{DotSpatial} & & lib \\ \hline 
-	\textit{DSL} & & lib \\ \hline 
+	DSL libraries & & nuget \\ \hline 
+	Authorization & & lib\textbackslash Authorization \\ \hline 
+	DevExpress & & lib\textbackslash DevExpress \\ \hline 
+	DotSpatial & & lib\textbackslash DotSpatial \\ \hline 
 \end{tabularx}
 
 Note that the Components.Persistence.Stability.Version2.dll and DGeoSuite dlls are both copied in the lib folder and collected with nuget.
@@ -702,19 +698,19 @@
 \renewcommand{\arraystretch}{1.2}
 \begin{tabularx}{\textwidth}{|X|p{1.5cm}|p{4.1cm}|} \hline
 	\textbf{dll} & \textbf{version} & \textbf{location} \\ \hline
-	Deltares.Engine & & lib\textbackslash DamEngine \\ \hline 
-	Deltares.DamPiping.BlighCalculator & & lib\textbackslash DamEngine \\ \hline 
-	Deltares.WTIPiping & & lib\textbackslash DamEngine \\ \hline 
-	Deltares.StixFileWriter & & lib\textbackslash DamEngine \\ \hline 
-	Deltares.MacroStability.CSharpWrapper & & lib\textbackslash DamEngine \\ \hline 
-	Components.Persistence.Stability.Version2 & & lib\textbackslash DamEngine \\ \hline 
-	Components.Persistence.Stability.Version2 & & nuget \\ \hline 
-	DGeoSuite & & lib\textbackslash DamEngine \\ \hline 
-	DGeoSuite & & nuget (implicit) \\ \hline 
-	Components.Persistence.Stability.Version1 & & nuget (implicit) \\ \hline 
-	\textit{Authorization} & & lib \\ \hline 
-	\textit{DotSpatial} & & lib \\ \hline 
-	\textit{DSL} & & lib \\ \hline 
+	Deltares.DamEngine.Data & & nuget \\ \hline 
+	Deltares.DamEngine.Interface & & nuget \\ \hline 
+	Deltares.DamEngine.Io & & nuget \\ \hline 
+	Deltares.DamEngine.Calculators & & nuget (implicit) \\ \hline 
+	Deltares.WTIPiping & & nuget (implicit) \\ \hline 
+	Deltares.StixFileWriter & & nuget (implicit) \\ \hline 
+	Deltares.MacroStability.CSharpWrapper & & nuget (implicit) \\ \hline 
+	Components.Persistence.Stability.Version2 & & nuget (implicit) \\ \hline 
+	DGeoSuite.Common & & nuget (implicit)\\ \hline 
+    DGeoSuite.Common.Persistence & & nuget (implicit) \\ \hline 
+	DSL libraries & & nuget \\ \hline 
+	Authorization & & lib\textbackslash Authorization \\ \hline 
+	DotSpatial & & lib\textbackslash DotSpatial \\ \hline 
 \end{tabularx}
 
 Note that the Components.Persistence.Stability.Version2.dll and DGeoSuite dlls are both copied in the lib folder and collected with nuget.