]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Update Documentation and error messages
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 14:29:42 +0000 (14:29 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 14:29:42 +0000 (14:29 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26952 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/README.CMAKE
deal.II/cmake/configure/configure_mumps.cmake
deal.II/cmake/configure/configure_umfpack.cmake
deal.II/cmake/modules/FindMUMPS.cmake
deal.II/cmake/modules/FindSCALAPACK.cmake

index 46979ef64e023c15fac9edcfa25f71db08a1e0e4..73da0621e0c8796c7c95924deb06ac61a3baca42 100644 (file)
@@ -267,10 +267,11 @@ CONFIGURATION
       Currently, the following variables will be considered:
 
         METIS_DIR,
+        MUMPS_DIR (and SCALAPACK_DIR),
         P4EST_DIR (and SC_DIR),
         PETSC_DIR and PETSC_ARCH (forming ${PETSC_DIR}/${PETSC_ARCH}),
         TRILINOS_DIR,
-        UMFPACK_DIR (and AMD_DIR)
+        UMFPACK_DIR (and AMD_DIR, SUITESPARSECONFIG_DIR)
 
   3.) The system default locations for libraries and includes.
 
index 4fd8fd7859ff6574ac972c89b7b9a0166bf04c49..82254c9cb6b7b437d605b9fe8731dd3dc80151ef 100644 (file)
@@ -44,5 +44,22 @@ MACRO(FEATURE_MUMPS_CONFIGURE_EXTERNAL var)
 ENDMACRO()
 
 
+SET(FEATURE_MUMPS_CUSTOM_ERROR_MESSAGE TRUE)
+
+
+MACRO(FEATURE_MUMPS_ERROR_MESSAGE)
+  MESSAGE(SEND_ERROR "\n"
+    "Could not find the mumps library!\n"
+    "Please ensure that the library is installed on your computer.\n"
+    "If the libraries is not at a default location, either provide some hints\n"
+    "for the autodetection:\n"
+    "    $ MUMPS_DIR=\"...\" cmake <...>\n"
+    "    $ ccmake -DMUMPS_DIR=\"...\" cmake <...>\n"
+    "or set the relevant variables by hand in ccmake.\n"
+    "Relevant hints for MUMPS are MUMPS_DIR and SCALAPACK_DIR.\n\n"
+    )
+ENDMACRO()
+
+
 CONFIGURE_FEATURE(MUMPS)
 
index 719aebb1662f27fc0bb685fe710201a29a30c137..fcf594b8b97d0f2f9d8be45b73d20cc9b5c80649 100644 (file)
@@ -70,8 +70,10 @@ MACRO(FEATURE_UMFPACK_ERROR_MESSAGE)
     "    $ UMFPACK_DIR=\"...\" cmake <...>\n"
     "    $ ccmake -DUMFPACK_DIR=\"...\" cmake <...>\n"
     "or set the relevant variables by hand in ccmake.\n"
+    "Relevant hints for UMFPACK are UMFPACK_DIR, AMD_DIR, SUITESPARSECONFIG_DIR.\n"
     "Alternatively you may choose to compile the bundled libraries\n"
-    "by setting DEAL_II_ALLOW_BUNDLED=ON or DEAL_II_FORCE_BUNDLED_UMFPACK=ON.\n\n"
+    "by setting DEAL_II_ALLOW_BUNDLED=ON or DEAL_II_FORCE_BUNDLED_UMFPACK=ON.\n"
+    "(BLAS has to be installed for bundled UMFPACK to be available)\n\n"
     )
 ENDMACRO()
 
index c348f60772ff13aca0db17e790214cc4811c0d23..9be2efd77df76eae5a0c46601ee990f842a09983 100644 (file)
@@ -33,6 +33,8 @@ INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE(SCALAPACK) # which will also include lapack and blas
 
 #
+# TODO: mumps might link to scotch and or metis as well. Ignore this for
+#       now. :-]
 # TODO: libpord.a ?
 #
 
index 0b16faf6607216d0f4c0a75edcfa8034b9e78fbe..1dd003492b8ccd63cd70095ca25de53d3fcd3929 100644 (file)
@@ -32,7 +32,7 @@ INCLUDE(FindPackageHandleStandardArgs)
 # SCALAPACK needs LAPACK and BLAS as dependency, search for them with the help
 # of the LAPACK find module:
 #
-# TODO: SCALAPACK and mpi...
+# TODO: ScaLAPACK and mpi...
 #
 FIND_PACKAGE(LAPACK)
 
@@ -58,7 +58,7 @@ SET(SCALAPACK_LINKER_FLAGS
 # probabilistic way...
 #
 FIND_LIBRARY(BLACS_LIBRARY
-  NAMES blacs
+  NAMES blacs # TODO
     ${BLACS_DIR}
     ${SCALAPACK_DIR}
     ${SCALAPACK_DIR}/../blacs/

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.