From 2f1c025c31f4d931739401c0db8c80ffd3314546 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 13 Jul 2013 12:39:05 +0000 Subject: [PATCH] Update documentation git-svn-id: https://svn.dealii.org/trunk@29995 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/TODO.CMAKE | 7 ---- deal.II/doc/external-libs/mumps.html | 5 +-- deal.II/doc/external-libs/p4est.html | 48 +++++++++++++++------------- 3 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 deal.II/cmake/TODO.CMAKE diff --git a/deal.II/cmake/TODO.CMAKE b/deal.II/cmake/TODO.CMAKE deleted file mode 100644 index 944e639e52..0000000000 --- a/deal.II/cmake/TODO.CMAKE +++ /dev/null @@ -1,7 +0,0 @@ -Some last bits and thoughts: - -* A TECPLOT feature has to be written - -* Support debug;optimized;general for all FEATURES - -* document that we no longer need the two-lib installation of p4est diff --git a/deal.II/doc/external-libs/mumps.html b/deal.II/doc/external-libs/mumps.html index ad74a1e469..6f26ade667 100644 --- a/deal.II/doc/external-libs/mumps.html +++ b/deal.II/doc/external-libs/mumps.html @@ -3,8 +3,8 @@ - The deal.II Readme on interfacing to PETSc and Trilinos - + The deal.II Readme on interfacing to MUMPS + @@ -329,6 +329,7 @@

You can override the autodetection by manually specifying 

+
     -DDEAL_II_WITH_MUMPS=OFF|ON
.

diff --git a/deal.II/doc/external-libs/p4est.html b/deal.II/doc/external-libs/p4est.html index 6f24b8d7d8..735d088210 100644 --- a/deal.II/doc/external-libs/p4est.html +++ b/deal.II/doc/external-libs/p4est.html @@ -2,8 +2,8 @@ "http://www.w3.org/TR/REC-html40/frameset.dtd"> - - The deal.II Readme + The deal.II Readme on interfacing to p4est + @@ -23,34 +23,38 @@

You need to install p4est before deal.II. To do so, you can - download it - from here, copy it to - a fresh directory into which you should also copy - the p4est-setup.sh script (the one - from this link, not one you may have gotten from the p4est webpage). Then - call the script as follows: - - 

-	  ./p4est-setup.sh p4est-x-y-z.tar.gz /path/to/installation
-
- + download it from here. + You can either choose to manually compile and install p4est (as + explained in documentation of p4est), or alternatively use + a script that will automatically compile + and install a debug and optimized version of p4est. + +

+ +

+ If you want to use the script, copy the tarball to a fresh directory + together with the p4est-setup.sh script + (the one from this link, not one you may have gotten from the p4est + webpage). Then call the script as follows: + 

+
+    ./p4est-setup.sh p4est-x-y-z.tar.gz /path/to/installation
+
where p4est-x-y-z.tar.gz is the name of the p4est distribution file, and /path/to/installation is a directory into which you want to install p4est.

- After this, you need to configure deal.II - using a line like - - 

+      In both cases, you can configure deal.II using a
+      line like
+      
 
     cmake -DP4EST_DIR=/path/to/installation -DDEAL_II_WITH_P4EST=ON -DDEAL_II_WITH_MPI=ON <...>
-	

-      
-      Obviously, you can also add additional flags to
-      cmake as described in the general ReadMe file.
+
+ if the p4est library isn't picked up automatically. Obviously, you + can also add additional flags to cmake as described in + the general ReadMe file.

-- 2.39.5