diff options
Diffstat (limited to 'img')
24 files changed, 56 insertions, 92 deletions
diff --git a/img/algorithm_birds_eye.tikz b/img/algorithm_birds_eye.tikz index 27f6123..15c609a 100644 --- a/img/algorithm_birds_eye.tikz +++ b/img/algorithm_birds_eye.tikz @@ -1,65 +1,65 @@ -\hspace{-12.5mm} \tikzexternaldisable \begin{tikzpicture}[ scale=1.0, - lhs/.style={left,xshift=-5mm,align=left}, - rhs/.style={right,xshift=5mm,align=left}, + lhs/.style={left,xshift=-5mm,align=right,text width=7cm}, + rhs/.style={right,xshift=5mm,align=left,text width=7cm}, coarse/.style={circle,inner sep=1.5mm}, fine/.style={circle,inner sep=1mm}, incomplete/.style={draw=gray,very thick,fill=white}, complete/.style={draw=gray,very thick,fill=green!70!black} ] -\draw[gray,very thick] (0,0) -- (0,-11) {}; -\draw[gray,very thick] (1,0) -- (1,-11) {}; -\node[coarse,complete] at (0,0) {}; -\node[lhs] at (0,0) {\(f_{g,i}(\G)\) vollständig zu Zeit \(t\)}; +\draw[gray,very thick] (-0.4,0) -- (-0.4,-11) {}; +\draw[gray,very thick] (0.4,0) -- (0.4,-11) {}; -\node[fine,complete] at (1,0) {}; -\node[rhs] at (1,0) {\(f_{f,i}(\F)\) vollständig zu Zeit \(t\)}; +\node[coarse,complete] at (-0.4,0) {}; +\node[lhs] at (-0.4,0) {\(f_{g,i}(\G)\) vollständig zu Zeit \(t\)}; -\node[coarse,incomplete] at (0,-1) {}; -\node[lhs] at (0,-1) {Zeitschritt \(t \to t+\delta t_g\) auf \(\G\)}; +\node[fine,complete] at (0.4,0) {}; +\node[rhs] at (0.4,0) {\(f_{f,i}(\F)\) vollständig zu Zeit \(t\)}; -\node[fine,incomplete] at (1,-2) {}; -\node[rhs] at (1,-2) {Zeitschritt \(t \to t+\delta t_f\) auf \(\F\)}; +\node[coarse,incomplete] at (-0.4,-1) {}; +\node[lhs] at (-0.4,-1) {Zeitschritt \(t \to t+\delta t_g\) auf \(\G\)}; -\node[coarse,incomplete] at (0,-3) {}; -\node[lhs] at (0,-3) -{Interpolation von \(\rho_g, u_g, f_{g,i}^\text{neq}\) in \(x_{g \to f}^g \in \G\)\\zu Zeitpunkt \(t + \delta t_g / 2\)}; +\node[fine,incomplete] at (0.4,-2) {}; +\node[rhs] at (0.4,-2) {Zeitschritt \(t \to t+\delta t_f\) auf \(\F\)}; -\node[fine,incomplete] at (1,-4) {}; -\node[rhs] at (1,-4) -{Setzen von \(f_{f,i}\) in \(x_{g \to f}^g \in \F\) mit (\ref{eq:expandedDirectG2F})}; +\node[coarse,incomplete] at (-0.4,-3) {}; +\node[lhs] at (-0.4,-3) +{Interpolation von \(\rho_g, u_g, f_{g,i}^\text{neq}\) in \(x_{g \to f}^g\)}; -\node[fine,incomplete] at (1,-5) {}; -\node[rhs] at (1,-5) -{Interpolation von \(f_{f,i}\) in \(x_{g \to f}^f \in \F\) mit (\ref{eq:expandedInterpolG2F})}; +\node[fine,incomplete] at (0.4,-4) {}; +\node[rhs] at (0.4,-4) +{Setzen von \(f_{f,i}\) in \(x_{g \to f}^g\) (\ref{eq:expandedDirectG2F})}; -\node[fine,complete] at (1,-6) {}; -\node[rhs] at (1,-6) {\(f_{f,i}(\F)\) vollständig zu Zeit \(t + \delta t_f\)}; +\node[fine,incomplete] at (0.4,-5) {}; +\node[rhs] at (0.4,-5) +{Interpolation von \(f_{f,i}\) in \(x_{g \to f}^f\) (\ref{eq:expandedInterpolG2F})}; -\node[fine,incomplete] at (1,-7) {}; -\node[rhs] at (1,-7) {Zeitschritt \(t+\delta t_f \to t+2\delta t_f\) auf \(\F\)}; +\node[fine,complete] at (0.4,-6) {}; +\node[rhs] at (0.4,-6) {\(f_{f,i}(\F)\) vollständig zu Zeit \(t + \delta t_f\)}; -\node[fine,incomplete] at (1,-8) {}; -\node[rhs] at (1,-8) -{Setzen von \(f_{f,i}\) in \(x_{g \to f}^g \in \F\) mit (\ref{eq:expandedDirectG2F})}; +\node[fine,incomplete] at (0.4,-7) {}; +\node[rhs] at (0.4,-7) {Zeitschritt \(t+\delta t_f \to t+2\delta t_f\) auf \(\F\)}; -\node[fine,incomplete] at (1,-9) {}; -\node[rhs] at (1,-9) -{Interpolation von \(f_{f,i}\) in \(x_{g \to f}^f \in \F\) mit (\ref{eq:expandedInterpolG2F})}; +\node[fine,incomplete] at (0.4,-8) {}; +\node[rhs] at (0.4,-8) +{Setzen von \(f_{f,i}\) in \(x_{g \to f}^g\) (\ref{eq:expandedDirectG2F})}; -\node[coarse,incomplete] at (0,-10) {}; -\node[lhs] at (0,-10) -{Restriktion von \(f_{g,i}\) in \(x_{f \to g} \in \G\) mit (\ref{eq:restrictedF2G})}; +\node[fine,incomplete] at (0.4,-9) {}; +\node[rhs] at (0.4,-9) +{Interpolation von \(f_{f,i}\) in \(x_{g \to f}^f\) (\ref{eq:expandedInterpolG2F})}; -\node[coarse,complete] at (0,-11) {}; -\node[lhs] at (0,-11) {\(f_{g,i}(\G)\) vollständig zu Zeit \(t+\delta t_g\)}; +\node[coarse,incomplete] at (-0.4,-10) {}; +\node[lhs] at (-0.4,-10) +{Restriktion von \(f_{g,i}\) in \(x_{f \to g}\) (\ref{eq:restrictedF2G})}; -\node[fine,complete] at (1,-11) {}; -\node[rhs] at (1,-11) {\(f_{f,i}(\F)\) vollständig zu Zeit \(t+\delta t_g\)}; +\node[coarse,complete] at (-0.4,-11) {}; +\node[lhs] at (-0.4,-11) {\(f_{g,i}(\G)\) vollständig zu Zeit \(t+\delta t_g\)}; + +\node[fine,complete] at (0.4,-11) {}; +\node[rhs] at (0.4,-11) {\(f_{f,i}(\F)\) vollständig zu Zeit \(t+\delta t_g\)}; \end{tikzpicture} \tikzexternalenable diff --git a/img/common/knudsen_wrapper.gnuplot b/img/common/knudsen_wrapper.gnuplot index 0bc189c..0feeb41 100644 --- a/img/common/knudsen_wrapper.gnuplot +++ b/img/common/knudsen_wrapper.gnuplot @@ -11,4 +11,7 @@ set ytics 0,1,4 set cbtics ("{/Symbol \243}0" 0, "1" 1, "{/Symbol \263}2" 2) set cbrange [0:2] +set colorbox user origin graph 1.01, graph 0 size 0.02, graph 1 +set rmargin at screen 0.91 + set cblabel "Verfeinerungskriterium" offset 1,0 diff --git a/img/common/velocity_wrapper.gnuplot b/img/common/velocity_wrapper.gnuplot index 7e3b87a..a08c8b4 100644 --- a/img/common/velocity_wrapper.gnuplot +++ b/img/common/velocity_wrapper.gnuplot @@ -11,4 +11,7 @@ set ytics 0,1,4 set cbtics 0,0.5,2.0 set cbrange [0:2.0] +set colorbox user origin graph 1.01, graph 0 size 0.02, graph 1 +set rmargin at screen 0.91 + set cblabel "Geschwindigkeitsnorm" diff --git a/img/cylinder2d_deltap_comparison.tikz b/img/cylinder2d_deltap_comparison.tikz index 709273c..e06b53b 100644 --- a/img/cylinder2d_deltap_comparison.tikz +++ b/img/cylinder2d_deltap_comparison.tikz @@ -6,7 +6,7 @@ \begin{axis}[ scale only axis, height=7.5cm, - width=0.9*\textwidth, + width=0.85*\textwidth, legend cell align=left, legend pos=south east, grid=both, diff --git a/img/cylinder2d_drag_lift_comparison.tikz b/img/cylinder2d_drag_lift_comparison.tikz index 96b628d..778f4d3 100644 --- a/img/cylinder2d_drag_lift_comparison.tikz +++ b/img/cylinder2d_drag_lift_comparison.tikz @@ -6,7 +6,7 @@ \begin{axis}[ scale only axis, height=7.5cm, - width=0.9*\textwidth, + width=0.85*\textwidth, legend cell align=left, legend pos=south east, grid=both, @@ -39,7 +39,7 @@ scale only axis, height=7.5cm, yshift=-8.75cm, - width=0.9*\textwidth, + width=0.85*\textwidth, legend cell align=left, legend pos=south west, grid=both, diff --git a/img/cylinder2d_high_res_drag_comparison.tikz b/img/cylinder2d_high_res_drag_comparison.tikz index 8ecdcbd..927fa1a 100644 --- a/img/cylinder2d_high_res_drag_comparison.tikz +++ b/img/cylinder2d_high_res_drag_comparison.tikz @@ -6,7 +6,7 @@ \begin{axis}[ scale only axis, height=7.5cm, - width=0.9*\textwidth, + width=0.85*\textwidth, legend cell align=left, legend pos=south east, grid=both, diff --git a/img/cylinder2d_high_res_lift_deltap_comparison.tikz b/img/cylinder2d_high_res_lift_deltap_comparison.tikz index 759f2bb..4b42257 100644 --- a/img/cylinder2d_high_res_lift_deltap_comparison.tikz +++ b/img/cylinder2d_high_res_lift_deltap_comparison.tikz @@ -6,7 +6,7 @@ \begin{axis}[ scale only axis, height=7.5cm, - width=0.9*\textwidth, + width=0.85*\textwidth, legend cell align=left, legend pos=south east, grid=both, @@ -29,7 +29,7 @@ scale only axis, yshift=-8.5cm, height=7.5cm, - width=0.9*\textwidth, + width=0.85*\textwidth, legend cell align=left, legend pos=south east, grid=both, diff --git a/img/cylinder2d_optimized_refinement_n5_re100_16s.gnuplot b/img/cylinder2d_optimized_refinement_n5_re100_16s.gnuplot index 8c206e9..0f5563f 100644 --- a/img/cylinder2d_optimized_refinement_n5_re100_16s.gnuplot +++ b/img/cylinder2d_optimized_refinement_n5_re100_16s.gnuplot @@ -28,6 +28,4 @@ set obj 4 fillstyle empty border -1 front lw 1 set obj 5 rect from 0.55,0.15 to 11.05,3.95 set obj 5 fillstyle empty border -1 front lw 1 -set title "Geeignet dreifach verfeinertes Gitter mit 13454 Knoten" - load 'common/include_fluid.gnuplot' diff --git a/img/cylinder2d_unrefined_n12_re100_16s.gnuplot b/img/cylinder2d_unrefined_n12_re100_16s.gnuplot index 81a0dfa..d32ee1c 100644 --- a/img/cylinder2d_unrefined_n12_re100_16s.gnuplot +++ b/img/cylinder2d_unrefined_n12_re100_16s.gnuplot @@ -6,6 +6,4 @@ plot 'data/cylinder2d_unrefined_n12_re100_16s.csv' using ($6*10):($7*10):(sqrt($ load 'common/velocity_wrapper.gnuplot' -set title "Uniform aufgelöstes Gitter mit 13500 Knoten" - load 'common/include_fluid.gnuplot' diff --git a/img/massloss_interpolation_plot.tikz b/img/massloss_interpolation_plot.tikz index 2626c26..b895a19 100644 --- a/img/massloss_interpolation_plot.tikz +++ b/img/massloss_interpolation_plot.tikz @@ -2,7 +2,7 @@ \begin{axis}[ scale only axis, height=8.75cm, - width=0.9*\textwidth, + width=0.85*\textwidth, mark size=0, line width=0.5pt, legend pos=south west, diff --git a/img/poiseuille2d_grid.tikz b/img/poiseuille2d_grid.tikz index f29c206..8e87002 100644 --- a/img/poiseuille2d_grid.tikz +++ b/img/poiseuille2d_grid.tikz @@ -1,8 +1,8 @@ \begin{tikzpicture} \begin{axis}[ scale only axis, - height=\textwidth)/4, - width=\textwidth, + height=0.95\textwidth)/4, + width=0.95\textwidth, axis equal, xmin=0, xmax=4, ymin=0, ymax=1, diff --git a/img/poiseuille2d_setup.tikz b/img/poiseuille2d_setup.tikz deleted file mode 100644 index 76b307d..0000000 --- a/img/poiseuille2d_setup.tikz +++ /dev/null @@ -1,38 +0,0 @@ -\begin{tikzpicture}[ - scale=1.1*\textwidth/41cm, - coarse/.style={circle,thick,inner sep=2}, - fine/.style={cross out,thick,inner sep=0.75}, - legend/.style={minimum height=1,minimum width=1} -] - -\foreach \x in {0,...,20} - \foreach \y in {0,...,10}{ - \ifthenelse{\equal{\y}{0} \OR \equal{\y}{10}}{ - \node[coarse,draw=black] at (\x,\y){ }; - }{ - \ifthenelse{\equal{\x}{0}}{ - \node[coarse,draw=green] at (\x,\y){ }; - }{ - \node[coarse,draw=blue] at (\x,\y){ }; - } - } - } - -\foreach \x in {0,...,42} - \foreach \y in {0,...,20}{ - \ifthenelse{\equal{\y}{0} \OR \equal{\y}{20}}{ - \node[fine,draw=black] at (19+\x*0.5,\y*0.5){ }; - }{ - \ifthenelse{\equal{\x}{42}}{ - \node[fine,draw=red] at (19+\x*0.5,\y*0.5){ }; - }{ - \node[fine,draw=blue] at (19+\x*0.5,\y*0.5){ }; - } - } - } - -\node[legend,fill=blue,label=0:Fluid] at (9+0*6,-2) { }; -\node[legend,fill=black,label=0:Wand] at (9+1*6,-2) { }; -\node[legend,fill=green,label=0:Einfluss] at (9+2*6,-2) { }; -\node[legend,fill=red,label=0:Ausfluss] at (9+3*6,-2) { }; -\end{tikzpicture} diff --git a/img/poiseuille2d_velocity_grid.tikz b/img/poiseuille2d_velocity_grid.tikz index 8ff04ab..612b88e 100644 --- a/img/poiseuille2d_velocity_grid.tikz +++ b/img/poiseuille2d_velocity_grid.tikz @@ -1,8 +1,8 @@ \begin{tikzpicture} \begin{axis}[ scale only axis, - height=\textwidth)/4, - width=\textwidth, + height=0.95\textwidth)/4, + width=0.95\textwidth, axis equal, xmin=0, xmax=4, ymin=0, ymax=1, diff --git a/img/static/cylinder2d_improved_grid_n20_re100_16s_knudsen.pdf b/img/static/cylinder2d_improved_grid_n20_re100_16s_knudsen.pdf Binary files differindex be8ab6b..acc7ce6 100644 --- a/img/static/cylinder2d_improved_grid_n20_re100_16s_knudsen.pdf +++ b/img/static/cylinder2d_improved_grid_n20_re100_16s_knudsen.pdf diff --git a/img/static/cylinder2d_low_resolution_outflow_refine_n5_re100_16s.pdf b/img/static/cylinder2d_low_resolution_outflow_refine_n5_re100_16s.pdf Binary files differindex ef7d937..eaad995 100644 --- a/img/static/cylinder2d_low_resolution_outflow_refine_n5_re100_16s.pdf +++ b/img/static/cylinder2d_low_resolution_outflow_refine_n5_re100_16s.pdf diff --git a/img/static/cylinder2d_optimized_refinement_n5_re100_16s.pdf b/img/static/cylinder2d_optimized_refinement_n5_re100_16s.pdf Binary files differindex 2bb1a30..e555e69 100644 --- a/img/static/cylinder2d_optimized_refinement_n5_re100_16s.pdf +++ b/img/static/cylinder2d_optimized_refinement_n5_re100_16s.pdf diff --git a/img/static/cylinder2d_optimized_refinement_n5_re100_16s_knudsen.pdf b/img/static/cylinder2d_optimized_refinement_n5_re100_16s_knudsen.pdf Binary files differindex 7cfa276..43ace8a 100644 --- a/img/static/cylinder2d_optimized_refinement_n5_re100_16s_knudsen.pdf +++ b/img/static/cylinder2d_optimized_refinement_n5_re100_16s_knudsen.pdf diff --git a/img/static/cylinder2d_single_refinement_n20_re100_16s.pdf b/img/static/cylinder2d_single_refinement_n20_re100_16s.pdf Binary files differindex c404855..8daca5a 100644 --- a/img/static/cylinder2d_single_refinement_n20_re100_16s.pdf +++ b/img/static/cylinder2d_single_refinement_n20_re100_16s.pdf diff --git a/img/static/cylinder2d_single_refinement_n20_re100_16s_knudsen.pdf b/img/static/cylinder2d_single_refinement_n20_re100_16s_knudsen.pdf Binary files differindex 1648d01..be759ce 100644 --- a/img/static/cylinder2d_single_refinement_n20_re100_16s_knudsen.pdf +++ b/img/static/cylinder2d_single_refinement_n20_re100_16s_knudsen.pdf diff --git a/img/static/cylinder2d_unrefined_n12_re100_16s.pdf b/img/static/cylinder2d_unrefined_n12_re100_16s.pdf Binary files differindex b5d2aba..be92ce2 100644 --- a/img/static/cylinder2d_unrefined_n12_re100_16s.pdf +++ b/img/static/cylinder2d_unrefined_n12_re100_16s.pdf diff --git a/img/static/cylinder2d_unrefined_n20_re100_16s.pdf b/img/static/cylinder2d_unrefined_n20_re100_16s.pdf Binary files differindex 3d9d1d9..f7706e4 100644 --- a/img/static/cylinder2d_unrefined_n20_re100_16s.pdf +++ b/img/static/cylinder2d_unrefined_n20_re100_16s.pdf diff --git a/img/static/cylinder2d_unrefined_n20_re100_16s_knudsen.pdf b/img/static/cylinder2d_unrefined_n20_re100_16s_knudsen.pdf Binary files differindex 207b45e..ab2d22c 100644 --- a/img/static/cylinder2d_unrefined_n20_re100_16s_knudsen.pdf +++ b/img/static/cylinder2d_unrefined_n20_re100_16s_knudsen.pdf diff --git a/img/static/cylinder2d_unrefined_n40_re100_16s.pdf b/img/static/cylinder2d_unrefined_n40_re100_16s.pdf Binary files differindex 84d9a6b..c83d691 100644 --- a/img/static/cylinder2d_unrefined_n40_re100_16s.pdf +++ b/img/static/cylinder2d_unrefined_n40_re100_16s.pdf diff --git a/img/static/cylinder2d_unrefined_n40_re100_16s_knudsen.pdf b/img/static/cylinder2d_unrefined_n40_re100_16s_knudsen.pdf Binary files differindex 69e2f16..1f8dd4c 100644 --- a/img/static/cylinder2d_unrefined_n40_re100_16s_knudsen.pdf +++ b/img/static/cylinder2d_unrefined_n40_re100_16s_knudsen.pdf |