diff --git a/docs/html/img100.png b/docs/html/img100.png
index 2c3a36e8..a6754f48 100644
Binary files a/docs/html/img100.png and b/docs/html/img100.png differ
diff --git a/docs/html/img101.png b/docs/html/img101.png
index a9d84a65..968dade3 100644
Binary files a/docs/html/img101.png and b/docs/html/img101.png differ
diff --git a/docs/html/img102.png b/docs/html/img102.png
index 0497bd70..2c3a36e8 100644
Binary files a/docs/html/img102.png and b/docs/html/img102.png differ
diff --git a/docs/html/img103.png b/docs/html/img103.png
index 321efb07..a9d84a65 100644
Binary files a/docs/html/img103.png and b/docs/html/img103.png differ
diff --git a/docs/html/img104.png b/docs/html/img104.png
index 1bb60423..0497bd70 100644
Binary files a/docs/html/img104.png and b/docs/html/img104.png differ
diff --git a/docs/html/img94.png b/docs/html/img94.png
index 43e3e8dd..a5ba6436 100644
Binary files a/docs/html/img94.png and b/docs/html/img94.png differ
diff --git a/docs/html/img95.png b/docs/html/img95.png
index 381d3787..91a157b3 100644
Binary files a/docs/html/img95.png and b/docs/html/img95.png differ
diff --git a/docs/html/img96.png b/docs/html/img96.png
index 89fc7ed8..43e3e8dd 100644
Binary files a/docs/html/img96.png and b/docs/html/img96.png differ
diff --git a/docs/html/img97.png b/docs/html/img97.png
index fb6b7f9c..381d3787 100644
Binary files a/docs/html/img97.png and b/docs/html/img97.png differ
diff --git a/docs/html/img98.png b/docs/html/img98.png
index a6754f48..89fc7ed8 100644
Binary files a/docs/html/img98.png and b/docs/html/img98.png differ
diff --git a/docs/html/img99.png b/docs/html/img99.png
index 968dade3..fb6b7f9c 100644
Binary files a/docs/html/img99.png and b/docs/html/img99.png differ
diff --git a/docs/html/node12.html b/docs/html/node12.html
index 6c18560d..694d48ed 100644
--- a/docs/html/node12.html
+++ b/docs/html/node12.html
@@ -727,7 +727,7 @@ $w = y_1$;
\begin{tabbing}
\quad \=\quad...
...= y_l+r_l$\\
-\textbf{endfor} [1mm]
+\textbf{endfor} \\ [1mm]
$w = y_1$;
\end{tabbing}}
\end{minipage}}">
diff --git a/docs/html/node14.html b/docs/html/node14.html
index eb86bf6f..87a6502d 100644
--- a/docs/html/node14.html
+++ b/docs/html/node14.html
@@ -165,9 +165,9 @@ Preconditioner types, corresponding strings and default choices.
'ML' |
Multi-level hybrid preconditioner (additive on the
same level and multiplicative through the levels),
- with post-smoothing only.
+ with pre- and post-smoothing.
Number of levels: 2.
- Post-smoother: RAS with overlap 1 and ILU(0)
+ Smoother: RAS with overlap 1 and ILU(0)
on the local blocks.
Aggregation: decoupled smoothed aggregation with
threshold
! a coarsest matrix replicated on the processors, and the
! LU factorization from UMFPACK as coarse-level solver
call mld_precinit(P,'ML',info,nlev=3)
- call_mld_precset(P,mld_smoother_type_,'BJAC',info)
- call mld_precset(P,mld_coarse_mat_,'REPL',info)
- call mld_precset(P,mld_coarse_solve_,'UMF',info)
+ call_mld_precset(P,'SMOOTHER_TYPE','BJAC',info)
+ call_mld_precset(P,'SMOOTHER_POS,'POST'w,info)
+ call mld_precset(P,'COARSE_MAT','REPL',info)
+ call mld_precset(P,'COARSE_SOLVE','UMF',info)
... ...
|
@@ -240,9 +242,9 @@ Setup of an additive three-level Schwarz preconditioner.
! post-smoother, and 5 block-Jacobi sweeps (with UMFPACK LU
! on the blocks) as distributed coarsest-level solver
call mld_precinit(P,'ML',info,nlev=3)
- call mld_precset(P,mld_ml_type_,'ADD',info)
- call_mld_precset(P,mld_smoother_pos_,'TWOSIDE',info)
- call mld_precset(P,mld_coarse_sweeps_,5,info)
+ call mld_precset(P,'ML_TYPE','ADD',info)
+ call_mld_precset(P,'SMOOTHER_POS','TWOSIDE',info)
+ call mld_precset(P,'COARSE_SWEEPS',5,info)
... ...
@@ -269,7 +271,7 @@ Setup of a one-level Schwarz preconditioner.
... ...
! set RAS with overlap 2 and ILU(0) on the local blocks
call mld_precinit(P,'AS',info)
- call mld_precset(P,mld_sub_ovr_,2,info)
+ call mld_precset(P,'SUB_OVR',2,info)
... ...
diff --git a/docs/html/node18.html b/docs/html/node18.html
index 2b9d7d6e..e192c081 100644
--- a/docs/html/node18.html
+++ b/docs/html/node18.html
@@ -193,7 +193,7 @@ according to their needs.
-
+
Table 2:
Parameters defining the type of multi-level preconditioner.
@@ -225,7 +225,7 @@ Parameters defining the type of multi-level preconditioner.
mld_smoother_pos_
SMOOTHER_POS |
character(len=*) |
'PRE' 'POST' 'TWOSIDE' |
-'POST' |
+'TWOSIDE' |
``Position'' of the smoother: pre-smoother, post-smoother,
pre- and post-smoother. |
@@ -238,7 +238,7 @@ Parameters defining the type of multi-level preconditioner.
-
+
Table 3:
Parameters defining the one-level preconditioner used as smoother.
@@ -339,7 +339,7 @@ Parameters defining the one-level preconditioner used as smoother.
-
+
Table 4:
Parameters defining the aggregation algorithm.
@@ -385,12 +385,28 @@ Parameters defining the aggregation algorithm.
WIDTH="56" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="img92.png"
ALT="$\in [0, 1]$">
-0 |
+0.05 |
Threshold in the aggregation algorithm. |
+mld_aggr_scale_
AGGR_SCALE |
+real( kind_parameter) |
+Any real num. |
+1.0 |
+Scale factor applied to the threshold going
+ from level to level . |
+
mld_aggr_omega_alg_
AGGR_OMEGA_ALG |
character(len=*) |
'EIG_EST' 'USER_CHOICE' |
@@ -426,7 +442,7 @@ Parameters defining the aggregation algorithm.
-->
Damping parameter of
-
+
Table 5:
Parameters defining the coarse-space correction at the coarsest
@@ -512,7 +528,7 @@ level.
integer |
Any int. num. |
4 |
Number of Block-Jacobi sweeps when 'BJAC' is used as
diff --git a/docs/html/node20.html b/docs/html/node20.html
index 9b703cc1..646cdd9b 100644
--- a/docs/html/node20.html
+++ b/docs/html/node20.html
@@ -69,14 +69,14 @@ This routine computes
, where , where is a previously built
preconditioner, stored into p , and
denotes the preconditioner itself or its transpose, according to
the value of trans .
@@ -106,7 +106,7 @@ and hence it is completely transparent to the user.
| |
The local part of the vector . Note that type and
kind_parameter must be chosen according
to the real/complex, single/double precision version of MLD2P4 under use. |
@@ -117,7 +117,7 @@ and hence it is completely transparent to the user.
|
The local part of the vector . Note that type and
kind_parameter must be chosen according
to the real/complex, single/double precision version of MLD2P4 under use. |
@@ -144,28 +144,28 @@ and hence it is completely transparent to the user.
-->
;
if trans = 'T','t' then
(transpose of ; if trans = 'C','c' then
(conjugate transpose of .
work |
diff --git a/docs/html/node26.html b/docs/html/node26.html
index 51eedaaf..0cd0fb70 100644
--- a/docs/html/node26.html
+++ b/docs/html/node26.html
@@ -63,7 +63,7 @@ Mathematics Department, Macquarie University, Sydney.
The command line arguments were:
latex2html -local_icons -noaddress -dir ../../html userhtml.tex
-The translation was initiated by Salvatore Filippone on 2015-10-14
+The translation was initiated by Filippone on 2015-12-17
|