Fix links to the trilinos website.

diff --git a/doc/readme.html b/doc/readme.html
index b2c4079671d2e3261e8e748a7f97b724d5444e5f..6751ee266bb8c04db5460b5151b923a3b3fd2ccb 100644 (file)
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -595,10 +595,21 @@
                 </p>
             </dd>
 
-            <dt><a name="trilinos"></a><a href="http://trilinos.sandia.gov" target="_top">Trilinos</a></dt>
+            <dt><a name="trilinos"></a><a href="http://trilinos.org" target="_top">Trilinos</a></dt>
             <dd>
                 <p>
-                    <a href="http://trilinos.sandia.gov" target="_top">Trilinos</a> is a library for parallel linear algebra and all sorts of other things as well. To interface with a self compiled version of <a href="http://trilinos.sandia.gov" target="_top">Trilinos</a>                    add <code>-DTRILINOS_DIR=/path/to/trilinos</code> to the argument list for <code>cmake</code>. Alternatively, you can also set an environment variable <code>TRILINOS_DIR</code> and <code>cmake</code> will pick up this path.
+                  <a href="http://trilinos.org"
+                     target="_top">Trilinos</a> is a library for
+                  parallel linear algebra and all sorts of other
+                  things as well. To interface with a self compiled
+                  version of <a href="http://trilinos.org"
+                                target="_top">Trilinos</a>
+                  add <code>-DTRILINOS_DIR=/path/to/trilinos</code>
+                  to the argument list
+                  for <code>cmake</code>. Alternatively, you can
+                  also set an environment
+                  variable <code>TRILINOS_DIR</code>
+                  and <code>cmake</code> will pick up this path.
                 </p>
 
                 <p>

diff --git a/examples/step-31/doc/intro.dox b/examples/step-31/doc/intro.dox
index 96055a1093dc5b83b7168f07e6c19e856b8a16d0..d7f8fc85678ace23dce96e15d9a15e4bd7fcf1f3 100644 (file)
--- a/examples/step-31/doc/intro.dox
+++ b/examples/step-31/doc/intro.dox
@@ -957,7 +957,7 @@ multigrid have been removed.
 
 In much the same way as we used PETSc to support our linear algebra needs in
 step-17 and step-18, we use interfaces to the <a
-href="http://trilinos.sandia.gov">Trilinos</a> library (see the
+href="http://trilinos.org">Trilinos</a> library (see the
 deal.II README file for installation instructions) in this program. Trilinos
 is a very large collection of
 everything that has to do with linear and nonlinear algebra, as well as all

diff --git a/examples/step-33/doc/intro.dox b/examples/step-33/doc/intro.dox
index f1b667af51a429175044aaa75153f7f3c82dae66..16b58b0f2eed85871507b084bccc611297613692 100644 (file)
--- a/examples/step-33/doc/intro.dox
+++ b/examples/step-33/doc/intro.dox
@@ -16,7 +16,7 @@ too much trouble.
 </i>
 
 <b>Note:</b>The program uses the <a
-href="http://trilinos.sandia.gov">Trilinos</a> linear solvers (which
+href="http://trilinos.org">Trilinos</a> linear solvers (which
 are part of the Aztec/Amesos package of Trilinos) and an automatic
 differentiation package, Sacado, also part of Trilinos. deal.II must
 be configured to use this package. Refer to the <a
@@ -195,7 +195,7 @@ convergence order expected from a Newton method.
 Since computing the Jacobian matrix $\mathbf R'(\mathbf W^k)$ is a
 terrible beast, we use an automatic differentiation package, Sacado,
 to do this.  Sacado is a package within the <a
-href="http://trilinos.sandia.gov" target="_top">Trilinos</a> framework
+href="http://trilinos.org" target="_top">Trilinos</a> framework
 and offers a C++ template class <code>Sacado::Fad::DFad</code>
 (<code>Fad</code> standing for "forward automatic
 differentiation") that supports basic arithmetic operators and

diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h
index 81a00643c96dc44c8a254baee45277dd3eb78223..c5a0f6ed746c40f85c85827b7b09b87fb2c87115 100644 (file)
--- a/include/deal.II/lac/trilinos_precondition.h
+++ b/include/deal.II/lac/trilinos_precondition.h
@@ -1551,7 +1551,7 @@ namespace TrilinosWrappers
      * This function is similar to the one above, but allows the user to set
      * all the options of the Trilinos ML preconditioner. In order to find out
      * about all the options for ML, we refer to the <a
-     * href=http://trilinos.sandia.gov/packages/ml/mlguide5.pdf>ML user's
+     * href=http://trilinos.org/packages/ml/mlguide5.pdf>ML user's
      * guide</a>. In particular, users need to follow the ML instructions in
      * case a vector-valued problem ought to be solved.
      */
@@ -1810,7 +1810,7 @@ namespace TrilinosWrappers
      * This function is similar to the one above, but allows the user to set
      * most of the options of the Trilinos ML preconditioner. In order to find
      * out about all the options for ML, we refer to the <a
-     * href=http://trilinos.sandia.gov/packages/ml/mlguide5.pdf>ML user's
+     * href=http://trilinos.org/packages/ml/mlguide5.pdf>ML user's
      * guide</a>. Not all ML options have a corresponding MueLu option.
      */
     void

diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h
index eb12a05f11f0304c6c162d8fedb7e09032e48736..7e5a491dfa8007e148aa2d8babee2c884067d35d 100644 (file)
--- a/include/deal.II/lac/trilinos_solver.h
+++ b/include/deal.II/lac/trilinos_solver.h
@@ -50,7 +50,7 @@ namespace TrilinosWrappers
    * derived classes simply set the right flags to select one solver or
    * another, or to set certain parameters for individual solvers. For a
    * general discussion on the Trilinos solver package AztecOO, we refer to
-   * the <a href = "http://trilinos.sandia.gov/packages/aztecoo/AztecOOUserGui
+   * the <a href = "http://trilinos.org/packages/aztecoo/AztecOOUserGui
    * de.pdf">AztecOO user guide</a>.
    *
    * This solver class can also be used as a standalone class, where the