mld2p4:

docs/html/img92.png docs/html/img93.png docs/html/node18.html docs/html/node20.html docs/html/node4.html docs/html/node9.html docs/mld2p4-1.0-guide.pdf docs/src/building.tex docs/src/distribution.tex docs/src/userinterface.tex Minor documentation changes. mlprec/mld_prec_type.f90 Fixed implicit none everywhere.
16 years ago · 0a436e66d8
parent bf7b5ad3de
commit 0a436e66d8
11 changed files with 743 additions and 743 deletions
--- a/docs/html/img92.png
+++ b/docs/html/img92.png
--- a/docs/html/img93.png
+++ b/docs/html/img93.png
--- a/docs/html/node18.html
+++ b/docs/html/node18.html
@ -137,7 +137,7 @@ refer to Section&nbsp;<A HREF="node11.html#sec:background">4</A>.

 <P>
 <BR><P></P>
-<DIV ALIGN="CENTER"><A NAME="1251"></A>
+<DIV ALIGN="CENTER"><A NAME="1252"></A>
 <TABLE>
 <CAPTION><STRONG>Table 2:</STRONG>
 Parameters defining the type of multi-level preconditioner.
@ -181,7 +181,7 @@ Parameters defining the type of multi-level preconditioner.

 <P>
 <BR><P></P>
-<DIV ALIGN="CENTER"><A NAME="1253"></A>
+<DIV ALIGN="CENTER"><A NAME="1254"></A>
 <TABLE>
 <CAPTION><STRONG>Table 3:</STRONG>
 Parameters defining the one-level preconditioner used as smoother.
@ -281,7 +281,7 @@ Parameters defining the one-level preconditioner used as smoother.

 <P>
 <BR><P></P>
-<DIV ALIGN="CENTER"><A NAME="1255"></A>
+<DIV ALIGN="CENTER"><A NAME="1256"></A>
 <TABLE>
 <CAPTION><STRONG>Table 4:</STRONG>
 Parameters defining the aggregation algorithm.
@ -291,29 +291,29 @@ Parameters defining the aggregation algorithm.
 <TABLE CELLPADDING=3 BORDER="1" ALIGN="CENTER">
 <TR><TD ALIGN="LEFT"><code>what</code></TD>
 <TD ALIGN="LEFT"><SMALL>DATA TYPE</SMALL></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=65><code>val</code></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=74><SMALL>DEFAULT</SMALL></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><code>val</code></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><SMALL>DEFAULT</SMALL></TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=198><SMALL>COMMENTS</SMALL></TD>
 </TR>
 <TR><TD ALIGN="LEFT"><code>mld_aggr_alg_</code></TD>
 <TD ALIGN="LEFT"><code>character(len=*)</code></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=65><TT>'DEC'</TT></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=74><TT>'DEC'</TT></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><TT>'DEC'</TT></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><TT>'DEC'</TT></TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=198>Aggregation algorithm. Currently, only the decoupled aggregation is available.</TD>
 </TR>
 <TR><TD ALIGN="LEFT"><code>mld_aggr_kind_</code></TD>
 <TD ALIGN="LEFT"><code>character(len=*)</code></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=65><TT>'SMOOTH'</TT>   <TT>'RAW'</TT></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=74><TT>'SMOOTH'</TT></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><TT>'SMOOTH'</TT>   <TT>'RAW'</TT></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><TT>'SMOOTH'</TT></TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=198>Type of aggregation: smoothed, raw (i.e. using the tentative prolongator).</TD>
 </TR>
 <TR><TD ALIGN="LEFT"><code>mld_aggr_thresh_</code></TD>
 <TD ALIGN="LEFT"><code>real(</code><I>kind_parameter</I><code>)</code></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=65>Any&nbsp;real&nbsp;num. <IMG
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68>Any&nbsp;real&nbsp;num. <IMG
 WIDTH="56" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
 SRC="img90.png"
 ALT="$\in [0, 1]$"></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=74>0</TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68>0</TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=198>Threshold <IMG
 WIDTH="13" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
 SRC="img91.png"
@ -321,49 +321,57 @@ Parameters defining the aggregation algorithm.
 </TR>
 <TR><TD ALIGN="LEFT"><code>mld_aggr_omega_alg_</code></TD>
 <TD ALIGN="LEFT"><code>character(len=*)</code></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=65><TT>'USER_CHOICE'</TT>   <TT>'EIG_EST'</TT></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=74><TT>'EIG_EST'</TT></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><TT>'EIG_EST'</TT>   <TT>'USER_CHOICE'</TT></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><TT>'EIG_EST'</TT></TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=198>How the damping parameter <IMG
 WIDTH="16" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
 SRC="img84.png"
 ALT="$\omega$"> in the
                         smoothed aggregation should be computed:
-                         either via an estimate of the eigenvalue
+                         either via an estimate of the spectral radius of
                         <IMG
 WIDTH="50" HEIGHT="21" ALIGN="BOTTOM" BORDER="0"
 SRC="img85.png"
- ALT="$D^{-1}A$"> with largest modulus, or explicily
+ ALT="$D^{-1}A$">, or explicily
                         specified by the user.</TD>
 </TR>
 <TR><TD ALIGN="LEFT"><code>mld_aggr_eig_</code></TD>
 <TD ALIGN="LEFT"><code>character(len=*)</code></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=65><TT>'A_NORMI'</TT></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=74><TT>'A_NORMI'</TT></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=198>How to estimate the eigenvalue <IMG
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><TT>'A_NORMI'</TT></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><TT>'A_NORMI'</TT></TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=198>How to estimate the spectral radius of <IMG
 WIDTH="50" HEIGHT="21" ALIGN="BOTTOM" BORDER="0"
 SRC="img85.png"
- ALT="$D^{-1}A$"> with largest modulus.
+ ALT="$D^{-1}A$">.
                           Currently only the infinity norm estimate
                           is available.</TD>
 </TR>
 <TR><TD ALIGN="LEFT"><code>mld_aggr_damp_</code></TD>
 <TD ALIGN="LEFT"><code>real(</code><I>kind_parameter</I><code>)</code></TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=65>Any&nbsp;nonnegative&nbsp;real&nbsp;num.</TD>
-<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=74><!-- MATH
- $4/(3|\lambda_{max}(D^{-1}A)|)$
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68>Any&nbsp;nonnegative&nbsp;real&nbsp;num.</TD>
+<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=68><!-- MATH
+ $4/(3\rho(D^{-1}A))$
 -->
 <IMG
- WIDTH="151" HEIGHT="39" ALIGN="MIDDLE" BORDER="0"
+ WIDTH="113" HEIGHT="39" ALIGN="MIDDLE" BORDER="0"
 SRC="img92.png"
- ALT="$4/(3\vert\lambda_{max}(D^{-1}A)\vert)$"></TD>
+ ALT="$4/(3\rho(D^{-1}A))$"></TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=198>Damping parameter <IMG
 WIDTH="16" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
 SRC="img84.png"
 ALT="$\omega$"> in the smoothed aggregation algorithm. 
-                           Must be set by the user if
+                           It must be set by the user if
                           <code>USER_CHOICE</code> was specified for 
                           <code>mld_aggr_omega_alg_</code>,
-                           otherwise it is computed by the library.</TD>
+                           otherwise it is computed by the library, using the
+                           selected estimate of the spectral radius <IMG
+ WIDTH="73" HEIGHT="39" ALIGN="MIDDLE" BORDER="0"
+ SRC="img93.png"
+ ALT="$\rho(D^{-1}A)$"> of
+                           <IMG
+ WIDTH="50" HEIGHT="21" ALIGN="BOTTOM" BORDER="0"
+ SRC="img85.png"
+ ALT="$D^{-1}A$">.</TD>
 </TR>
 </TABLE>
 </DIV>
@ -374,7 +382,7 @@ Parameters defining the aggregation algorithm.

 <P>
 <BR><P></P>
-<DIV ALIGN="CENTER"><A NAME="1257"></A>
+<DIV ALIGN="CENTER"><A NAME="1258"></A>
 <TABLE>
 <CAPTION><STRONG>Table 5:</STRONG>
 Parameters defining the coarse-space correction at the coarsest
@ -432,7 +440,7 @@ level.</CAPTION>
 <TD ALIGN="LEFT"><code>integer</code></TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=91>Any&nbsp;int.&nbsp;num.&nbsp;<IMG
 WIDTH="31" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
- SRC="img93.png"
+ SRC="img94.png"
 ALT="$&gt; 0$"></TD>
 <TD ALIGN="LEFT">4</TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=198>Number of Block-Jacobi sweeps when 'BJAC' is used as
--- a/docs/html/node20.html
+++ b/docs/html/node20.html
@ -73,14 +73,14 @@ This routine computes <!-- MATH
 -->
 <IMG
 WIDTH="118" HEIGHT="39" ALIGN="MIDDLE" BORDER="0"
- SRC="img94.png"
+ SRC="img95.png"
 ALT="$y = op(M^{-1})  x$">, where <IMG
 WIDTH="23" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
 SRC="img59.png"
 ALT="$M$"> is a previously built
 preconditioner, stored into <code>p</code>, and <IMG
 WIDTH="21" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
- SRC="img95.png"
+ SRC="img96.png"
 ALT="$op$">
 denotes the preconditioner itself or its transpose, according to
 the value of <code>trans</code>.
@ -110,7 +110,7 @@ and hence it is completely transparent to the user.
 <TR><TD ALIGN="LEFT" VALIGN="TOP" WIDTH=34>&nbsp;</TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=340>The local part of the vector <IMG
 WIDTH="15" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
- SRC="img96.png"
+ SRC="img97.png"
 ALT="$x$">. Note that <I>type</I> and   
                <I>kind_parameter</I> must be chosen according
                to the real/complex, single/double precision version of MLD2P4 under use.</TD>
@ -121,7 +121,7 @@ and hence it is completely transparent to the user.
 <TR><TD ALIGN="LEFT" VALIGN="TOP" WIDTH=34>&nbsp;</TD>
 <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=340>The local part of the vector <IMG
 WIDTH="13" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
- SRC="img97.png"
+ SRC="img98.png"
 ALT="$y$">. Note that <I>type</I> and
                <I>kind_parameter</I> must be chosen according
                to the real/complex, single/double precision version of MLD2P4 under use.</TD>
@ -148,28 +148,28 @@ and hence it is completely transparent to the user.
 -->
 <IMG
 WIDTH="132" HEIGHT="39" ALIGN="MIDDLE" BORDER="0"
- SRC="img98.png"
+ SRC="img99.png"
 ALT="$op(M^{-1}) = M^{-1}$">;
                if <code>trans</code> = <code>'T','t'</code> then <!-- MATH
 $op(M^{-1}) = M^{-T}$
 -->
 <IMG
 WIDTH="135" HEIGHT="40" ALIGN="MIDDLE" BORDER="0"
- SRC="img99.png"
+ SRC="img100.png"
 ALT="$op(M^{-1}) = M^{-T}$">
                (transpose of <IMG
 WIDTH="48" HEIGHT="39" ALIGN="MIDDLE" BORDER="0"
- SRC="img100.png"
+ SRC="img101.png"
 ALT="$M^{-1})$">;  if <code>trans</code> = <code>'C','c'</code> then <!-- MATH
 $op(M^{-1}) = M^{-C}$
 -->
 <IMG
 WIDTH="136" HEIGHT="40" ALIGN="MIDDLE" BORDER="0"
- SRC="img101.png"
+ SRC="img102.png"
 ALT="$op(M^{-1}) = M^{-C}$">
                (conjugate transpose of <IMG
 WIDTH="48" HEIGHT="39" ALIGN="MIDDLE" BORDER="0"
- SRC="img100.png"
+ SRC="img101.png"
 ALT="$M^{-1})$">.</TD>
 </TR>
 <TR><TD ALIGN="LEFT" VALIGN="TOP" WIDTH=34><code>work</code></TD>
--- a/docs/html/node4.html
+++ b/docs/html/node4.html
@ -67,8 +67,6 @@ MLD2P4 is available from the web site

 </BLOCKQUOTE>
 where contact points for further information can be also found.
-To report bugs or ask general usage questions, please, send an email to
-<TT>bugreport@mld2p4.it</TT>.

 <P>
 The software is available under a modified BSD license, as specified
--- a/docs/html/node9.html
+++ b/docs/html/node9.html
@ -61,7 +61,7 @@ Bug reporting</A>
 If you find any bugs in our codes, please let us know at

 <a href="mailto:bugreport@mld2p4.it">
-bugreport@mld2p4.it
+<TT>bugreport@mld2p4.it</TT>

 </a>
 ; be aware that  
--- a/docs/mld2p4-1.0-guide.pdf
+++ b/docs/mld2p4-1.0-guide.pdf
--- a/docs/src/building.tex
+++ b/docs/src/building.tex
@ -226,7 +226,7 @@ If you find any bugs in our codes, please let us know at
 \begin{rawhtml}
 <a href="mailto:bugreport@mld2p4.it">
 \end{rawhtml}
-bugreport@mld2p4.it
+\texttt{bugreport@mld2p4.it}
 \begin{rawhtml}
 </a>
 \end{rawhtml}
--- a/docs/src/distribution.tex
+++ b/docs/src/distribution.tex
@ -8,9 +8,6 @@ MLD2P4 is available from the web site
 \texttt{http://www.mld2p4.it}
 \end{quotation}
 where contact points for further information can be also found.
-To report bugs or ask general usage questions, please, send an email to
-\texttt{bugreport@mld2p4.it}.
-

 The software is available under a modified BSD license, as specified
 in Appendix~\ref{sec:license}; please note that some of the optional
--- a/docs/src/userinterface.tex
+++ b/docs/src/userinterface.tex
@ -217,7 +217,7 @@ refer to Section~\ref{sec:background}.
                   
 \bsideways
 \begin{center}
-\begin{tabular}{|l|l|p{2.3cm}|p{2.6cm}|p{7cm}|}
+\begin{tabular}{|l|l|p{2.4cm}|p{2.4cm}|p{7cm}|}
 \hline
 \verb|what|              & \textsc{data type}        &  \verb|val|      &  \textsc{default}  &
 \textsc{comments} \\ \hline
@ -235,27 +235,29 @@ refer to Section~\ref{sec:background}.
                         & 0
                         & Threshold $\theta$ in the aggregation algorithm. \\ \hline
 \verb|mld_aggr_omega_alg_| & \verb|character(len=*)|
-                         & \texttt{'USER\_CHOICE'} \hspace{2.5cm} \texttt{'EIG\_EST'}
+                         & \texttt{'EIG\_EST'} \hspace{2.5cm} \texttt{'USER\_CHOICE'}
                         & \texttt{'EIG\_EST'}
                         & How the damping parameter $\omega$ in the
                         smoothed aggregation should be computed:
-                         either via an estimate of the eigenvalue
-                         $D^{-1}A$ with largest modulus, or explicily
+                         either via an estimate of the spectral radius of
+                         $D^{-1}A$, or explicily
                         specified by the user. \\ \hline
 \verb|mld_aggr_eig_|     & \verb|character(len=*)|
                         & \texttt{'A\_NORMI'}
                         & \texttt{'A\_NORMI'}
-                         & How to estimate the eigenvalue $D^{-1}A$ with largest modulus.
+                         & How to estimate the spectral radius of $D^{-1}A$.
                           Currently only the infinity norm estimate
                           is available. \\ \hline
 \verb|mld_aggr_damp_|    & \verb|real(|\emph{kind\_parameter}\verb|)|
                         & Any~nonnegative~real~num.
-                         & $4/(3|\lambda_{max}(D^{-1}A)|)$
+                         & $4/(3\rho(D^{-1}A))$
                         & Damping parameter $\omega$ in the smoothed aggregation algorithm. 
-                           Must be set by the user if
+                           It must be set by the user if
                           \verb|USER_CHOICE| was specified for 
                           \verb|mld_aggr_omega_alg_|,
-                           otherwise it is computed by the library.\\
+                           otherwise it is computed by the library, using the
+                           selected estimate of the spectral radius $\rho(D^{-1}A)$ of
+                           $D^{-1}A$.\\
 \hline
 \end{tabular}
 \end{center}
--- a/mlprec/mld_prec_type.f90
+++ b/mlprec/mld_prec_type.f90
@ -819,6 +819,7 @@ contains
  end subroutine mld_ml_alg_descr

  subroutine mld_ml_level_descr(iout,ilev,iprcparm,nlaggr, info,rprcparm,dprcparm)
+    implicit none 
    integer, intent(in) :: iprcparm(:),iout,ilev
    integer, intent(in), allocatable :: nlaggr(:)
    integer, intent(out) :: info