Index: DamClients/DamUI/trunk/doc/DAM UI - User manual/DAM UI - User manual.tex =================================================================== diff -u -r4535 -r4536 --- DamClients/DamUI/trunk/doc/DAM UI - User manual/DAM UI - User manual.tex (.../DAM UI - User manual.tex) (revision 4535) +++ DamClients/DamUI/trunk/doc/DAM UI - User manual/DAM UI - User manual.tex (.../DAM UI - User manual.tex) (revision 4536) @@ -2251,13 +2251,15 @@ In de mode calamiteiten en ontwerp kunnen globale rekeninstellingen worden ingesteld (op waterschapsniveau). \paragraph*{Glijvlakmodel} -DAM kan gebruik maken van de volgende rekenmodellen: +DAM kan gebruik maken van de volgende rekenmodellen voor \textit{Stability Inside}: \begin{itemize}[noitemsep, nolistsep] \item Bishop \item Uplift Van \item Bishop/Uplift Van \end{itemize} +Hiernaast biedt DAM 1 model (\textit{Bishop}) aan voor \textit{Stability Outside}. + \paragraph*{Gridinstellingen} Er zijn verschillende opties mogelijk: \begin{itemize}[noitemsep, nolistsep] Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataFormat.tex =================================================================== diff -u -r2584 -r4536 --- DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataFormat.tex (.../DataFormat.tex) (revision 2584) +++ DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataFormat.tex (.../DataFormat.tex) (revision 4536) @@ -35,7 +35,10 @@ location$\_$scenario$\_$id & All scenarios with missing location$\_$scenario$\_$id are not imported and message is given. \\ \hline characteristic points (required) & All locations with missing required characteristic points are not imported and message is given. \\ \hline crosssection (via shape) & All locations with missing cross section are not imported and message is given. \\ \hline +SigmaTau curve (via csv) & When needed (as defined in the soils.csv) the curves must each meet the validation requirements as given in OverviewDataUIAndEngine.xlsx. All incorrect curves are not imported and a message is given. \\ \hline \end{tabular} + + \caption{Exception handling required data during import} \label{table:ExceptionHandlingReqData} \end{table} Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/CalcSettings.tex =================================================================== diff -u -r3660 -r4536 --- DamClients/DamUI/trunk/doc/DAM UI - Functional Design/CalcSettings.tex (.../CalcSettings.tex) (revision 3660) +++ DamClients/DamUI/trunk/doc/DAM UI - Functional Design/CalcSettings.tex (.../CalcSettings.tex) (revision 4536) @@ -2,13 +2,15 @@ All calculation settings are the same for all dike rings and locations within the project. So there is only one set of calculation settings. \section{Macrostability}\label{sec:Macrostability} -In DAM the following piping models can be used: +In DAM the following models for Stability Inside can be used: \begin{itemize} \item \textit{Bishop} \item \textit{UpliftVan} \item \textit{Bishop-UpliftVan} \end{itemize} +Next to Stability Inside, one model (\textit{Bishop}) is offered for Stability Outside. + Note that for both \textit{Bishop} and \textit{UpliftVan} a brute force search method based on moving grids is offered. For \textit{UpliftVan}, the search method \textit{Bee Swarm} is an alternative option. @@ -36,8 +38,6 @@ In DAM the following piping models can be used: \begin{itemize} \item Bligh - \item Sellmeijer VNK - \item Sellmeijer 4 forces \item Sellmeijer revised (WBI) \end{itemize} Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataDisplay.tex =================================================================== diff -u -r3431 -r4536 --- DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataDisplay.tex (.../DataDisplay.tex) (revision 3431) +++ DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataDisplay.tex (.../DataDisplay.tex) (revision 4536) @@ -31,8 +31,8 @@ \section{Map}\label{sec:map} -Show the locations as a dot on a map with Open street map as background. -Background can also be empty. +Show the locations as a dot on a map with a PDOK map as background (when selected). +The background can also be empty. Display imported shapefiles when selected by user. \section{General}\label{sec:DisplayGeneral} Index: DamClients/DamUI/trunk/data/DamEngineTestProjects/OverzichtDataDAM.xlsx =================================================================== diff -u -r4524 -r4536 Binary files differ