Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/OuterShoulderAdeptedGeometry.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM - Manual.docx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/Differences with previous release.txt =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/Differences with previous release.txt (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/Differences with previous release.txt (revision 3966) @@ -0,0 +1,60 @@ +MWDAM-1057/1056: +For design results, the actual values for all kind of Z-values which are based on the redesigned surface line +are corrrected in the new UI. + +MWDAM-1057/1056/1155 +For design results, the profilename and the profile probability are now always filled. + +MWDAM-1057/1056 +When performing a calculation, selected but not relevant calculations are now given back in the calcultion log +as not relevant to inform the user. An example of this is when a location is selected with both piping as well +as stability profiles but only a stability calculation is performed. The, for each piping profile a message is +logged to say that this is not relevant. Also, when calculations fail the preparation stage of the calculation +this is logged to inform the user. + +MWDAM-1057 +The combination of outwards stability and zone areas is no longer allowed. + +MWDAM-1161 +In Release, when for model BishopUpliftVan an UpliftVan calculation failed for one the location-profile combinations, all the combinations for this location were not calculated with Bishop anymore. In new version all combinations are calculated. When one the calculations fails, the overall result for this combination is the failed one. + +MWDAM-1034 +The displayed uplift factor for Piping (Bligh, Sellmeijer4Forces and SellmeijerVNK) was not correct. The calculation was made correctly. + +MWDAM-1034 +The PL3/PL4 values in Piping results in Dam 15.1 were corrected for uplift. This should only be done for stability calculations. + +MWDAM-1180 +The parameter UseNewMinDistanceDikeToeStartDitch is not correctly applied. While testing you have to work around this. To correctly compare with Dam 15.1.2.24738, the parameter should always be set to True (because that is the current behaviour). + +MWDAM-1219 +As must be clear from the issue itself, the actual problem is not with the determination of the pl-line 4 but with the determination of the correct scenario (i.e. Hydraulic Shortcut versus No Hydraulic Shortcut). This was due that in the original dam a mistake was made in the determination of the Location With Lowest UpliftFactor. In that old version, it was assumed that eacht surface line (in RD) is given from left to right but never bothered to check this. So, for surface lines running from right to left (as is the case here) this produced a wrong result. In the new (engine) version this mistake has been corrected by the fact that the engine always uses localised surface lines which always run from left to right. So the engine results are the correct results. + +MWDAM-1223 +When design was made for piping calculations in combination with DTH adaption the Sf piping was set to '1' if crest was adapted to DTH. Now real safety factor is calculated. + +MWDAM-1225 +Message The surfaceline points are not ascending (x-values) for same project no message in DAM 15.1 +Surfaceline validator in DAM 15.1 was not correct and accepted vertical lines in surfacelines. Vertical lines has to be avoided in D-Geo Stability due to possible failing calculations. + +MWDAM-1227 +As with MWDAM-1219 the real problem is the correct determination of the Location With Lowest UpliftFactor. Old DAM uses (wrongly) global surface line whereas the engine uses the correct localised surface line. The effect here is a different value for xCoordinateLastUpliftPoint which is passed on to the DGSMStabDam.dll which determines the grid. + +MWDAM-1237 +DAM 15.1 always calculated with Psi=Phi since Psi wsa no input in D-Geo Stability 15. Later versions of D-Geo Stability (also 18.1) consider Psi as input. Also DAM 18.1 always calculates with Psi=Phi. Note: When *.sti files are used with a different value for Psi are 'reset' to psi=phi. + +MWDAM-1238 +Piping design calculation with geometry adaption gives wrong safety factor in result in release 15.1. +This issue has been solved, so the safety factors in design calculation with geometry adaption will be different than in the 15.1 release version. The new answers are the correct answers. + +MWDAM-1261-DAM Design: Undo/Redo does not work properly; same bug but different effect in 15.1 to 18.1 + +MWDAM-1272 DAM 15.1 assigned PL4 to a layer which was intercepted by the surface line. + +MWDAM-1273 +See MWDAM-1219 above as this has the same cause for the problem: In Old DAM, the determination of the regional scenarios is done based on een suface line given in global RD coordinates. This while all plline data is local. So trying to find the proper phreatic level for any given point of the surface line ALWAYS results in the last level of line PL1 as the point of the surfacel line is way betong the PL1 line. The new version has all data in local coordinates so the proper phreatic level is found, resulting in a better uplift factor and therefor other results (amongst which the proper status for hydraulic shortcut). + +MWDAM-1274 +In v15.1, in the determination of regional assessment scenarios, extending the 1D geometry to the surface level (when needed) was done by stretching the top layer. This should have been done by adding a layer on top of the original top layer with DikeEmbankmentMaterial as material. In v18, this correct way is implemented. Note that the difference in results may be neglectable is most cases. + + Index: DamClients/DamUI/tags/23.1.1/setup/Manuals/ManualShortcuts.wxi =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Manuals/ManualShortcuts.wxi (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Manuals/ManualShortcuts.wxi (revision 3966) @@ -0,0 +1,5 @@ + + + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DAM UI - Functional Design.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DAM UI - Functional Design.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DAM UI - Functional Design.tex (revision 3966) @@ -0,0 +1,84 @@ +\documentclass{deltares_report} +\usepackage[titletoc]{appendix} +\usepackage{multirow} +%----------------------------------------------- + +\makeatletter + +\begin{document} +\pagestyle{empty} +\cleardoublepage +% + +\newcommand{\ProgramName}{DAM UI\xspace} +\newcommand{\kernel}{failuremechanism kernel\xspace} + +\title{\ProgramName} +\subtitle{Functional Design} +\projectnumber{1210702-000} +\client{Deltares - Geo engineering DKS} +\reference{1210702-000-GEO-0003} +\classification{-} +\author{Irene van der Zwan, John Bokma} +\partner{-} +\contact{john.bokma@deltares.nl} +\documentid{-} +\organisationi{Deltares} +\publisheri{Deltares - DSC} + +\date{April 2022} +\version{0.2} + +\keywords{Dike, safety assessment, design, software, macro stability, piping} + +\summary{This document contains the functional design for \ProgramName, a software module that computes the strength of a complete dikering with respect to several failure mechanisms, such as macro stability and piping\newline +\newline +\textbf{\footnotesize{Samenvatting}} \newline +Dit document bevat het functioneel ontwerp voor \ProgramName, een software module die een gebruiker in staat stelt om voor een dijktraject berekeningen uit te voeren voor verschillende faalmechanismen, waaronder macrostabiliteit en piping.} + +\versioni{0.1} +\datei{sep 2019} +\authori{Irene van der Zwan} +\revieweri{Kin Sun Lam \newline Andr\'e Grijze} +\approvali{Leo voogt} + +\versionii{0.2} +\dateii{April 2022} +\authorii{Irene van der Zwan \newline John Bokma} +\reviewerii{Kin Sun Lam \newline Dennis Tang} +\approvalii{Goaitske de Vries} + +\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 + +\include{DAM_UI_FO} +\include{OpenProject} +\include{DataFormat} +\include{DataCombination} +% ToDo MWDAM-1717 DAMLiveConfiguration.tex is not present in the repository. +%\include{DAMLiveConfiguration} +\include{DataDisplay} +\include{DataEdit} +\include{CalcSettings} +\include{ResultsDisplay} +\include{DataExport} +\include{DSoilmodel} +\include{Literature} + + +%------------------------------------------------------------------------------ +% ToDo MWDAM-1717 AppendixA.tex is not present in the repository. +%\appendix\chapter*{Appendix} \addcontentsline{toc}{chapter}{Appendix} +%\include{AppendixA} + + + +%----------------------------------------------------------------------------- + +\pagestyle{empty} +\mbox{} + +%------------------------------------------------------------------------------ +\end{document} \ No newline at end of file Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DAM_UI_FO.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DAM_UI_FO.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DAM_UI_FO.tex (revision 3966) @@ -0,0 +1,93 @@ +\chapter{Introduction} +\label{chapterIntroduction} + +\section{Purpose and scope of this document} \label{sec:PurposeAndScope} + +This document contains the functional design for the \ProgramName, a user interface for the DAM Engine. The DAM Engine is designed for the automated calculation of the strength of dikes. +DAM was developed by Deltares with and for STOWA for all water authorities. +This document describes requirements and functional design of \ProgramName. +What will actually will be implemented depends on the requirements of the clients using this \ProgramName. +If some functionality is not (yet) needed, then that part does not need to be implemented. + +\subsection{Future options} +\label{sec:FutureOptions} +As mentioned above this document contains some options that will not be implemented in the first release, but are foreseen to be implemented in the near future. Therefore although sometimes a reference will be made to these options, these will not be described in detail yet. + +That applies in particular to the following subjects: +\begin{itemize} + \item NWO module("Niet Waterkerende Objecten") + \item WBI failure mechanisms (Piping, Macrostability) +\end{itemize} +\section{Other system documents} +\label{sec:SystemDocuments} + +The full documentation on the program comprises the following documents. + +\renewcommand{\arraystretch}{1.3} + +\begin{table}[H] +%\caption{xxx} +%\label{xxx} +\begin{tabular}{|p{40mm}|p{\textwidth-40mm-24pt}|} \hline +\textbf{Title} & \textbf{Content} \\ \hline +\ProgramName - Architecture Overall \newline \citep{DAM_ArchitectureOverall} & Description of overall architecture of the \ProgramName and its components. \\ \hline +\ProgramName- Functional Design\newline \citep{DAMEngine_FunctionalDesign} & Description of the requirements and functional design. \\ \hline +\ProgramName - Technical Design\newline \citep{DAMEngine_TechnicalDesign}& Description of the implementation of the technical design of \ProgramName. \\ \hline +\ProgramName - Technical documentation \newline \citep{DAMEngine_TechnicalDocumentation} & Description of the arguments and usage of different software components, generated from in-line comment with Doxygen. \\ \hline +\ProgramName - Test Plan \newline \citep{DAMEngine_TestPlan} & Description of the different regression and acceptation tests, including target values. \\ \hline +\ProgramName - Test Report \newline \citep{DAMEngine_TestReport} & Description of the test results (benchmarks and test scripts). \\ \hline +Architecture Guidelines \newline \citep{ArchitectureGuidelines} & Architecture guidelines that are used by DSC-Deltares. \\ \hline +\end{tabular} +\caption{\small \ProgramName system documents.} +\label{table-SystemDocuments} +\end{table} + +\section{Document revisions} +\label{sec:DocumentRevisions} +\subsection{Revision 0.1} +\label{sec:Revision01} +First concept of the document. + +\chapter{Non-functional requirements} + +\chapter{Functional requirements} + +Main purpose of the \ProgramName +The \ProgramName can import data and combines this data to make geotechnical calculations. After calculations (made by DAM Engine) the \ProgramName shows the results and make analyzation possible. + +\section{User story Open project} +As a geotechnical engineer I want to open existing projects to see what data is used and which calculations are made with what result. + +\section{User story Data format} +As a geotechnical engineer I want to store my data in a predescribed format, so that I can reuse the data. The design of this functionality is described in \autoref{sec:USDataFormat}. + +\section{User story GIS Data combination} +As a geotechnical engineer I want to combine GIS data per location, so that I don't have to do that by hand. The design of this functionality is described in \autoref{sec:DataExtraction} + +\section{User story Soil Data combination} +As a geotechnical engineer I want to combine subsoil with surfaceline per location, so that I don't have to draw 2D geometries. The design of this functionality is described in \autoref{sec:GeometryGeneration} + +% ToDo MWDAM-1717 DAMLiveConfiguration.tex is not present in the repository. +\section{User story DAM Live configuration} +As a geotechnical engineer I want to make a DAM Live configuration, so that I can make calculations with DAM engine, using sensors for the input of piezometric lines. %The design of this functionality is described in \autoref{sec:DAMLiveConfiguration}. + +\section{User story Data display} +As a geotechnical engineer I want to see the data per location in tables, cross section and map view, so I can check the data before calculation. The design of this functionality is described in \autoref{sec:USDataDisplay}. + +\section{User story Data editing} +As a geotechnical engineer I want to edit the data per location, so I can adept the data before calculation. The design of this functionality is described in \autoref{sec:USDataEdit}. + +\section{User story Calculation settings} +As a geotechnical engineer I want to see and be able to adept the calculations settings, so I can decide what calculations are made. +The design of this functionality is described in \autoref{sec:USCalcSettings}. + +\section{User story Display results} +As a geotechnical engineer I want to see the results of the calculations of the DAM Engine, so I can evaluate the calculations. +The design of this functionality is described in \autoref{sec:USDisplayResults}. + +\section{User story Export data} +As a geotechnical engineer I want to export data as tables (CSV-format) and/or shapes, so I can use the data for other purposes. +The design of this functionality is described in \autoref{sec:USDataExport}. + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineDataModelMain.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineActivityOperational.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/Resources/EulaDeltares.rtf =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Resources/EulaDeltares.rtf (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Resources/EulaDeltares.rtf (revision 3966) @@ -0,0 +1,146 @@ +{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}{\f1\fswiss\fprq2\fcharset0 Tahoma;}{\f2\fswiss\fprq2\fcharset0 Helvetica LT Std;}{\f3\fnil\fcharset0 Calibri;}} +{\colortbl ;\red0\green139\blue191;\red0\green0\blue255;} +{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\li720\qc\cf1\lang2057\b\f0\fs24 SOFTWARE LICENSE AGREEMENT\par +\pard\li720\cf0\lang1033\b0\f1\fs20\par +\expndtw-2 If you require a printed version of this Software License Agreement, e.g. prior to accepting these terms and conditions, please open the PDF-file.\par +\pard\li720\qj\b\par +\pard\li720\cf1\lang2057\expndtw0\f0 Read this software license agreement carefully\par +\cf0\lang1033\expndtw-2\f1\par +\b0 This is a legal agreement between the prospective user, either an individual or an entity, (hereafter: \ldblquote Licensee\rdblquote ) and Deltares (hereafter \ldblquote Deltares\rdblquote ) to license the computer program subject to this contracting-procedure (hereafter \ldblquote Computer Program\rdblquote ).\par + \par +By clicking on the checkbox with \cf1\lang2057\expndtw0\b\f0\rdblquote I Agree\rdblquote\cf0\lang1033\expndtw-2\b0\f1 and pressing the \cf1\lang2057\expndtw0\b\f0\ldblquote Ok\rdblquote -\cf0\lang1033\expndtw-2\b0\f1 button:\par +\par +\pard\fi-360\li1440 1.\tab you expressly declare being authorized to act on behalf of Licensee for the purposes of accepting this software license agreement (hereafter \ldblquote License Agreement\rdblquote );\par +2.\tab Licensee expressly accepts this License Agreement and accepts to be legally bound by the terms and conditions contained therein. \par +\pard\li1440\par +\pard\li720 If you are not authorized to act on behalf of Licensee to agree upon this License Agreement or if Licensee does not agree with the License Agreement, please do not click the \cf1\lang2057\expndtw0\b\f0\ldblquote Ok\rdblquote\cf0\lang1033\expndtw-2\b0\f1 - button and exit this program by clicking the \cf1\lang2057\expndtw0\b\f0\ldblquote Cancel\rdblquote\cf0\lang1033\expndtw-2\b0\f1 - button.\expndtw0\par +\pard\li1080\b\par +\pard\li720\cf1\lang2057\f0 Agree as Follows with \b0 General terms of delivery for software licensing and software services by Stichting Deltares:\par +\b\par +\pard\fi-426\li1146\ri59\tx709\tx4820\fs16 1.\tab General\par +\cf0\b0\fs14 1.1\tab These general terms (hereinafter: Terms) form an integral part of all offers by Stichting Deltares (hereinafter: Deltares) to provide user rights to software products and related documentation (hereafter: the Program) and/or related services and apply to all agreements between Deltares and licensees to its software products and/or related services (hereafter: User).\par +1.2\tab Deltares software is fit for use by skilled persons only, who have experience in the relevant field and who have sufficient knowledge of the properties, possibilities, limitations and the purpose of the Program. The User should study the relevant manual prior to using the Program. \par +1.3\tab Deltares has the right to involve third parties in the execution of the agreement.\par +1.4\tab Additions, alterations or deviations of or to these Terms or to an agreement between the parties must be in written form signed by the parties.\par +1.5\tab If these Terms require a written notice, then this can also include notices in digital form, i.e. per fax or e-mail, unless the context indicates otherwise. The party that chooses to make use of an electronic medium has the burden of proof if the other party states that the electronically communicated statement was not received or not received correctly.\par +\par +\cf1\b\fs16 2.\tab Make Program available\par +\cf0\b0\fs14 2.1\tab Deltares makes a Program available to User by sending User the Program including available documentation, a data carrier, or by providing user with a written notice that the Program is available for downloading by User.\par +2.2\tab Deltares makes available to User the version of the Program that is the most recent at the moment of making the Program available.\f2\fs24 \f0\fs14\par +2.3\tab Exceeding a delivery period shall not entitle User to claim damages.\par +\par +\cf1\b\fs16 3.\tab Licences and intellectual property\par +\cf0\b0\fs14 3.1\tab Unless stipulated otherwise in the offer, Deltares grants User a non-exclusive, non-transferable right to use the Program, for an indefinite period of time and against payment of a one-time fee. \par +3.2\tab The right of use is limited to User\rquote s own use of the Program and to the number of agreed users as stipulated in the offer. User is not authorised to grant any sublicences to the Program to third parties, or in any other way to facilitate the use by third parties.\par +3.3\tab User does not have the right to modify the Program.\par +3.4\tab Except as allowed by applicable law, but in that case limited to the extent required by that law, User may not, and may not authorize any third party to reverse engineer, decompile or disassemble the Program in whole or in part nor create any derivative works from the Program.\par +3.5\tab Deltares is entitled to take technical measures to prevent unauthorized use of the Program. User shall not remove or have removed or circumvent such technical provisions or devices intended for the prevention of unauthorized use of the Program.\par +3.6\tab User acknowledges that the Program is confidential in nature and may contain trade secrets of Deltares. User will keep confidential all information from Deltares of which he may reasonably suspect that it is confidential information and will not disclose such information to third parties.\par +3.7\tab To the best of Deltares\rquote knowledge and belief, the Program does not infringe any third party copyright or any other intellectual property. Any responsibility or liability of Deltares for claims, costs, expenses and/or consequential losses or damages resulting from or arising out of any infringement of intellectual property rights is excluded.\par +3.8\tab In case of (i) an apparent risk or (ii) it is alleged or proven in legal proceedings that use of the Program infringes upon any intellectual property rights of third parties, Deltares has the right, in consultation with User, but at its sole discretion, to:\par +\pard\fi-220\li1380\ri59\tx660\tx4820 a.\tab take legal action for its own account; in this event, User is obliged to allow Deltares to join or intervene in the existing proceedings;\par +b.\tab reach a settlement for its own account;\par +c.\tab within the limits of the purpose of the Program, carry out repairs and/or alterations at its own expense until the alleged or proven infringement ceases to exist and replace free of charge the copies of files and/or documentation causing the infringement; or\par +d.\tab terminate the agreement and return the licence-fee to User without any other right to compensation for User.\par +\pard\fi-426\li1146\ri59\tx709\tx4820\tab If any of the situations as referred to above in (a) through (c) occur, Deltares has the right to impose certain (temporary) user-restrictions upon User so that the infringement, at least temporarily, does no longer exist, such without any rights to compensation for User.\par +\par +\cf1\b\fs16 4.\tab Maintenance and support\par +\cf0\b0\fs14\tab In the event maintenance and support is agreed upon, then the following applies:\par +4.1\tab Deltares at all times has the right, within the purpose of the Program, to modify later versions of Program with regard to its appearance, programming, arithmetical and/or functional properties at its sole discretion.\par +4.2\tab Maintenance and support of the Program consists of:\par +\pard\fi-220\li1380\ri59\tx660\tx4820 a.\tab replacing the version of the Program in use by User by the most recent version, or, in case this is made explicit in the proposal, offering a new version for a reduced price; \par +b.\tab subject to article 5.2, restoring any errors in the Program that prevent the normal operation of the Program; \par +c.\tab updating available documentation and providing such updated documentation to User; \par +d.\tab within reasonable limits, providing support to User\rquote s users concerning the operation of the Program.\par +\pard\fi-426\li1146\ri59\tx709\tx4820\tab Maintenance and support does not include (assistance in) actions aimed at resolving technical engineering problems.\par +4.3\tab Notwithstanding article 4.4, User is not obliged to follow the Deltares policy regarding new versions of the Program.\par +4.4\tab Deltares is not obliged to provide maintenance and support with regard to versions older than one (1) year if more recent versions are available.\par +4.5\tab Deltares is not obliged to provide maintenance and support concerning the Program if User uses the Program in combination with hardware and/or operating systems that do not comply with the system requirements as indicated by Deltares.\par +4.6\tab With each installation of a new version of the Program, User shall uninstall all files that are (to be) replaced. Consequently, User shall never have two (2) or more versions of the Program in use without the written consent of Deltares.\par +4.7\tab Deltares is under no obligation to notify User of modifications to the Program. Normally, modifications are apparent from the documentation (if available) supplied with a new version.\par +\par +\cf1\b\fs16 5.\tab Guarantees\par +\cf0\b0\fs14 5.1\tab For up to three (3) months after the date of delivery, Deltares guarantees the functioning of the Program in conformity with the accompanying documentation, if available.\par +5.2\tab If errors in the Program or the documentation that prevent the normal use of the Program become apparent during the term of guarantee or during the term of maintenance, and User has immediately informed Deltares thereof, Deltares shall, in consultation with User, but at its sole discretion:\par +\pard\fi-220\li1380\ri59\tx660\tx4820 a.\tab either at its own expense carry out repairs until the error is solved in such a way that normal use of the Program is possible and/or replace, free of charge, (part of) the Program and/or documentation containing the error with the repaired one; or\par +b.\tab terminate the agreement unilaterally and return the licence-fee to User, without any other rights to compensation for User.\par +\pard\fi-426\li1146\ri59\tx709\tx4820 5.3\tab The guarantee as stated in articles 5.1 and 5.2 is the only guarantee Deltares gives on the Program. Any other guarantee is explicitly excluded. Deltares specifically does not guarantee that under all circumstances correct results can be obtained with the Program and/or that the Program is fit for solving a technical engineering problem.\par +5.4\tab In the event that, before the end of the term of guarantee as stated in article 5.1, a revised version of the Program is provided on the basis of article 5.2 or 5.5, Deltares gives a guarantee on the new version until the latest of either the expiration of the original guarantee or one month after delivery of the revised version.\par +5.5\tab If, according to Deltares, it becomes apparent that use of the Program may cause damage, Deltares, in consultation with User, but at its sole discretion, has the right to:\par +\pard\fi-220\li1380\ri59\tx660\tx4820 a.\tab either, within the limits of the Program\rquote s purpose, at its own expense carry out repairs and/or alterations until the risk of damage ceases to exist and/or replace free of charge (parts of) the Program or documentation;\par +b.\tab impose on User temporary or permanent restrictions concerning the use of the Program, so that the risk of damage no longer exists; \par +c.\tab terminate the agreement and return the licence-fee to User without any other rights to compensation for User.\par +\pard\fi-426\li1146\ri59\tx709\tx4820 5.6\tab All guarantees are void if User (i) has altered the Program in any way, (ii) uses or has used the Program in combination with hardware and/or operating systems that do not comply with the system requirements as indicated by Deltares, or (iii) has failed to notify Deltares in writing of defects in the Program within one (1) week of their discovery or (iv) has not paid the amounts due.\par +\cf1\b\fs16\par +\par +6.\tab Liability\par +\cf0\b0\fs14 6.1\tab User is at all times solely responsible for the use of the Program and the interpretation and use of the results obtained with the Program, and for the consequences that arise from using these results. Deltares is not liable for damage or other expenses of any kind by User or third parties (partially or wholly) due to the use of the Program and the interpretation and the use of the results generated by the Program. This includes without limitation damage or expenses that are (partially or wholly) the result of or connected with:\par +\pard\fi-220\li1380\ri59\tx660\tx4820 a.\tab defects in the Program;\par +b. \tab the temporary or permanent inability to use the Program, partly or completely, as a result of or in connection with defects in the Program or alleged or legally proven infringements upon any rights of third parties as a consequence of the use of the Program by User.\par +\pard\fi-426\li1146\ri59\tx709\tx4820 6.2\tab User indemnifies Deltares against any third party claim for compensation regarding damages and expenses resulting from the use of the Program by User, the interpretation of the results and/or the use of these results.\par +6.3\tab Deltares\rquote liability arising out of default, contract, negligence, tort, breach of any statutory duty or otherwise shall be limited to direct damages, with a maximum of the total amount paid by the User excluding \lquote BTW\rquote (Dutch VAT) in the six (6) months prior to Deltares\rquote default. Direct damages in this context refers exclusively to:\par +\pard\fi-220\li1380\ri59\tx660\tx4820 a.\tab reasonable costs incurred by User to have the performance of Deltares comply with the terms of the agreement (this form of damage will not be compensated if the agreement is terminated by User); \par +b. \tab reasonable costs incurred to establish the cause and the amount of the damage, insofar this is related to direct damage as described within these Terms;\par +c.\tab reasonable costs incurred to prevent or reduce damages, insofar User shows that such costs have actually led to limitation of direct damages pursuant to these Terms.\par +\pard\fi-426\li1146\ri59\tx709\tx4820 6.4\tab Deltares shall not be liable for indirect damages, including, but not limited to, loss of profit and revenues.\par +6.5\tab Deltares\rquote liability as a result of default only arises after User has given Deltares notice of default. The notice of default shall be in writing, leaving Deltares a reasonable time to restore any shortcomings. \par +\par +\cf1\b\fs16 7.\tab Application Service Providing (ASP)\par +\cf0\b0\fs14 7.1\tab If Deltares and User agreed upon use of the functionality of the Program by User on the basis of ASP (= Application Service Provision) at a distance by means of a WAN-connection (WAN = Wide Area Network), Deltares will sent to User a username and password that provide access to the functionality of the Program.\par +7.2\tab In the case of an agreement concerning the ASP service, articles 2.1 en 3.1 do not apply. All other Terms apply equally, unless the nature of the stipulation implies otherwise.\par +7.3\tab Deltares will provide reasonable efforts to make functionality of the Program available for User during Deltares office hours (8:30 a.m. to 4:30 p.m. Central European Time-zone). User will immediately notify Deltares in case functionality is not available. If non availability exceeds, or threatens to exceed, the duration of a calendar week, parties can make further arrangements concerning the use of the Program.\par +7.4\tab Deltares will never be liable for User\rquote s problems regarding telecommunication facilities, for loss of or damage to data or for the consequences of the unavailability of the ASP service.\par +\par +\cf1\b\fs16 8.\tab Training \par +\cf0\b0\fs14\tab In case training is agreed upon, the following applies:\par +8.1\tab Cancellation of participation by User shall take place in writing. Cancellation by User until six weeks before the start of the training is free of charge. In case of cancellation between three and six weeks before the start of the training, User shall pay 50% of the agreed training fee, after three weeks before the start of the training User shall pay the full training fee. \par +8.2\tab Deltares reserves the right to cancel a course. In that case Deltares shall reimburse the paid training fee.\par +8.3\tab If Deltares makes available any material related to training to User, User obtains a non-exclusive and non-transferrable right for its own use of the material. User is not authorised to copy or modify the material.\par +\par +\cf1\b\fs16 9. \tab Invoices and payment\par +\cf0\b0\fs14 9.1 \tab User shall pay invoices within thirty (30) days after the invoice date. In the event User exceeds the payment period, User shall pay both the statutory commercial interest and collection costs without notice of default being required. In case of non-payment, Deltares may suspend maintenance and support and may require security for future deliveries or services. \par +9.2 \tab Any complaint raised by User regarding (the amount of) an invoice does not suspend the obligation to pay.\par +9.3 \tab Deltares may require User to pay in advance.\par +\par +\cf1\b\fs16 10.\tab Rates\par +\cf0\b0\fs14 10.1 \tab The fees and rates stated in the offers and agreements are in Euros, exclusive of BTW and other government levies, and also exclusive of dispatch costs, transport costs, travel costs, packaging costs, installation costs, communication costs, cost of agents and brokers and other costs to enable the use of the Program to User unless the offer explicitly states otherwise.\par +10.2 \tab For its right to use the Program, User pays Deltares a one-time fee.\par +10.3 \tab In case of ASP service a one-time connection fee is charged. Additionally, subscription fees and user-hours are charged periodically.\par +10.4\tab Deltares determines annually the annual price for maintenance and support on the basis of a percentage of the then current list-price of the Program.\par +10.5\tab Deltares determines the rates for training on an individual basis in relation to the extent of the training and the nature of the Program.\par +10.6 \tab Deltares can change the prices annually. Upon request User shall receive the then current price list.\par +\par +\cf1\b\fs16 11.\tab Transfer of rights\par +\cf0\b0\fs14 11.1\tab User is not allowed to transfer any agreement subject to this Terms, nor any of its rights and obligations arising therefrom, to a third party without prior written approval of Deltares.\par +\pard\li720\ri59\tx709\tx4820\par +\pard\fi-426\li1146\ri59\tx709\tx4820\cf1\b\fs16 12.\tab Term and termination\par +\cf0\b0\fs14 12.1\tab An agreement under this Terms is effective from the moment Deltares has received from User the returned offer duly signed for acceptance. If the returned and signed offer deviates from the original offer, the agreement becomes effective at the date of the written confirmation of Deltares of the deviating offer that User signed.\par +12.2\tab In the event maintenance and support is agreed upon, this is for a period of one (1) year. Each year, the maintenance and support agreement is tacitly extended for a period of one (1) year, unless one of the parties terminates the agreement by means of a registered letter to the other party at the latest one (1) month before the expiration date of the agreement. Termination for convenience before the end of the term of the maintenance and support agreement is not possible.\par +12.3\tab Aside from what is determined elsewhere in these Terms, a party has the right to terminate the agreement for cause per registered letter:\par +\pard\fi-220\li1380\ri59\tx660\tx4820 a.\tab if the other party defaults in its performance of obligations arising from the agreement and continues to do so after proper default notice, in which the other party is given a reasonable term to fulfil its obligations.\par +b.\tab without any prior notice or notice of default being required, in the event that the other party applies for a suspension of payment or is granted a suspension of payment; files for bankruptcy or is declared insolvent; is liquidated or ceases to exist for reasons other than a merger (in which case article 11.2 applies); a considerable extent of the other party\rquote s property or of the Program is seized, or if the other party is considered to be unable to fulfil the obligations arising from the agreement.\par +\pard\fi-426\li1146\ri59\tx709\tx4820 12.4\tab In the event of termination of the agreement in accordance with article 12.3, all invoiced but yet unpaid sums shall immediately be due and payable.\par +12.5\tab In the event of termination of the agreement User shall immediately (i) cease all use of the Program, (ii) delete (all copies of) the Program from the hardware and (iii) return (all copies of) the Program and the accompanying documentation to Deltares.\par +\par +\cf1\b\fs16 13.\tab Disputes and applicable law\par +\cf0\b0\fs14 13.1\tab Dutch law applies to all offers and agreements of which these Terms form part.\par +13.2\tab All disputes arising from offers, agreements or subsequent agreements will in first instance be brought before the competent court in The Hague, including the presiding judge in injunction proceedings (\lquote Kort Geding\rquote ).\par +\par +\tab\par +\tab\par +\tab\cf1\b Stichting Deltares\par +\tab Boussinesqweg 1\par +\tab P.O. Box 177\par +\tab 2600 MH Delft, the Netherlands\par +\pard\fi-426\li1146\ri59\tx990\tx4820\tab Tel: \tab +31 (0) 88 335 82 73\par +\tab Fax: \tab +31 (0) 88 355 85 82\par +\tab e-mail: \tab info@deltares.nl\par +\tab{\field{\*\fldinst{HYPERLINK "www.deltares.com"}}{\fldrslt{\ul\cf2 www.deltares.com}}}\f0\fs14\par +\pard\fi-426\li1146\ri59\tx709\tx4820\tab Chamber of Commerce no. 41146461\par +\pard\li720\cf0\b0\f1\fs20\par +\lang1033\par +\b\par +\b0\par +\pard\li720\sa200\sl276\slmult1\lang9\f3\fs22\par +} + \ No newline at end of file Index: DamClients/DamUI/tags/23.1.1/setup/Resources/start_page_background.jpg =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DSoilmodel.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DSoilmodel.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DSoilmodel.tex (revision 3966) @@ -0,0 +1,31 @@ +\chapter{Use of D-Soilmodel}\label{sec:DSoilmodel} + +D-Soil Model is used for the import of subsoil and geometry. +D-Soil Model and DAM 18.1 use the similar source files, see table +\begin{table} +\begin{tabular}{lll} +DAM 18.1 & D-Soil Model & DAM 19.1 \\ +soilmaterials.mdb & soilmaterials.mdb & \multirow{6}{*}{projectnaam.soil} \\ +soilprofiles.csv & soilprofiles.csv & \\ +segments.csv & segments.csv & \\ +segments.shp & segments.shp & \\ +surfacelines.csv & surfacelines.csv & \\ +characteristicpoints.csv & characteristicpoints.csv & \\ +locations.csv & & locations.csv \\ +scenarios.csv & & scenarios.csv \\ +shp-bestanden & & shp-bestanden +\end{tabular} +\label{Source files for D-Soil Model and DAM} +\end{table} + +To way to use the projectname.soil instead of the separate source files is described in this chapter, devided per source file. + +\section{Soilmaterials} + +\section{Soilprofiles-1D} + +\section{Soilprofiles-2D} + +\section{Segments} + +\section{Geometry} Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/Figure_CharacteristicPointsInMacroStability.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/ShoulderDevelop.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineSequenceAssessmentRegional.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/wsp_1WL.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/OpenProject.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/OpenProject.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/OpenProject.tex (revision 3966) @@ -0,0 +1,14 @@ +\chapter{Open Project}\label{sec:USOpenProject} + +To be able to open a project, the user must be able to build a project, to save it and to open it. + +\section{Building a project}\label{sec:BuildingProject} +The user can define a project by defining different sources, see \autoref{sec:USDataFormat} and \autoref{sec:USDataCombi} + +\section{Saving a project} \label{sec:SavingProject} +The project can be saved at a location defined by the user. + +\section{Opening a project}\label{sec:OpeningProject} +The user must be able to open an excisting project. When calculations were made, also the calculation results must be shown. +When a project is calculated in a previous version of DAM (i.e. DAM 18.1 instead of 19.1), the calculations must not be shown because the calculations can be outdated due to newer versions of used kernels. + Index: DamClients/DamUI/tags/23.1.1/setup/Harvest/DamTestScriptsTransform.xsl =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Harvest/DamTestScriptsTransform.xsl (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Harvest/DamTestScriptsTransform.xsl (revision 3966) @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + $(var.ProjectDir)Harvest\DamDefines.wxi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + no + + + + + + + + + + + + + + + Tutorials + + + + + + + + + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineSequenceOperational.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataCombination.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataCombination.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataCombination.tex (revision 3966) @@ -0,0 +1,88 @@ +\chapter{Data combination}\label{sec:USDataCombi} + +DAM can generate input for the kernels by combining the data from the source files. This is done by linking via the location id and via GIS-files (see \autoref{sec:DataExtraction}). + +\section{Id/Name}\label{sec:IdNameValidation} +The data is combined by matching Id's (Names) between the several data sources. Not all characters can be used when defining Id's. The following characters are valid: \newline +"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \newline +"abcdefghijklmnopqrstuvwxyz" \newline +"01234567879" \newline +"!\#\textdollar \% \&()*+,-.\/" \newline +":;<=>?@" \newline +"[\textbackslash ]\textasciicircum \_\textasciigrave " \newline +"\{|\}\textasciitilde " \newline +" " (space)\newline +A validation of the Id's must be done when performing the data combination. + +\section{Data extraction}\label{sec:DataExtraction} + +The locations are described with a name and RD-coordinates; a point element in GIS files. +Each location is connected to a crosssection; a line element in GIS files. + +The combination of data from GIS files is made based on these point and line elements.\\ +If the input data is available in a GIS file with line elements the data is collected at the intersection of the crosssection with the line element, see \autoref{fig:GISLine}. + +When a parameter is available in a line shape, \ProgramName will check, during import of data, if the cross section of a location intersects the shapefile of the parameter. When so, this parameter is connected to this location. +If a cross section intersects more than one line of the shapefile, no parameters are connected at all and a message is given that this location is not imported. + +\begin{figure}[H] + \centering + \includegraphics[width=0.7\textwidth]{pictures/GISLine.png} + \caption{Data is collected from the line element at the intersection} + \label{fig:GISLine} +\end{figure} + +If the input data is available in a GIS file with area elements the data is collected at from the area where the location point is situated, see \autoref{fig:GISArea}. + +\begin{figure}[H] + \centering + \includegraphics[width=0.7\textwidth]{pictures/GISArea.png} + \caption{Data is collected from the area element where the location point is situated} + \label{fig:GISArea} +\end{figure} + +If the inputdata is not available in GIS files, all input data can be linked to each location via a table (csv-format). + +\section{Geometry Generation}\label{sec:GeometryGeneration} + +The \ProgramName can combine a surface line with a subsoil scenario. The result is a geometry, usable for the failure mechanism Macrostability. + +\section{Subsoil} +The subsoil model is made up of the following elements: +\begin{itemize} + \item Soil segments + \item Soil profiles + \item Soil layers + \item Soil materialparameters +\end{itemize} + +A soil segment is located on a map and can contain several soil scenarios. A soil scenario is a combination of a soil profile and its probability. +Each soil profile is build up from layers (1D- profile) or areas (2D-profile). A layer (or area) has the name of a material. And finally this material is described via soil type and several parameters (such as strength parameters).\\ +All is displayed in \autoref{fig:SubSoilElements}. + +\begin{figure}[H] + \centering + \includegraphics[width=1\textwidth]{pictures/SubSoilElements.png} + \caption{The elements of the subsoil model and their properties} + \label{fig:SubSoilElements} +\end{figure} + +By linking the location to a soil segment via the locations.csv column segment\textunderscore id, \ProgramName combines the location to all soil profiles of the soil segment. +The use of D-Soil Model for this purpose is decribed in \autoref{sec:DSoilmodel}. +The procedure for combining a surfaceline with a soil profile is described in \autoref{sec:CombiSurfaceLineSoilProfile}. + +\section{Combination of surface line with soil profile}\label{sec:CombiSurfaceLineSoilProfile} + +\subsection{Combination of surface line with a 1D soilprofile}\label{sec:CombiSurfaceLine1DSoilProfile} +A 1D soil profile is a summation of layers with layer boundaries (Z-values) and materialnames. Combination with a surfaceline is uncomplicated if all the Z-values of the surface line are within the boundaries of the soil profile. +If not, the user can define a filling material. + +\subsection{Transfer of 1D soilprofile}\label{sec:Transfer1D} +The user can vertically transfer the 1D profiles by defining a characteristic point as a reference level. This means that the Z-value of the characteristic point is the top of all 1D-soilprofiles of that location. This reference level is given per project. So if the surfacelevelinside is the reference, for each location the 1D-soilprofiles will start at the Z-value of the surfacelevelinside of that location. On top of the 1D soilprofile the filling material is used. + +\subsection{Combination of surface line with a 2D soilprofile}\label{sec:CombiSurfaceLine2DSoilProfile} +A 2D profile already has a topboundary with different Z-values. Combination with a surface line is more complicated since this top boundary and surfacel may differ in X and/or Z-values. +The origin of the surfaceline can differ from the origin of the top boundary of the soil profile. The user can define this difference. The surfaceline is determing the final length of the combinated 2D-profile. +If the surface line xxx soil profile length: subsoil at the right side will be deleted +If the surface line xxx soil profile length: subsoil at the right side will be generated with Z-values at boundary. + Index: DamClients/DamUI/tags/23.1.1/doc/UML Diagrams/DAM UI Main Dataflow.uxf =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/UML Diagrams/DAM UI Main Dataflow.uxf (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/UML Diagrams/DAM UI Main Dataflow.uxf (revision 3966) @@ -0,0 +1,302 @@ + + + 10 + + UMLDeployment + + 300 + 330 + 1040 + 450 + + DAM UI + + + + + + UMLDeployment + + 710 + 850 + 240 + 110 + + DAM Engine + + + + Relation + + 720 + 630 + 90 + 240 + + lt=<- +fg=red +XML Input + 10.0;220.0;10.0;10.0 + + + Relation + + 810 + 630 + 100 + 240 + + lt=<- +fg=red +XML Output + 10.0;10.0;10.0;220.0 + + + UMLDeployment + + 620 + 380 + 180 + 90 + + Importer + + + + UMLDeployment + + 340 + 480 + 180 + 90 + + Geometry Viewer + + + + UMLDeployment + + 340 + 650 + 180 + 90 + + Map Viewer + + + + UMLDeployment + + 1080 + 470 + 180 + 90 + + Property Editor + + + + UMLDeployment + + 1090 + 650 + 180 + 90 + + Table Editor + + + + UMLObject + + 630 + 570 + 360 + 70 + + DAM UI Data Model + + + + + UMLDeployment + + 840 + 380 + 180 + 90 + + Exporter + + + + Relation + + 660 + 240 + 30 + 160 + + lt=<- +fg=red + + 10.0;140.0;10.0;10.0 + + + UMLObject + + 520 + 180 + 180 + 70 + + CSV-files +Soilbase +Sti-files + + + + + UMLObject + + 720 + 180 + 180 + 70 + + Shapefiles + + + + + UMLObject + + 930 + 180 + 180 + 70 + + CSV results +CSV surfacelines + + + + + Relation + + 750 + 240 + 30 + 160 + + lt=<- +fg=red + + 10.0;140.0;10.0;10.0 + + + Relation + + 960 + 240 + 30 + 160 + + lt=<- +fg=red + + 10.0;10.0;10.0;140.0 + + + Relation + + 900 + 630 + 90 + 240 + + lt=<. +fg=red +Sti files +WMF files + 10.0;10.0;10.0;220.0 + + + Relation + + 710 + 460 + 30 + 130 + + lt=<- +fg=red + + 10.0;110.0;10.0;10.0 + + + Relation + + 910 + 460 + 30 + 130 + + lt=<- +fg=red + + 10.0;10.0;10.0;110.0 + + + Relation + + 510 + 510 + 140 + 100 + + lt=<- +fg=red + + 10.0;10.0;120.0;80.0 + + + Relation + + 510 + 600 + 140 + 120 + + lt=<-> +fg=red + + 10.0;100.0;120.0;10.0 + + + Relation + + 980 + 510 + 120 + 100 + + lt=<-> +fg=red + + 100.0;10.0;10.0;80.0 + + + Relation + + 980 + 610 + 130 + 100 + + lt=<-> +fg=red + + 110.0;80.0;10.0;10.0 + + Index: DamClients/DamUI/tags/23.1.1/setup/Resources/splash_screen.jpg =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Technical Design/pictures/DAM UI Data Model Main.pdf =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Technical Design/pictures/DAM UI Data Model Main.pdf (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Technical Design/pictures/DAM UI Data Model Main.pdf (revision 3966) @@ -0,0 +1,52 @@ +%PDF-1.4 +%���� +4 0 obj +<>stream +x��YKo7���c������")�X@Ak{�(YI�,�ȿ�CrIy-3q �o4Ԉ���ڼ\4\�V�vq���h�6_�ZK��%��P�2�4c�y߬��װ�/8����}�|����`�'��5� ?�R�qG�G���2���/�/h{{�p?�[����~;��aDA( �k��}ln��I����ػp�d�h� ����n�^�)�J�:�ۅcnq��v�Y��l77�q�g/���O����O���ʽ!^�>��� �Z0���F��GN;!�>�C��c +)���SM����x�p�sM�zNj�2����M5�^���g\�Dp���8����a�ֻ�!�<ʀ=�.�(��b�.��cè7/d����Yv�S�h(˥����a�r�o�s?����&��M��\�ӎ(o�#�@D9��g���]n�QTv�&"��b�] +�]� cmGy2a�^o���r��3bxG���Jx�E��f5��������k�;:}-ͽ���vx7|��-w��*c�v�%c�������vs�������_�aF��Fi�mbCs� �lp oD�)�9{���l[{��ڄ����Ҽ�Ejl�!���]���q�+b�����[��Yh\R�iXFo�O�����|�.��-a�Y#yj�ދ��K���2��{��j��W}����nI�rW!O 7ڭ����NW�q�t�Ii����P����@i���x��>��v��IN[�JG�uoo��4�$�ph�Ԥp��GŪ�K�br��w2p�����np�k[eL����L��%���ǶSŋaUF#����Q�(��X�E8"�)���^�ȑ��Lm��$���T�N x �zS� *���'b�,%�^�u��:��C)�9�1�iw���%�Q�#��\�Z�J��O�u�X"�T���`6*(� \�)�9�wc���c�iܘx��l�~ �WA2S���2�x:�퉨����V'C��A�N�h�H�Mu{�Y!ظ(zM&&�S�"L��H��Q�6�`3��jb�0��Ն���ʠi� �r�vB��� \ m��$����U�Ԣ�(�{���X�٨�Q8?9�-�]̒�Ť�dO��]L�u1c"u��͵�mY�l��i]� ��'��� +��oL����i'4;�9 +���f1��F��w(����O�5������Hב:�#a����:.s�ܣ��H]TE���x����?rX� +endstream +endobj +6 0 obj +<>/Font<>>>/Parent 5 0 R/MediaBox[0 0 1460 990]>> +endobj +3 0 obj +<> +endobj +2 0 obj +<> +endobj +1 0 obj +<> +endobj +5 0 obj +<> +endobj +7 0 obj +<> +endobj +8 0 obj +<> +endobj +xref +0 9 +0000000000 65535 f +0000002037 00000 n +0000002012 00000 n +0000001924 00000 n +0000000015 00000 n +0000002062 00000 n +0000001732 00000 n +0000002113 00000 n +0000002158 00000 n +trailer +<]/Root 7 0 R/Size 9>> +%iText-5.4.1 +startxref +2311 +%%EOF Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineActivityAssessmentRegional.pdf =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineActivityAssessmentRegional.pdf (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineActivityAssessmentRegional.pdf (revision 3966) @@ -0,0 +1,71 @@ +%PDF-1.4 +%���� +6 0 obj +<>stream +x��ZK�$� +�ׯ�19���:Ɓm��� �C�à�ww��nx�N��#��JZw�{��tv0��E�(}�$V�:}u;��bu{?}};�0�:i��V��W�e�~�����n�i�MF�6Y�])��d��~���Zݗ���˪�P7Fk�Y�h!�2"Ԯ��\��oo�z�\��v��b��+p���(�v\�`���2��)�(c,=7j3���J�����`u�j���D�zY�ƩZ +  +�ƨ�L���c��k1$7ЏS�|C�Տ߾:�np�,����+~��7e��O��5-��Zz�I�"�n7�_�~�l�/w��_o�Gū���I��T{�Z�Lm�ww��M{c��eA�۞���`�y$��i8kUO!7�,Zy3Y��*��.�*�":*���F������b�~wml�|�4��|�?s3۰*���@W�����,iZBV��P>i���b{��,�- -� +,wƕ2��^,�qԛ������S +�y��}Ԁ���7��c��ހH7�_�L��4���YU>� f����cXgo�W��� +��Bs���t:�p��� ��7�/X�_U\��b�ch�fgC�=jqԽ�z��,�a�X\/l�i��`��?\AĩԮ�m2�q���mDr$7�����Q %�ƈ����s &*�� �{�9��>/Font<>>>/Parent 7 0 R/MediaBox[0 0 550 830]>> +endobj +3 0 obj +<> +endobj +4 0 obj +<> +endobj +2 0 obj +<> +endobj +5 0 obj +<> +endobj +1 0 obj +<> +endobj +7 0 obj +<> +endobj +9 0 obj +<> +endobj +10 0 obj +<> +endobj +xref +0 11 +0000000000 65535 f +0000002527 00000 n +0000002477 00000 n +0000002364 00000 n +0000002452 00000 n +0000002502 00000 n +0000000015 00000 n +0000002557 00000 n +0000002153 00000 n +0000002608 00000 n +0000002653 00000 n +trailer +<]/Root 9 0 R/Size 11>> +%iText-5.4.1 +startxref +2807 +%%EOF Index: DamClients/DamUI/tags/23.1.1/setup/Harvest/Harvest.targets =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Harvest/Harvest.targets (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Harvest/Harvest.targets (revision 3966) @@ -0,0 +1,63 @@ + + + + $(SolutionDir)release\Install_Version + + + + + + + + + + $(SolutionDir)data\Tutorials\DAMDesign + + + + + + + + + + + HarvestDam; + HarvestDamTestScripts; + $(BuildDependsOn); + + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineSequenceAssessment.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/Resources/setup_start.jpg =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/UML Diagrams/DAM UI Data Model Main.uxf =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/UML Diagrams/DAM UI Data Model Main.uxf (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/UML Diagrams/DAM UI Data Model Main.uxf (revision 3966) @@ -0,0 +1,273 @@ + + + 10 + + UMLClass + + 160 + 270 + 250 + 150 + + Dike +-- ++ Soils ++ SoilDatabaseName ++ SoilProfile1Ds ++ Locations ++ Gauges + + + + + UMLClass + + 1010 + 880 + 250 + 110 + + Soil +-- ++ Parameters + + + + + UMLClass + + 1000 + 590 + 250 + 110 + + Scenario +-- + + + + + + UMLClass + + 630 + 590 + 250 + 110 + + Location +-- ++ Parameters + + + + + Relation + + 870 + 640 + 150 + 40 + + lt=<- +m1=0..n + 130.0;10.0;10.0;10.0 + + + UMLClass + + 630 + 430 + 250 + 120 + + Segment +-- ++ SoilGeometryProbabilities + + + + + UMLClass + + 1000 + 430 + 250 + 120 + + SoilGeometryProbability +-- ++ SoilProfile1D ++ SoilProfile2DName ++ SoilProfile2D ++ FailureMechanismType ++ Probability + + + + + Relation + + 870 + 480 + 150 + 40 + + lt=<- +m1=0..n + 130.0;10.0;10.0;10.0 + + + Relation + + 400 + 110 + 390 + 340 + + lt=<- +m1=0..n + 350.0;320.0;350.0;10.0;10.0;10.0 + + + Relation + + 400 + 300 + 250 + 390 + + lt=<- +m1=0..n + 230.0;360.0;170.0;360.0;170.0;10.0;10.0;10.0 + + + Relation + + 400 + 360 + 630 + 610 + + lt=<- +m1=0..n + 610.0;580.0;80.0;580.0;80.0;10.0;10.0;10.0 + + + UMLClass + + 160 + 40 + 250 + 150 + + WaterBoard +-- ++ Dikes ++ Segments ++ Locations ++ Soilgeometry2DNames ++ FeatureRepository ++ BackgroundRepositoryFeature + + + + Relation + + 270 + 180 + 50 + 110 + + lt=<- +m1=0..n + 10.0;90.0;10.0;10.0 + + + UMLClass + + 630 + 740 + 250 + 100 + + SurfaceLine +-- + + + + + Relation + + 400 + 330 + 250 + 490 + + lt=<- +m1=0..n + 230.0;460.0;130.0;460.0;130.0;10.0;10.0;10.0 + + + Relation + + 740 + 540 + 50 + 70 + + lt=-> +m1=1..1 + 10.0;50.0;10.0;10.0 + + + Relation + + 740 + 690 + 50 + 70 + + lt=-> +m1=1..1 + 10.0;10.0;10.0;50.0 + + + UMLClass + + 1330 + 430 + 250 + 120 + + SoilProfile1D/2D +-- + + + + + + Relation + + 1250 + 540 + 220 + 430 + + lt=<- +m1=0..n + 10.0;400.0;200.0;400.0;200.0;10.0 + + + Relation + + 1240 + 480 + 110 + 40 + + lt=-> +m1=1..1 + 10.0;10.0;90.0;10.0 + + Index: DamClients/DamUI/tags/23.1.1/setup/Harvest/DamTransform.xsl =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Harvest/DamTransform.xsl (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Harvest/DamTransform.xsl (revision 3966) @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + $(var.ProjectDir)Harvest\DamDefines.wxi + + + + + + + + + + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/GISLine.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/packages.config =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/packages.config (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/packages.config (revision 3966) @@ -0,0 +1,4 @@ + + + + \ No newline at end of file Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/HydraulicShortcut.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineComponents.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/GISArea.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/Picture1.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DAM UI - Functional Design.tcp =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DAM UI - Functional Design.tcp (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DAM UI - Functional Design.tcp (revision 3966) @@ -0,0 +1,12 @@ +[FormatInfo] +Type=TeXnicCenterProjectInformation +Version=4 + +[ProjectInfo] +MainFile=DAM UI - Functional Design.tex +UseBibTeX=1 +UseMakeIndex=1 +ActiveProfile=LaTeX ⇨ PDF +ProjectLanguage=en +ProjectDialect=US + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataFormat.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataFormat.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataFormat.tex (revision 3966) @@ -0,0 +1,121 @@ +\chapter{Data format}\label{sec:USDataFormat} + +Validation is done during three phases: import, editing in UI and for calculation. + +\section{Validation during import} + +All required and optional import data is placed in table OverviewDataUIAndEngine.xlsx, tab DAM\_input. + +\ProgramName can import data from csv files and shape files +The sequence of import is + 1. csv files (except scenarios.csv), overwritten by: + 2. shape files, overwritten by: + 3. scenario.csv +If data is not present during import the default value is used, when a default is available. Default values are mentioned in OverviewDataUIAndEngine.xlsx + +Required data +Data can be required when importing and/or required when calculating. +In OverviewDataUIAndEngine.xlsx is described what data is required and when. Example: crosssection and dikering$\_$ are only required when using shapefiles (see column remark).\newline +If data is required for import and is missing or invalid, the exception handling is dependent of the kind of data, see \autoref{table:ExceptionHandlingReqData}. +Messages are given in the log window. + +\begin{table}[H] +\begin{tabular}{|p{40mm}|p{\textwidth-40mm-24pt}|} \hline +\textbf{Parameter} & \textbf{Exception handling} \\ \hline +location$\_$id in location.csv (or via shape) & All locations with missing location$\_$id are not imported and message is given. \\ \hline +location$\_$id in scenarios.csv (or via shape) & All scenarios with missing location$\_$id are not imported and message is given. \\ \hline +surfaceline in location.csv$\_$id & All locations with missing surfaceline$\_$id are not imported and message is given. \\ \hline +Profielnaam in surfacelines.csv$\_$id & All surfacelines with missing surfaceline$\_$id are not imported and message is given. \\ \hline +dikering$\_$id via shape & Project is not imported and message is given. \\ \hline +segment$\_$id in locations.csv or via shape & All locations with missing segment$\_$id are not imported and message is given. \\ \hline +segment$\_$id in segment.csv & All locations using segments with missing segment$\_$id are not imported and message is given. \\ \hline +calculation$\_$type in segments.csv & All locations using segments with missing calculation$\_$type are not imported and message is given. \\ \hline +soilprofile$\_$id in segments.csv & All locations using segments with missing soilprofile$\_$id are not imported and message is given. \\ \hline +top$\_$level in soilprofiles.csv& All locations linked (via segment) to soilprofiles with missing top$\_$level are not imported and message is given. \\ \hline +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 +\end{tabular} +\caption{Exception handling required data during import} +\label{table:ExceptionHandlingReqData} +\end{table} + +In OverviewDataUIAndEngine.xls, tab DAM\_input also the optional data is listed. If these parameters are not present, no error or warning is given. When a default is available, this value is used, otherwise the parameters is NULL. +If the parameter is required for calculation and the value is NULL and the kernel does not provide a default, an error message is given. + +\subsection{Editing characteristic points}\label{sec:ValCharPoints} +When the characteristic points are edited by the user in the UI, they must be validated by rules in following table. Blue text validations are not implemented yet. + +\begin{figure}[H] + \centering + \includegraphics[width=1\textwidth]{pictures/Figure_CharacteristicPointsInMacroStability.png} + \caption{Characteristic points on the surface line} + \label{fig:CharPoints} +\end{figure} + + +\begin{tabular}{|p{35mm}|p{35mm}|p{\textwidth-72pt-105mm}|p{13mm}|p{11mm}|p{11mm}|} \hline +\textbf{Name EN} & \textbf{Name NL} & \textbf{Symbol} & \textbf{Unit} & \textbf{Min value} & \textbf{Max value} \\ \hline +\multirow{2}{35mm}{Surface level outside} & \multirow{2}{35mm}{Maaiveld buitenwaarts} & X$_{C}$ & m & - & - \\ \cline{3-6} + & & Z$_{C}$ & m NAP & - & - \\ \hline +\multirow{2}{35mm}{Dike toe at river} & \multirow{2}{35mm}{Teen Dijk buitenwaarts} & X$_{D}$ & m & $>$X$_{C}$ & $<$X$_{E}$ \\ \cline{3-6} + & & Z$_{D}$ & m NAP & \textcolor[rgb]{0,0,1}{$>$Z$_{C}$} & $<$Z$_{G}$ \\ \hline +\multirow{2}{35mm}{Shoulder top outside} & \multirow{2}{35mm}{Kruin buitenberm} & X$_{E}$ & m & $>$X$_{D}$ & $<$X$_{F}$ \\ \cline{3-6} + & & Z$_{E}$ & m NAP &\textcolor[rgb]{0,0,1}{ $>$Z$_{D}$} & \textcolor[rgb]{0,0,1}{$<$Z$_{F}$} \\ \hline +\multirow{2}{35mm}{Shoulder base outside} & \multirow{2}{35mm}{Insteek buitenberm} & X$_{F}$ & m & $>$X$_{E}$ & $<$X$_{G}$ \\ \cline{3-6} + & & Z$_{F}$ & m NAP & \textcolor[rgb]{0,0,1}{$>$Z$_{E}$ }& \textcolor[rgb]{0,0,1}{$<$Z$_{G}$ }\\ \hline +\multirow{2}{35mm}{Dike top at river} & \multirow{2}{35mm}{Kruin buitentalud} & X$_{G}$ & m & $>$X$_{F}$ & $<$X$_{H}$ \\ \cline{3-6} + & & Z$_{G}$ & m NAP & $>$Z$_{D}$ & - \\ \hline +\multirow{2}{35mm}{Traffic load outside} & \multirow{2}{35mm}{Verkeersbelasting buitenwaarts} & X$_{H}$ & m & \textcolor[rgb]{0,0,1}{$>$X$_{C}$ }& \textcolor[rgb]{0,0,1}{$<$X$_{I}$} \\ \cline{3-6} + & & Z$_{H}$ & m NAP &\textcolor[rgb]{0,0,1}{$>$Z$_{G}$} & \textcolor[rgb]{0,0,1}{$<$Z$_{I}$} \\ \hline +\multirow{2}{35mm}{Traffic load inside} & \multirow{2}{35mm}{Verkeersbelasting binnenwaarts} & X$_{I}$ & m & \textcolor[rgb]{0,0,1}{$>$X$_{H}$ }& \textcolor[rgb]{0,0,1}{$<$X$_{S}$} \\ \cline{3-6} + & & Z$_{I}$ & m NAP &\textcolor[rgb]{0,0,1}{$>$Z$_{H}$} & \textcolor[rgb]{0,0,1}{$<$Z$_{J}$} \\ \hline +\multirow{2}{35mm}{Dike top at polder} & \multirow{2}{35mm}{Kruin binnentalud} & X$_{J}$ & m & $>$X$_{I}$ & $<$X$_{K}$ \\ \cline{3-6} + & & Z$_{J}$ & m NAP & $>$Z$_{M}$ & -\\ \hline +\multirow{2}{35mm}{Shoulder base inside} & \multirow{2}{35mm}{Insteek binnenberm} & X$_{K}$ & m & $>$X$_{J}$ & $<$X$_{L}$ \\ \cline{3-6} + & & Z$_{K}$ & m NAP & \textcolor[rgb]{0,0,1}{$>$Z$_{J}$} & \textcolor[rgb]{0,0,1}{$<$Z$_{L}$} \\ \hline +\multirow{2}{35mm}{Shoulder top inside} & \multirow{2}{35mm}{Kruin binnenberm} & X$_{L}$ & m & $>$X$_{K}$ & $<$X$_{M}$ \\ \cline{3-6} + & & Z$_{L}$ & m NAP & \textcolor[rgb]{0,0,1}{$>$Z$_{K}$} & \textcolor[rgb]{0,0,1}{$<$Z$_{M}$ }\\ \hline +\multirow{2}{35mm}{Dike toe at polder} & \multirow{2}{35mm}{Teen dijk binnenwaarts} & X$_{M}$ & m & $>$X$_{L}$ & $<$X$_{N}$ \\ \cline{3-6} + & & Z$_{M}$ & m NAP & \textcolor[rgb]{0,0,1}{$>$Z$_{L}$} & $<$Z$_{J}$ \\ \hline +\multirow{2}{35mm}{Ditch dike side} & \multirow{2}{35mm}{Insteek sloot dijkzijde} & X$_{N}$ & m & $>$X$_{M}$ & $<$X$_{O}$ \\ \cline{3-6} + & & Z$_{N}$ & m NAP & \textcolor[rgb]{0,0,1}{$>$Z$_{M}$} & \textcolor[rgb]{0,0,1}{$<$Z$_{O}$} \\ \hline +\multirow{2}{35mm}{Bottom ditch dike side} & \multirow{2}{35mm}{Slootbodem dijkzijde} & X$_{O}$ & m & $>$X$_{N}$ & $<$X$_{P}$ \\ \cline{3-6} + & & Z$_{O}$ & m NAP & $>$Z$_{N}$ & $<$Z$_{P}$ \\ \hline +\multirow{2}{35mm}{Bottom ditch polder side} & \multirow{2}{35mm}{Slootbodem polderzijde} & X$_{P}$ & m & $>$X$_{O}$ & $<$X$_{Q}$ \\ \cline{3-6} + & & Z$_{P}$ & m NAP & \textcolor[rgb]{0,0,1}{$>$Z$_{O}$} &\textcolor[rgb]{0,0,1}{ $<$Z$_{Q}$} \\ \hline +\multirow{2}{35mm}{Ditch polder side} & \multirow{2}{35mm}{Insteek sloot polderzijde} & X$_{Q}$ & m & $>$X$_{P}$ & $<$X$_{R}$ \\ \cline{3-6} + & & Z$_{Q}$ & m NAP & \textcolor[rgb]{0,0,1}{$>$Z$_{P}$} & \textcolor[rgb]{0,0,1}{$<$Z$_{R}$ }\\ \hline +\multirow{2}{35mm}{Surface level inside} & \multirow{2}{35mm}{Maaiveld binnenwaarts} & X$_{R}$ & m & - & - \\ \cline{3-6} + & & Z$_{R}$ & m NAP & - & - \\ \hline +\end{tabular} + +If a required characteristic point is missing, (validation)message must be given: Characteristic point is missing.\newline +Required characteristic points are: +\begin{itemize} + \item Surface level outside + \item Dike toe at river + \item Dike top at river + \item Dike top at polder + \item Dike toe at polder + \item Surface level inside +\end{itemize} + +If a set of characteristic points is not complete, (validation)message must be given: Set Characteristic points is not complete. NL: Set karakteristieke is niet compleet. \newline +Sets of characteristic points (Name and points from table) are: +\begin{itemize} + \item TrafficLoad (H and I in table) NL: Verkeersbelasting + \item ShoulderOutside (E and F in table) NL: Buitenberm + \item ShoulderInside (K and L in table) NL: Binnenberm + \item Ditch (N,O,P and Q in table) NL: Sloot +\end{itemize} + +Note: All sets are optional, but when one of the characteristic points is asigned, the others of the set must also be present. + +\section{Validation during editing} +\ProgramName validates during the import of the data and during editing by user in the User interface. Minimal and maximum values are given in OverviewDataUIAndEngine.xlsx. +The data is also validated by the used kernels when calculations are started. + +\section{Validation for calculation} +\ProgramName validates during the import of the data and during editing by user in the User interface. +The data is also validated by the used kernels when calculations are started. Messages are given in the log window. Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Technical Design/pictures/DAMComponents.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/UML Diagrams/DAM UI Main Modules.uxf =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/UML Diagrams/DAM UI Main Modules.uxf (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/UML Diagrams/DAM UI Main Modules.uxf (revision 3966) @@ -0,0 +1,171 @@ + + + 10 + + UMLDeployment + + 400 + 310 + 1010 + 430 + + DAM UI + + + + + + UMLDeployment + + 450 + 450 + 180 + 90 + + Importer + + + + UMLDeployment + + 710 + 450 + 180 + 90 + + Geometry Viewer + + + + UMLDeployment + + 710 + 570 + 180 + 90 + + Map Viewer + + + + UMLDeployment + + 920 + 450 + 180 + 90 + + Property Editor + + + + UMLDeployment + + 920 + 570 + 180 + 90 + + Table Editor + + + + UMLDeployment + + 450 + 570 + 180 + 90 + + Exporter + + + + UMLClass + + 430 + 410 + 220 + 280 + + IO + + + + UMLClass + + 1140 + 410 + 220 + 280 + + Calculator + + + + UMLClass + + 670 + 410 + 450 + 280 + + UI + + + + UMLDeployment + + 1160 + 450 + 180 + 90 + + Calculator + + + + UMLDeployment + + 810 + 780 + 180 + 90 + + DSL + + + + UMLDeployment + + 1170 + 780 + 180 + 90 + + DAM Engine + + + + Relation + + 890 + 680 + 30 + 120 + + lt=<. + 10.0;100.0;10.0;10.0 + + + Relation + + 1240 + 680 + 30 + 120 + + lt=<. + 10.0;100.0;10.0;10.0 + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/PL1_RRD.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/ApplicationGUIDs.wxi =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/ApplicationGUIDs.wxi (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/ApplicationGUIDs.wxi (revision 3966) @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineActivityAssessment.pdf =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineActivityAssessment.pdf (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineActivityAssessment.pdf (revision 3966) @@ -0,0 +1,63 @@ +%PDF-1.4 +%���� +6 0 obj +<>stream +x��YMo7���=t�$�_Ǵh�!��� Iv��$Ē���w���r +�R�B� +�7;��y;CR���;땋���ݏ�ݻ�s7(o��������c��{�m:��tF���>u������A-��W8�����vPz�v�y���u����+��v88Y����SI�u|��wQi ��׈"��j�� ���`�J��Rn������ɨ�#%|Of2Xtl< 4~3Ke��o3��t�WiP��}�\Ql �f���7�� +N���1���V]#?�a�&��E����Rm���z�����6�-~6�M8�|�je0��~��W��q�kM��/��Ӻ[�M��zF#���P���2��Wκ�lzC\�Bp=.�u�G��VR\� 4����"�Y`KԌE�cn�>�+�"@�a]� �������d�Xj�Fy�,�;�l{�I�>��41nQT��ҭHh��M�n��!� �n!�2+~9͑����1y���W��4��@�rI� +8)3 +JG �6O��5�6S��TM�s5���I�|\�1�|ͣ����l�m�f�&me�M�f�+��q�䒄\����wTN& �'o>n�j��c�"y�O[��c�vq����\�"i�7��N�FF�M�N�~u�tL�$��u �5.9F�t��+A�U�A��B�![�fY�L��'�Y�e�q�.�>Ӽ��y���ُ�ɛ�ј��M�o�n� r=N�SD�:_>K�䍨�:Wt�<�ο1p�R�c=�D)�dB�h�`�H>�0�S +m>� ���SB5��@�tc(��G n��OI>�a�OY�)7��-,/ǵ�K���s~��f\<�7�� �z3�:���q�A���߬�KU d�q�x��F ��2�@K �'Z���h�!��J (�C��2��€Ђ�Ђ�J e� +-��Aƿ�Nf��Q +�4Ӑ�~��W���vA�Z#����6V�Vd�Q�Z= mlBg��5���6���%�q +m���(c�mh���2�вTCˢL� -[>�ڗ��?bm���d�2�n�]���^���n7�A=13bOO?߉ͯ� -�˷rh���徎��1�$H�3~|���C�r�8���V��z��X�S��m1!�C�3фX۞��n���W�\!�����{㫒�tQ�g��&9غշ��?��=L�|6՝y^�f�~�Y��oh�|�Y�Txʦv�����Tr6[%Giu�}�,/H�2� e���$�Z�h�F�a��"LQ��0� +���+?΄� 񐳆�\a�{��.�T�a\�J��#�uՠ(�=�'��#�0F�}eBE�<͉�r� 3N�9'b�D�H!OR�8���V?'���O�ǡ�����|� ����O7�q�q2���'=���غ�ckg[#��#56����&g���O��>�\9!�.��� Ю̳&Ԭ �)c�5� +endstream +endobj +8 0 obj +<>/Font<>>>/Parent 7 0 R/MediaBox[0 0 410 620]>> +endobj +3 0 obj +<> +endobj +1 0 obj +<> +endobj +2 0 obj +<> +endobj +5 0 obj +<> +endobj +4 0 obj +<> +endobj +7 0 obj +<> +endobj +9 0 obj +<> +endobj +10 0 obj +<> +endobj +xref +0 11 +0000000000 65535 f +0000001833 00000 n +0000001863 00000 n +0000001745 00000 n +0000001913 00000 n +0000001888 00000 n +0000000015 00000 n +0000001938 00000 n +0000001534 00000 n +0000001989 00000 n +0000002034 00000 n +trailer +<]/Root 9 0 R/Size 11>> +%iText-5.4.1 +startxref +2188 +%%EOF Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Technical Design/DAM UI - Technical Design.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Technical Design/DAM UI - Technical Design.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Technical Design/DAM UI - Technical Design.tex (revision 3966) @@ -0,0 +1,219 @@ +\documentclass{deltares_report} +\usepackage[titletoc]{appendix} +%----------------------------------------------- + +\begin{document} +\pagestyle{empty} +\cleardoublepage +% + +\newcommand{\ProgramName}{DAM UI\xspace} +\newcommand{\ProgramNamePlusSpace}{DAM UI } + +\title{\ProgramName} +\subtitle{Technical Design} +\projectnumber{1210702-000} +\client{Deltares - Geo engineering DKS} +\reference{1210702-000-GEO-0009} +\classification{-} +\author{Tom The, John Bokma} +\partner{-} +\contact{tom.the@deltares.nl, john.bokma@deltares.nl} +\documentid{-} +\organisationi{Deltares} +\publisheri{Deltares - DSC} + +\date{April 2022} +\version{0.2} + +\keywords{Dike, safety assessment, design, software, macro stability, piping} + +\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.\newline +\newline +\textbf{\footnotesize{Samenvatting}} \newline +Dit document bevat het technisch ontwerp voor \ProgramName, een User Interface applicatie die een gebruiker in staat stelt om voor een dijktraject berekeningen uit te voeren voor verschillende faalmechanismen, waaronder macrostabiliteit en piping.} + +\versioni{0.1} +\datei{Jan 2017} +\authori{Tom The} +\revieweri{John Bokma} +\approvali{Hans van Putten} + +\versionii{0.2} +\dateii{April 2022} +\authorii{Tom The, John Bokma} +\reviewerii{Walter Austmann} +\approvalii{Arthur Baart} + +\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} + +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} + +The full documentation on the program comprises the following documents. + +\renewcommand{\arraystretch}{1.3} + +\begin{table}[H] +%\caption{xxx} +%\label{xxx} +\begin{tabular}{|p{40mm}|p{\textwidth-40mm-24pt}|} \hline +\textbf{Title} & \textbf{Content} \\ \hline +Functional Design \newline \citep{DAMUI_FunctionalDesign} & Description of the requirements and functional design of \ProgramName. \\ \hline +Technical Design (this document) \newline \citep{DAMUI_TechnicalDesign}& Description of the technical design of \ProgramName. \\ \hline +Technical documentation \newline \citep{DAMUI_TechnicalDocumentation} & Description of the arguments and usage of different software components, generated from in-line comment with Doxygen. \\ \hline +Test Plan \newline \citep{DAMUI_TestPlan} & Description of the different regression and acceptation tests, including target values, of \ProgramName. \\ \hline +Test Report \newline \citep{DAMUI_TestReport} & Description of the test results (benchmarks and test scripts),of \ProgramName. \\ \hline +User Manual \newline \citep{DAMUI_Manual} & Description of the different functionalites available in the \textit{User Interface} and background information. \\ \hline +\end{tabular} +\caption{\small \ProgramNamePlusSpace system documents.} +\label{table-SystemDocuments} +\end{table} + + +%------------------------------------------------------------------------------ +\chapter{System Architecture} \label{chapterSystemArchitecture} + +\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. In \citep{DAM_ArchitectureOverall} a description of the overall architecture of the DAM system can be found. + +\begin{figure}[H] + \begin{center} + \includegraphics[width=15cm]{pictures/DamComponents.pdf} + \end{center} + \caption{\small DAM and its components.} + \label{fig-DamComponents} +\end{figure} + +The arrows illustrate the dependencies of the components. + +\section{DAM UI components} \label{sec:DamUIComponents} + +See \autoref{fig-DAMUIMainModules} for an overview of the components of \ProgramNamePlusSpace. +\begin{figure}[H] + \begin{center} + \includegraphics[width=15cm]{pictures/DAM UI Main Modules.pdf} + \end{center} + \caption{\small \ProgramNamePlusSpace components.} + \label{fig-DAMUIMainModules} +\end{figure} + +\section{DAM UI Dataflow} \label{sec:DamUIDataflow} + +See \autoref{fig-DAMUIDataflow} for an overview of the dataflow in \ProgramNamePlusSpace. +\begin{figure}[H] + \begin{center} + \includegraphics[width=15cm]{pictures/DAM UI Main Dataflow.pdf} + \end{center} + \caption{\small \ProgramNamePlusSpace Dataflow.} + \label{fig-DAMUIDataflow} +\end{figure} + +In case the DAM Engine is used to calculate the macro stability, +additional output is available in the form of an output file per calculation. +This file (.stix) holds the resulting slip plan besides to the input and can be used to review the result using D-Stability. +The input files can be used to check/redo the calculation using the UI suitable for the used kernel. + +The required input is specified via the MacroStabilityInput object as defined in the C \# wrapper module for the Macro Stability kernel. +In the communication between Engine and UI, +the name of the resulting stix file is part of the Design Results of the XML output of the Engine. +This name of course has to unique and will be created based on the names of the location, scenario and profile combined with the number of the iteration in case of design. +To indicate its purpose, it ends on "\_result". + +Future developments foreseen for the stability calculations include the addition of the bare input for the Macro Stability kernel in order to be able to check the position of the input grid(s). + +%------------------------------------------------------------------------------ +\chapter{Architectural Choices} \label{chapterArchitecturalChoices} + +\todo{Architectural Choices} + + + +%------------------------------------------------------------------------------ +\chapter{Data Model} \label{chapterDataModel} + +See \autoref{fig-DAMUIDataModelMain} for an overview of the data model of \ProgramNamePlusSpace. +\begin{figure}[H] + \begin{center} + \includegraphics[width=15cm]{pictures/DAM UI Data Model Main.pdf} + \end{center} + \caption{\small \ProgramNamePlusSpace UI Data Model.} + \label{fig-DAMUIDataModelMain} +\end{figure} + + + +%------------------------------------------------------------------------------ +\chapter{Data Description} \label{chapterDataDescription} + +\section{Input} +\todo{Data Description Input} + +\section{Results} +First of all, +not all calculations will pass kernel validations or lead to valid results due to errors that occur in the calculations (e.g. uplift does not occur where it is expected). +Some calculations may be performed but cause warnings. +Using a log manager, +all these cases are reported back to the user via a log that is to be displayed at the end of the calculation process. +This log is then also saved automatically with a time stamp. +Note that the saved log will not be loaded again in the program itself. +Finally, the log is cleared at the start of each new calculation process. + +The results of the calculations differ per failure mechanism per model. +An overview of all "single" result parameters is provided by the DAM documentation on the public wiki for DAM (https://publicwiki.deltares.nl/display/DAM/Tabblad+Ontwerpberekeningen). +These results are presented in a table for all performed calculations. + +Per individual calculation, +a property editor provides access to the most important "single" result parameters. +This editor also provided the opportunity for a user to evaluate the calculation and to add notes on it. +This editor may also provide other options such as direct access to external programs to view and recalculate results. +This depends on the Failure mechanism and the model. +For the failure mechanism stability, +all relevant data (input and output) is available as stix file to enable starting D-Stability of the D-Geo Suite. +This functionality is made available at the push of a button in the editor. + +Next to these results parameters, other more complex result data is available for presentation and/or use too. + +For the failure mechanism stability, output data is available for the resulting slip plane. +This data is used to display that slip plane graphically within \ProgramName itself. +This slip plane is super imposed on the existing geometry as shown in the cross section tab. + +For failure mechanisms piping, +in case of design with the "Adapt geometry" option, +a resulting surface line is available together with its (1D) profile. +This data is written to a separate xml file per calculation with a proper identifiable name which is unique to the individual calculation. +This name is comprised of location name, profile name, scenario name and if need be the iteration number. +For the selected individual result, this adapted surface line is shown as dotted line within \ProgramName super imposed on the existing geometry as shown in the cross section tab. +For this, +upon selection of an individual calculation result, +the file with the data is read and the resulting surface line is drawn. + + +%------------------------------------------------------------------------------ +\chapter{Module Description} \label{chapterModuleDescription} + +\todo{Module Description} + + +%------------------------------------------------------------------------------ +\chapter{Literature} \label{chapterLiterature} + +\bibliography{../DAM_references/dam_references} + +\pagestyle{empty} +\mbox{} + +%------------------------------------------------------------------------------ +\end{document} Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/PL1_Lineair.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/Product.wxs =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Product.wxs (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Product.wxs (revision 3966) @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: DamClients/DamUI/tags/23.1.1/setup/Resources/DAM_icon.ico =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Technical Design/pictures/DAM UI Main Modules.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineActivityDesign.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineSequenceDesign.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/LargerDikeBase.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/redPL.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/Harvest/DamDefines.wxi =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Harvest/DamDefines.wxi (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Harvest/DamDefines.wxi (revision 3966) @@ -0,0 +1,6 @@ + + + + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/RRDClay.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/utils/svn_insert_version.cmd =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/utils/svn_insert_version.cmd (revision 0) +++ DamClients/DamUI/tags/23.1.1/utils/svn_insert_version.cmd (revision 3966) @@ -0,0 +1,74 @@ +setlocal enabledelayedexpansion +@ECHO off +ECHO "svn_insert_version.cmd started" + +SET ORG_DIR=%CD% + +SET argcount=0 +FOR %%x IN (%*) DO SET /A argcount+=1 + +IF %argcount%==0 ( + ECHO "invalid arguments: [path] (infile) (outfile)" + ECHO "usage: replace SVNREV text with revision number, SVNROOT with repository" + ECHO "path: execute at specific location" + ECHO "[optional] infile: file to read, defaults to AssemblyInfo.cs.svn" + ECHO "[optional] outfile: file to create, defaults to AssemblyInfo.cs" + GOTO EOF +) + +ECHO "%argcount% arguments received" + +IF %argcount%==1 ( + ECHO "setting default in and out files." + SET INTEXTFILE=AssemblyInfo.cs.svn + SET OUTTEXTFILE=AssemblyInfo.cs +) ELSE ( + ECHO "setting custom in and out files." + SET INTEXTFILE=%2 + SET OUTTEXTFILE=%3 +) + +CD %1 + +ECHO "parsing svn info in directory %CD%" + +REM GET THE SVN VERSION NUMBER AND REVISION PATH +FOR /f "tokens=1,* delims=�" %%A IN ('svn info') DO ( + ECHO %%A | findstr /I "^Revision" && SET REV_BUF=%%A + ECHO %%A | findstr /I "^URL" && SET ROOT_BUF=%%A + ECHO %%A | findstr /I /C:"Repository Root" && SET AFTER_BUF=%%A +) + +IF NOT DEFINED REV_BUF ( + SET SVN_REV=0 + SET SVN_ROOT= +) ELSE ( + SET SVN_REV=%REV_BUF:~10% + SET SVN_ROOT=%ROOT_BUF:~5% + SET "FIND=*%AFTER_BUF:~17% + CALL SET SVN_ROOT=%%SVN_ROOT:!FIND!=%% +) + +ECHO "using rev %SVN_REV% and root %SVN_ROOT%" + +REM SUBSTITUTE THE VERSION NUMBER IN TEMPLATE +ECHO "modifying %OUTTEXTFILE% in directory %1" +SET SEARCHTEXT=SVNREV +SET SEARCHROOT=SVNROOT +SET OUTPUTLINE= + +IF EXIST %OUTTEXTFILE% ( + ECHO "removing %OUTTEXTFILE%" + DEL %OUTTEXTFILE% +) + +ECHO "writing new %OUTTEXTFILE%" + +REM This command can process version files which contain special character "!" +call powershell -Command "(gc %INTEXTFILE%) -replace '%SEARCHTEXT%', '%SVN_REV%' | Out-File -encoding UTF8 %OUTTEXTFILE% + +) + +CD %ORG_DIR% +ECHO "svn_insert_version.cmd done" +:EOF \ No newline at end of file Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Test report/DAM UI Test Report.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/SubSoilElements.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Technical Design/pictures/DAM UI Main Dataflow.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/SourcePictures.pptx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/MoveDitch.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/Literature.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/Literature.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/Literature.tex (revision 3966) @@ -0,0 +1,3 @@ +\chapter{Literature} \label{chapterLiterature} + +\bibliography{../DAM_references/dam_references} \ No newline at end of file Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Release Notes.docx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/WixUI/Product_WixUI_Deltares.wxs =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/WixUI/Product_WixUI_Deltares.wxs (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/WixUI/Product_WixUI_Deltares.wxs (revision 3966) @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + 1 + + 1 + + LicenseAccepted = "1" + + + + + + 1 + + 1 + + + + 1 + 1 + 1 + + + + + + + \ No newline at end of file Index: DamClients/DamUI/tags/23.1.1/doc/parseLogs.py =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/parseLogs.py (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/parseLogs.py (revision 3966) @@ -0,0 +1,47 @@ +import os + +logDirectory = r"./BuildLogs" +pdfDirectory = r"./" + +pdfFiles = os.listdir(pdfDirectory) +expectedDocuments = ["DAM UI - Functional Design.pdf", + "DAM UI - Technical Design.pdf"] + +print ("##teamcity[testStarted name='PDF Generated']") +for doc in expectedDocuments: + if doc not in pdfFiles: + print ("##teamcity[testFailed name='PDF Generated' message='{} - Not Generated']".format(doc.strip())) +print ("##teamcity[testFinished name='PDF Generated']") + + +logFiles = os.listdir(logDirectory) +for log in logFiles: + name = log.strip("_Log.txt") + path = os.path.join(logDirectory,log) + print ("##teamcity[testSuiteStarted name='{}']".format(name)) + + fi = open(path, 'r') + logLines = fi.readlines() + + print ("##teamcity[testStarted name='LaTeX Warnings']") + for line in logLines: + text = line.replace("'", " ") + text = text.replace("`", " ") + if "LaTeX Warning:" in line: + if "was:used:in:doc" not in text and "\@arrayparboxrestore" not in text and "There were multiply-defined labels" not in text and "underbar has changed" not in text and "underline has changed" not in text and 'Font shape declaration has incorrect series value' not in text and 'Package siunitx Warning: Option ' not in text: + print("##teamcity[testFailed name='LaTeX Warnings' message='{}']".format(text.strip())) + + print ("##teamcity[testFinished name='LaTeX Warnings']") + + print ("##teamcity[testStarted name='Citation Warnings']") + for line in logLines: + text = line.replace("'", " ") + text = text.replace("`", " ") + if "Package natbib Warning: Citation" in line: + print ("##teamcity[testFailed name='Citation Warnings' message='{}']".format(text.strip())) + + print ("##teamcity[testFinished name='Citation Warnings']") + + + print ("##teamcity[testSuiteFinished name='{}']".format(name)) + fi.close() Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/RRDPeat.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/CalcSettings.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/CalcSettings.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/CalcSettings.tex (revision 3966) @@ -0,0 +1,44 @@ +\chapter{Calculation settings}\label{sec:USCalcSettings} +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: +\begin{itemize} + \item \textit{Bishop} + \item \textit{UpliftVan} + \item \textit{Bishop-UpliftVan} +\end{itemize} + +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. +The combi model \textit{Bishop-UpliftVan} always uses the brute force search method for the \textit{Bishop} calculations whereas for the \textit{UpliftVan} a choice can be made between brute force and \textit{Bee Swarm}. + +The determination of position the grid(s) must offer automatic positioning next to a user steered method. +In the latter case, the user defines the dimension of the grid(s) by entering the number of grid points and the distance between the points +(in both X- and Z-direction; for both grids when required). + +The combi model \textit{Bishop-UpliftVan} performs the calculations as follows. For each calculation that is to be made +(a combination of location, scenario, subsoil/surface line and iteration step), first of all a short calculation is performed to determine whether uplift does occur for the given case. +If so, an \textit{UpliftVan} calculation is to be performed next to the \textit{Bishop} calculation that is always part of this model. +If not, only the \textit{Bishop} calculation is done. + +For each calculation, at least one stix file is written to a calculation folder per model. +This (result) stix file hold the input as passed to the \textit{Macro Stability} kernel as well as the resulting slip circle (\textit{Bishop}) or slip plane (\textit{UpliftVan}). +This file can be used to replicate the result as obtained using DAM by performing the calculation with \textit{D-Stability}. +This of course will only be true when the same version of \textit{Macro Stability} kernel is used by both programs. + +Possible second stix = input. + +\section{Piping}\label{sec:piping} + +\subsection{Models} +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} + +For the description of the models, see https://publicwiki.deltares.nl/display/DAM/Piping Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DTHAdaptedGeometry.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/Features.wxi =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Features.wxi (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Features.wxi (revision 3966) @@ -0,0 +1,10 @@ + + + + + + + + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMMainDataflow.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/ResultsDisplay.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/ResultsDisplay.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/ResultsDisplay.tex (revision 3966) @@ -0,0 +1,97 @@ +\chapter{Display results}\label{sec:USDisplayResults} + +The user must be able to view the results of the calculations within \ProgramName. + +The overall results at main level must be presented in a table so these can be exported and/or copy pasted in an excel sheet. +Unless stated otherwise, all results are read only. + +Next to that, the individual results of a single calculation must be presented in a property view. +This view must show the relevant information about the calculation +(i.e. what location, profile, scenario etc. it represents) as well as the main results. +An optional graphic presentation of the results must be offered when applicable (e.g. the picture of the final slip circle for a bishop stability calculation). +It must also be possible to open/recalculate the individual result in the original program from within \ProgramName when applicable. + +\section{Stabilty results} +The results presented in the table for the stability calculations must be (at least but not limited to): +\begin{itemize} + \item name of the location + \item name of the scenario + \item calculation result (succeeded, failed, not calculated) + \item location coordinates (in RD) + \item type of analysis (no adaption/adapt geometry) + \item uplift (yes/no) + \item profile name + \item profile probability + \item the safety factor + \item entry point of the slip plane + \item exit point of the slip plane + \item Result messages (e.g. error messages from calculation/validation) + \item Number of iterations (important for Design with adapt geometry) + \item Notes (free remarks by user, editable) + \item Evaluation (Not evaluated/Accepted/Rejected, editable) +\end{itemize} + +In the technical design (\citep{DAMUI_TechnicalDesign}), a full list of all required results is presented. + +\section{Piping results} +The results per individual calculation presented using a table for the piping calculations must be (at least but not limited to): +\begin{itemize} + \item name of the location + \item name of the scenario + \item calculation result (succeeded, failed, not calculated) + \item location coordinates (in RD) + \item type of analysis (no adaption/adapt geometry) + \item uplift (yes/no) + \item profile name + \item profile probability + \item safety factor (= piping factor) + \item required safety factor + \item River level + \item Piping Model + \item Entry point piping X (local) + \item Exit point piping X (local) + \item Seepage length piping + \item Hcritical + \item Uplift safety factor + \item Backward erosion safety factor + \item Backward erosion safety factor (WBI*) + \item Backward erosion CCreep (WBI*) + \item Backward erosion hc (WBI*) + \item Backward erosion delta hc (WBI*) + \item Backward erosion reduced delta hc (WBI*) + \item Uplift safety factor (WBI*) + \item Uplift hc (WBI*) + \item Uplift delta hc (WBI*) + \item Heave safety factor (WBI*) + \item Heave hc (WBI*) + \item Heave gradient (WBI*) + \item Piping hc (WBI*) + \item Effective stress exit point (WBI*) + \item Result messages (e.g. error messages from calculation/validation) + \item Number of iterations (important for option Design with adapt geometry) + \item Notes (free remarks by user, editable) + \item Evaluation (Not evaluated/Accepted/Rejected, editable) +\end{itemize} +\Note{*: Should only be visibile when the WBI model is used. A full list of all parameters and their dependency on the used model is provided in the technical design \citep{DAMUI_TechnicalDesign}. + +In the property view (per result) the next items must be displayed and for a part be editable: +\begin{itemize} + \item name of the location + \item profile name + \item Piping Model + \item name of the scenario + \item safety factor (= piping factor) + \item calculation result (succeeded, failed, not calculated) + \item Number of iterations (important for Desing with adapt geometry) + \item Evaluation (Not evaluated/Accepted/Rejected, editable) + \item Notes (free remarks by user, editable) +\end{itemize} + +In order to be able to (re-)display the results mentioned above when loading a project file that already calculated them, +these results must be part of the damx project file itself. + +Finally, some extra information that can be useful to examine the results further +(such as the profile and surface line used in the analysis) +are written to an external file per location, scenario, profile. +Note that the name of the file must be added to the individual results per calculation as part of the damx project file. +The data in this file will be used to display the adapted surfaceline graphically when this is available. For this purpose, the file should be read upon selection of the result. Index: DamClients/DamUI/tags/23.1.1/setup/Dam.wixproj =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Dam.wixproj (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Dam.wixproj (revision 3966) @@ -0,0 +1,105 @@ + + + + + Debug + x86 + 3.10 + f7a7c140-89cc-4479-9688-265bbbad274b + 2.0 + Dam + Package + + + Dam + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + False + + + ICE57 + + + bin\$(Configuration)\ + obj\$(Configuration)\ + ICE57 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(WixExtDir)\WixUtilExtension.dll + WixUtilExtension + + + $(WixExtDir)\WixUIExtension.dll + WixUIExtension + + + + + DSeries + {8caf5219-9f89-443f-8924-800ae583d7ba} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file Index: DamClients/DamUI/tags/23.1.1/setup/Associates.wxi =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Associates.wxi (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Associates.wxi (revision 3966) @@ -0,0 +1,8 @@ + + + + + + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataExport.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataExport.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataExport.tex (revision 3966) @@ -0,0 +1,23 @@ +\chapter{Data export}\label{sec:USDataExport} + +The user must be able to export the following data from \ProgramName: + +\begin{itemize} + \item The calculation log + (the log that is produced during the calculations with all errors and warnings provided by kernel validation and calculation) + must be saved as text file. + This needs to be done automatically for every performed calculation. + In order to keep the files traceable and apart, a time stamp will be incorporated in the filename. + \item Redesigned surface lines after calculation with characteristic points. + The during calculation redesigned surface lines and the corresponding characteristic points must be exported in the same format as the import files. + It is a complete set of all calculated locations. + \item Location scenarios file(s). + The location scenario data can be exported to a csv file per location. + \item Calculation result file(s). + For stability calculations these are both the sti and the std file as used/produced by D-Geo Stability. + For Piping, these are the xml files containing the redesigned surface line and its belonging 1D profile. + \item Calculation image when available. + This is only for stability calculations. + The image shows the critical slip plane. + In case of design, Adapted geometry, the slip plane will be projected on the adapted geometry. +\end{itemize} Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DeletedGeometryPoints.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/ReduceSlope.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/dempingfactor.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Release Notes.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/buildDocs.bat =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/buildDocs.bat (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/buildDocs.bat (revision 3966) @@ -0,0 +1,24 @@ +REM This is the order of dependencies of the files. + +mkdir "BuildLogs" + +cd ".\DAM UI - Functional Design" +pdflatex "DAM UI - Functional Design.tex" +bibtex "DAM UI - Functional Design" +pdflatex "DAM UI - Functional Design.tex" +pdflatex "DAM UI - Functional Design.tex" +pdflatex "DAM UI - Functional Design.tex" > DamUIFunctionalDesign_Log.txt +xcopy DamUIFunctionalDesign_Log.txt "..\BuildLogs" /Y +xcopy *.pdf ..\ /Y + +cd "..\Dam UI - Technical Design" +pdflatex "DAM UI - Technical Design.tex" +bibtex "DAM UI - Technical Design" +pdflatex "DAM UI - Technical Design.tex" +pdflatex "DAM UI - Technical Design.tex" +pdflatex "DAM UI - Technical Design.tex" > DamUITechnicalDesign_Log.txt +xcopy DamUITechnicalDesign_Log.txt "..\BuildLogs" /Y +xcopy *.pdf ..\ /Y + +cd .. +python parseLogs.py \ No newline at end of file Index: DamClients/DamUI/tags/23.1.1/setup/Resources/setup_banner.jpg =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataEdit.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataEdit.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataEdit.tex (revision 3966) @@ -0,0 +1,27 @@ +\chapter{Data edit}\label{sec:USDataEdit} + +\section{Navigator}\label{sec:dataeditnavigatorwindow} +Data in Navigator window is not editable. Only locations are selectable. + +\section{Tables}\label{sec:DataEditTablesWindow} +In https://repos.deltares.nl/repos/dam/DamOverall/trunk/doc/DAM General/OverviewDataUIAndEngine.xlsx column Editable in UI is given which data should be editable +It is not possible to add locations. + +\section{Cross section}\label{sec:DataEditCrossSectionWindow} +Data in cross section is not editable. + +\section{Properties}\label{sec:DataEditPropertiesWindow} +How the data is editable varies from tab: +\begin{itemize} + \item Tab Location\newline + Data is similar editable as locations tab in table window. + \item Tab Location scenarios\newline + Data is editable, but it is not possible to add scenarios. + \item Tab Surface line (NL-Hoogte geometrie)\newline + The column characteristic points is editable via a pull down menu with characteristic points. The pull down menu contains all possible characteristic points. The validation is done directly; so if an user changes something incorrect in the surface line window, validation message appears in Validation window. Validation rules are described in \autoref{sec:ValCharPoints}. +Note: The surface line points can not be edited, so after import it is not possible to let a traffic load point coincide with another characteristic point. Traffic load points can only coincide with a another characteristic point when it is defined in the import files. + \item Tab Calculations\newline + Data is not editable. +\end{itemize} + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM - Manual.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/WixUI/WixUIVariables.wxl =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/WixUI/WixUIVariables.wxl (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/WixUI/WixUIVariables.wxl (revision 3966) @@ -0,0 +1,67 @@ + + + + + Installs the most common program features of [ProductName], including manual. Recommended for most users. + + en-US + + EulaDeltares.rtf + WindowLayout_normal.en-US.xml + setup_start.jpg + + + + 88 + 88 + + + 40 + + 220 + + Arial + 10 + 8 + + + + + + The Setup Wizard will install [ProductName] on your computer. Click Next to continue or Cancel to exit the Setup Wizard. + + + + The Setup Wizard will install [ProductName] on your computer. Click Next to continue or Cancel to exit the Setup Wizard. + + + {\WixUI_Font_Title}Please read the End-User License Agreement + + + To Remove or Repair the installation of [ProductName]. Click Next to continue or Cancel to exit the Setup Wizard. + + {\WixUI_Font_Banner_Description}Select the operation you wish to perform. + {\WixUI_Font_Banner_Description}Browse to the destination folder + {\WixUI_Font_Banner_Description}Select the way you want features to be installed. + {\WixUI_Font_Banner_Description}Select the way you want features to be installed. + + {\WixUI_Font_Banner_Description}The Setup Wizard will complete the installation of [ProductName] on your computer. Click Install to continue or Cancel to exit the Setup Wizard. + {\WixUI_Font_Title}Resuming the [ProductName] Setup Wizard + + + {\WixUI_Font_Banner_Description}The disk space required for the installation of the selected features. + {\WixUI_Font_Banner_Description}Disk space required for the installation exceeds available disk space. + {\WixUI_Font_Banner_Description}Disk space required for the installation exceeds available disk space. + {\WixUI_Font_Banner_Description}Choose the setup type that best suits your needs + {\WixUI_Font_Banner_Description}Please read the following license agreement carefully + + There is a problem. An old ds flex is detected. A new version must be installed before we can install [ProductName]. + + There is a problem. An old (or no) Common Files is detected. Version 19.1 or higher must be installed before we can install [ProductName]. + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMComponents.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/Localization/Localization.wxl =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Localization/Localization.wxl (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Localization/Localization.wxl (revision 3966) @@ -0,0 +1,3 @@ + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/PL1PhreaGoesUp.png =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/pictures/DAMEngineDataModelLocation.pdf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/tags/23.1.1/setup/Manuals/Manuals.wxi =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/setup/Manuals/Manuals.wxi (revision 0) +++ DamClients/DamUI/tags/23.1.1/setup/Manuals/Manuals.wxi (revision 3966) @@ -0,0 +1,4 @@ + + + + Index: DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataDisplay.tex =================================================================== diff -u --- DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataDisplay.tex (revision 0) +++ DamClients/DamUI/tags/23.1.1/doc/DAM UI - Functional Design/DataDisplay.tex (revision 3966) @@ -0,0 +1,43 @@ +\chapter{Data display}\label{sec:USDataDisplay} + +\section{Navigator}\label{sec:DataDisplayNavigatorWindow} +Give an overview of all imported locations. +Make the locations selectable for calculation + +\section{Tables}\label{sec:DataDisplayTablesWindow} +Show per row the imported data per location, see https://repos.deltares.nl/repos/dam/DamOverall/trunk/doc/DAM General/OverviewDataUIAndEngine.xlsx for the data to be shown. +If column csv contains 'locations', item must be shown in the table. + +\section{Cross section}\label{sec:DataDisplayCrossSectionWindow} +Show the cross section of the selected location (selected in either the navigator window or the table window). Make it possible to scroll throw the different soilprofiles. + +Show the soilprofiles with material colors. + +Show the characteristic points on the surfaceline. + +\section{Properties}\label{sec:DataDisplayPropertiesWindow} +Show location data in a tab, named Location (NL: Locatie) +Show location scenarios in a tab, named Location scenarios (NL: Locatie scenario\'s) +Show surfacelines points in a tab, named Surfaceline (NL: Hoogtegeometrie). +This tab contains a table named Points (NL: Punten) with columns: +\begin{itemize} + \item Characteristic point (NL: Karakteristiek punt) + editable via pull down menu with characteristic points, see OverDataUIAndEngine.xls + \item [m] + \item [m NAP] +\end{itemize} + +Example: see D-Soil Model. + + +\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. +Display imported shapefiles when selected by user. + +\section{General}\label{sec:DisplayGeneral} +When selecting a location in navigation, table or map window, the other windows must 'follow': selecting same location. +When selecting a soilprofile in the calculations table or in the cross section window, the other window must 'follow': selecting same soil profile. + +Show popup of source of data if the mouse is above textedit or cell of table. +The text of the popup is placed in https://repos.deltares.nl/repos/dam/DamOverall/trunk/doc/DAM General/OverviewDataUIAndEngine.xlsx.