From 7af511a2187f0b71bfe6001f02ea7feba7f869c4 Mon Sep 17 00:00:00 2001 From: Cirdans-Home Date: Wed, 10 Mar 2021 21:36:32 +0100 Subject: [PATCH] Added command for inline code highlighting --- docs/amg4psblas_1.0-guide.pdf | Bin 1806363 -> 1806899 bytes docs/html/index.html | 2 +- docs/html/userhtml.html | 2 +- docs/html/userhtmlli1.html | 4 +- docs/html/userhtmlli2.html | 2 +- docs/html/userhtmlli4.html | 4 +- docs/html/userhtmlse4.html | 80 ++++++++++++++++++++++++---------- docs/html/userhtmlse8.html | 2 +- docs/src/gettingstarted.tex | 14 +++--- docs/src/userguide.tex | 6 +++ docs/src/userhtml.tex | 5 +++ 11 files changed, 82 insertions(+), 39 deletions(-) diff --git a/docs/amg4psblas_1.0-guide.pdf b/docs/amg4psblas_1.0-guide.pdf index 5d03290e3c42f6afacf63d54899a7ca2134a5dab..b252ae6e3aa7ba6408ff5cc04f26c24d9cbe9471 100644 GIT binary patch delta 2244 zcmb7EU2IfE6z*JV3zrIIxx06Fr_gDk#)Mez+?lyEL&{%SXf#27M9Yr^=?ladn(*KY zKWp%|rAxO^Aq=K5@<22`5Mnf0iNT*3)R_1H5o3rEQDcGzC7Pg#Xgo872*$)V**W){ zbH4MPb7t<|@sqpWIJN7!6s2A|C9O~IOB>S0bZR;+_0#ETQ+j_oBb}Kxr?b*bI{VFF z|K55U@z`vCF}t|-?%trOVP4c33lep54klq__YQd8<5}Nh-aitwnC}k+a~mT9anfV@ z$AVm~@O;qYO;tJI)u7qDJrHE(`Tr{RALY%}>$%xx*;p{sTptKpZ!6sR zAZ#)V27}xr6}Ars?e`9GVlYUiOniuI!vVhC!qjLMDP4WVxJB4fT`s|!=%{k`RqXE8?YhS&v zHvd>KFbRS4$Nv!+x^g^#m91Slo@+UXlG?4gVH+yPgeM7MEKUG$!gvw^P=qBBxH$#j zJc2MuCE=10rnm-5AQzGOgzWC?}2RzxbMeF5#Oh(g;DBZ|UTM!>D;F@a$y zkQGr1GDHMy4d*04OVfz@0{Yjn0C`3fa3xNg9@?D zQ1;$p;6ZW(7V^Q#{SLxo1)tIWzNh`JE`MQ(Y~i&N?cwsK1}bDHXXfg@Y_}BZgr@3rWgAQR+QpsIqi-amECb%>gK#u602lM#k^avQo@#y zuK%OdZXLj-25;*@(>;uT@?QPW#1*{2`*gn9R>2{@++XL_p+(Y~#nvpdrV9nvUNU19 z{D9Z^tT|i3!kaNChCrZLr2e+3Ii3S8umX)-WAI!uUUu1bnA6?XEVpK*HOo-$^;0go!phFHz8-5Hv1S#@ zeg22>s&G1&KQjxfP~(S7W_1;lmJpqBX?+N1*8}o0FqxM@C|nzxVPN8ozH?8ty3IBQ zJ$sqyDBSjid9Mlw-QVj7v#c9N_A>3(%tqnE#-hvscU#rT4Qn^AH2qC;Cy@!UHOJ&Ew<&8F)xKHb>+ YN*%)KZgb->Ces;{%J1k{xn`CBHy%+6iU0rr delta 1800 zcmah`Ylv1w7~VO%?&Y}d>bLVR%t^J{(1%*&a z8+q0Z_ww1wIxb=)ln`k`1z%+sjiM!ql7fsVsG#~$K@t86>YcOgvj6%q&w1XN=Y8JG zdHu!1XJ0t{bc|vzu8gbVd2w}I6W7Ldu^-Qm>*ED+L);iIj2FeJxakf2)X^#?nXu;@ z(i_TGkK*~&w)9sT+t1G68tWg!OYFgS(hKayQ@FO=b_{Rx?A250Cj0pWuC><(@nU;m zDznrsJdQKAw=$ix4<5%Y?ylKhK92Kt@q2JLZwTKp$L8)K997y!KAo|-b^?>>6f_Je z&AkBK!+52AMP~l1e0CVW>CH(QADdIT%6>D3Q`32^CA?}jug;E-;^OJ4Ouaofglo!E zCEVxDj#q0Bj^pOp{;TY3<1;SaDR6OfmtpRnxhY>yK(8}>)s<7H@t|k7Uzi@H&VF?U zo@W;})HsRZq|1$ynd)beE@zfym!SbcMHJC63^WiyLlFf)Gz}vLAUKfZM$%AmLxl=y zs3ivt1dIVuj0!HLFBAkJa~es7kP(eSDkO(z1)kDH8cw7k(xBBK84xO>k}mUMkO&B(kh`LqMs7Bt z4UHo1#0(r%;0rSVUdGL3BvlNCgCP_Tz{dnYps+B8ssKP3MU{Y!2oq5y!Cu1nN`(R< z_(BN~(02oUS%wNCM$*}XL??AX25)e4 zP*cvBF}@4}U;#7+9YG<+9J(VNDmVgA!mfb9ekCl4GwJpoNT&#)0+i!S!_Sog=pY$P zp(-#PmCr5DcGlOe4q@MGA|>qo2hw<`foI|5;N;;H$_<>1uWI2Tm#vJqFxGOrzjnvN z4;3GHte>tbt_xTIuFxoVlJduUiQl?qQ`lzYmaSrISX4#9HivSP`UoWZ3ElwI;c!YW-@?Z89n;ct_>Di_u}s6pw; zZT8wISt-7FHF;a;t`|ATIA}uY-#$zpunThzh=VN3_zvT?6=>!_sb{j-|qY6_qI?Xt@P&GiE+EL>vpi$!F>)oQRbH`w!cJZ zbLO9kMAnB$(>h>Y3flKl2xWH`?D-P-b^K}HFOe+iy_!73U|tHw@KPxUjVOC)qx}N} z-qCjJpM)(>@hd^@(5y%H^*oY$wX~KAEsxD0l9sgtepG zN1X|~2jza~O4x3cuQ-yhdr`js-GuEy`RCgb)`9X@)+VeIc0(&c=J*Y6`*5sx3p~9653EPiI_h!52IdZ9{W2^#^XL@YyIHB_cEdqbVind)_ G{eJ;EYO&h@ 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