From e28adfacfa2872640d071fb9e2d7f4740ccc64e8 Mon Sep 17 00:00:00 2001
From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 19 Jul 2013 21:48:50 +0000
Subject: [PATCH] update petsc/trilinos documentation

git-svn-id: https://svn.dealii.org/trunk@30071 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/doc/external-libs/petsc.html    | 16 +++-----
 deal.II/doc/external-libs/trilinos.html | 50 +++++++++++--------------
 2 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/deal.II/doc/external-libs/petsc.html b/deal.II/doc/external-libs/petsc.html
index 736fc2025c..3fbc0b78f8 100644
--- a/deal.II/doc/external-libs/petsc.html
+++ b/deal.II/doc/external-libs/petsc.html
@@ -38,6 +38,11 @@
 
     <h4>Installing <acronym>deal.II</acronym> with PETSc</h4>
 
+    <p style="color: red"><b>Note:</b> The latest version of PETSc tested is
+       3.4.2. Major releases after this version may cause problems, so we
+       recommend sticking to this version if at all possible.
+    </p>
+
     <p>
       PETSc usually requires you to set the
       environment variables <code>PETSC_DIR</code> and <code>PETSC_ARCH</code>
@@ -63,16 +68,6 @@
       during configuration.
     </p>
 
-    <p>
-      <b>Note:</b> PETSc appears not to co-operate
-      well when using threads and some programs crash when deal.II is
-      compiled in its usual mode supporting multithreading. If you see
-      this sort of behavior, disable
-      multithreading upon configuration of <acronym>deal.II</acronym>
-      using the <code>-DDEAL_II_WITH_THREADS=OFF</code> switch for
-      <code>cmake</code>.
-    </p>
-
     <p><b>Note:</b> <acronym>deal.II</acronym> can be installed with both
       PETSc and Trilinos and they do not usually get in their
       respective ways. There are, however, occasions where this is not true
@@ -108,7 +103,6 @@
         cd petsc-x-y-z
 	export PETSC_DIR=`pwd`
 	export PETSC_ARCH=x86_64       # or any other identifying text for your machine
-	export LD_LIBRARY_PATH=$PETSC_DIR/$PETSC_ARCH/lib:$LD_LIBRARY_PATH
 	./config/configure.py --with-shared=1 --with-x=0 --with-mpi=1 --download-hypre=1
 	make
       </pre>
diff --git a/deal.II/doc/external-libs/trilinos.html b/deal.II/doc/external-libs/trilinos.html
index 4871bf8e62..4efc8291a7 100644
--- a/deal.II/doc/external-libs/trilinos.html
+++ b/deal.II/doc/external-libs/trilinos.html
@@ -52,11 +52,10 @@
     <h5>Installing Trilinos</h5>
 
     <p style="color: red">
-      Note: Trilinos versions 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.  Versions tested to work are 10.8.5,
-      10.12.2, and 11.0.3. We recommend only using one of the tested versions
-      for the time being.
+      Note: Trilinos versions older than 10.12.2 can cause problems and are
+      therefore not recommended. The newest version tested to work is 11.4.1.
+      Major releases after this version may cause problems, so we recommend
+      sticking to this version if at all possible.
     </p>
 
     <p>
@@ -65,41 +64,34 @@
       reasonable configuration:
 	<pre>
 
-    cd trilinos-10.12.2
+    cd trilinos-11.4.1
     mkdir build
     cd build
 
-    cmake -D Trilinos_ENABLE_OPTIONAL_PACKAGES:BOOL=ON \
-      -D Trilinos_ENABLE_Sacado:BOOL=ON \
-      -D Trilinos_ENABLE_Stratimikos:BOOL=ON \
-      -D CMAKE_BUILD_TYPE:STRING=RELEASE \
-      -D CMAKE_CXX_FLAGS:STRING="-g -O3" \
-      -D CMAKE_C_FLAGS:STRING="-g -O3" \
-      -D CMAKE_FORTRAN_FLAGS:STRING="-g -O5" \
-      -D Trilinos_EXTRA_LINK_FLAGS:STRING="-lgfortran" \
-      -D CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE \
-      -D Trilinos_VERBOSE_CONFIGURE:BOOL=FALSE \
-      -D TPL_ENABLE_MPI:BOOL=ON \
-      -D BUILD_SHARED_LIBS:BOOL=ON \
-      -D CMAKE_INSTALL_PREFIX:PATH=$HOME/share/trilinos ..
-
-    make
+    cmake -D Trilinos_ENABLE_Sacado=ON \
+      -D Trilinos_ENABLE_Stratimikos=ON \
+      -D CMAKE_BUILD_TYPE=RELEASE \
+      -D CMAKE_CXX_FLAGS="-g -O3" \
+      -D CMAKE_C_FLAGS="-g -O3" \
+      -D CMAKE_FORTRAN_FLAGS="-g -O5" \
+      -D Trilinos_EXTRA_LINK_FLAGS="-lgfortran" \
+      -D CMAKE_VERBOSE_MAKEFILE=FALSE \
+      -D Trilinos_VERBOSE_CONFIGURE=FALSE \
+      -D TPL_ENABLE_MPI=ON \
+      -D BUILD_SHARED_LIBS=ON \
+      -D CMAKE_INSTALL_PREFIX:PATH=$HOME/share/trilinos \
+      ..
+
     make install
 	</pre>
       You will need to adjust the path into which you want to install Trilinos
-      in the second to last line of the cmake command.
-    </p>
-
-    <p>
-      <b>Using MPI:</b> If you
-      want to use Trilinos with MPI on parallel machines,
-      use <code>TPL_ENABLE_MPI=ON</code> instead.
+      in the CMAKE_INSTALL_PREFIX line.
     </p>
 
     <p>
       <b>Parallel builds:</b>
       If your computer has more than one processor core, use
-      <code>make -jN</code> instead of <code>make</code> in the last two lines
+      <code>make -jN</code> instead of <code>make</code> in the last line
       above, where <code>N</code> is the number of processors you have.
     </p>
 
-- 
2.39.5