Verslag update

11 files changed, 89 insertions, 57 deletions

diff --git a/Smoke/report/2IV35-Report.log b/Smoke/report/2IV35-Report.log
index 9a2bc29..6a65803 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 09:43

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

 entering extended mode

 **2IV35-Report.tex

 (2IV35-Report.tex

@@ -514,52 +514,67 @@ Underfull \hbox (badness 10000) in paragraph at lines 22--24
 

  []

 

-

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

+<height_plot.png, id=111, 847.165pt x 629.35126pt>

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

+ <use height_plot.png>

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

 

  []

 

 

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

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

+

+ []

+

+<height_plot2.png, id=112, 847.165pt x 629.35126pt>

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

+ <use height_plot2.png>

+[21 <height_plot.png>]

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

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 36--37

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

 

  []

 

 

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

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

 

  []

 

 

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

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

 

  []

 

+[22 <height_plot2.png>]

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

+

+ []

 

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

+

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

 

  []

 

-[21]

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

+

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

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 55--58

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

 

  []

 

 )

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

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

 

  []

 

-[22] (chapter8.tex

+[23] (chapter8.tex

 Chapter 8.

 

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

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

  []

 

-[23

+[24

 

 

 

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

  []

 

-[24] (chapter9.tex

+[25] (chapter9.tex

 Chapter 9.

 

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

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

  []

 

-[25

+[26

 

 

 

@@ -646,7 +661,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 28--28
 

  []

 

-[26] (chapter10.tex

+[27] (chapter10.tex

 Chapter 10.

 

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

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

  []

 

-[27

+[28

 

 

 

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

  []

 

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

+[29] (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:

- 2101 strings out of 95490

- 22721 string characters out of 1188952

+ 2113 strings out of 95490

+ 22922 string characters out of 1188952

  75550 words of memory out of 1076186

- 4879 multiletter control sequences out of 60000

+ 4887 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:

- 135 PDF objects out of 300000

+ 140 PDF objects out of 300000

  0 named destinations out of 300000

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

+ 51 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:\

@@ -730,4 +745,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 (29 pages, 457517 bytes).

+Output written on 2IV35-Report.pdf (30 pages, 855412 bytes).

diff --git a/Smoke/report/2IV35-Report.pdf b/Smoke/report/2IV35-Report.pdf
index 63a8962..b088a94 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 2deff95..1643870 100644
--- a/Smoke/report/2IV35-Report.toc
+++ b/Smoke/report/2IV35-Report.toc
@@ -22,18 +22,18 @@
 \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}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/Smoke/report/chapter1.tex b/Smoke/report/chapter1.tex
index c700270..88d7918 100644
--- a/Smoke/report/chapter1.tex
+++ b/Smoke/report/chapter1.tex
@@ -9,7 +9,7 @@ techniques on top of the existing code. \\
 \end {center}

 

 The above figure illustrates the different assignments. After doing step 3 there were two different ways to continue the practical assignment. We chose

-to take the left branch of the figure which, amongst others, involved implementing isosurfaces and hight plots. \\

+to take the left branch of the figure which, amongst others, involved implementing isosurfaces and height plots. \\

 

 Every chapter in this report discusses a particular objective from the practical assignment. The next chapter will briefly talk about the skeleton program and how

 we adapted the code to be able to add functionality. Chapter 3 will discuss the color mapping, chapter 4 is about glyphs and so on. \\

diff --git a/Smoke/report/chapter2.tex b/Smoke/report/chapter2.tex
index be36f5c..b4afc0a 100644
--- a/Smoke/report/chapter2.tex
+++ b/Smoke/report/chapter2.tex
@@ -11,7 +11,7 @@ stored. The skeleton program keeps track of the density, velocity and force. The
 attribute has its own 'preferred' visualization technique. \\

 

 Using these values at the cell's vertices, all sorts of techniques, additional values and other useful info can be used. The values are used in colormap techniques,

-calculation of the divergence and the rendering of the hight plots. \\

+calculation of the divergence and the rendering of the height plots. \\

 

 \begin {center}

   \includegraphics[width=70mm]{flow_vis.png} \\

diff --git a/Smoke/report/chapter7.aux b/Smoke/report/chapter7.aux
index 723df9f..9406efd 100644
--- a/Smoke/report/chapter7.aux
+++ b/Smoke/report/chapter7.aux
@@ -4,13 +4,13 @@
 \@writefile{lot}{\addvspace {10\p@ }}

 \@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}}

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

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

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

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

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

 \@setckpt{chapter7}{

-\setcounter{page}{23}

+\setcounter{page}{24}

 \setcounter{equation}{0}

 \setcounter{enumi}{0}

 \setcounter{enumii}{0}

diff --git a/Smoke/report/chapter7.tex b/Smoke/report/chapter7.tex
index 3a277b5..f4ad82e 100644
--- a/Smoke/report/chapter7.tex
+++ b/Smoke/report/chapter7.tex
@@ -22,6 +22,23 @@ vertex we used the stored height from the array and render the vertex using that
 To see more depth in the picture we also included some ambient and diffuse light to the program. In order to let the light have effect on the surface we calculated

 the normal vector for each vertex. \\

 

+\begin {center}

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

+  Figure 9: A height plot of the density \\

+\end {center}

+

+The above picture (figure 9) shows a height plot of a fluid where the height encodes the density of the fluid. The colormap is also mapped to the density but this

+is not necessarily the case. In the snapshot on the next page (figure 10), the height is visualizing the velocity of the fluid while the colormap shows differences

+in the density. \\

+

+As you can see from the second height plot, the bright yellow colors are not on the highest point of the height map. This means the density is not always the

+largest where the velocity is high. \\

+

+\begin {center}

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

+  Figure 10: Another height plot, but this time of the velocity \\

+\end {center}

+

 \subsection{Normal vector}

 

 For the calculation of the normal vector for a given vertex, say $ v_0 $, we first take the two neighboring vertices in that cell, $ v_{1} $ and $ v_{2} $. We take

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

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

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

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

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

-\@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}}

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

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

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

 \@setckpt{chapter8}{

-\setcounter{page}{25}

+\setcounter{page}{26}

 \setcounter{equation}{0}

 \setcounter{enumi}{0}

 \setcounter{enumii}{0}

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

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

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

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

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

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

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

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

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

 \@setckpt{chapter9}{

-\setcounter{page}{27}

+\setcounter{page}{28}

 \setcounter{equation}{0}

 \setcounter{enumi}{0}

 \setcounter{enumii}{0}

diff --git a/Smoke/report/height_plot.png b/Smoke/report/height_plot.png
new file mode 100644
index 0000000..3ed9109
--- /dev/null
+++ b/Smoke/report/height_plot.png
diff --git a/Smoke/report/height_plot2.png b/Smoke/report/height_plot2.png
new file mode 100644
index 0000000..0990c0f
--- /dev/null
+++ b/Smoke/report/height_plot2.png