From: Peter Schaefer Date: Fri, 31 Aug 2012 19:09:17 +0000 (+0200) Subject: [doc] pinsel pinsel X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=5bafb382f94c06198c2688113254f55218318c6c;p=bacc.git [doc] pinsel pinsel --- diff --git a/doc/doc.pdf b/doc/doc.pdf index bb49f21..fd5ea82 100644 Binary files a/doc/doc.pdf and b/doc/doc.pdf differ diff --git a/doc/doc.tex b/doc/doc.tex index 3320d81..7d6876c 100644 --- a/doc/doc.tex +++ b/doc/doc.tex @@ -17,9 +17,12 @@ \usepackage[utf8]{inputenc} %Eingabekodierung \usepackage{fixltx2e} %Deutschsprach Bugs -\definecolor{gray}{gray}{.95} +\definecolor{gray}{gray}{.8} +\definecolor{dred}{rgb}{.8,0,0} +\definecolor{dgreen}{rgb}{0,.8,.4} +\definecolor{dblue}{rgb}{0,.4,.4} -\def\todo#1{\textcolor{red}{#1}} +\def\todo#1{\textcolor{dred}{#1}} \def\why#1{\textcolor{blue}{#1}} \def\Matlab{{\sc Matlab}} \def\q{\Q} @@ -344,10 +347,10 @@ Dann gilt auf isotropen Netzen: \section{Analytische Berechnung der Integrale} Es seien $T_j,T_k \subseteq\R^3$ zwei beschränkte, achsenorientierte Rechtecke in $\R^3$. Die Berechnung der Matrix für das Galerkin-Verfahren benötigt die Auswertung von -\begin{eqnarray*} +\begin{eqnarray}\label{math:V} \frac{1}{4\pi} \int_{T_j} \int_{T_k} \frac{1}{|\bs x- \bs y|} ds_{\bs y} ds_{\bs x} \in \R^3. -\end{eqnarray*} -Wir betrachten zunächst die Berechnung von zwei Integralen, die im Zuge der Berechnungen auftreten werden. +\end{eqnarray} +Wir betrachten zunächst die Berechnung von zwei Integralen, die dabei auftreten werden. \subsection{einfach Integral} Wir bezeichnen \begin{eqnarray*} @@ -387,7 +390,7 @@ Für alle weiteren relevante Fälle $p = -3/2 +k : k \in \N\backslash0$ lässt s \end{align*} \subsection{Integral über zwei Elemente} -Bei der Integration über zwei Seitenelemente \Ta, \Tb $\in \T_{\ell}$ haben wir geometrisch zischen zwei Fällen unterschieden. Entweder die beiden Elemente liegen in parallelen Ebenen oder in orthogonalen Ebenen. +Bei der Berechnung von \ref{math:V} haben wir geometrisch zwischen zwei Fällen zu unterschei den. Entweder die beiden Elemente liegen in parallelen Ebenen oder in orthogonalen Ebenen. \subsubsection{Parallele Elemente} Liegen die beiden Elemente parallel zueinander lassen sie sich Folgendermaßen darstellen: @@ -572,15 +575,15 @@ so so oder so... \subsection{Datenstruktur} Für die Implementierung in \Matlab~und C++ wollen wollen wir eine einheitliche Datenstruktur einführen. -Die für die Partition $\mathcal{T}_{\ell} = \{T_1\ldots T_M\}$ benötigen Knoten $\mathcal{K}_{\ell} = \{C_1\ldots C_N\}$ stellen wir in einer $ N \times 3$ Matrix dar. Dabei enthält die $j$-te Zeile die Koordinaten des Knoten $C_j$ im $\R^3$. +Die für die Partition $\mathcal{T}_{\ell} = \{T_1\ldots T_N\}$ benötigten Knoten $\mathcal{K}_{\ell} = \{C_1\ldots C_M\}$ stellen wir in einer $M \times 3$ Matrix $COO$ dar. Dabei enthält die $j$-te Zeile die Koordinaten des Knoten $C_j$, d.h. : \begin{displaymath} - COO[j,1:3] = C_j := (x_j,y_j,z_j)^{T} \text{ wobei } x,y,z \in \R + COO[j,1:3] = C_j := (x_j,y_j,z_j)^{T} \text{ wobei } x_j,y_j,z_j \in \R. \end{displaymath} -Die Elemente $\mathcal{E}_{\ell}$ werden wir ebenfalls Zeilenweise in einer $M \times 4$ Matrix abspeichern. Dabei soll die $i$-te Zeile den Indizes der Knoten $\{C_j,C_k,C_{\ell},C_m\}$ des Elements $T_j$ entsprechen. +Die Elemente $\mathcal{T}_{\ell}$ werden wir ebenfalls Zeilenweise in einer $N \times 4$ Matrix $ELE$ abspeichern. Dabei soll die $i$-te Zeile den Indizes der Knoten $\{C_j,C_k,C_{\ell},C_m\}$ des Elements $T_i$ entsprechen, also: \begin{displaymath} - ELE[i,1:4] = T_i := (j,k,l,m) + ELE[i,1:4] = T_i := (j,k,l,m). \end{displaymath} -Die Knoten wollen wir gegen den Uhrzeigersinn anordnen und der Knoten $C_j$ soll der kleinste bezüglich der Koordinaten sein. +Die Knoten wollen wir gegen den Uhrzeigersinn anordnen \todo{und der Knoten $C_j$ soll der kleinste bezüglich der Koordinaten sein}. \noindent Für die bessere Handhabung der Elemente beim Verfeinern der Partition, wollen wir auch die Nachbarschaftsrelationen geeignet abspeichern. Dazu überlegen wir uns, dass wir Aufgrund der Netzstabilität maximal zwei Nachbarn pro Kante eines Elements zulassen wollen. diff --git a/doc/fig/exmpl11_ref.eps b/doc/fig/exmpl11_ref.eps index c99aa3a..7e714e2 100644 --- a/doc/fig/exmpl11_ref.eps +++ b/doc/fig/exmpl11_ref.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/exmpl11_ref.eps -%%CreationDate: 08/31/2012 13:37:03 +%%CreationDate: 08/31/2012 20:24:57 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -235,7 +235,7 @@ SO (1) s gs 624 269 3721 2937 MR c np 8.33333 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 1224 -1550 0 0 -1224 1550 0 934 1738 5 MP stroke 0 1224 -1550 0 0 -1224 1550 0 2484 1738 5 MP stroke diff --git a/doc/fig/exmpl11_ref.pdf b/doc/fig/exmpl11_ref.pdf index a9d943e..1eada85 100644 Binary files a/doc/fig/exmpl11_ref.pdf and b/doc/fig/exmpl11_ref.pdf differ diff --git a/doc/fig/exmpl12_ele.tex b/doc/fig/exmpl12_ele.tex index 641d48d..6e20551 100644 --- a/doc/fig/exmpl12_ele.tex +++ b/doc/fig/exmpl12_ele.tex @@ -5,10 +5,10 @@ 2 & 12 & 16 & 17 & 13\\ 3 & 9 & 14 & 15 & 11\\ 4 & 2 & 10 & 11 & 3\\ - 5 & 3 & 6 & 7 & 4\\ - 6 & 11 & 15 & 16 & 12\\ - 7 & 1 & 9 & 10 & 2\\ - 8 & 7 & 12 & 13 & 8\\ - 9 & 6 & 11 & 12 & 7 + 5 & 7 & 12 & 13 & 8\\ + 6 & 6 & 11 & 12 & 7\\ + 7 & 3 & 6 & 7 & 4\\ + 8 & 11 & 15 & 16 & 12\\ + 9 & 1 & 9 & 10 & 2 \end{tabular} \label{exmpl12:ele} \ No newline at end of file diff --git a/doc/fig/exmpl12_f2s.tex b/doc/fig/exmpl12_f2s.tex index 0a1f580..00f8688 100644 --- a/doc/fig/exmpl12_f2s.tex +++ b/doc/fig/exmpl12_f2s.tex @@ -1,9 +1,9 @@ \begin{tabular}{>{\columncolor{gray}}rcccc} \rowcolor{gray} Index & e1 & e2 & e3 & e4\\ - 1 & 5 & 9 & 8 & 1\\ - 2 & 6 & 6 & 2 & 2\\ + 1 & 7 & 6 & 5 & 1\\ + 2 & 8 & 8 & 2 & 2\\ 3 & 3 & 3 & 3 & 3\\ - 4 & 7 & 7 & 4 & 4 + 4 & 9 & 9 & 4 & 4 \end{tabular} \label{exmpl12:f2s} \ No newline at end of file diff --git a/doc/fig/exmpl12_nei.tex b/doc/fig/exmpl12_nei.tex index 0a10a4a..e9b1d50 100644 --- a/doc/fig/exmpl12_nei.tex +++ b/doc/fig/exmpl12_nei.tex @@ -1,14 +1,14 @@ \begin{tabular}{>{\columncolor{gray}}rcccccccc} \rowcolor{gray} Index & n1 & n2 & n3 & n4 & n5 & n6 & n7 & n8\\ - 1 & 5 & 8 & 0 & 0 & 0 & 0 & 0 & 0\\ - 2 & 6 & 0 & 0 & 8 & 0 & 0 & 0 & 0\\ - 3 & 0 & 0 & 6 & 7 & 0 & 0 & 0 & 4\\ - 4 & 7 & 3 & 5 & 0 & 0 & 0 & 9 & 0\\ - 5 & 4 & 9 & 1 & 0 & 0 & 0 & 0 & 0\\ - 6 & 3 & 0 & 2 & 9 & 0 & 0 & 0 & 0\\ - 7 & 0 & 3 & 4 & 0 & 0 & 0 & 0 & 0\\ - 8 & 9 & 2 & 0 & 1 & 0 & 0 & 0 & 0\\ - 9 & 4 & 6 & 8 & 5 & 0 & 0 & 0 & 0 + 1 & 7 & 5 & 0 & 0 & 0 & 0 & 0 & 0\\ + 2 & 8 & 0 & 0 & 5 & 0 & 0 & 0 & 0\\ + 3 & 0 & 0 & 8 & 9 & 0 & 0 & 0 & 4\\ + 4 & 9 & 3 & 7 & 0 & 0 & 0 & 6 & 0\\ + 5 & 6 & 2 & 0 & 1 & 0 & 0 & 0 & 0\\ + 6 & 4 & 8 & 5 & 7 & 0 & 0 & 0 & 0\\ + 7 & 4 & 6 & 1 & 0 & 0 & 0 & 0 & 0\\ + 8 & 3 & 0 & 2 & 6 & 0 & 0 & 0 & 0\\ + 9 & 0 & 3 & 4 & 0 & 0 & 0 & 0 & 0 \end{tabular} \label{exmpl12:nei} \ No newline at end of file diff --git a/doc/fig/exmpl12_ref.eps b/doc/fig/exmpl12_ref.eps index c205770..a289888 100644 --- a/doc/fig/exmpl12_ref.eps +++ b/doc/fig/exmpl12_ref.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/exmpl12_ref.eps -%%CreationDate: 08/31/2012 13:37:03 +%%CreationDate: 08/31/2012 20:24:57 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -235,17 +235,17 @@ SO (1) s gs 624 269 3721 2937 MR c np 8.33333 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 612 -775 0 0 -612 775 0 934 1126 5 MP stroke 0 612 -1550 0 0 -612 1550 0 2484 1126 5 MP stroke 0 1223 -1550 0 0 -1223 1550 0 2484 2961 5 MP stroke 0 611 -1550 0 0 -611 1550 0 934 2349 5 MP stroke +0 612 -775 0 0 -612 775 0 1709 1126 5 MP stroke +0 612 -775 0 0 -612 775 0 1709 1738 5 MP stroke 0 612 -775 0 0 -612 775 0 934 1738 5 MP stroke 0 612 -1550 0 0 -612 1550 0 2484 1738 5 MP stroke 0 612 -1550 0 0 -612 1550 0 934 2961 5 MP stroke -0 612 -775 0 0 -612 775 0 1709 1126 5 MP stroke -0 612 -775 0 0 -612 775 0 1709 1738 5 MP stroke gr 8.33333 w @@ -259,15 +259,15 @@ c8 (\(3\)) s 1709 2073 mt (\(4\)) s -1321 1462 mt +2096 850 mt (\(5\)) s -3259 1462 mt +2096 1462 mt (\(6\)) s -1709 2685 mt +1321 1462 mt (\(7\)) s -2096 850 mt +3259 1462 mt (\(8\)) s -2096 1462 mt +1709 2685 mt (\(9\)) s /c9 { 1.000000 0.000000 0.000000 sr} bdef c9 diff --git a/doc/fig/exmpl12_ref.pdf b/doc/fig/exmpl12_ref.pdf index 3a43248..2adafd5 100644 Binary files a/doc/fig/exmpl12_ref.pdf and b/doc/fig/exmpl12_ref.pdf differ diff --git a/doc/fig/exmpl13_ele.tex b/doc/fig/exmpl13_ele.tex index fffad66..e27ea41 100644 --- a/doc/fig/exmpl13_ele.tex +++ b/doc/fig/exmpl13_ele.tex @@ -5,14 +5,14 @@ 2 & 18 & 22 & 23 & 19\\ 3 & 15 & 20 & 21 & 17\\ 4 & 2 & 10 & 11 & 3\\ - 5 & 4 & 8 & 9 & 5\\ - 6 & 17 & 21 & 22 & 18\\ - 7 & 1 & 15 & 16 & 2\\ - 8 & 13 & 18 & 19 & 14\\ - 9 & 11 & 17 & 18 & 13\\ - 10 & 3 & 7 & 8 & 4\\ + 5 & 13 & 18 & 19 & 14\\ + 6 & 11 & 17 & 18 & 13\\ + 7 & 4 & 8 & 9 & 5\\ + 8 & 17 & 21 & 22 & 18\\ + 9 & 1 & 15 & 16 & 2\\ + 10 & 10 & 16 & 17 & 11\\ 11 & 8 & 12 & 13 & 9\\ - 12 & 10 & 16 & 17 & 11\\ - 13 & 7 & 11 & 12 & 8 + 12 & 7 & 11 & 12 & 8\\ + 13 & 3 & 7 & 8 & 4 \end{tabular} \label{exmpl13:ele} \ No newline at end of file diff --git a/doc/fig/exmpl13_f2s.tex b/doc/fig/exmpl13_f2s.tex index f5e0517..ca58dd0 100644 --- a/doc/fig/exmpl13_f2s.tex +++ b/doc/fig/exmpl13_f2s.tex @@ -4,10 +4,10 @@ 1 & 1 & 1 & 1 & 1\\ 2 & 2 & 2 & 2 & 2\\ 3 & 3 & 3 & 3 & 3\\ - 4 & 4 & 12 & 12 & 4\\ - 5 & 10 & 13 & 11 & 5\\ + 4 & 4 & 10 & 10 & 4\\ + 5 & 5 & 5 & 5 & 5\\ 6 & 6 & 6 & 6 & 6\\ - 7 & 7 & 7 & 7 & 7\\ + 7 & 13 & 12 & 11 & 7\\ 8 & 8 & 8 & 8 & 8\\ 9 & 9 & 9 & 9 & 9 \end{tabular} diff --git a/doc/fig/exmpl13_nei.tex b/doc/fig/exmpl13_nei.tex index af1bcd7..9e767a0 100644 --- a/doc/fig/exmpl13_nei.tex +++ b/doc/fig/exmpl13_nei.tex @@ -1,18 +1,18 @@ \begin{tabular}{>{\columncolor{gray}}rcccccccc} \rowcolor{gray} Index & n1 & n2 & n3 & n4 & n5 & n6 & n7 & n8\\ - 1 & 11 & 8 & 0 & 0 & 5 & 0 & 0 & 0\\ - 2 & 6 & 0 & 0 & 8 & 0 & 0 & 0 & 0\\ - 3 & 0 & 0 & 6 & 7 & 0 & 0 & 0 & 12\\ - 4 & 7 & 12 & 10 & 0 & 0 & 0 & 13 & 0\\ - 5 & 10 & 11 & 1 & 0 & 0 & 0 & 0 & 0\\ - 6 & 3 & 0 & 2 & 9 & 0 & 0 & 0 & 0\\ - 7 & 0 & 3 & 4 & 0 & 0 & 0 & 12 & 0\\ - 8 & 9 & 2 & 0 & 1 & 0 & 0 & 0 & 0\\ - 9 & 12 & 6 & 8 & 13 & 0 & 0 & 0 & 11\\ - 10 & 4 & 13 & 5 & 0 & 0 & 0 & 0 & 0\\ - 11 & 13 & 9 & 1 & 5 & 0 & 0 & 0 & 0\\ - 12 & 7 & 3 & 9 & 4 & 0 & 0 & 0 & 0\\ - 13 & 4 & 9 & 11 & 10 & 0 & 0 & 0 & 0 + 1 & 11 & 5 & 0 & 0 & 7 & 0 & 0 & 0\\ + 2 & 8 & 0 & 0 & 5 & 0 & 0 & 0 & 0\\ + 3 & 0 & 0 & 8 & 9 & 0 & 0 & 0 & 10\\ + 4 & 9 & 10 & 13 & 0 & 0 & 0 & 12 & 0\\ + 5 & 6 & 2 & 0 & 1 & 0 & 0 & 0 & 0\\ + 6 & 10 & 8 & 5 & 12 & 0 & 0 & 0 & 11\\ + 7 & 13 & 11 & 1 & 0 & 0 & 0 & 0 & 0\\ + 8 & 3 & 0 & 2 & 6 & 0 & 0 & 0 & 0\\ + 9 & 0 & 3 & 4 & 0 & 0 & 0 & 10 & 0\\ + 10 & 9 & 3 & 6 & 4 & 0 & 0 & 0 & 0\\ + 11 & 12 & 6 & 1 & 7 & 0 & 0 & 0 & 0\\ + 12 & 4 & 6 & 11 & 13 & 0 & 0 & 0 & 0\\ + 13 & 4 & 12 & 7 & 0 & 0 & 0 & 0 & 0 \end{tabular} \label{exmpl13:nei} \ No newline at end of file diff --git a/doc/fig/exmpl13_ref.eps b/doc/fig/exmpl13_ref.eps index f0407f4..5e5af21 100644 --- a/doc/fig/exmpl13_ref.eps +++ b/doc/fig/exmpl13_ref.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/exmpl13_ref.eps -%%CreationDate: 08/31/2012 13:37:04 +%%CreationDate: 08/31/2012 20:24:58 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -235,21 +235,21 @@ SO (1) s gs 624 269 3721 2937 MR c np 8.33333 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 612 -775 0 0 -612 775 0 934 1126 5 MP stroke 0 612 -1550 0 0 -612 1550 0 2484 1126 5 MP stroke 0 1223 -1550 0 0 -1223 1550 0 2484 2961 5 MP stroke 0 611 -775 0 0 -611 775 0 934 2349 5 MP stroke +0 612 -775 0 0 -612 775 0 1709 1126 5 MP stroke +0 612 -775 0 0 -612 775 0 1709 1738 5 MP stroke 0 306 -387 0 0 -306 387 0 934 1432 5 MP stroke 0 612 -1550 0 0 -612 1550 0 2484 1738 5 MP stroke 0 612 -1550 0 0 -612 1550 0 934 2961 5 MP stroke -0 612 -775 0 0 -612 775 0 1709 1126 5 MP stroke -0 612 -775 0 0 -612 775 0 1709 1738 5 MP stroke -0 306 -387 0 0 -306 387 0 934 1738 5 MP stroke -0 306 -388 0 0 -306 388 0 1321 1432 5 MP stroke 0 611 -775 0 0 -611 775 0 1709 2349 5 MP stroke +0 306 -388 0 0 -306 388 0 1321 1432 5 MP stroke 0 306 -388 0 0 -306 388 0 1321 1738 5 MP stroke +0 306 -387 0 0 -306 387 0 934 1738 5 MP stroke gr 8.33333 w @@ -263,23 +263,23 @@ c8 (\(3\)) s 1321 2073 mt (\(4\)) s -1127 1309 mt +2096 850 mt (\(5\)) s -3259 1462 mt +2096 1462 mt (\(6\)) s -1709 2685 mt +1127 1309 mt (\(7\)) s -2096 850 mt +3259 1462 mt (\(8\)) s -2096 1462 mt +1709 2685 mt (\(9\)) s -1127 1615 mt +2096 2073 mt (\(10\)) s 1515 1309 mt (\(11\)) s -2096 2073 mt -(\(12\)) s 1515 1615 mt +(\(12\)) s +1127 1615 mt (\(13\)) s /c9 { 1.000000 0.000000 0.000000 sr} bdef c9 diff --git a/doc/fig/exmpl13_ref.pdf b/doc/fig/exmpl13_ref.pdf index f89ad89..8f318d3 100644 Binary files a/doc/fig/exmpl13_ref.pdf and b/doc/fig/exmpl13_ref.pdf differ diff --git a/doc/fig/net1.eps b/doc/fig/net1.eps index fe41f4d..7b60698 100644 --- a/doc/fig/net1.eps +++ b/doc/fig/net1.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/net1.eps -%%CreationDate: 08/31/2012 13:37:04 +%%CreationDate: 08/31/2012 20:24:58 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -186,21 +186,21 @@ c0 4.16667 w gs 624 269 3721 2937 MR c np 16.6667 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 612 -775 0 0 -612 775 0 934 1126 5 MP stroke 0 612 -1550 0 0 -612 1550 0 2484 1126 5 MP stroke 0 1223 -1550 0 0 -1223 1550 0 2484 2961 5 MP stroke 0 611 -775 0 0 -611 775 0 934 2349 5 MP stroke +0 612 -775 0 0 -612 775 0 1709 1126 5 MP stroke +0 612 -775 0 0 -612 775 0 1709 1738 5 MP stroke 0 306 -387 0 0 -306 387 0 934 1432 5 MP stroke 0 612 -1550 0 0 -612 1550 0 2484 1738 5 MP stroke 0 612 -1550 0 0 -612 1550 0 934 2961 5 MP stroke -0 612 -775 0 0 -612 775 0 1709 1126 5 MP stroke -0 612 -775 0 0 -612 775 0 1709 1738 5 MP stroke -0 306 -387 0 0 -306 387 0 934 1738 5 MP stroke -0 306 -388 0 0 -306 388 0 1321 1432 5 MP stroke 0 611 -775 0 0 -611 775 0 1709 2349 5 MP stroke +0 306 -388 0 0 -306 388 0 1321 1432 5 MP stroke 0 306 -388 0 0 -306 388 0 1321 1738 5 MP stroke +0 306 -387 0 0 -306 387 0 934 1738 5 MP stroke 4.16667 w gr diff --git a/doc/fig/net1.pdf b/doc/fig/net1.pdf index e2e4af4..8105b2f 100644 --- a/doc/fig/net1.pdf +++ b/doc/fig/net1.pdf @@ -3,13 +3,11 @@ 5 0 obj <> stream -xœuRIn! ¼ó -¿€˜¥ixAÎy@”Œ5‘&9äûMc÷Øiq@Ta—ëhàXûþÖÌÓe…돹™b])ÞC„m†€.Á÷;¼Â—qp5ƒÓ꬇°dìWæÃx„ß~û9nm( í—gºbï}îŠÍ”47’Bޘ¢€I©Æå2 -$Õ°.‡óFç)1ß˳VL÷¿XrHÓÅmd yfB¥Ê×Ô=Ãph"Ü?éL’˜ÃÊ.w0uáX–1¾ l°'ÒF¡qpaÿº©ž¥ÏÒGé ÊÆ*Ÿv`´7 -~lø9š+’ÔΊ¡¡«¤©,V9v:e_ üã‰Ò°æ5=5•Š*I."©âT(ÔÇUE´tϟ4Eõ¬c^eÓ휥2¬v᥯?Q6ò}endstream +xœuSËnÄ ¼û+üÔ - -2012-08-31T13:37:04+02:00 -2012-08-31T13:37:04+02:00 + +2012-08-31T20:24:58+02:00 +2012-08-31T20:24:58+02:00 MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. - -../doc/fig/net1.eps + +../doc/fig/net1.eps @@ -60,26 +58,26 @@ endstream endobj 2 0 obj <>endobj xref 0 10 0000000000 65535 f -0000000604 00000 n -0000002300 00000 n -0000000545 00000 n -0000000414 00000 n +0000000605 00000 n +0000002301 00000 n +0000000546 00000 n +0000000415 00000 n 0000000015 00000 n -0000000395 00000 n -0000000668 00000 n -0000000709 00000 n -0000000738 00000 n +0000000396 00000 n +0000000669 00000 n +0000000710 00000 n +0000000739 00000 n trailer << /Size 10 /Root 1 0 R /Info 2 0 R -/ID [] +/ID [<2D7D7384BA0E4985F5907B3D11BE82C6><2D7D7384BA0E4985F5907B3D11BE82C6>] >> startxref -2613 +2614 %%EOF diff --git a/doc/fig/net_wrong.eps b/doc/fig/net_wrong.eps index 2ee7683..740c90c 100644 --- a/doc/fig/net_wrong.eps +++ b/doc/fig/net_wrong.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/net_wrong.eps -%%CreationDate: 08/31/2012 13:37:04 +%%CreationDate: 08/31/2012 20:24:58 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -186,7 +186,7 @@ c0 4.16667 w gs 624 269 3721 2937 MR c np 16.6667 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 612 -1550 0 0 -612 1550 0 2484 1126 5 MP stroke 0 611 -1550 0 0 -611 1550 0 2484 2349 5 MP stroke diff --git a/doc/fig/net_wrong.pdf b/doc/fig/net_wrong.pdf index a84ed76..d5b7378 100644 Binary files a/doc/fig/net_wrong.pdf and b/doc/fig/net_wrong.pdf differ diff --git a/doc/fig/refType_1.eps b/doc/fig/refType_1.eps index 0199da9..9e0e16b 100644 --- a/doc/fig/refType_1.eps +++ b/doc/fig/refType_1.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/refType_1.eps -%%CreationDate: 08/31/2012 16:03:30 +%%CreationDate: 08/31/2012 20:13:46 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -186,7 +186,7 @@ c0 4.16667 w gs 624 269 3721 2937 MR c np 16.6667 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 2447 -3100 0 0 -2447 3100 0 934 2961 5 MP stroke gr diff --git a/doc/fig/refType_1.pdf b/doc/fig/refType_1.pdf index 0d3c90d..5f636a9 100644 Binary files a/doc/fig/refType_1.pdf and b/doc/fig/refType_1.pdf differ diff --git a/doc/fig/refType_2.eps b/doc/fig/refType_2.eps index fccecdc..9ac3890 100644 --- a/doc/fig/refType_2.eps +++ b/doc/fig/refType_2.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/refType_2.eps -%%CreationDate: 08/31/2012 16:03:31 +%%CreationDate: 08/31/2012 20:13:46 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -186,7 +186,7 @@ c0 4.16667 w gs 624 269 3721 2937 MR c np 16.6667 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 1224 -1550 0 0 -1224 1550 0 934 1738 5 MP stroke 0 1224 -1550 0 0 -1224 1550 0 2484 1738 5 MP stroke diff --git a/doc/fig/refType_2.pdf b/doc/fig/refType_2.pdf index d7bee6e..9734996 100644 Binary files a/doc/fig/refType_2.pdf and b/doc/fig/refType_2.pdf differ diff --git a/doc/fig/refType_3.eps b/doc/fig/refType_3.eps index 4c4c59c..fe6152d 100644 --- a/doc/fig/refType_3.eps +++ b/doc/fig/refType_3.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/refType_3.eps -%%CreationDate: 08/31/2012 16:03:31 +%%CreationDate: 08/31/2012 20:13:46 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -186,7 +186,7 @@ c0 4.16667 w gs 624 269 3721 2937 MR c np 16.6667 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 1224 -3100 0 0 -1224 3100 0 934 1738 5 MP stroke 0 1223 -3100 0 0 -1223 3100 0 934 2961 5 MP stroke diff --git a/doc/fig/refType_3.pdf b/doc/fig/refType_3.pdf index 54f79f6..7942815 100644 Binary files a/doc/fig/refType_3.pdf and b/doc/fig/refType_3.pdf differ diff --git a/doc/fig/refType_4.eps b/doc/fig/refType_4.eps index 4e5819a..35eeef6 100644 --- a/doc/fig/refType_4.eps +++ b/doc/fig/refType_4.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/refType_4.eps -%%CreationDate: 08/31/2012 16:03:32 +%%CreationDate: 08/31/2012 20:13:47 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -186,7 +186,7 @@ c0 4.16667 w gs 624 269 3721 2937 MR c np 16.6667 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 2447 -1550 0 0 -2447 1550 0 934 2961 5 MP stroke 0 2447 -1550 0 0 -2447 1550 0 2484 2961 5 MP stroke diff --git a/doc/fig/refType_4.pdf b/doc/fig/refType_4.pdf index 3fc2c64..db53daa 100644 Binary files a/doc/fig/refType_4.pdf and b/doc/fig/refType_4.pdf differ diff --git a/doc/fig/refType_full.eps b/doc/fig/refType_full.eps index 93f3167..7fcdc41 100644 --- a/doc/fig/refType_full.eps +++ b/doc/fig/refType_full.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-29-generic #46-Ubuntu SMP Fri Jul 27 17:03:23 UTC 2012 x86_64. %%Title: ../doc/fig/refType_full.eps -%%CreationDate: 08/31/2012 16:03:30 +%%CreationDate: 08/31/2012 20:13:45 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK @@ -186,7 +186,7 @@ c0 4.16667 w gs 624 269 3721 2937 MR c np 16.6667 w -/c8 { 0.000000 0.392157 0.392157 sr} bdef +/c8 { 0.000000 0.400000 0.400000 sr} bdef c8 0 2447 -3100 0 0 -2447 3100 0 934 2961 5 MP stroke gr diff --git a/doc/fig/refType_full.pdf b/doc/fig/refType_full.pdf index adf180a..8744709 100644 Binary files a/doc/fig/refType_full.pdf and b/doc/fig/refType_full.pdf differ diff --git a/src/exmpl11.mat b/src/exmpl11.mat index a0d53b4..3f3a261 100644 Binary files a/src/exmpl11.mat and b/src/exmpl11.mat differ diff --git a/src/exmpl12.mat b/src/exmpl12.mat index 45f0201..aaf8fd3 100644 Binary files a/src/exmpl12.mat and b/src/exmpl12.mat differ diff --git a/src/exmpl13.mat b/src/exmpl13.mat index 835d875..ce7a4a0 100644 Binary files a/src/exmpl13.mat and b/src/exmpl13.mat differ diff --git a/src/export_exmpl.m b/src/export_exmpl.m index cdf63cb..e83ebda 100644 --- a/src/export_exmpl.m +++ b/src/export_exmpl.m @@ -12,7 +12,7 @@ marked = [2 3 1 3]; export_mesh(coordinates,elements,neigh,f2s,'exmpl12') marked = ones(1,9); -marked(5) = 2; +marked(7) = 2; % marked([4,7]) = 3; [coordinates elements neigh f2s sites] =... refineQuad(coordinates,elements,neigh,sites,marked); diff --git a/src/plotShape.m b/src/plotShape.m index b75248c..c08e868 100644 --- a/src/plotShape.m +++ b/src/plotShape.m @@ -93,7 +93,7 @@ if(e==1) for idx = eles current = coordinates(elements(idx,[1:4,1])',:); % current(3,:) = current(3,:)-current(1,:)+current(2,:); - fill3(current(:,1),current(:,2),current(:,3),[0,200,100]/255); % Zeichnet Oberflaeche + fill3(current(:,1),current(:,2),current(:,3),[0,204,102]/255); % Zeichnet Oberflaeche hold on end elseif(e==2) @@ -110,7 +110,7 @@ else for idx = eles current = coordinates(elements(idx,[1:4,1])',:); % current(3,:) = current(3,:)-current(1,:)+current(2,:); - plot3(current(:,1),current(:,2),current(:,3),'LineWidth',line,'color',[0,100,100]/255); % Zeichnet nur Kanten + plot3(current(:,1),current(:,2),current(:,3),'LineWidth',line,'color',[0,102,102]/255); % Zeichnet nur Kanten hold on end end