bug fix

git-svn-id: http://svn.aei.mpg.de/numrel/AEIThorns/PunctureTracker/trunk@3 a2659f00-0f4f-0410-9214-a4596bbb8a4f

3 files changed, 33 insertions, 23 deletions

diff --git a/doc/documentation.tex b/doc/documentation.tex
index f9b451f..5836c6f 100644
--- a/doc/documentation.tex
+++ b/doc/documentation.tex
@@ -45,11 +45,11 @@
 %
 % Example of including a graphic image:
 %    \begin{figure}[ht]
-% 	\begin{center}
-%    	   \includegraphics[width=6cm]{MyArrangement_MyThorn_MyFigure}
-% 	\end{center}
-% 	\caption{Illustration of this and that}
-% 	\label{MyArrangement_MyThorn_MyLabel}
+%       \begin{center}
+%          \includegraphics[width=6cm]{MyArrangement_MyThorn_MyFigure}
+%       \end{center}
+%       \caption{Illustration of this and that}
+%       \label{MyArrangement_MyThorn_MyLabel}
 %    \end{figure}
 %
 % Example of using a label:
@@ -79,10 +79,10 @@
 \begin{document}
 
 % The author of the documentation
-\author{Erik Schnetter \textless schnetter@aei.mpg.de\textgreater}
+\author{Michael Koppitz \textless koppitz@aei.mpg.de\textgreater}
 
 % The title of the document (not necessarily the name of the Thorn)
-\title{BHTracker}
+\title{PunctureTracker}
 
 % the date your document was last changed, if your document is in CVS,
 % please use:
@@ -98,23 +98,33 @@
 
 % Add an abstract for this thorn's documentation
 \begin{abstract}
-   \texttt{BHTracker} tracks black holes or other features as they
-   move over the grid and makes Carpet's refinement regions follow
-   them.
+   \texttt{PunctureTracker} tracks black hole Punctures
+   (singularities) by subtracting the value of the shift at the
+   current location (the pucnture is advected with the shift)
+   storing the location in a ``SphericalSurface'' one can use this
+   information in Regrid2 to let the grid follow the BHs.
 \end{abstract}
 
 % The following sections are suggestive only.
 % Remove them or add your own.
 
-\section{Overview}
+\section{Parameters}
+
+   \texttt{PunctureTracker} has the followoing options:
+   -pt_track_punctures (boolean, that triggers action)\\
+   -pt_verbose         (integer that give the verbosity level)\\
+   -pt_num_tracked     (integer that tells how many Punctures are to
+   be tracked)\\
+   -pt_initial_x (double: Initial x coordinate positions of BHs)\\
+   -pt_initial_y     (double: Initial y coordinate positions of BHs)\\
+   -pt_initial_z     (double: Initial z coordinate positions of BHs)\\
+   -pt_which_surface_to_take (integer: which Spherical Surface should
+   be used to store the new puncture location)
+
+\section{Grid Scalars}
+   -(pt_loc_x, pt_loc_y, pt_loc_z) location of puncture
+   -(pt_shiftx, pt_shifty, pt_shiftz) value of shift at location of puncture
 
-   \texttt{BHTracker} expects that some other mechanism has performed
-   the actual tracking and stored the information about the tracked
-   black hole location in a \texttt{SphericalSurface}.  It can thus
-   track any object, not just black holes.  \texttt{BHTracker} then
-   steers certain parameters of \texttt{CarpetRegrid} to make it move
-   the refined regions.  \texttt{BHTracker} is not intelligent, it is
-   just a glob of glue to make ends meet.
 
 % Do not delete next line
 % END CACTUS THORNGUIDE
diff --git a/schedule.ccl b/schedule.ccl
index f95f829..ab3b151 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -13,13 +13,13 @@ if(pt_track_punctures){
     OPTIONS: GLOBAL
   } "calculate new location of punctures"
 
-  SCHEDULE PunctureTracker at CCTK_POSTSTEP
+  SCHEDULE PunctureTracker at CCTK_POSTSTEP before SphericalSurface_HasBeenSet
   {
     LANG: C
     OPTIONS: GLOBAL
   } "calculate new location of punctures"
   
-  SCHEDULE update_punc_loc at CCTK_POSTSTEP after PunctureTracker
+  SCHEDULE update_punc_loc at CCTK_POSTSTEP after PunctureTracker before SphericalSurface_HasBeenSet
   {
     LANG: C
     OPTIONS: GLOBAL
diff --git a/src/punc_track.c b/src/punc_track.c
index d4b83fa..7fb26b9 100644
--- a/src/punc_track.c
+++ b/src/punc_track.c
@@ -157,8 +157,8 @@ void update_punc_loc(CCTK_ARGUMENTS){
     pt_loc_y[n] = pt_loc_y_p[n] - pt_shifty[n] * pt_dt;
     pt_loc_z[n] = pt_loc_z_p[n] - pt_shiftz[n] * pt_dt;
 
-    sf_centroid_x[pt_which_surface_to_take[n]]=pt_loc_x[n];    
-    sf_centroid_y[pt_which_surface_to_take[n]]=pt_loc_y[n];
-    sf_centroid_z[pt_which_surface_to_take[n]]=pt_loc_z[n];
+    sf_centroid_x[pt_which_surface_to_take[n]]=pt_loc_x_p[n];    
+    sf_centroid_y[pt_which_surface_to_take[n]]=pt_loc_y_p[n];
+    sf_centroid_z[pt_which_surface_to_take[n]]=pt_loc_z_p[n];
   }
 }