[cig-commits] commit: Added missing figure.

[Mercurial]

changeset:   91:ac1ae5ce597c
parent:      89:12e125af3774
user:        Brad Aagaard <baagaard at usgs.gov>
date:        Wed Mar 28 14:56:30 2012 -0700
files:       faultRup.tex figs/cohesivecell.pdf
description:
Added missing figure.


diff -r 12e125af3774 -r ac1ae5ce597c faultRup.tex
--- a/faultRup.tex	Wed Mar 28 09:37:40 2012 -0700
+++ b/faultRup.tex	Wed Mar 28 14:56:30 2012 -0700
@@ -1242,20 +1242,33 @@ MGK acknowledges partial support from NS
 \end{figure*}
 
 
+\begin{figure}
+  ADD diagram of solvertest problem
+  %\noindent\includegraphics{figs/solvertest_geometry}
+  \caption{Diagram of geometry and boundary conditions for the
+    performance benchmark.}
+  \label{fig:solvertest:geometry}
+\end{figure}
+
+\begin{figure}
+  ADD plot of scaling for solvertest problem
+  %\noindent\includegraphics{figs/solvertest_scaling}
+  \caption{Plot of parallel scaling for the performance benchmark.}
+  \label{fig:solvertest:scaling}
+\end{figure}
+
 % ------------------------------------------------------------------
 % TABLES
 % ------------------------------------------------------------------
 
+\clearpage
 \begin{table*}
-\caption{Example preconditioners for the saddle point problem in
-  equation~(\ref{eqn:saddle:point}). All of these field split
-  preconditioners require the use of the parameters
-  \texttt{split\_fields = True} and \texttt{matrix\_type = aij} for
-  \texttt{pylithapp.problem.formulation}.}
+  \caption{Example Preconditioners for the Saddle Point Problem in
+    Equation~(\ref{eqn:saddle:point})\tablenotemark{a}}
 \label{tab:solver:options}
 \centering
 \begin{tabular}{ll}
-  $\begin{pmatrix}\hat K & 0 \\ 0 & I\end{pmatrix}$ & $\begin{pmatrix}\hat K & L^T \\ 0 & I\end{pmatrix}$ \\
+  $\begin{pmatrix}\mathbf{K} & \mathbf{0} \\ \mathbf{0} & \mathbf{I}\end{pmatrix}$ & $\begin{pmatrix}\mathbf{K} & \mathbf{L}^T \\ \mathbf{0} & \mathbf{I}\end{pmatrix}$ \\
   \texttt{[pylithapp.problem.formulation]}             & \texttt{[pylithapp.problem.formulation]} \\
   \texttt{split\_fields = True}                        & \texttt{split\_fields = True} \\
   \texttt{matrix\_type = aij}                          & \texttt{matrix\_type = aij} \\
@@ -1268,7 +1281,7 @@ MGK acknowledges partial support from NS
   \texttt{fs\_fieldsplit\_1\_pc\_type = jacobi}        & \texttt{fs\_fieldsplit\_1\_pc\_type = jacobi} \\
   \texttt{fs\_fieldsplit\_1\_ksp\_type = preonly}      & \texttt{fs\_fieldsplit\_1\_ksp\_type = preonly} \\
   \smallskip \\
-  $\begin{pmatrix}\hat K & 0 \\ 0 & -\hat S\end{pmatrix}$ & $\begin{pmatrix}\hat K & 0 \\ L & \hat S\end{pmatrix}$ \\
+  $\begin{pmatrix}\mathbf{K} & \mathbf{0} \\ \mathbf{0} & -\mathbf{S}\end{pmatrix}$ & $\begin{pmatrix}\mathbf{K} & \mathbf{0} \\ \mathbf{L} & \mathbf{S}\end{pmatrix}$ \\
   \texttt{[pylithapp.problem.formulation]}                   & \texttt{[pylithapp.problem.formulation]} \\
   \texttt{split\_fields = False}                             & \texttt{split\_fields = False} \\
   \texttt{matrix\_type = aij}                                & \texttt{matrix\_type = aij} \\
@@ -1283,7 +1296,7 @@ MGK acknowledges partial support from NS
   \texttt{fieldsplit\_1\_pc\_type = none}                    & \texttt{fieldsplit\_1\_pc\_type = none} \\
   \texttt{fieldsplit\_1\_ksp\_type = minres}                 & \texttt{fieldsplit\_1\_ksp\_type = minres} \\
   \smallskip \\
-  $\begin{pmatrix}\hat K & L^T \\ 0 & \hat S\end{pmatrix}$ & $\begin{pmatrix}I & 0 \\ B^T A^{-1} & I\end{pmatrix}\begin{pmatrix}\hat A & 0 \\ 0 & \hat S\end{pmatrix}\begin{pmatrix}I & A^{-1} B \\ 0 & I\end{pmatrix}$ \\
+  $\begin{pmatrix}\mathbf{K} & \mathbf{L}^T \\ \mathbf{0} & \mathbf{S}\end{pmatrix}$ & $\begin{pmatrix}\mathbf{I} & \mathbf{0} \\ \mathbf{B}^T \mathbf{A}^{-1} & \mathbf{I}\end{pmatrix}\begin{pmatrix}\mathbf{A} & \mathbf{0} \\ \mathbf{0} & \mathbf{S}\end{pmatrix}\begin{pmatrix}\mathbf{I} & \mathbf{A}^{-1} \mathbf{B} \\ \mathbf{0} & \mathbf{I}\end{pmatrix}$ \\
   \texttt{[pylithapp.problem.formulation]}                    & \texttt{[pylithapp.problem.formulation]} \\
   \texttt{split\_fields = False}                              & \texttt{split\_fields = False} \\
   \texttt{matrix\_type = aij}                                 & \texttt{matrix\_type = aij} \\
@@ -1298,10 +1311,14 @@ MGK acknowledges partial support from NS
   \texttt{fieldsplit\_1\_pc\_type = none}                     & \texttt{fieldsplit\_1\_pc\_type = none} \\
   \texttt{fieldsplit\_1\_ksp\_type = minres}                  & \texttt{fieldsplit\_1\_ksp\_type = minres} \\
 \end{tabular}
+\tablenotetext{a}{All of these field split
+  preconditioners require the use of the parameters
+  \texttt{split\_fields = True} and \texttt{matrix\_type = aij} for
+  \texttt{pylithapp.problem.formulation}.}
 \end{table*}
 
 \begin{table}
-\caption{Performance of Krylov solvers on a problem with 3 faults. Problem 1 (P1) has 25000 unknowns and 645
+\caption{\brad{REDO}Performance of Krylov Solvers on a problem with 3 faults. Problem 1 (P1) has 25000 unknowns and 645
   constraints, whereas the larger Problem 2 (P2) has 191,000 unknowns and 2241 constraints. The relative
   solver tolerance is $10^{-8}$, and the preconditioners used were Additive Schwarz Method (ASM), FieldSplit (FS),
   Incomplete Cholesky (ICC), algebraic multigrid (ML), Schur complement, least-square commutator (LSC), and a custom
diff -r 12e125af3774 -r ac1ae5ce597c figs/cohesivecell.pdf
Binary file figs/cohesivecell.pdf has changed