Merge pull request #1865 from gforney/master

add some slice average keyword documentation, remove some debug print

Author: gforney

Manuals/SMV_User_Guide/SMV_User_Guide.tex

@@ -1167,7 +1167,7 @@ \subsection{Axis aligned slices}
 &SLCF PBY=1.50,QUANTITY='TEMPERATURE',VECTOR=.TRUE. /
 \end{lstlisting}
 
-When adjacent grids have different resolutions, vector slices may be displayed uniformly 
+When adjacent grids have different resolutions, vector slices may be displayed uniformly
 by selecting the {\em uniform spacing}\ checkbox in the Slice file settings dialog box.
 This is illustrated in Figure \ref{figvsliceuniformx}.
 
@@ -3962,6 +3962,32 @@ \subsubsection{Slice and Vector Slice Files}
   mesh number (int)
 \end{lstlisting}
 
+%%+++++++++++++++++++++++
+\hitemssf{OUTPUTSLICEDATA}
+Use {\tt OUTPUTSLICEDATA}\ to output slice data to a spread
+sheet file whenever the `r' key is pressed to render an image.
+Usage:
+\begin{lstlisting}
+  OUTPUTSLICEDATA
+  flag (int)
+\end{lstlisting}
+
+where flag is 1 to turn on slice data output and 0 to turn it off.
+
+%%+++++++++++++++++++++++
+\hitemssf{SETSLICEAVERAGE}
+Use {\tt SETSLICEAVERAGE}\ to average slice data when loading.
+{\tt SETSLICEAVERAGE}\ must be used before a slice
+file is loaded. Usage:
+\begin{lstlisting}
+  SETSLICEAVERAGE
+  flag (int) interval (float)
+\end{lstlisting}
+
+where flag is 1 to turn slice averaging on and 0 to turn it off.
+The parmameter interval is specified the time interval used
+to perform the average.
+
 %%+++++++++++++++++++++++
 \hitemssf{SETSLICEBOUNDS}
 Use {\tt SETSLICEBOUNDS}\ to set minimum and maximum bounds for slice files.

Manuals/SMV_Verification_Guide/SMV_Verification_Guide.tex

@@ -700,7 +700,7 @@ \section{Slices}
 &&&\raisebox{0.5in}[0pt]{\includegraphics[height=7.5in]{\SMVfigdir/colorbar_20_620}}\\
  \end{tabular}
 \end{center}
- \caption[A test showing regular and averaged slice file data]{A test showing regular and averaged slice file data}
+ \caption[A test showing regular and averaged slice file data]{A test showing regular slice file images and slice file images averaged over a 5~s time interval.}
 \label{figsliceaveragetest}%
 \end{figure}
 

Source/smokeview/IOscript.c

@@ -290,8 +290,8 @@ void InitKeywords(void){
   InitKeyword("LOADVSLICE",          SCRIPT_LOADVSLICE, 2);          // documented
   InitKeyword("LOADVSLICEM",         SCRIPT_LOADVSLICEM, 3);         // documented
   InitKeyword("SETSLICEBOUNDS",      SCRIPT_SETSLICEBOUNDS, 1);      // documented
-  InitKeyword("SETSLICEAVERAGE",     SCRIPT_SETSLICEAVERAGE, 2);
-  InitKeyword("OUTPUTSLICEDATA",     SCRIPT_OUTPUTSLICEDATA, 2);
+  InitKeyword("SETSLICEAVERAGE",     SCRIPT_SETSLICEAVERAGE, 2);     // documented
+  InitKeyword("OUTPUTSLICEDATA",     SCRIPT_OUTPUTSLICEDATA, 1);     // documented
 
 // particle files
   InitKeyword("LOADPARTICLES",       SCRIPT_LOADPARTICLES, 0);       // documented

Source/smokeview/update.c

@@ -768,7 +768,6 @@ void SynchTimes(void){
       parti=partinfo+j;
       if(parti->loaded==0)continue;
       parti->timeslist[n] = GetDataTimeFrame(global_times[n], parti->times_map, parti->times,parti->ntimes);
-      if(j==0)printf("%i part time=%f\n", parti->timeslist[n], parti->times[parti->timeslist[n]]);
     }
 
   /* synchronize shooter times */