diff --git a/docs/amg4psblas_1.0-guide.pdf b/docs/amg4psblas_1.0-guide.pdf index 5d03290e..b252ae6e 100644 Binary files a/docs/amg4psblas_1.0-guide.pdf and b/docs/amg4psblas_1.0-guide.pdf differ diff --git a/docs/html/index.html b/docs/html/index.html index df4ed87f..c4c15ade 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -10,7 +10,7 @@ -

MLD2P4
User’s and Reference Guide
-

MLD2P4
User’s and Reference Guide
of AMG4PSBLAS. -

[next] [up]

-

diff --git a/docs/html/userhtmlli2.html b/docs/html/userhtmlli2.html index 93ef6c4a..c5d318c3 100644 --- a/docs/html/userhtmlli2.html +++ b/docs/html/userhtmlli2.html @@ -10,7 +10,7 @@ -

[nextTransactions on Mathematical Software, 44, (2018) 39:1–39:2 -

[prev] [up]

-

diff --git a/docs/html/userhtmlse4.html b/docs/html/userhtmlse4.html index 8c0ed8c7..599aee17 100644 --- a/docs/html/userhtmlse4.html +++ b/docs/html/userhtmlse4.html @@ -274,20 +274,30 @@ class="small-caps">r

No preconditioner

’NONE’

’NONE’

Considered to use the PSBLAS Krylov solvers with no preconditioner.

Diagonal

’DIAG’, -’JACOBI’, -’L1-JACOBI’

’DIAG’, +’JACOBI’, +’L1-JACOBI’

Diagonal preconditioner. For any zero diagonal entry of the matrix to be preconditioned, the corresponding entry @@ -296,10 +306,16 @@ of the preconditioner is set to 1. class="hline">

Gauss-Seidel

’GS’, -’L1-GS’

’GS’, +’L1-GS’

Hybrid Gauss-Seidel (forward), that is, global block Jacobi with Gauss-Seidel as local solver. @@ -307,10 +323,16 @@ local solver. class="hline">

Symmetrized Gauss-Seidel

’FBGS’, -’L1-FBGS’

’FBGS’, +’L1-FBGS’

Symmetrized hybrid Gauss-Seidel, that is, forward Gauss-Seidel followed by backward Gauss-Seidel. @@ -318,26 +340,36 @@ backward Gauss-Seidel. class="hline">

Block Jacobi

’BJAC’, -’L1-BJAC’

’BJAC’, +’L1-BJAC’

Block-Jacobi with ILU(0) on the local blocks.

Additive Schwarz

’AS’

’AS’

Additive Schwarz (AS), with overlap 1 and ILU(0) on the local blocks.

Multilevel

’ML’

’ML’

V-cycle with one hybrid forward Gauss-Seidel (GS) sweep as pre-smoother and one hybrid backward diff --git a/docs/html/userhtmlse8.html b/docs/html/userhtmlse8.html index b7756c21..d38234e8 100644 --- a/docs/html/userhtmlse8.html +++ b/docs/html/userhtmlse8.html @@ -128,7 +128,7 @@ class="cmr-12">abide by its terms: -

+

diff --git a/docs/src/gettingstarted.tex b/docs/src/gettingstarted.tex index 2635933c..f3f26f51 100644 --- a/docs/src/gettingstarted.tex +++ b/docs/src/gettingstarted.tex @@ -59,21 +59,21 @@ Examples showing the basic use of AMG4PSBLAS are reported in Section~\ref{sec:ex \begin{tabular}{|l|p{2cm}|p{6.8cm}|} \hline \textsc{type} & \textsc{string} & \textsc{default preconditioner} \\ \hline -No preconditioner &\verb|'NONE'|& Considered to use the PSBLAS +No preconditioner &\fortinline|'NONE'|& Considered to use the PSBLAS Krylov solvers with no preconditioner. \\ \hline -Diagonal & \verb|'DIAG'|, \verb|'JACOBI'|, \verb|'L1-JACOBI'| & Diagonal preconditioner. +Diagonal & \fortinline|'DIAG'|, \fortinline|'JACOBI'|, \fortinline|'L1-JACOBI'| & Diagonal preconditioner. For any zero diagonal entry of the matrix to be preconditioned, the corresponding entry of the preconditioner is set to~1.\\ \hline -Gauss-Seidel & \verb|'GS'|, \verb|'L1-GS'| & Hybrid Gauss-Seidel (forward), that is, +Gauss-Seidel & \fortinline|'GS'|, \fortinline|'L1-GS'| & Hybrid Gauss-Seidel (forward), that is, global block Jacobi with Gauss-Seidel as local solver.\\ \hline -Symmetrized Gauss-Seidel & \verb|'FBGS'|, \verb|'L1-FBGS'| & Symmetrized hybrid Gauss-Seidel, that is, +Symmetrized Gauss-Seidel & \fortinline|'FBGS'|, \fortinline|'L1-FBGS'| & Symmetrized hybrid Gauss-Seidel, that is, forward Gauss-Seidel followed by backward Gauss-Seidel.\\ \hline -Block Jacobi & \verb|'BJAC'|, \verb|'L1-BJAC'| & Block-Jacobi with ILU(0) on the local blocks.\\ \hline -Additive Schwarz & \verb|'AS'| & Additive Schwarz (AS), +Block Jacobi & \fortinline|'BJAC'|, \fortinline|'L1-BJAC'| & Block-Jacobi with ILU(0) on the local blocks.\\ \hline +Additive Schwarz & \fortinline|'AS'| & Additive Schwarz (AS), with overlap~1 and ILU(0) on the local blocks. \\ \hline -Multilevel &\verb|'ML'| & V-cycle with one hybrid forward Gauss-Seidel +Multilevel &\fortinline|'ML'| & V-cycle with one hybrid forward Gauss-Seidel (GS) sweep as pre-smoother and one hybrid backward GS sweep as post-smoother, decoupled smoothed aggregation as coarsening algorithm, and LU (plus triangular solve) diff --git a/docs/src/userguide.tex b/docs/src/userguide.tex index d171b66d..5c835449 100644 --- a/docs/src/userguide.tex +++ b/docs/src/userguide.tex @@ -24,6 +24,12 @@ \usemintedstyle{friendly} \definecolor{bg}{rgb}{0.95,0.95,0.95} \usepackage{breakurl} +\ifpdf +\newmintinline[fortinline]{fortran}{} +\else% +\def\fortinline{\lstinline[basicstyle=\ttfamily,language=fortran]} +\fi + %\newboolean{mtc} %\setboolean{mtc}{true} diff --git a/docs/src/userhtml.tex b/docs/src/userhtml.tex index 76f97ca0..74f60d8e 100644 --- a/docs/src/userhtml.tex +++ b/docs/src/userhtml.tex @@ -22,6 +22,11 @@ %\setboolean{mtc}{true} \usepackage{microtype} \usepackage{listings} +\ifpdf +\newmintinline[fortinline]{fortran}{} +\else% +\def\fortinline{\lstinline[basicstyle=\ttfamily,language=fortran]} +\fi \pdfoutput=0 \relax