Skip to content

Commit

Permalink
update figures and meshformat, hopefully the last time
Browse files Browse the repository at this point in the history
  • Loading branch information
@project-fluxo-old
project-fluxo-old committed Nov 23, 2023
1 parent c2e72ba commit d61504c
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 66 deletions.
Binary file modified docs/documentation/userguide/figures/2d_edge_vertex_connectivity_example.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/documentation/userguide/figures/2d_edge_vertex_connectivity_example.odg
View file
Binary file not shown.
Binary file modified docs/documentation/userguide/figures/2d_edge_vertex_connectivity_example.pdf
View file
Binary file not shown.
136 changes: 70 additions & 66 deletions docs/documentation/userguide/meshformat.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,23 +279,23 @@ The **EdgeInfo** array for the example mesh {numref}`fig:exmesh2d` with 4 elemen
name: tab:edge_info_array
---
| | (+/- orientation)FEMEdgeID | offsetIndEDGEConnect | LastIndEDGEConnect | [#ElemID,locEdgeID] | [in **ElemInfo**] |
| - | - | - | - | - | - |
| 1 | -6 | 0 | 1 | [#1,1] | [(offsetIndEDGE,1)+1] |
| 2 | -10 | 1 | 2 | [#1,2] | |
| 3 | +2 | 2 | 2 | [#1,3] | |
| 4 | +11 | 2 | 3 | [#1,4] | [(lastIndEDGE,1)] |
| 5 | +7 | 3 | 3 | [#2,1] | [(offsetIndEDGE,2)+1] |
| 6 | -8 | 3 | 4 | [#2,2] | |
| 7 | +6 | 4 | 5 | [#2,3] | |
| 8 | -9 | 5 | 6 | [#2,4] | [(lastIndEDGE,2)] |
| 9 | +3 | 6 | 6 | [#3,1] | [(offsetIndEDGE,3)+1] |
| 10 | +10 | 6 | 7 | [#3,2] | |
| 11 | +8 | 7 | 8 | [#3,3] | |
| 12 | -5 | 8 | 9 | [#3,4] | [(lastIndEDGE,3)] |
| 13 | +1 | 9 | 9 | [#4,1] | [(offsetIndEDGE,4)+1] |
| 14 | +5 | 9 | 10 | [#4,2] | |
| 15 | +9 | 10 | 11 | [#4,3] | |
| 16 | -11 | 11 | 12 | [#4,4] | [(lastIndEDGE,4)] |
| - | - | - | - | - | - |
| 1 | - 6 | 0 | 1 | [#1,1] | [(offsetIndEDGE,1)+1] |
| 2 | - 10 | 1 | 2 | [#1,2] | |
| 3 | + 2 | 2 | 2 | [#1,3] | |
| 4 | + 11 | 2 | 3 | [#1,4] | [(lastIndEDGE,1)] |
| 5 | + 7 | 3 | 3 | [#2,1] | [(offsetIndEDGE,2)+1] |
| 6 | - 8 | 3 | 4 | [#2,2] | |
| 7 | + 6 | 4 | 5 | [#2,3] | |
| 8 | - 9 | 5 | 6 | [#2,4] | [(lastIndEDGE,2)] |
| 9 | + 3 | 6 | 6 | [#3,1] | [(offsetIndEDGE,3)+1] |
| 10 | + 10 | 6 | 7 | [#3,2] | |
| 11 | + 8 | 7 | 8 | [#3,3] | |
| 12 | - 5 | 8 | 9 | [#3,4] | [(lastIndEDGE,3)] |
| 13 | + 1 | 9 | 9 | [#4,1] | [(offsetIndEDGE,4)+1] |
| 14 | + 5 | 9 | 10 | [#4,2] | |
| 15 | + 9 | 10 | 11 | [#4,3] | |
| 16 | - 11 | 11 | 12 | [#4,4] | [(lastIndEDGE,4)] |
```

```{table} **EdgeInfo** definitions
Expand All @@ -312,29 +312,30 @@ name: tab:edge_info_def
---
name: tab:edge_conn_info
---
| | (+/- master/slave)nbElemID | (+/- orientation)nbLocEdgeID | [#ElemID,locEdgeID,FEMEdgeID] | [in **EdgeInfo**] |
| - | - | - | - | - |
| 1 | -2 | +3 | [#1,1,6 ] | [(offsetIndEDGEConnect, 1)+1] |
| 2 | -3 | +2 | [#1,2,10] | [(offsetIndEDGEConnect, 2)+1] |
| 3 | +4 | -4 | [#1,4,11] | [(offsetIndEDGEConnect, 4)+1] |
| 4 | -3 | +3 | [#2,2,8 ] | [(offsetIndEDGEConnect, 6)+1] |
| 5 | +1 | -1 | [#2,3,6 ] | [(offsetIndEDGEConnect, 7)+1] |
| 6 | -4 | +3 | [#2,4,9 ] | [(offsetIndEDGEConnect, 8)+1] |
| 7 | 1 | -2 | [#3,2,10] | [(offsetIndEDGEConnect,10)+1] |
| 8 | 2 | -2 | [#3,3,8 ] | [(offsetIndEDGEConnect,11)+1] |
| 9 | 4 | +2 | [#3,4,5 ] | [(offsetIndEDGEConnect,12)+1] |
| 10 | 3 | -4 | [#4,2,5 ] | [(offsetIndEDGEConnect,14)+1] |
| 11 | 2 | -4 | [#4,3,9 ] | [(offsetIndEDGEConnect,15)+1] |
| 12 | 1 | +4 | [#4,4,11] | [(offsetIndEDGEConnect,16)+1] |
| | (+/- master/slave) nbElemID | (+/- orientation)nbLocEdgeID | [#ElemID,locEdgeID,FEMEdgeID] | [in **EdgeInfo**] |
| - | - | - | - | - |
| 1 | + 2 | + 3 | [#1,1,6 ] | [(offsetIndEDGEConnect, 1)+1] |
| 2 | - 3 | + 2 | [#1,2,10] | [(offsetIndEDGEConnect, 2)+1] |
| 3 | + 4 | - 4 | [#1,4,11] | [(offsetIndEDGEConnect, 4)+1] |
| 4 | - 3 | + 3 | [#2,2,8 ] | [(offsetIndEDGEConnect, 6)+1] |
| 5 | - 1 | - 1 | [#2,3,6 ] | [(offsetIndEDGEConnect, 7)+1] |
| 6 | - 4 | + 3 | [#2,4,9 ] | [(offsetIndEDGEConnect, 8)+1] |
| 7 | + 1 | - 2 | [#3,2,10] | [(offsetIndEDGEConnect,10)+1] |
| 8 | + 2 | - 2 | [#3,3,8 ] | [(offsetIndEDGEConnect,11)+1] |
| 9 | - 4 | + 2 | [#3,4,5 ] | [(offsetIndEDGEConnect,12)+1] |
| 10 | + 3 | - 4 | [#4,2,5 ] | [(offsetIndEDGEConnect,14)+1] |
| 11 | + 2 | - 4 | [#4,3,9 ] | [(offsetIndEDGEConnect,15)+1] |
| 12 | - 1 | + 4 | [#4,4,11] | [(offsetIndEDGEConnect,16)+1] |
```
```{table} **EdgeConnectInfo** definitions
---
name: tab:edge_conn_info_def
---
| | |
| :--- | :--- |
| *nbElemID*: | element ID of connected element via the edge. Sign refers if the edge is master or slave (`+` master / `-` slave) |
| *nbLocEdgeID*: | local Edge ID in neighbor element. Sign refers to the local to global edge orientation (`+` is same / `-` is opposite) |
| *nbElemID*: | element ID of connected element via the edge. Sign refers if the neighbor edge is master or slave (`+` master / `-` slave) |
| | from the master slave information, the master/slave of the elements' edge can be deduced |
| *nbLocEdgeID*: | local Edge ID in neighbor element. Sign refers to the local to global edge orientation of neighbor edge (`+` is same / `-` is opposite) |
```


Expand Down Expand Up @@ -381,6 +382,7 @@ name: tab:vertex_info_array
| 15 | 2 | 25 | 28 | [#4,3] | |
| 16 | 5 | 28 | 30 | [#4,4] | [ (lastIndVERTEX,4) ]|
```

```{table} **VertexInfo** definitions
---
name: tab:vertex_info_def
Expand All @@ -407,46 +409,48 @@ name: tab:vertex_connect_info
---
name: tab:vertex_connect_info_array
---
| | (+/- master/slave)nbElemID | localNodeID | [#ElemID,locVertexID,FEMVertexID] | [in **VertexInfo**] |
| - | - | - | - | - |
| 1 | -4 | 4 | [#1,1,5] | [(offsetIndVERTEXConnect,1)+1] |
| 2 | -2 | 4 | [#1,1,5] | [ (lastIndVERTEXConnect,1) ] |
| 3 | -2 | 3 | [#1,2,6] | [(offsetIndVERTEXConnect,2)+1] |
| 4 | -3 | 3 | [#1,2,6] | [ (lastIndVERTEXConnect,2) ] |
| 5 | -3 | 2 | [#1,3,3] | [(offsetIndVERTEXConnect,3)+1] |
| 6 | -4 | 1 | [#1,4,4] | [(offsetIndVERTEXConnect,4)+1] |
| 7 | -4 | 3 | [#2,1,2] | [(offsetIndVERTEXConnect,5)+1] |
| 8 | +3 | 4 | [#2,2,2] | |
| 9 | +2 | 2 | [#2,3,6] | [ (lastIndVERTEXConnect,5) ] |
| 10 | +4 | 3 | [#2,3,6] | [(offsetIndVERTEXConnect,6)+1] |
| 11 | +3 | 4 | [#2,4,5] | |
| 12 | +2 | 1 | [#2,4,5] | [ (lastIndVERTEXConnect,6) ] |
| 13 | +1 | 2 | [#2,1,1] | [ (offsetIndVERTEXConnect,7)+1] |
| 14 | +3 | 3 | [#2,2,3] | [ (lastIndVERTEXConnect,7) ] |
| 15 | +1 | 1 | [#2,1,1] | [ (offsetIndVERTEXConnect,8)+1] |
| 16 | +4 | 4 | [#2,1,1] | [ (lastIndVERTEXConnect,8) ] |
| 17 | +4 | 2 | [#3,1,1] | [ (offsetIndVERTEXConnect,9)+1] |
| 18 | +1 | 3 | [#3,1,1] | [(offsetIndVERTEXConnect,10)+1] |
| 19 | +1 | 2 | [#3,1,1] | [(offsetIndVERTEXConnect,11)+1] |
| 20 | +2 | 3 | [#3,1,1] | [ (lastIndVERTEXConnect,11) ] |
| 21 | +2 | 2 | [#3,1,1] | [(offsetIndVERTEXConnect,12)+1] |
| 22 | +2 | 1 | [#3,1,1] | |
| 23 | +4 | 3 | [#3,1,1] | [ (lastIndVERTEXConnect,12) ] |
| 24 | +1 | 4 | [#4,1,1] | [(offsetIndVERTEXConnect,13)+1] |
| 25 | +3 | 1 | [#4,1,1] | [(offsetIndVERTEXConnect,14)+1] |
| 26 | +2 | 1 | [#4,1,1] | [(offsetIndVERTEXConnect,15)+1] |
| 27 | +2 | 2 | [#4,1,1] | |
| 28 | +3 | 4 | [#4,1,1] | [ (lastIndVERTEXConnect,15) ] |
| 29 | +1 | 1 | [#4,1,1] | [(offsetIndVERTEXConnect,16)+1] |
| 30 | +2 | 4 | [#4,1,1] | [ (lastIndVERTEXConnect,16) ] |
| | (+/- master/slave) nbElemID | localNodeID | [#ElemID,locVertexID,FEMVertexID] | [in **VertexInfo**] |
| - | - | - | - | - |
| 1 | - 4 | 4 | [#1,1,5] | [(offsetIndVERTEXConnect,1)+1] |
| 2 | - 2 | 4 | [#1,1,5] | [ (lastIndVERTEXConnect,1) ] |
| 3 | - 2 | 3 | [#1,2,6] | [(offsetIndVERTEXConnect,2)+1] |
| 4 | - 3 | 3 | [#1,2,6] | [ (lastIndVERTEXConnect,2) ] |
| 5 | - 3 | 2 | [#1,3,3] | [(offsetIndVERTEXConnect,3)+1] |
| 6 | - 4 | 1 | [#1,4,4] | [(offsetIndVERTEXConnect,4)+1] |
| 7 | - 4 | 3 | [#2,1,2] | [(offsetIndVERTEXConnect,5)+1] |
| 8 | - 3 | 4 | [#2,1,2] | |
| 9 | - 2 | 2 | [#2,1,2] | [ (lastIndVERTEXConnect,5) ] |
| 10 | - 4 | 3 | [#2,2,2] | [(offsetIndVERTEXConnect,6)+1] |
| 11 | - 3 | 4 | [#2,2,2] | |
| 12 | + 2 | 1 | [#2,2,2] | [ (lastIndVERTEXConnect,6) ] |
| 13 | + 1 | 2 | [#2,3,6] | [ (offsetIndVERTEXConnect,7)+1] |
| 14 | - 3 | 3 | [#2,3,6] | [ (lastIndVERTEXConnect,7) ] |
| 15 | + 1 | 1 | [#2,4,5] | [ (offsetIndVERTEXConnect,8)+1] |
| 16 | - 4 | 4 | [#2,4,5] | [ (lastIndVERTEXConnect,8) ] |
| 17 | + 4 | 2 | [#3,1,1] | [ (offsetIndVERTEXConnect,9)+1] |
| 18 | + 1 | 3 | [#3,2,3] | [(offsetIndVERTEXConnect,10)+1] |
| 19 | + 1 | 2 | [#3,3,6] | [(offsetIndVERTEXConnect,11)+1] |
| 20 | - 2 | 3 | [#3,3,6] | [ (lastIndVERTEXConnect,11) ] |
| 21 | - 2 | 2 | [#3,4,2] | [(offsetIndVERTEXConnect,12)+1] |
| 22 | + 2 | 1 | [#3,4,2] | |
| 23 | - 4 | 3 | [#3,4,2] | [ (lastIndVERTEXConnect,12) ] |
| 24 | + 1 | 4 | [#4,1,4] | [(offsetIndVERTEXConnect,13)+1] |
| 25 | - 3 | 1 | [#4,2,1] | [(offsetIndVERTEXConnect,14)+1] |
| 26 | + 2 | 1 | [#4,3,2] | [(offsetIndVERTEXConnect,15)+1] |
| 27 | - 2 | 2 | [#4,3,2] | |
| 28 | - 3 | 4 | [#4,3,2] | [ (lastIndVERTEXConnect,15) ] |
| 29 | + 1 | 1 | [#4,4,5] | [(offsetIndVERTEXConnect,16)+1] |
| 30 | - 2 | 4 | [#4,4,5] | [ (lastIndVERTEXConnect,16) ] |
```

```{table} **VertexConnectInfo** definitions
---
name: tab:vertex_conn_info_def
---
| | |
| :--- | :--- |
| *nbElemID*: | element ID of connected element via the edge. Sign refers if the edge is master or slave (`+` master / `-` slave) |
| *nbElemID*: | element ID of connected element via the vertex. Sign refers if the neighbor vertex is master or slave (`+` master / `-` slave) |
| | from the master slave information, the master/slave of the elements' vertex can be deduced |
| *nbLocVertexID*: | local vertex ID in neighbor element. |
```

Expand Down

0 comments on commit d61504c

Please sign in to comment.