Merge branch 'development' into maint-1.0

docs/html/userhtmlsu6.html

@@ -71,38 +71,38 @@ class="cmr-12">The part of the code dealing with reading and assembling the spar
 <span 
 class="cmr-12">right-hand side vector and the deallocation of the relevant data structures, performed</span>
 <span 
-class="cmr-12">through the PSBLAS routines for sparse matrix and vector management, is not</span>
+class="cmr-12">through the PSBLAS routines for sparse matrix and vector management,</span>
 <span 
-class="cmr-12">reported here for the sake of conciseness. The complete code can be found in the</span>
+class="cmr-12">is not reported here for the sake of conciseness. The complete code can be</span>
 <span 
-class="cmr-12">example program file </span><span class="obeylines-h"><span class="verb"><span 
+class="cmr-12">found in the example program file </span><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-12">amg_dexample_ml.f90</span></span></span><span 
-class="cmr-12">, in the directory </span><span class="obeylines-h"><span class="verb"><span 
-class="cmtt-12">examples/fileread</span></span></span> <span 
-class="cmr-12">of</span>
-<span 
-class="cmr-12">the AMG4PSBLAS implementation (see Section</span><span 
+class="cmr-12">, in the directory</span>
+<span class="obeylines-h"><span class="verb"><span 
+class="cmtt-12">samples/simple/fileread</span></span></span> <span 
+class="cmr-12">of the AMG4PSBLAS implementation (see Section</span><span 
 class="cmr-12">&#x00A0;</span><a 
 href="userhtmlsu5.html#x13-120003.5"><span 
 class="cmr-12">3.5</span><!--tex4ht:ref: sec:ex_and_test --></a><span 
-class="cmr-12">). A sample test problem along</span>
+class="cmr-12">). A</span>
 <span 
-class="cmr-12">with the relevant input data is available in </span><span class="obeylines-h"><span class="verb"><span 
-class="cmtt-12">examples/fileread/runs</span></span></span><span 
-class="cmr-12">. For details on</span>
+class="cmr-12">sample test problem along with the relevant input data is available in</span>
+<span class="obeylines-h"><span class="verb"><span 
+class="cmtt-12">samples/simple/fileread/runs</span></span></span><span 
+class="cmr-12">. For details on the use of the PSBLAS routines, see</span>
 <span 
-class="cmr-12">the use of the PSBLAS routines, see the PSBLAS User&#8217;s Guide</span><span 
+class="cmr-12">the PSBLAS User&#8217;s Guide</span><span 
 class="cmr-12">&#x00A0;</span><span class="cite"><span 
 class="cmr-12">[</span><a 
 href="userhtmlli5.html#XPSBLASGUIDE"><span 
 class="cmr-12">20</span></a><span 
 class="cmr-12">]</span></span><span 
 class="cmr-12">.</span>
-<!--l. 138--><p class="indent" >   <span 
-class="cmr-12">The setup and application of the default multilevel preconditioner for the real single</span>
                                                                                
 
                                                                                
+<!--l. 138--><p class="indent" >   <span 
+class="cmr-12">The setup and application of the default multilevel preconditioner for the real single</span>
 <span 
 class="cmr-12">precision and the complex, single and double precision, versions are obtained</span>
 <span 
@@ -114,7 +114,7 @@ class="cmr-12">for</span>
 <span 
 class="cmr-12">details). If these versions are installed, the corresponding codes are available in</span>
 <span class="obeylines-h"><span class="verb"><span 
-class="cmtt-12">examples/fileread/</span></span></span><span 
+class="cmtt-12">samples/simple/fileread/</span></span></span><span 
 class="cmr-12">.</span>
                                                                                
 
@@ -277,7 +277,7 @@ class="cmr-12">For all the previous preconditioners, example programs where the
 class="cmr-12">and the right-hand side are generated by discretizing a PDE with Dirichlet</span>
 <span 
 class="cmr-12">boundary conditions are also available in the directory </span><span class="obeylines-h"><span class="verb"><span 
-class="cmtt-12">examples/pdegen</span></span></span><span 
+class="cmtt-12">samples/simple/pdegen</span></span></span><span 
 class="cmr-12">.</span>
                                                                                
 

docs/src/gettingstarted.tex

@@ -129,9 +129,9 @@ relevant data structures, performed
 through the PSBLAS routines for sparse matrix and vector management, is not reported
 here for the sake of conciseness.
 The complete code can be found in the example program file \verb|amg_dexample_ml.f90|,
-in the directory \verb|examples/fileread| of the AMG4PSBLAS implementation (see
+in the directory \verb|samples/simple/fileread| of the AMG4PSBLAS implementation (see
 Section~\ref{sec:ex_and_test}). A sample test problem along with the relevant
-input data is available in \verb|examples/fileread/runs|.
+input data is available in \verb|samples/simple/fileread/runs|.
 For details on the use of the PSBLAS routines, see the PSBLAS User's
 Guide~\cite{PSBLASGUIDE}.
 
@@ -139,7 +139,7 @@ The setup and application of the default multilevel preconditioner
 for the real single precision and the complex, single and double
 precision, versions are obtained with straightforward modifications of the previous
 example (see Section~\ref{sec:userinterface} for details). If these versions are installed,
-the corresponding codes are available in \verb|examples/fileread/|.
+the corresponding codes are available in \verb|samples/simple/fileread/|.
 
 \begin{listing}[tbp]
 \begin{center}
@@ -300,7 +300,7 @@ The corresponding example program is available in the file
 
 For all the previous preconditioners, example programs where the sparse matrix and
 the right-hand side are generated by discretizing a PDE with Dirichlet
-boundary conditions are also available in the directory \verb|examples/pdegen|.
+boundary conditions are also available in the directory \verb|samples/simple/pdegen|.
 \vspace{-1em}\begin{listing}[tbh]
 \ifpdf%
 \begin{minted}[breaklines=true,bgcolor=bg,fontsize=\small]{fortran}