From: David Wells Date: Mon, 21 Apr 2025 18:38:13 +0000 (-0400) Subject: Fix the pictures of oriented faces. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a5c35b9221dd9ad49c3f190f8e432b1a8131165;p=dealii.git Fix the pictures of oriented faces. --- diff --git a/doc/doxygen/custom.css b/doc/doxygen/custom.css index f0679877e5..bf630e8493 100644 --- a/doc/doxygen/custom.css +++ b/doc/doxygen/custom.css @@ -78,6 +78,19 @@ div.image img[src="fe_enriched_h-refinement.png"] { width:500px; } +/* + * environment for aligning pictures in four columns. + */ +.fourcolumn { + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr; + grid-column-gap: 25px; + grid-row-gap: 25px; + margin-left: auto; + margin-right: auto; + margin-bottom: 25px; +} + /* * environment for aligning pictures in three columns. */ diff --git a/doc/doxygen/headers/reordering.h b/doc/doxygen/headers/reordering.h index 64eb888ac3..97be0a700f 100644 --- a/doc/doxygen/headers/reordering.h +++ b/doc/doxygen/headers/reordering.h @@ -119,14 +119,14 @@ * For a quadrilateral, these values correspond to * - *orientation* : `true` is the default orientation and `false` means * vertices 1 and 2 are swapped. - * - *rotation* : all vertices are rotated by 90 degrees clockwise. - * - *flip* : all vertices are rotated by 180 degrees clockwise. + * - *rotation* : all vertices are rotated by 90 degrees counterclockwise. + * - *flip* : all vertices are rotated by 180 degrees counterclockwise. * * For a triangle, these values correspond to * - *orientation* : `true` is the default orientation and `false` means * vertices 1 and 2 are swapped. - * - *rotation* : all vertices are rotated by 120 degrees clockwise. - * - *flip* : all vertices are rotated by 240 degrees clockwise. + * - *rotation* : all vertices are rotated by 120 degrees counterclockwise. + * - *flip* : all vertices are rotated by 240 degrees counterclockwise. * * Here, 'clockwise' is relative to the vector defined by the cross product of * two lines adjacent to the zeroth vertex in their standard orientation (which, @@ -158,6 +158,67 @@ * transform the cell-local vertices so that they match the first cell's * vertex ordering: i.e., the inverse orientation. * + *

Orientations as Permutations of Vertices

+ * As discussed above, TriaAccessor::combined_face_orientation() returns a value + * less than ReferenceCell::n_face_orientations() which describes how the + * bounding object (i.e., a face) should be rotated to match the cell-local + * definition of that object. The encoding of triangles is + * + *
+ *
+ *
+ * @image html triangle-0.svg + * @image html triangle-1.svg + *
+ *
+ *
+ *
+ * @image html triangle-2.svg + * @image html triangle-3.svg + *
+ *
+ *
+ *
+ * @image html triangle-4.svg + * @image html triangle-5.svg + *
+ *
+ *
+ * + * Similarly, quadrilaterals are encoded as + * + *
+ *
+ *
+ * @image html quadrilateral-0.svg + * @image html quadrilateral-1.svg + *
+ *
+ *
+ *
+ * @image html quadrilateral-2.svg + * @image html quadrilateral-3.svg + *
+ *
+ *
+ *
+ * @image html quadrilateral-4.svg + * @image html quadrilateral-5.svg + *
+ *
+ *
+ *
+ * @image html quadrilateral-6.svg + * @image html quadrilateral-7.svg + *
+ *
+ *
+ * + * The numbers on each edge are the line numbers with the two bounding vertices + * as subscripts: e.g., $0_0^1$ is the first line of a triangle and when it + * appears as $0_1^0$ then the line is in the reversed orientation (i.e., + * numbers::reverse_line_orientation). + * *

Orientation of Quadrilateral Meshes

* * Purely quadrilateral meshes are a special case, since deal.II will (with the diff --git a/doc/doxygen/headers/simplex.h b/doc/doxygen/headers/simplex.h index e1c4283087..179d23d93e 100644 --- a/doc/doxygen/headers/simplex.h +++ b/doc/doxygen/headers/simplex.h @@ -65,10 +65,8 @@ * * @section simplex_reference_cells Reference cells * - * In 2D, we provide triangles and quadrilaterals with the following possible - * orientations in 3D: + * In 2D, we provide triangles and quadrilaterals: * - *
*
*
* @image html reference_cells_0.png @@ -77,15 +75,6 @@ * 2D: triangle and quadrilateral *
*
- *
- *
- * @image html reference_cells_1.png - *
- *
- * Possible orientations of triangles and quadrilaterals in 3D - *
- *
- *
* * In 3D, tetrahedra, pyramids, wedges, and hexahedra are available: * diff --git a/doc/doxygen/images/quadrilateral-0.svg b/doc/doxygen/images/quadrilateral-0.svg new file mode 100644 index 0000000000..c4cec7b5de --- /dev/null +++ b/doc/doxygen/images/quadrilateral-0.svg @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + 0 + 1 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + 1 + 1 + 3 + + + + + + + + + + + + + + + + + + + + 0 + 0 + 2 + + + + + + + + + + + + + + + + + + + + 3 + 2 + 3 + + + + + + + + + + + + + + + + + + + + 3 + + + + + + + + + + + + + 0 + + + + + + + + + diff --git a/doc/doxygen/images/quadrilateral-1.svg b/doc/doxygen/images/quadrilateral-1.svg new file mode 100644 index 0000000000..6d98fcd257 --- /dev/null +++ b/doc/doxygen/images/quadrilateral-1.svg @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 2 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + 3 + 2 + 3 + + + + + + + + + + + + + + + + + + + + 2 + 0 + 1 + + + + + + + + + + + + + + + + + + + + 1 + 1 + 3 + + + + + + + + + + + + + + + + + + + + 3 + + + + + + + + + + + + + 1 + + + + + + + + + diff --git a/doc/doxygen/images/quadrilateral-2.svg b/doc/doxygen/images/quadrilateral-2.svg new file mode 100644 index 0000000000..43c4ec5ce0 --- /dev/null +++ b/doc/doxygen/images/quadrilateral-2.svg @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 2 + 0 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + 3 + + + + + + + + + + + + + + + + + + + + 2 + 0 + 1 + + + + + + + + + + + + + + + + + + + + 3 + 2 + 3 + + + + + + + + + + + + + + + + + + + + 1 + 3 + 1 + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 2 + + + + + + + + + diff --git a/doc/doxygen/images/quadrilateral-3.svg b/doc/doxygen/images/quadrilateral-3.svg new file mode 100644 index 0000000000..32f86530b5 --- /dev/null +++ b/doc/doxygen/images/quadrilateral-3.svg @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + 2 + 3 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 3 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + 1 + 3 + 1 + + + + + + + + + + + + + + + + + + + + 0 + 2 + 0 + + + + + + + + + + + + + + + + + + + + 2 + 0 + 1 + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 3 + + + + + + + + + diff --git a/doc/doxygen/images/quadrilateral-4.svg b/doc/doxygen/images/quadrilateral-4.svg new file mode 100644 index 0000000000..b068442b02 --- /dev/null +++ b/doc/doxygen/images/quadrilateral-4.svg @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + 3 + 2 + + + + + + + + + + + + + 3 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + 0 + 2 + 0 + + + + + + + + + + + + + + + + + + + + 1 + 3 + 1 + + + + + + + + + + + + + + + + + + + + 2 + 1 + 0 + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + 4 + + + + + + + + + diff --git a/doc/doxygen/images/quadrilateral-5.svg b/doc/doxygen/images/quadrilateral-5.svg new file mode 100644 index 0000000000..b1994a53aa --- /dev/null +++ b/doc/doxygen/images/quadrilateral-5.svg @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 3 + 1 + + + + + + + + + + + + + 3 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + 2 + 1 + 0 + + + + + + + + + + + + + + + + + + + + 3 + 3 + 2 + + + + + + + + + + + + + + + + + + + + 0 + 2 + 0 + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + 5 + + + + + + + + + diff --git a/doc/doxygen/images/quadrilateral-6.svg b/doc/doxygen/images/quadrilateral-6.svg new file mode 100644 index 0000000000..3203914c0c --- /dev/null +++ b/doc/doxygen/images/quadrilateral-6.svg @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + 3 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 3 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + 3 + 3 + 2 + + + + + + + + + + + + + + + + + + + + 2 + 1 + 0 + + + + + + + + + + + + + + + + + + + + 0 + 0 + 2 + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 6 + + + + + + + + + diff --git a/doc/doxygen/images/quadrilateral-7.svg b/doc/doxygen/images/quadrilateral-7.svg new file mode 100644 index 0000000000..702de7788f --- /dev/null +++ b/doc/doxygen/images/quadrilateral-7.svg @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + 1 + 0 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + 3 + + + + + + + + + + + + + + + + + + + + 0 + 0 + 2 + + + + + + + + + + + + + + + + + + + + 1 + 1 + 3 + + + + + + + + + + + + + + + + + + + + 3 + 3 + 2 + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 7 + + + + + + + + + diff --git a/doc/doxygen/images/reference_cells_1.png b/doc/doxygen/images/reference_cells_1.png deleted file mode 100644 index db5c43bba2..0000000000 Binary files a/doc/doxygen/images/reference_cells_1.png and /dev/null differ diff --git a/doc/doxygen/images/triangle-0.svg b/doc/doxygen/images/triangle-0.svg new file mode 100644 index 0000000000..b08cc1cd37 --- /dev/null +++ b/doc/doxygen/images/triangle-0.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 1 + 0 + 1 + 2 + + + 1 + 1 + 2 + + + 2 + 2 + 0 + + + + + + + + + + + + 0 + + + + + + + + + diff --git a/doc/doxygen/images/triangle-1.svg b/doc/doxygen/images/triangle-1.svg new file mode 100644 index 0000000000..a0577d2d67 --- /dev/null +++ b/doc/doxygen/images/triangle-1.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + 0 + 2 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + 1 + 2 + 1 + + + + + + + + + + + + + + + + + + + + 0 + 1 + 0 + + + + + + + + + + + + + 1 + + + + + + + + + diff --git a/doc/doxygen/images/triangle-2.svg b/doc/doxygen/images/triangle-2.svg new file mode 100644 index 0000000000..38e8d86e7a --- /dev/null +++ b/doc/doxygen/images/triangle-2.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + 2 + 0 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + 0 + 0 + 1 + + + + + + + + + + + + + + + + + + + + 1 + 1 + 2 + + + + + + + + + + + + + 2 + + + + + + + + + diff --git a/doc/doxygen/images/triangle-3.svg b/doc/doxygen/images/triangle-3.svg new file mode 100644 index 0000000000..a7a9a72222 --- /dev/null +++ b/doc/doxygen/images/triangle-3.svg @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 2 + 1 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + 0 + 1 + 0 + + + + + + + + + + + + + + + + + + + + 2 + 0 + 2 + + + + + + + + + + + + + 3 + + + + + + + + + diff --git a/doc/doxygen/images/triangle-4.svg b/doc/doxygen/images/triangle-4.svg new file mode 100644 index 0000000000..d75b56fc96 --- /dev/null +++ b/doc/doxygen/images/triangle-4.svg @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + 2 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + 2 + 2 + 0 + + + + + + + + + + + + + + + + + + + + 0 + 0 + 1 + + + + + + + + + + + + + 4 + + + + + + + + + diff --git a/doc/doxygen/images/triangle-5.svg b/doc/doxygen/images/triangle-5.svg new file mode 100644 index 0000000000..c631cc6eaa --- /dev/null +++ b/doc/doxygen/images/triangle-5.svg @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + 0 + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + 2 + 0 + 2 + + + + + + + + + + + + + + + + + + + + 1 + 2 + 1 + + + + + + + + + + + + + 5 + + + + + + + + +