write about working Trilinos versions

git-svn-id: https://svn.dealii.org/trunk@26114 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index ee0efc5bf7f0663b0d51c7e29e12ecd92d385514..9a16777177f40894b9fb02a11b5a61d6f9dd8453 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -62,6 +62,12 @@ used to store boundary indicators internally.
 
 
 <ol>
+<li>
+New: we are now compatible with Trilinos 10.4.2, 10.8.5, and 10.12.2. See the
+readme for more information.
+<br>
+(Timo Heister, 2012/08/24)
+
 <li>
 Changed: To make the naming of types defined in namespace types
 consistent, we have renamed types::subdomain_id_t to

diff --git a/deal.II/doc/readme-petsc-trilinos.html b/deal.II/doc/readme-petsc-trilinos.html
index d855aafc93ba93b5b54738a5e85766cc37d90019..fd35d55b3acc835be315be183a2b99573e72b7dd 100644 (file)
--- a/deal.II/doc/readme-petsc-trilinos.html
+++ b/deal.II/doc/readme-petsc-trilinos.html
@@ -137,9 +137,10 @@
       <h5>Trilinos starting with version 10.0</h5>
 
       <p style="color: red">
-      Note: Trilinos versions 10.6.x, 10.8.0, 10.8.1, and 10.10.2 are not compatible with
+      Note: Trilinos versions 10.6.x, 10.8.0, 10.8.1, 10.10.2, 10.12.1 are not compatible with
       deal.II. They contain subtle bugs related to (parallel) matrices and vectors.
-      We recommend staying with 10.4.2 for the time being.
+      Versions tested to work are 10.4.2, 10.8.5, and 10.12.2. We recommend only using
+      one of the tested versions for the time being.
       </p>
 
       <p>

diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html
index 8079f8957b6c10e7d0e187dae894471b60ee674e..f35adb466ed7db3ec37da1338aa1580617966c28 100644 (file)
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@ -561,12 +561,14 @@
     <dt>Trilinos</dt>
     <dd>
       <p>
-      <acronym>deal.II</acronym> can also interface to <a
-      href="http://trilinos.sandia.gov" target="_top">Trilinos</a>. The
+      <acronym>deal.II</acronym> can also interface
+      to <a href="http://trilinos.sandia.gov" target="_top">Trilinos</a>. The
       simplest way to use these interfaces is to
       pass <code>--with-trilinos=/path/to/trilinos</code>
-      to <acronym>deal.II</acronym>'s <code>./configure</code> script. More
-      configuration options can be found <a href="readme-petsc-trilinos.html"
+      to <acronym>deal.II</acronym>'s <code>./configure</code> script.  Note
+      that not all versions of Trilinos are compatible
+      with <acronym>deal.II</acronym>.  More details about compatibility and
+      configuration can be found <a href="readme-petsc-trilinos.html"
       target="body">here</a>.
       </p>
     </dd>