[doc] pinsel pinsel

diff --git a/doc/doc.pdf b/doc/doc.pdf
index bb49f21e50ca2b703ba5b81511d9af2816f7c507..fd5ea825f7bc17e0199b7b74932a3915390ec785 100644 (file)
Binary files a/doc/doc.pdf and b/doc/doc.pdf differ

diff --git a/doc/doc.tex b/doc/doc.tex
index 3320d81e80182ca400175c00e2a8b5f2339dbb9f..7d6876c78e6b39db422c9f02202af620637883b3 100644 (file)
--- 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 c99aa3a99db0bd203aba2579a5bb1239c926471b..7e714e261d43da84abb74b915c6ca534c4be6fe3 100644 (file)
--- 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 a9d943edea54c7d64bf0adf9622fc7db926ddddc..1eada85c36c3354fb31cc371869de5cc9602eff0 100644 (file)
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 641d48dbe5378a5967187e08269fee7e7be7fb53..6e20551b799b8d189640f16e28b0799da5bee1c0 100644 (file)
--- 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 0a1f580556240d13c1f9e8bb6c787ba7e4a30bf6..00f86880daf5c9746f7a9ddf2fb35214113ed1ed 100644 (file)
--- 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 0a10a4aab0177f1732b007b07b6ce44ac0ebe7d7..e9b1d50a6c4ceac19e676bac8b25740e15ffca89 100644 (file)
--- 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 c2057701ef870593941c6bb8ba44183781925432..a2898880c1453c5f4c4c232dbb22846388377ae3 100644 (file)
--- 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 3a43248c58fd19ada285534981d1f56ea183e505..2adafd5e43d5216040f6efc18fe526aeb24c169c 100644 (file)
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 fffad665698acecd9bb1e9c57b0ee92d0c199bd1..e27ea419ab4e327defa013589297d9883da075b0 100644 (file)
--- 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 f5e05170c28e1939cf76d9920e1e051df2b66a44..ca58dd02b1f363c13681844c1435c3c4d6fcb3af 100644 (file)
--- 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 af1bcd796da165f0c7e3109691dd1437c600312c..9e767a021ccea3acdb00ec28a9bbc5b1cb90b24b 100644 (file)
--- 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 f0407f41d1f944fef05662345362f69c42acf743..5e5af21e8be0d3ab9771587c474eeb320fd2c7d3 100644 (file)
--- 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 f89ad89c05059245617090031acb03047a46efb3..8f318d3a45e8d2d764f71f883e24d2528dce33b8 100644 (file)
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 fe41f4dc8175642da138155cb487419b64356dba..7b606989810ba6469ffcbbf5f44e14acd1f780b3 100644 (file)
--- 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 e2e4af497d651e6fc1aff9a9c62417b9c776a809..8105b2f7bdfdc8016dec3f7f97d9c76472b78249 100644 (file)
--- a/doc/fig/net1.pdf
+++ b/doc/fig/net1.pdf
@@ -3,13 +3,11 @@
 5 0 obj
 <</Length 6 0 R/Filter /FlateDecode>>
 stream
-x\9cuRIn\ 4!\f¼ó
-¿\80\98¥ixAÎ\19\ ey@\94\8c\145\91&9äû\ 1Mc÷Øiq@\14Ta\97ë\ 6h\1dàXûþÖÌÓe\85ë\8f¹\99b])ÞC\84\90\11m\86\80.Á÷;¼Â\97qp5\83\10Óê¬\87°dìWæÃx\84ß~û9nm(\1e\ví\97g\13º\ eb\ 6ï}î\8aÍ\944\107\81\8d\81\92B\17Þ\98¢\80I©Æå2
-$Õ°.\87óFç)1ß˳VL÷¿Xr\aHÓÅ\12md\ryfB¥Ê×Ô=Ãph\7f"Ü?éL\92\ 2\98ÃÊ.w0uáX\961¾     l\ 4°'ÒF¡qpaÿº©\9e¥ÏÒGé     \17ÊÆ*\9fv`´7
-~lø\119\9a+\92ÔÎ\8a¡¡«¤©,V9\8dv:e\15_      üã\ 1\89Ò°æ\e5=5\e\95\8a*I\1c."©âT(ÔÇUE´\1d\atÏ\9f4Eõ¬c^eÓí\9c¥2¬\ 1v᥯?Q6ò}endstream
+x\9cuSËnÄ \f¼û+ü\ 5Ô<Bà\vzîrè\aTíJURiÛC\7f\7fA\e0kï\8aCÂ\80'ã\19ç\82d,R[Çóc\87\97Ó\8aç?¸@66gç0 OD&¡'\eñ÷\13ßñ\a,\9e¡\15\84¸ZãÐ/\89ê\11|\81#ü¯§ßíÔø\9c39~9½\82¯LD     \9ds©rî\90cCl\a6\ 6rô\95zã\12\ 5ô\92\ 26å&q°úu\99öÛØw\8a~_î5c¼}\8b)\ f`pÚ\90\83      Ì!÷\P\86ò5V×ÈOíw\84û\1f<½H\ 1\S¤\8d»êHv¬lVA\14)e\7fÚ¢ÊN\ 2£\82=°©Ê\8f\954ä¥\8dZ\a¶\ 1pz2pÁ1å5¤ÊtäD<ñç\81P\1e\ 1\95è\ 1´ \9aàûhî\91y\fdèûLtKTÊQFêÁ)ÒI\9e®á\93
+Hy­Ò\98h»·OŨ\b5ð`\10:­º£XTîêß(ðV×\15k&òïendstream
 endobj
 6 0 obj
-310
+311
 endobj
 4 0 obj
 <</Type/Page/MediaBox [0 0 381 302]
@@ -45,12 +43,12 @@ endobj
 <?adobe-xap-filters esc="CRLF"?>
 <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
 <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
-<rdf:Description rdf:about='uuid:bc4d2242-2b7c-11ed-0000-5b20b665609a' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.05'/>
-<rdf:Description rdf:about='uuid:bc4d2242-2b7c-11ed-0000-5b20b665609a' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2012-08-31T13:37:04+02:00</xmp:ModifyDate>
-<xmp:CreateDate>2012-08-31T13:37:04+02:00</xmp:CreateDate>
+<rdf:Description rdf:about='uuid:b7f12c36-2bb5-11ed-0000-ecf77e1e55fe' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.05'/>
+<rdf:Description rdf:about='uuid:b7f12c36-2bb5-11ed-0000-ecf77e1e55fe' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2012-08-31T20:24:58+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2012-08-31T20:24:58+02:00</xmp:CreateDate>
 <xmp:CreatorTool>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.</xmp:CreatorTool></rdf:Description>
-<rdf:Description rdf:about='uuid:bc4d2242-2b7c-11ed-0000-5b20b665609a' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:bc4d2242-2b7c-11ed-0000-5b20b665609a'/>
-<rdf:Description rdf:about='uuid:bc4d2242-2b7c-11ed-0000-5b20b665609a' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>../doc/fig/net1.eps</rdf:li></rdf:Alt></dc:title></rdf:Description>
+<rdf:Description rdf:about='uuid:b7f12c36-2bb5-11ed-0000-ecf77e1e55fe' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:b7f12c36-2bb5-11ed-0000-ecf77e1e55fe'/>
+<rdf:Description rdf:about='uuid:b7f12c36-2bb5-11ed-0000-ecf77e1e55fe' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>../doc/fig/net1.eps</rdf:li></rdf:Alt></dc:title></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>
                                                                         
@@ -60,26 +58,26 @@ endstream
 endobj
 2 0 obj
 <</Producer(GPL Ghostscript 9.05)
-/CreationDate(D:20120831133704+02'00')
-/ModDate(D:20120831133704+02'00')
+/CreationDate(D:20120831202458+02'00')
+/ModDate(D:20120831202458+02'00')
 /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)>>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 [<EC37CA9391FA1424ECBE3089B317DE73><EC37CA9391FA1424ECBE3089B317DE73>]
+/ID [<2D7D7384BA0E4985F5907B3D11BE82C6><2D7D7384BA0E4985F5907B3D11BE82C6>]
 >>
 startxref
-2613
+2614
 %%EOF

diff --git a/doc/fig/net_wrong.eps b/doc/fig/net_wrong.eps
index 2ee768367d9d15112b50ab0f4b276fb6df61a343..740c90c3e3b5cf614a741323d19d48fad53db7e5 100644 (file)
--- 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 a84ed7659821e8e2f3c0b5c66cef76016134ab46..d5b737834b4c9acf2a43c6f6c111553521cdcefa 100644 (file)
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 0199da905c276dad4e54dcefd6394f75fcf53688..9e0e16b75faccadd3cdfc461f642b3d480a36f76 100644 (file)
--- 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 0d3c90d027e22fb0afbbe52241d43c8a08883d68..5f636a9a6bd31b860a08629afb3eaba6fde178af 100644 (file)
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 fccecdc0ca4ef4af78b9b1db5752f5952c0e004d..9ac3890503d605c57180c05ae8f3523d03341ea9 100644 (file)
--- 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 d7bee6e96d8c8c317e41fd95a88a8c4efb138b4a..9734996efff9595571a5b31d3170b8706353c64f 100644 (file)
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 4c4c59c30401bd51f1cd3ed7fe93aedd3d5dbb28..fe6152d86a60adfbd63722df149716639ee3aa09 100644 (file)
--- 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 54f79f67166f742bcdc070c586724e93455ee8fc..79428156c2becdb34fcde2b7cb2df9d57e22a337 100644 (file)
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 4e5819a495ffcea2cb2675f66e2b8ccf32ea12d7..35eeef6975b6a07f7d7f27117b7a8183264e0b5b 100644 (file)
--- 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 3fc2c6467c6dcd75a235bedb48d7fa73b70c5dcd..db53daaa63559d941c209993d787800243708c14 100644 (file)
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 93f3167b3484000f6b3e5dcbd601024ab9cee1d4..7fcdc41addaf74c7881bc30588302df3db1d7d63 100644 (file)
--- 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 adf180a2eaf2e19a54163e0694ca1d7f7f72afc6..874470963ca10d6b550bce5f9c7c20493a4e614d 100644 (file)
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 a0d53b44d26dbc6bd4cc8f9ca137a6a009234a14..3f3a26176137551e486ae4b60625ba6df74b7759 100644 (file)
Binary files a/src/exmpl11.mat and b/src/exmpl11.mat differ

diff --git a/src/exmpl12.mat b/src/exmpl12.mat
index 45f0201d1d94cddec7dd48a2e0f6cd2615910d2c..aaf8fd3cb17d079b563f42270a140c58ad8c3032 100644 (file)
Binary files a/src/exmpl12.mat and b/src/exmpl12.mat differ

diff --git a/src/exmpl13.mat b/src/exmpl13.mat
index 835d875f97ac6735510e088dc5b9d49729e3b8f0..ce7a4a0fc2f30b97f486b7fe6f5565819bafc87f 100644 (file)
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 cdf63cb56830be245b10f37f3beedd3b97a17fb9..e83ebda1517377d1fc99969cf488e66368913c8b 100644 (file)
--- 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 b75248ca17952db5ea563567ca3349d81ef0e40b..c08e86890fea437f2af3d8992aba90adbaf8958d 100644 (file)
--- 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