diff --git a/doc/images/Makefile b/doc/images/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..eb6ec8abf4165a5b879330564a095ded64ae7a7d --- /dev/null +++ b/doc/images/Makefile @@ -0,0 +1,12 @@ +SOURCES := $(shell find $(SOURCEDIR) -name '*.tex') +OBJS := $(SOURCES:%.tex=%.png) + +%.png: %.pdf + convert -density 300 $< -quality 90 $@ + +%.pdf: %.tex + pdflatex $< + +.PHONY: all +all: $(OBJS) + rm -rf *.pdf *.out *.aux *.log diff --git a/doc/images/facial-adjacency-group.png b/doc/images/facial-adjacency-group.png index a384da6432ecf50073ee30fb02430f7055a2cd6b..0b3f5233148a50e8fad2a4483c92851d88ba4b46 100644 Binary files a/doc/images/facial-adjacency-group.png and b/doc/images/facial-adjacency-group.png differ diff --git a/doc/images/facial-adjacency-group.tex b/doc/images/facial-adjacency-group.tex new file mode 100644 index 0000000000000000000000000000000000000000..9c2152a116c5ca1d26d6731d95b0c82f5cac3f96 --- /dev/null +++ b/doc/images/facial-adjacency-group.tex @@ -0,0 +1,14 @@ +\documentclass{standalone} +\usepackage{tikz} + +\begin{document} +\begin{tikzpicture} +\draw [thick] (0, 2) rectangle node {$0$}(3, 4); +\draw [thick] (3, 2) rectangle node {$1$}(6, 4); +\draw [thick] (0, 0) rectangle node {$2$} (4, 2); +\draw [thick] (4, 0) rectangle node {$3$}(6, 2); +\draw [line width=3pt, line cap=round, orange] (4, 0) -- (6, 0) -- (6, 2); +\draw [line width=3pt, line cap=round, magenta] (4, 0) -- (4, 2); +\draw [line width=3pt, line cap=round, green!60!black] (4, 2) -- (6, 2); +\end{tikzpicture} +\end{document} diff --git a/doc/images/facial-adjacency-group.xoj b/doc/images/facial-adjacency-group.xoj deleted file mode 100644 index 6b8318eb268469ef96cd3e218f91f0bff5150c00..0000000000000000000000000000000000000000 Binary files a/doc/images/facial-adjacency-group.xoj and /dev/null differ diff --git a/doc/images/nodes-vertices.png b/doc/images/nodes-vertices.png index 8ee30bd8e29ff657eb8f2a6c2193956c40f9969b..29b32d3ecdcf76e4e0c42e0c20d21e138d8121a3 100644 Binary files a/doc/images/nodes-vertices.png and b/doc/images/nodes-vertices.png differ diff --git a/doc/images/nodes-vertices.tex b/doc/images/nodes-vertices.tex new file mode 100644 index 0000000000000000000000000000000000000000..7ec3bc40b379ae95bae047659570fbef44aff58e --- /dev/null +++ b/doc/images/nodes-vertices.tex @@ -0,0 +1,45 @@ +\documentclass{standalone} +\usepackage{tikz} +\usetikzlibrary{decorations.markings} + +\tikzset{-node-/.style={decoration={ + markings, + mark=at position #1 with { + \draw[fill=green!60!black, line width=0.4] circle [radius=0.1];}}, + postaction={decorate}}} + +\begin{document} +\begin{tikzpicture} +\draw [thick, -node-=.33,-node-=0.66] (0, 0) to (3, 0); +\draw [thick, -node-=.33,-node-=0.66] (3, 0) to (0, 3); +\draw [thick, -node-=.33,-node-=0.66] (0, 3) to (0, 0); +\draw [fill=green!60!black] (0, 0) circle [radius=0.1]; +\draw [fill=green!60!black] (3, 0) circle [radius=0.1]; +\draw [fill=green!60!black] (0, 3) circle [radius=0.1]; +\draw [fill=green!60!black] (1, 1) circle [radius=0.1]; + +\draw [ultra thick,bend left,->] (1.5, 2.5) to (3.5, 2.5); + +\begin{scope}[shift={(4, 2)},rotate=-47] +\draw [thick, -node-=.33,-node-=0.66] (0, 0) to [bend left] (3, 0); +\draw [thick, -node-=.33,-node-=0.66] (3, 0) to [bend right] (0, 3); +\draw [thick, -node-=.33,-node-=0.66] (0, 3) to [bend right] (0, 0); +\draw [dashed] (3, 0) to [bend left] (5, 3); +\draw [dashed] (5, 3) to [bend right] (0, 3); + +\draw [fill=magenta!60] (0, 0) circle [radius=0.15]; +\draw [fill=magenta!60] (0, 3) circle [radius=0.15]; +\draw [fill=magenta!60] (3, 0) circle [radius=0.15]; +\draw [fill=green!60!black] (0.75, 1.5) circle [radius=0.1]; +\end{scope} + +\node at (1.5, -0.5) [below] {Reference Element}; +\draw [fill=green!60!black] (0.25, -1.5) circle [radius=0.1] + node [right] {~ unit nodes}; +\node at (6.5, -0.5) [below] {Mesh Element}; +\draw [fill=green!60!black] (5.5, -1.5) circle [radius=0.1] + node [right] {~ nodes (unique)}; +\draw [fill=magenta!60] (5.5, -2) circle [radius=0.15] + node [right] {~ vertices (shared)}; +\end{tikzpicture} +\end{document} diff --git a/doc/images/nodes-vertices.xoj b/doc/images/nodes-vertices.xoj deleted file mode 100644 index fc0bb2950f4eafb2f1adc226b0b23c2f52ba7fc9..0000000000000000000000000000000000000000 Binary files a/doc/images/nodes-vertices.xoj and /dev/null differ diff --git a/doc/mesh.rst b/doc/mesh.rst index ccfba1e768691515f8f90ed7358e1cd660e5f6e4..cbb322793cf7bbd7190b3250f13f3fa141cc53e7 100644 --- a/doc/mesh.rst +++ b/doc/mesh.rst @@ -38,6 +38,8 @@ them. Consider the following picture: .. image:: images/nodes-vertices.png + :align: center + :width: 80% Mesh Data Structure ------------------- @@ -71,7 +73,7 @@ Mesh refinement .. automodule:: meshmode.mesh.refinement Mesh visualization ---------------- +------------------ .. automodule:: meshmode.mesh.visualization diff --git a/meshmode/mesh/__init__.py b/meshmode/mesh/__init__.py index 1f642bb0e13859e6db827ab79f039b138709efb8..1e1f92003d09ed781b1c39fec8aab3f155174a72 100644 --- a/meshmode/mesh/__init__.py +++ b/meshmode/mesh/__init__.py @@ -390,6 +390,8 @@ class FacialAdjacencyGroup(Record): of) a face. .. image:: images/facial-adjacency-group.png + :align: center + :width: 60% Represents (for example) *one* of the (colored) interfaces between :class:`MeshElementGroup` instances, or an interface between @@ -491,6 +493,8 @@ class Mesh(Record): :exc:`meshmode.DataUnavailable`. .. image:: images/facial-adjacency-group.png + :align: center + :width: 60% For example for the mesh in the figure, the following data structure would be present::