verslag

10 files changed, 76 insertions, 69 deletions

diff --git a/Smoke/report/2IV35-Report.log b/Smoke/report/2IV35-Report.log
index e189c85..9a2bc29 100644
--- a/Smoke/report/2IV35-Report.log
+++ b/Smoke/report/2IV35-Report.log
@@ -1,4 +1,4 @@
-This is pdfeTeX, Version 3.141592-1.21a-2.2 (MiKTeX 2.4) (preloaded format=latex 2007.9.5)  10 JAN 2008 01:29

+This is pdfeTeX, Version 3.141592-1.21a-2.2 (MiKTeX 2.4) (preloaded format=latex 2007.9.5)  10 JAN 2008 09:43

 entering extended mode

 **2IV35-Report.tex

 (2IV35-Report.tex

@@ -452,31 +452,33 @@ Underfull \hbox (badness 10000) in paragraph at lines 29--32
 

  []

 

-

-Underfull \hbox (badness 10000) in paragraph at lines 33--35

+<isolines.png, id=93, 847.165pt x 629.35126pt>

+File: isolines.png Graphic file (type png)

+ <use isolines.png>

+Underfull \hbox (badness 10000) in paragraph at lines 38--40

 

  []

 

-<marching.png, id=93, 588.1975pt x 216.81pt>

+<marching.png, id=94, 588.1975pt x 216.81pt>

 File: marching.png Graphic file (type png)

- <use marching.png>

-Underfull \hbox (badness 10000) in paragraph at lines 41--44

+ <use marching.png> [17 <isolines.png>]

+Underfull \hbox (badness 10000) in paragraph at lines 46--49

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 45--46

+Underfull \hbox (badness 10000) in paragraph at lines 50--51

 

  []

 

-<ambiguous.png, id=94, 475.7775pt x 280.04625pt>

+<ambiguous.png, id=98, 475.7775pt x 280.04625pt>

 File: ambiguous.png Graphic file (type png)

- <use ambiguous.png> [17 <marching.png>])

-Underfull \hbox (badness 10000) in paragraph at lines 54--25

+ <use ambiguous.png>)

+Underfull \hbox (badness 10000) in paragraph at lines 59--25

 

  []

 

-[18 <ambiguous.png>] (chapter7.tex

+[18 <marching.png> <ambiguous.png>] [19] (chapter7.tex

 Chapter 7.

 

 Underfull \hbox (badness 10000) in paragraph at lines 3--4

@@ -503,7 +505,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 19--21
 

  []

 

-[19

+[20

 

 

 

@@ -542,7 +544,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 48--50
 

  []

 

-[20]

+[21]

 Underfull \hbox (badness 10000) in paragraph at lines 51--52

 

  []

@@ -557,7 +559,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 59--26
 

  []

 

-[21] (chapter8.tex

+[22] (chapter8.tex

 Chapter 8.

 

 Underfull \hbox (badness 10000) in paragraph at lines 3--5

@@ -584,7 +586,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 20--22
 

  []

 

-[22

+[23

 

 

 

@@ -598,7 +600,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 27--27
 

  []

 

-[23] (chapter9.tex

+[24] (chapter9.tex

 Chapter 9.

 

 Underfull \hbox (badness 10000) in paragraph at lines 3--5

@@ -630,7 +632,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 22--24
 

  []

 

-[24

+[25

 

 

 

@@ -639,12 +641,12 @@ Underfull \hbox (badness 10000) in paragraph at lines 25--27
 

  []

 

-

-Underfull \hbox (badness 10000) in paragraph at lines 28--30

+)

+Underfull \hbox (badness 10000) in paragraph at lines 28--28

 

  []

 

-) [25] (chapter10.tex

+[26] (chapter10.tex

 Chapter 10.

 

 Underfull \hbox (badness 10000) in paragraph at lines 3--4

@@ -686,7 +688,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 25--27
 

  []

 

-[26

+[27

 

 

 

@@ -705,21 +707,21 @@ Underfull \hbox (badness 10000) in paragraph at lines 36--29
 

  []

 

-[27] (2IV35-Report.aux (toc.aux) (chapter1.aux) (chapter2.aux) (chapter3.aux)

+[28] (2IV35-Report.aux (toc.aux) (chapter1.aux) (chapter2.aux) (chapter3.aux)

 (chapter4.aux) (chapter5.aux) (chapter6.aux) (chapter7.aux) (chapter8.aux)

 (chapter9.aux) (chapter10.aux)) ) 

 Here is how much of TeX's memory you used:

- 2095 strings out of 95490

- 22638 string characters out of 1188952

+ 2101 strings out of 95490

+ 22721 string characters out of 1188952

  75550 words of memory out of 1076186

- 4875 multiletter control sequences out of 60000

+ 4879 multiletter control sequences out of 60000

  13870 words of font info for 54 fonts, out of 500000 for 1000

  54 hyphenation exceptions out of 4999

  27i,6n,22p,229b,203s stack positions out of 1500i,500n,5000p,200000b,32768s

 PDF statistics:

- 131 PDF objects out of 300000

+ 135 PDF objects out of 300000

  0 named destinations out of 300000

- 36 words of extra memory for PDF output out of 65536

+ 41 words of extra memory for PDF output out of 65536

 <C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmmi8.

 pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmsy8.pfb><C:\MiKTeX\texmf\fonts\ty

 pe1\bluesky\cm\cmr8.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmex10.pfb><C:\

@@ -728,4 +730,4 @@ esky\cm\cmtt12.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmsy10.pfb><C:\MiKTe
 X\texmf\fonts\type1\bluesky\cm\cmmi12.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\

 cm\cmbx12.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmr12.pfb><C:\MiKTeX\texm

 f\fonts\type1\bluesky\cm\cmr17.pfb>

-Output written on 2IV35-Report.pdf (28 pages, 425318 bytes).

+Output written on 2IV35-Report.pdf (29 pages, 457517 bytes).

diff --git a/Smoke/report/2IV35-Report.pdf b/Smoke/report/2IV35-Report.pdf
index d75e63d..63a8962 100644
--- a/Smoke/report/2IV35-Report.pdf
+++ b/Smoke/report/2IV35-Report.pdf
diff --git a/Smoke/report/2IV35-Report.toc b/Smoke/report/2IV35-Report.toc
index 51822de..2deff95 100644
--- a/Smoke/report/2IV35-Report.toc
+++ b/Smoke/report/2IV35-Report.toc
@@ -19,21 +19,21 @@
 \contentsline {section}{\numberline {6.1}Description}{16}

 \contentsline {section}{\numberline {6.2}Implementation}{16}

 \contentsline {section}{\numberline {6.3}Difficulties}{18}

-\contentsline {chapter}{\numberline {7}Height plots}{19}

-\contentsline {section}{\numberline {7.1}Description}{19}

-\contentsline {section}{\numberline {7.2}Implementation}{19}

-\contentsline {subsection}{\numberline {7.2.1}Normal vector}{20}

-\contentsline {section}{\numberline {7.3}Difficulties}{20}

-\contentsline {subsection}{\numberline {7.3.1}Rotation}{20}

-\contentsline {subsection}{\numberline {7.3.2}Height strips}{21}

-\contentsline {subsection}{\numberline {7.3.3}Calculating the normal}{21}

-\contentsline {chapter}{\numberline {8}Streamtubes}{22}

-\contentsline {section}{\numberline {8.1}Description}{22}

-\contentsline {section}{\numberline {8.2}Implementation}{22}

-\contentsline {section}{\numberline {8.3}Difficulties}{23}

-\contentsline {chapter}{\numberline {9}Conclusion}{24}

-\contentsline {section}{\numberline {9.1}Visualization}{24}

-\contentsline {section}{\numberline {9.2}The course}{25}

-\contentsline {chapter}{\numberline {10}Functionality}{26}

-\contentsline {section}{\numberline {10.1}Simulation}{26}

-\contentsline {section}{\numberline {10.2}Camera position}{27}

+\contentsline {chapter}{\numberline {7}Height plots}{20}

+\contentsline {section}{\numberline {7.1}Description}{20}

+\contentsline {section}{\numberline {7.2}Implementation}{20}

+\contentsline {subsection}{\numberline {7.2.1}Normal vector}{21}

+\contentsline {section}{\numberline {7.3}Difficulties}{21}

+\contentsline {subsection}{\numberline {7.3.1}Rotation}{21}

+\contentsline {subsection}{\numberline {7.3.2}Height strips}{22}

+\contentsline {subsection}{\numberline {7.3.3}Calculating the normal}{22}

+\contentsline {chapter}{\numberline {8}Streamtubes}{23}

+\contentsline {section}{\numberline {8.1}Description}{23}

+\contentsline {section}{\numberline {8.2}Implementation}{23}

+\contentsline {section}{\numberline {8.3}Difficulties}{24}

+\contentsline {chapter}{\numberline {9}Conclusion}{25}

+\contentsline {section}{\numberline {9.1}Visualization}{25}

+\contentsline {section}{\numberline {9.2}The course}{26}

+\contentsline {chapter}{\numberline {10}Functionality}{27}

+\contentsline {section}{\numberline {10.1}Simulation}{27}

+\contentsline {section}{\numberline {10.2}Camera position}{28}

diff --git a/Smoke/report/chapter6.aux b/Smoke/report/chapter6.aux
index fbd4151..e7f30ff 100644
--- a/Smoke/report/chapter6.aux
+++ b/Smoke/report/chapter6.aux
@@ -6,7 +6,7 @@
 \@writefile{toc}{\contentsline {section}{\numberline {6.2}Implementation}{16}}

 \@writefile{toc}{\contentsline {section}{\numberline {6.3}Difficulties}{18}}

 \@setckpt{chapter6}{

-\setcounter{page}{19}

+\setcounter{page}{20}

 \setcounter{equation}{0}

 \setcounter{enumi}{0}

 \setcounter{enumii}{0}

diff --git a/Smoke/report/chapter6.tex b/Smoke/report/chapter6.tex
index dfbb0e8..9dd0f22 100644
--- a/Smoke/report/chapter6.tex
+++ b/Smoke/report/chapter6.tex
@@ -30,23 +30,28 @@ So the algorithm passes through every cell and then checks the four cell vertice
 value. With that value, the algorithm can check if a vertex is inside ($ v_j \geq threshold $) or outside ($ v_j < threshold $) the isosurface. The inside/outside

 state is then stored in a bit. \\

 

+\begin {center}

+  \includegraphics[width=\textwidth]{isolines.png} \\

+  Figure 6: Three fire-like colored isolines on a blue grid \\

+\end {center}

+

 If a vertex, say $ v_0 $ is inside the isosurface, $ v_0 $ is set to 1, else it's left to 0. This is done for all four vertices which results in a 4-bit status.

 This means there are in total 16 different cases in which the isoline can run through a cell. \\

 

 \begin {center}

   \includegraphics[width=\textwidth]{marching.png} \\

-  Figure 6: The 16 marching square cases \\

+  Figure 7: The 16 marching square cases \\

 \end {center}

 

-The above image (figure 6) shows the 16 different cases of the marching squares algorithm. A white vertex indicates that the vertex is outside the isosurface and

+The above image (figure 7) shows the 16 different cases of the marching squares algorithm. A white vertex indicates that the vertex is outside the isosurface and

 black indicates it is inside the isosurface. Every inside or outside case has it's counterpart. So we've reduced the number of cases down to 8. In case 0 and 15 for

 instance, no lines have to be rendered, yet they are both very different cases. \\

 

-The cases 5 and 10 are both ambiguous cases as becomes clear from the next image (figure 7). \\

+The cases 5 and 10 are both ambiguous cases as becomes clear from the next image (figure 8). \\

 

 \begin {center}

   \includegraphics[width=100mm]{ambiguous.png} \\

-  Figure 7: Two ambiguous cases in the marching squares algorithm \\

+  Figure 8: Two ambiguous cases in the marching squares algorithm \\

 \end {center}

 

 \section{Difficulties}

diff --git a/Smoke/report/chapter7.aux b/Smoke/report/chapter7.aux
index a7eeb22..723df9f 100644
--- a/Smoke/report/chapter7.aux
+++ b/Smoke/report/chapter7.aux
@@ -1,16 +1,16 @@
 \relax 

-\@writefile{toc}{\contentsline {chapter}{\numberline {7}Height plots}{19}}

+\@writefile{toc}{\contentsline {chapter}{\numberline {7}Height plots}{20}}

 \@writefile{lof}{\addvspace {10\p@ }}

 \@writefile{lot}{\addvspace {10\p@ }}

-\@writefile{toc}{\contentsline {section}{\numberline {7.1}Description}{19}}

-\@writefile{toc}{\contentsline {section}{\numberline {7.2}Implementation}{19}}

-\@writefile{toc}{\contentsline {subsection}{\numberline {7.2.1}Normal vector}{20}}

-\@writefile{toc}{\contentsline {section}{\numberline {7.3}Difficulties}{20}}

-\@writefile{toc}{\contentsline {subsection}{\numberline {7.3.1}Rotation}{20}}

-\@writefile{toc}{\contentsline {subsection}{\numberline {7.3.2}Height strips}{21}}

-\@writefile{toc}{\contentsline {subsection}{\numberline {7.3.3}Calculating the normal}{21}}

+\@writefile{toc}{\contentsline {section}{\numberline {7.1}Description}{20}}

+\@writefile{toc}{\contentsline {section}{\numberline {7.2}Implementation}{20}}

+\@writefile{toc}{\contentsline {subsection}{\numberline {7.2.1}Normal vector}{21}}

+\@writefile{toc}{\contentsline {section}{\numberline {7.3}Difficulties}{21}}

+\@writefile{toc}{\contentsline {subsection}{\numberline {7.3.1}Rotation}{21}}

+\@writefile{toc}{\contentsline {subsection}{\numberline {7.3.2}Height strips}{22}}

+\@writefile{toc}{\contentsline {subsection}{\numberline {7.3.3}Calculating the normal}{22}}

 \@setckpt{chapter7}{

-\setcounter{page}{22}

+\setcounter{page}{23}

 \setcounter{equation}{0}

 \setcounter{enumi}{0}

 \setcounter{enumii}{0}

diff --git a/Smoke/report/chapter8.aux b/Smoke/report/chapter8.aux
index 4cf1fd3..e0e19b3 100644
--- a/Smoke/report/chapter8.aux
+++ b/Smoke/report/chapter8.aux
@@ -1,12 +1,12 @@
 \relax 

-\@writefile{toc}{\contentsline {chapter}{\numberline {8}Streamtubes}{22}}

+\@writefile{toc}{\contentsline {chapter}{\numberline {8}Streamtubes}{23}}

 \@writefile{lof}{\addvspace {10\p@ }}

 \@writefile{lot}{\addvspace {10\p@ }}

-\@writefile{toc}{\contentsline {section}{\numberline {8.1}Description}{22}}

-\@writefile{toc}{\contentsline {section}{\numberline {8.2}Implementation}{22}}

-\@writefile{toc}{\contentsline {section}{\numberline {8.3}Difficulties}{23}}

+\@writefile{toc}{\contentsline {section}{\numberline {8.1}Description}{23}}

+\@writefile{toc}{\contentsline {section}{\numberline {8.2}Implementation}{23}}

+\@writefile{toc}{\contentsline {section}{\numberline {8.3}Difficulties}{24}}

 \@setckpt{chapter8}{

-\setcounter{page}{24}

+\setcounter{page}{25}

 \setcounter{equation}{0}

 \setcounter{enumi}{0}

 \setcounter{enumii}{0}

diff --git a/Smoke/report/chapter9.aux b/Smoke/report/chapter9.aux
index 426839b..e633181 100644
--- a/Smoke/report/chapter9.aux
+++ b/Smoke/report/chapter9.aux
@@ -1,11 +1,11 @@
 \relax 

-\@writefile{toc}{\contentsline {chapter}{\numberline {9}Conclusion}{24}}

+\@writefile{toc}{\contentsline {chapter}{\numberline {9}Conclusion}{25}}

 \@writefile{lof}{\addvspace {10\p@ }}

 \@writefile{lot}{\addvspace {10\p@ }}

-\@writefile{toc}{\contentsline {section}{\numberline {9.1}Visualization}{24}}

-\@writefile{toc}{\contentsline {section}{\numberline {9.2}The course}{25}}

+\@writefile{toc}{\contentsline {section}{\numberline {9.1}Visualization}{25}}

+\@writefile{toc}{\contentsline {section}{\numberline {9.2}The course}{26}}

 \@setckpt{chapter9}{

-\setcounter{page}{26}

+\setcounter{page}{27}

 \setcounter{equation}{0}

 \setcounter{enumi}{0}

 \setcounter{enumii}{0}

diff --git a/Smoke/report/isolines.PNG b/Smoke/report/isolines.PNG
new file mode 100644
index 0000000..be60ce7
--- /dev/null
+++ b/Smoke/report/isolines.PNG
diff --git a/Smoke/report/wilrik.png b/Smoke/report/wilrik.png
new file mode 100644
index 0000000..554e5ff
--- /dev/null
+++ b/Smoke/report/wilrik.png