Index: dam kernel/trunk/doc/Dam kernel - Technical Design/DAM kernel - Technical Design.tex =================================================================== diff -u -r114 -r115 --- dam kernel/trunk/doc/Dam kernel - Technical Design/DAM kernel - Technical Design.tex (.../DAM kernel - Technical Design.tex) (revision 114) +++ dam kernel/trunk/doc/Dam kernel - Technical Design/DAM kernel - Technical Design.tex (.../DAM kernel - Technical Design.tex) (revision 115) @@ -291,8 +291,10 @@ This submodule calculates a specific failure mechanism by calling the IFailureMechanism interface of the wrapper implementation. \subsection{Design Calculation Runner} This submodule performs a design calculation for a specific failure mechanism by calling the IFailureMechanism interface and several surfaceline adapters through their ISurfacelineAdaptert interface. -\subsection{Operation Calculation Runner} +\subsection{Operational Calculation Runner} This submodule can perform a calculation based on sensor readings (as time-series). The load on the systems (the waternet) will be based on those sensor readings. This can be used in operational systems like DamLive. +\subsection{Probabilistic Calculation Runner} +This submodule performs a probabilistic calculation for a specific location and failure mechanism. The outcome is a failure probability for that location and failure mechanism. \subsection{Geometry creator} This submodule combines a surfaceline with a subsoil scenario. The output is a gemetry that can be used by the failure mechanisms to perform a calculation. \subsection{Waternet creator} Index: dam kernel/trunk/doc/UML Diagrams/DAM kernel Components.uxf =================================================================== diff -u -r114 -r115 --- dam kernel/trunk/doc/UML Diagrams/DAM kernel Components.uxf (.../DAM kernel Components.uxf) (revision 114) +++ dam kernel/trunk/doc/UML Diagrams/DAM kernel Components.uxf (.../DAM kernel Components.uxf) (revision 115) @@ -1,26 +1,27 @@ - 10 + 8 UMLGeneric - 480 - 1220 - 290 - 80 + 472 + 976 + 232 + 64 symbol=component -Surfaceline Adapter Height +Surfaceline Adapter Height +group=9 UMLGeneric - 80 - 560 - 260 - 80 + 152 + 448 + 208 + 64 symbol=component @@ -32,9 +33,9 @@ UMLGeneric 440 - 100 - 240 - 80 + 80 + 192 + 64 symbol=component @@ -45,21 +46,22 @@ UMLDeployment - 450 - 1160 - 690 - 590 + 448 + 928 + 552 + 528 - Common modules + Common modules +group=9 UMLDeployment - 420 - 50 - 290 - 440 + 424 + 40 + 232 + 352 Assessment Primary Dikes group=4 @@ -68,10 +70,10 @@ UMLGeneric - 80 - 200 - 270 - 80 + 152 + 160 + 216 + 64 symbol=component @@ -82,10 +84,10 @@ UMLGeneric - 80 - 300 - 270 - 80 + 152 + 240 + 216 + 64 symbol=component @@ -96,10 +98,10 @@ UMLGeneric - 80 - 100 - 270 - 80 + 152 + 80 + 216 + 64 symbol=component @@ -110,49 +112,52 @@ UMLGeneric - 480 - 1320 - 290 - 80 + 472 + 1056 + 232 + 64 symbol=component -Surfaceline Adapter Slope +Surfaceline Adapter Slope +group=9 UMLGeneric - 790 - 1320 - 290 - 80 + 720 + 1056 + 232 + 64 symbol=component -Surfaceline Adapter Shoulder +Surfaceline Adapter Shoulder +group=9 UMLGeneric - 480 - 1420 - 290 - 80 + 472 + 1136 + 232 + 64 symbol=component -Failure mechanism Calculation Runner +Failure mechanism Calculation Runner +group=9 UMLDeployment - 70 - 1160 - 350 - 590 + 144 + 928 + 280 + 528 Failure mechanism wrappers group=1 @@ -161,10 +166,10 @@ UMLDeployment - 70 - 50 - 300 - 440 + 144 + 40 + 240 + 352 Assessment Regional Dikes group=3 @@ -173,10 +178,10 @@ UMLDeployment - 60 - 510 - 310 - 440 + 136 + 408 + 248 + 352 Design Primary Dikes group=5 @@ -185,10 +190,10 @@ UMLGeneric - 100 - 1210 - 290 - 80 + 168 + 968 + 232 + 64 symbol=component @@ -199,10 +204,10 @@ UMLGeneric - 100 - 1310 - 290 - 80 + 168 + 1048 + 232 + 64 symbol=component @@ -213,10 +218,10 @@ UMLGeneric - 100 - 1410 - 290 - 80 + 168 + 1128 + 232 + 64 symbol=component @@ -227,64 +232,68 @@ UMLGeneric - 790 - 1220 - 290 - 80 + 720 + 976 + 232 + 64 symbol=component Surfaceline Adapter NWO -(NEW) +(NEW) +group=9 UMLGeneric - 790 - 1420 - 290 - 80 + 720 + 1136 + 232 + 64 symbol=component Scripting engine -(NEW) +(NEW) +group=9 UMLGeneric - 790 - 1620 - 290 - 80 + 720 + 1296 + 232 + 64 symbol=component -Geometry creator +Geometry creator +group=9 UMLGeneric - 790 - 1520 - 290 - 80 + 720 + 1216 + 232 + 64 symbol=component -Waternet creator +Waternet creator +group=9 UMLDeployment - 420 - 510 - 290 - 440 + 424 + 408 + 232 + 352 NWO Calculation Primary Dikes (NEW) @@ -295,9 +304,9 @@ UMLGeneric 440 - 560 - 250 - 80 + 448 + 200 + 64 symbol=component @@ -308,56 +317,57 @@ UMLDeployment - 40 + 120 0 - 1060 - 980 + 848 + 784 Main modules UMLDeployment - 40 - 1100 - 1160 - 730 + 120 + 880 + 928 + 632 Supporting modules Relation - 410 - 970 - 30 - 150 + 416 + 776 + 24 + 120 lt=[=]-[<] 10.0;10.0;10.0;130.0 UMLGeneric - 480 - 1520 - 290 - 80 + 472 + 1216 + 232 + 64 symbol=component -Design Calculation Runner +Design Calculation Runner +group=9 UMLGeneric - 780 - 100 - 240 - 80 + 712 + 80 + 192 + 64 symbol=component @@ -368,10 +378,10 @@ UMLDeployment - 760 - 50 - 290 - 440 + 696 + 40 + 232 + 352 Operational Primary Dikes group=8 @@ -380,14 +390,29 @@ UMLGeneric - 480 - 1620 - 290 - 80 + 472 + 1296 + 232 + 64 symbol=component -Operation Calculation Runner +Operation Calculation Runner +group=9 + + UMLGeneric + + 472 + 1376 + 232 + 64 + + symbol=component + +Probabilistic Calculation Runner +group=9 + + Index: dam kernel/trunk/doc/Dam kernel - Technical Design/pictures/DAMKernelComponents.pdf =================================================================== diff -u -r114 -r115 Binary files differ