Merge branch 'master' of github.com:studouglas/GEANT4-GPU

.gitignore

@@ -26,6 +26,8 @@ G4STORK/include/*.msh
 G4STORK/OutputFiles
 G4STORK/SourceFiles
 
+geant4.10.02/source/**/CUDAGPU.hh
+
 # Executables
 */**/AnalyzeTestResults
 */**/GenerateTestResults

Documentation/FinalPresentation/Presentation.tex

@@ -4,6 +4,7 @@
 \usepackage{graphicx}
 \usepackage[font={footnotesize}]{caption}
 \usepackage{textcomp}
+\usepackage{booktabs}
 \usepackage{listings}
 \lstset{language=C++,basicstyle=\footnotesize\ttfamily,keywordstyle=\color{red}}
 \newcommand{\textapprox}{\raisebox{0.5ex}{\texttildelow}}
@@ -41,6 +42,20 @@ \subsection{Brief Project Overview}
 \begin{frame}
 \frametitle{Brief Project Overview}
 Take an existing particle simulation toolkit - Geant4 - and have some functions run on a GPU device to improve performance.
+\begin{table}[htdp]
+\begin{center}
+\begin{tabular}{cc}
+\toprule
+\textbf{test} & \textbf{test}\\\midrule
+a & b\\
+a & b\\
+a & b\\
+\bottomrule
+\end{tabular}
+\end{center}
+\caption{default}
+\end{table}%
+
 \end{frame}
 
 \subsection{Explanation of Terms}
@@ -333,11 +348,10 @@ \subsubsection{Impl. 1: Performance}
 \begin{frame}
 \frametitle{Impl. 1: Performance Discussion}
 \begin{itemize}
-\item Simple ``getters'' and ``setters'' now 
+\item Simple ``getters'' and ``setters'' require copy from GPU to CPU memory
 \end{itemize}
 \end{frame}
 
-
 \subsection{Impl. 2: Add New GPU-Accelerated Methods to Interface}
 \begin{frame}
 \frametitle{Impl. 2: Add New GPU-Accelerated Methods to Interface}