Index: DamClients/DamUI/trunk/doc/DAM UI - Technical Design/pictures/DAM UI Data Model Main.pdf =================================================================== diff -u -r3416 -r6975 --- DamClients/DamUI/trunk/doc/DAM UI - Technical Design/pictures/DAM UI Data Model Main.pdf (.../DAM UI Data Model Main.pdf) (revision 3416) +++ DamClients/DamUI/trunk/doc/DAM UI - Technical Design/pictures/DAM UI Data Model Main.pdf (.../DAM UI Data Model Main.pdf) (revision 6975) @@ -1,22 +1,30 @@ %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� +<>stream +x��YMo�H��W�Lgƛ`�N&��{�ȴ� -9�����tu��M���U� $�U�b������ŏ7 i +θ*nn�Y����`�͊�X�.�2��v��u�Z�� Q�#L�������?�� +.����.�Ϗs�A��9G�"���Ͼ���5/���osJ]p�ÿ���n��@p�>� MyX�ŵ�����]]���]��q�}V�q� ��‹�)J&���f���u�<��l�m}U�5�f۬W���� *g�a�;�4�᱓Oq&������1&u|֛�S���m�yΟ�����|�� ��@��W<E&d����,���I ��h�4����:�����i���t��TWwD�{қ⺮6ˇ���a}�?d�#�˰p�c:7��S��m�]�>��~^���>�+�����e� �:���.,-�Ⱦ8�f%IV8�%��T��P�2�����Gmɤ2�W�'x�+U%�JU"��z��Y��۟�v��V��z��5�j&��6.�n�ly��wUӾl���Z5Ϗׯ�������>�39�0��S�Ԭ�?�o�v���`�]E;���Y���j1vv1 �s� +�С +)��Eh8�p?�8a�6�A�!�a�U�w����Q�l0�i� +�]���Aò�|T��M��]���ꭸ���� ˨��ű��Q}C|���W!j#�Xu}�к��F +��f�a�ۈ%�8'�4gX�Ot5�[[(6 +���Z���`Ӫ6���*�9�-q��_�v @�v`�����l�.�V���!8+Ǔ��tg�hp�Uɨ�����*7�a�ޥ�q'�o¸Jv��6>�F�.C���h�����]O��!���}�Ժ��u�A +�rO��UҢCaK������'.g���l*e6U2�stp�AٱYձ�訬��%�TW�󟳣=$$�����W�qL{���[F��a�g��ݣM}����-��&v50!�T�6}c���V�i΄�wW��� +�����z��!h� ���~ u#�(7B�8�{t0�X�(`��P4�Ä�r<�ӝͮ�����zY��M��\�:w/$y����5b�H�#'YF6���e��I�;����YY�{GM��/���(@𧻓�yd8#� A:w���Obtf�Q���1�c���~�~Y�~�����v�y}WW�p��7���������s��� �:���(v`Lm���nl��u�m��4� +�+� +L�)�� ����I���U!e�A��e�ϝ�-q�$��P�O`�3�2�p&}��u� �dz8�9�@�q�Sa�A�MB7AtVp�Li����s�2; +8A���3�9$r.�aW_(��ʔK��E(D�.�FL�ȡ�7�_)�Dc�A���,D)L��4��+ҋ�Τg�,�fV��~�fs*ȌF�"��9Z{d'6�1���n{- ń�F�xʌ��[2'�p�ra5I������X�&Չ�Щ�t�s�]�H{ [�7��O�awڙ�"N@��� ��I��d�nh�.�ގ�(ȧ�F�[2�9�;���T)5I��T�i�=B�����ؐ�(*7�թ�թ���H�����mgP�T��ER�ej�(S[N���O�c�~� @�ا������j� +"�����xg��ǭ2E+� �t�Aʥ#U���ڣ)Z1�P�kU��f �XJd"ì\�%�q�{!�iA�iA�)G��HO�H�f9}���Ӝ�#�7Ч�q���Ofp* endstream endobj 6 0 obj -<>/Font<>>>/Parent 5 0 R/MediaBox[0 0 1460 990]>> +<>/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<>>>/MediaBox[0 0 1460 1050]>> endobj 3 0 obj -<> +<> endobj 2 0 obj <> @@ -25,28 +33,28 @@ <> 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 +0000002377 00000 n +0000002352 00000 n +0000002264 00000 n 0000000015 00000 n -0000002062 00000 n -0000001732 00000 n -0000002113 00000 n -0000002158 00000 n +0000002402 00000 n +0000002071 00000 n +0000002453 00000 n +0000002498 00000 n trailer -<]/Root 7 0 R/Size 9>> +<<6bff019a147eab16227d49957b44bd56>]/Info 8 0 R/Size 9>> %iText-5.4.1 startxref -2311 +2651 %%EOF Index: DamClients/DamUI/trunk/doc/UML Diagrams/DAM UI Data Model Main.uxf =================================================================== diff -u -r3361 -r6975 --- DamClients/DamUI/trunk/doc/UML Diagrams/DAM UI Data Model Main.uxf (.../DAM UI Data Model Main.uxf) (revision 3361) +++ DamClients/DamUI/trunk/doc/UML Diagrams/DAM UI Data Model Main.uxf (.../DAM UI Data Model Main.uxf) (revision 6975) @@ -5,25 +5,32 @@ UMLClass 160 - 270 + 130 250 - 150 + 290 Dike -- -+ Soils -+ SoilDatabaseName -+ SoilProfile1Ds ++ Segments + Locations ++ SurfaceLines2 ++ SoilProfiles ++ SoilList ++ DamSoils ++ Aquifers + Gauges ++ GaugePLLines ++ BackgroundRepositoryFeatures ++ FeatureRepository + UMLClass - 1010 - 880 + 1000 + 850 250 110 @@ -121,13 +128,13 @@ Relation 400 - 110 + 180 390 - 340 + 270 lt=<- m1=0..n - 350.0;320.0;350.0;10.0;10.0;10.0 + 350.0;250.0;350.0;10.0;10.0;10.0 Relation @@ -146,46 +153,16 @@ 400 360 - 630 - 610 + 620 + 580 lt=<- m1=0..n - 610.0;580.0;80.0;580.0;80.0;10.0;10.0;10.0 + 600.0;550.0;80.0;550.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 @@ -249,14 +226,14 @@ Relation - 1250 + 1240 540 - 220 - 430 + 230 + 400 lt=<- m1=0..n - 10.0;400.0;200.0;400.0;200.0;10.0 + 10.0;370.0;210.0;370.0;210.0;10.0 Relation @@ -270,4 +247,76 @@ m1=1..1 10.0;10.0;90.0;10.0 + + UMLClass + + 170 + 1010 + 250 + 130 + + DamProjectCalculationSpecification +-- ++ FailureMechanismSystemType ++ PipingModelType ++ StabilityModelType ++ StabilityParameters + + + + + + UMLClass + + 550 + 1010 + 320 + 130 + + StabilityParameters +-- ++ SearchMethod ++ IsUpliftVanRunOnlyWhenUpliftOccurs ++ SlipCircleDefinition + + + + + Relation + + 410 + 1060 + 160 + 40 + + lt=-> +m1=1..1 + 10.0;10.0;140.0;10.0 + + + Relation + + 860 + 1060 + 160 + 40 + + lt=-> +m1=1..1 + 10.0;10.0;140.0;10.0 + + + UMLClass + + 1000 + 1010 + 250 + 130 + + SlipCircleDefinition +-- ++ Parameters + + + Index: DamClients/DamUI/trunk/doc/DAM UI - Technical Design/pictures/DAM UI Main Dataflow.pdf =================================================================== diff -u -r3416 -r6975 Binary files differ Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/CalcSettings.tex =================================================================== diff -u -r4536 -r6975 --- DamClients/DamUI/trunk/doc/DAM UI - Functional Design/CalcSettings.tex (.../CalcSettings.tex) (revision 4536) +++ DamClients/DamUI/trunk/doc/DAM UI - Functional Design/CalcSettings.tex (.../CalcSettings.tex) (revision 6975) @@ -1,5 +1,6 @@ \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. +All calculation settings are the same for all locations within the project. +So there is only one set of calculation settings. \section{Macrostability}\label{sec:Macrostability} In DAM the following models for Stability Inside can be used: Index: DamClients/DamUI/trunk/doc/UML Diagrams/DAM UI Main Dataflow.uxf =================================================================== diff -u -r3361 -r6975 --- DamClients/DamUI/trunk/doc/UML Diagrams/DAM UI Main Dataflow.uxf (.../DAM UI Main Dataflow.uxf) (revision 3361) +++ DamClients/DamUI/trunk/doc/UML Diagrams/DAM UI Main Dataflow.uxf (.../DAM UI Main Dataflow.uxf) (revision 6975) @@ -151,8 +151,7 @@ 70 CSV-files -Soilbase -Sti-files +Stix-files Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataFormat.tex =================================================================== diff -u -r4536 -r6975 --- DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataFormat.tex (.../DataFormat.tex) (revision 4536) +++ DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataFormat.tex (.../DataFormat.tex) (revision 6975) @@ -15,7 +15,7 @@ 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 +In OverviewDataUIAndEngine.xlsx is described what data is required and when. Example: crosssection is 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. @@ -26,7 +26,6 @@ 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