]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Big configuration cleanup part1
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 27 Feb 2013 23:30:34 +0000 (23:30 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 27 Feb 2013 23:30:34 +0000 (23:30 +0000)
Rename all variables that are isomorphic to DEAL_II_WITH_<FEATURE>.

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28626 0785d39b-7218-0410-832d-ea1e28bc413d

138 files changed:
deal.II/bundled/CMakeLists.txt
deal.II/cmake/configure/configure_1_mpi.cmake
deal.II/cmake/configure/configure_1_threads.cmake
deal.II/cmake/configure/configure_arpack.cmake
deal.II/cmake/configure/configure_functionparser.cmake
deal.II/cmake/configure/configure_hdf5.cmake
deal.II/cmake/configure/configure_lapack.cmake
deal.II/cmake/configure/configure_metis.cmake
deal.II/cmake/configure/configure_mumps.cmake
deal.II/cmake/configure/configure_netcdf.cmake
deal.II/cmake/configure/configure_p4est.cmake
deal.II/cmake/configure/configure_petsc.cmake
deal.II/cmake/configure/configure_slepc.cmake
deal.II/cmake/configure/configure_trilinos.cmake
deal.II/cmake/configure/configure_umfpack.cmake
deal.II/cmake/configure/configure_zlib.cmake
deal.II/cmake/scripts/report_features.cc
deal.II/doc/doxygen/options.dox.in
deal.II/doc/news/3.4.0-vs-4.0.0.html
deal.II/doc/news/6.1.0-vs-6.2.0.h
deal.II/examples/step-48/step-48.cc
deal.II/include/deal.II/base/config.h.in
deal.II/include/deal.II/base/exceptions.h
deal.II/include/deal.II/base/index_set.h
deal.II/include/deal.II/base/mpi.h
deal.II/include/deal.II/base/parallel.h
deal.II/include/deal.II/base/thread_local_storage.h
deal.II/include/deal.II/base/thread_management.h
deal.II/include/deal.II/base/timer.h
deal.II/include/deal.II/base/utilities.h
deal.II/include/deal.II/base/work_stream.h
deal.II/include/deal.II/distributed/tria.h
deal.II/include/deal.II/fe/fe_values.h
deal.II/include/deal.II/grid/tria_accessor.templates.h
deal.II/include/deal.II/lac/block_sparsity_pattern.h
deal.II/include/deal.II/lac/block_vector.h
deal.II/include/deal.II/lac/block_vector.templates.h
deal.II/include/deal.II/lac/parallel_vector.h
deal.II/include/deal.II/lac/parallel_vector.templates.h
deal.II/include/deal.II/lac/petsc_block_sparse_matrix.h
deal.II/include/deal.II/lac/petsc_block_vector.h
deal.II/include/deal.II/lac/petsc_full_matrix.h
deal.II/include/deal.II/lac/petsc_matrix_base.h
deal.II/include/deal.II/lac/petsc_matrix_free.h
deal.II/include/deal.II/lac/petsc_parallel_block_sparse_matrix.h
deal.II/include/deal.II/lac/petsc_parallel_block_vector.h
deal.II/include/deal.II/lac/petsc_parallel_sparse_matrix.h
deal.II/include/deal.II/lac/petsc_parallel_vector.h
deal.II/include/deal.II/lac/petsc_precondition.h
deal.II/include/deal.II/lac/petsc_solver.h
deal.II/include/deal.II/lac/petsc_sparse_matrix.h
deal.II/include/deal.II/lac/petsc_vector.h
deal.II/include/deal.II/lac/petsc_vector_base.h
deal.II/include/deal.II/lac/slepc_solver.h
deal.II/include/deal.II/lac/slepc_spectral_transformation.h
deal.II/include/deal.II/lac/sparse_direct.h
deal.II/include/deal.II/lac/sparse_vanka.templates.h
deal.II/include/deal.II/lac/sparsity_tools.h
deal.II/include/deal.II/lac/swappable_vector.templates.h
deal.II/include/deal.II/lac/trilinos_block_sparse_matrix.h
deal.II/include/deal.II/lac/trilinos_block_vector.h
deal.II/include/deal.II/lac/trilinos_parallel_block_vector.h
deal.II/include/deal.II/lac/trilinos_precondition.h
deal.II/include/deal.II/lac/trilinos_solver.h
deal.II/include/deal.II/lac/trilinos_sparse_matrix.h
deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h
deal.II/include/deal.II/lac/trilinos_vector.h
deal.II/include/deal.II/lac/trilinos_vector_base.h
deal.II/include/deal.II/lac/vector.h
deal.II/include/deal.II/lac/vector.templates.h
deal.II/include/deal.II/matrix_free/mapping_info.templates.h
deal.II/include/deal.II/matrix_free/matrix_free.h
deal.II/include/deal.II/matrix_free/matrix_free.templates.h
deal.II/include/deal.II/multigrid/mg_transfer.h
deal.II/include/deal.II/multigrid/mg_transfer.templates.h
deal.II/include/deal.II/numerics/matrix_tools.h
deal.II/include/deal.II/numerics/vector_tools.templates.h
deal.II/source/base/data_out_base.cc
deal.II/source/base/function_parser.cc
deal.II/source/base/index_set.cc
deal.II/source/base/logstream.cc
deal.II/source/base/mpi.cc
deal.II/source/base/multithread_info.cc
deal.II/source/base/partitioner.cc
deal.II/source/base/subscriptor.cc
deal.II/source/base/thread_management.cc
deal.II/source/base/timer.cc
deal.II/source/base/utilities.cc
deal.II/source/distributed/grid_refinement.cc
deal.II/source/distributed/solution_transfer.cc
deal.II/source/distributed/solution_transfer.inst.in
deal.II/source/distributed/tria.cc
deal.II/source/distributed/tria.inst.in
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/dofs/dof_renumbering.cc
deal.II/source/dofs/dof_tools.cc
deal.II/source/fe/fe_tools.cc
deal.II/source/fe/fe_tools.inst.in
deal.II/source/fe/mapping_q1_eulerian.inst.in
deal.II/source/fe/mapping_q_eulerian.inst.in
deal.II/source/grid/grid_in.cc
deal.II/source/grid/grid_refinement.cc
deal.II/source/grid/grid_tools.cc
deal.II/source/lac/block_sparsity_pattern.cc
deal.II/source/lac/constraint_matrix.cc
deal.II/source/lac/petsc_block_sparse_matrix.cc
deal.II/source/lac/petsc_full_matrix.cc
deal.II/source/lac/petsc_matrix_base.cc
deal.II/source/lac/petsc_matrix_free.cc
deal.II/source/lac/petsc_parallel_block_sparse_matrix.cc
deal.II/source/lac/petsc_parallel_block_vector.cc
deal.II/source/lac/petsc_parallel_sparse_matrix.cc
deal.II/source/lac/petsc_parallel_vector.cc
deal.II/source/lac/petsc_precondition.cc
deal.II/source/lac/petsc_solver.cc
deal.II/source/lac/petsc_sparse_matrix.cc
deal.II/source/lac/petsc_vector.cc
deal.II/source/lac/petsc_vector_base.cc
deal.II/source/lac/slepc_solver.cc
deal.II/source/lac/slepc_spectral_transformation.cc
deal.II/source/lac/solver.cc
deal.II/source/lac/sparse_direct.cc
deal.II/source/lac/sparsity_tools.cc
deal.II/source/lac/tridiagonal_matrix.cc
deal.II/source/lac/trilinos_block_sparse_matrix.cc
deal.II/source/lac/trilinos_block_vector.cc
deal.II/source/lac/trilinos_precondition.cc
deal.II/source/lac/trilinos_solver.cc
deal.II/source/lac/trilinos_sparse_matrix.cc
deal.II/source/lac/trilinos_sparsity_pattern.cc
deal.II/source/lac/trilinos_vector.cc
deal.II/source/lac/trilinos_vector_base.cc
deal.II/source/multigrid/mg_transfer_prebuilt.inst.in
deal.II/source/numerics/derivative_approximation.inst.in
deal.II/source/numerics/error_estimator.cc
deal.II/source/numerics/error_estimator.inst.in
deal.II/source/numerics/matrix_tools.cc
deal.II/source/numerics/time_dependent.cc

index d5b039c48e5a4534dd7f58669744c847e9a79635..6d576588075939cf49dc1f545baa162785d7b0c8 100644 (file)
@@ -36,7 +36,7 @@ IF(FEATURE_BOOST_BUNDLED_CONFIGURED)
 
   ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/serialization/src)
 
-  IF( DEAL_II_USE_MT AND NOT DEAL_II_CAN_USE_CXX11)
+  IF( DEAL_II_WITH_THREADS AND NOT DEAL_II_CAN_USE_CXX11)
     #
     # If the C++ compiler doesn't completely support the C++11 standard
     # (and consequently we can't use std::thread, std::mutex, etc), then
index 1859962f695e6910340501cab8376f0b4573f98c..75def06523d12ff6f057307ddf5afdec02186cc1 100644 (file)
@@ -52,8 +52,6 @@ MACRO(FEATURE_MPI_CONFIGURE_EXTERNAL var)
     SET(CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
   ENDIF()
 
-  SET(DEAL_II_COMPILER_SUPPORTS_MPI TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index 9aad0ffdaa7964bd4945c8a4b7677e22c60279bd..a2f26aee9889c12f7b58e5d0e88cfd5216268dbc 100644 (file)
@@ -32,11 +32,6 @@ MACRO(SETUP_THREADING var)
       )
     SET(${var} TRUE)
 
-    #
-    # We support threading. Go on and configure the rest:
-    #
-    SET(DEAL_II_USE_MT TRUE)
-
     #
     # Change -lphtread to -pthread for better compatibility on non linux
     # platforms:
index 70a427f778c562073f1539cdcf12756ad11c6858..f7d3226077e7f01169949d8e762eb312d0bfc104 100644 (file)
@@ -21,8 +21,6 @@ MACRO(FEATURE_ARPACK_CONFIGURE_EXTERNAL var)
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${ARPACK_LIBRARIES})
   ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${ARPACK_LINKER_FLAGS}")
 
-  SET(DEAL_II_USE_ARPACK TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index 3276db0b30384d89b38eb0c95c07212a3c602139..7facec4607a4b50eb5ba13cdf01adb1223052a4c 100644 (file)
@@ -29,7 +29,6 @@ ENDMACRO()
 
 MACRO(FEATURE_FUNCTIONPARSER_CONFIGURE_BUNDLED var)
   INCLUDE_DIRECTORIES(${FUNCTIONPARSER_FOLDER})
-  SET(HAVE_FUNCTIONPARSER TRUE)
   SET(${var} TRUE)
 ENDMACRO()
 
index 2f0ff3e937ca58290e8083c9cc468dad2c98f991..daa85919f94fc6fcc5507cb8d97714b55c5a8a49 100644 (file)
@@ -21,8 +21,6 @@ MACRO(FEATURE_HDF5_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIRS})
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${HDF5_LIBRARIES})
 
-  SET(DEAL_II_HAVE_HDF5 TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index a75ae016e1d900396b7a1fe5a5164ecb7b5f7fd1..8e68a41b5940fb4b3b2fdf1ece16b5ea54c467f4 100644 (file)
@@ -78,7 +78,6 @@ MACRO(FEATURE_LAPACK_CONFIGURE_EXTERNAL var)
 
   CHECK_FOR_LAPACK_FUNCTIONS()
 
-  SET(HAVE_LIBLAPACK TRUE)
   SET(${var} TRUE)
 ENDMACRO()
 
index b051ee212005d2b674ed3bd10e2ed0bdb6644f4f..37a7fefcf284a60d339a7e76f48d6cdeb18784d3 100644 (file)
@@ -41,8 +41,6 @@ MACRO(FEATURE_METIS_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIRS})
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${METIS_LIBRARIES})
 
-  SET(DEAL_II_USE_METIS TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index b45381ba38b5de410eb19102eabff7b4ad86e64b..462779fcb0b1e7ba230cc8f21b5adbe3cb5fb22b 100644 (file)
@@ -28,8 +28,6 @@ MACRO(FEATURE_MUMPS_CONFIGURE_EXTERNAL var)
     )
   ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${MUMPS_LINKER_FLAGS}")
 
-  SET(DEAL_II_USE_MUMPS TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index 9a9344b2626b8078151ef7bd86d9bf5440fb602d..b8a555a146a891c6d478b94dc60045701f1e8ee7 100644 (file)
@@ -20,8 +20,6 @@
 MACRO(FEATURE_NETCDF_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${NETCDF_INCLUDE_DIRS})
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${NETCDF_LIBRARIES})
-  SET(HAVE_LIBNETCDF TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index b26cfdbb8df721d320463d61101bbd981cdc1966..458b271c3e8172beb3224a103fef9e79e4b978f5 100644 (file)
@@ -48,8 +48,6 @@ MACRO(FEATURE_P4EST_CONFIGURE_EXTERNAL var)
 
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${P4EST_LIBRARIES})
 
-  SET(DEAL_II_USE_P4EST TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index 92d7440614878d47a663fd9532817fb01daac8de..95e216be4c2a1d24460f673b4b73cebfe2b66d6e 100644 (file)
@@ -46,9 +46,9 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var)
     # _NOT_ enabled.
     # So we check for this:
     #
-    IF( (PETSC_WITH_MPIUNI AND DEAL_II_COMPILER_SUPPORTS_MPI)
+    IF( (PETSC_WITH_MPIUNI AND DEAL_II_WITH_MPI)
          OR
-         (NOT PETSC_WITH_MPIUNI AND NOT DEAL_II_COMPILER_SUPPORTS_MPI))
+         (NOT PETSC_WITH_MPIUNI AND NOT DEAL_II_WITH_MPI))
       MESSAGE(WARNING "\n"
         "Could not find a sufficient petsc installation: "
         "Petsc has to be configured with the same MPI configuration as deal.II.\n\n"
@@ -76,8 +76,6 @@ MACRO(FEATURE_PETSC_CONFIGURE_EXTERNAL var)
     ${PETSC_LIBRARIES}
     )
 
-  SET(DEAL_II_USE_PETSC TRUE)
-
   #
   # Disable a bunch of warnings when compiling with petsc:
   #
index 8f4fe2d0d48c1d8985e9b69d962bd85fa3d8c928..df29d78cd68996004f8df8eac3740d8e9aa166f6 100644 (file)
@@ -57,8 +57,6 @@ MACRO(FEATURE_SLEPC_CONFIGURE_EXTERNAL var)
     ${SLEPC_LIBRARIES}
     )
 
-  SET(DEAL_II_USE_SLEPC TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index ee1f523f0ebc49870dfce9ba1fef600ef6639196..9fc42c061aaceaeb29cac3f64546928438d489b8 100644 (file)
@@ -90,9 +90,9 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     # Trilinos has to be configured with the same MPI configuration as
     # deal.II.
     #
-    IF( (TRILINOS_WITH_MPI AND NOT DEAL_II_COMPILER_SUPPORTS_MPI)
+    IF( (TRILINOS_WITH_MPI AND NOT DEAL_II_WITH_MPI)
          OR
-         (NOT TRILINOS_WITH_MPI AND DEAL_II_COMPILER_SUPPORTS_MPI))
+         (NOT TRILINOS_WITH_MPI AND DEAL_II_WITH_MPI))
       MESSAGE(WARNING "\n"
         "Trilinos has to be configured with the same MPI configuration as deal.II.\n\n"
         )
@@ -172,8 +172,6 @@ MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL var)
     ${Trilinos_TPL_LIBRARIES}
     )
 
-  SET(DEAL_II_USE_TRILINOS TRUE)
-
   SET(DEAL_II_EXPAND_TRILINOS_VECTOR "TrilinosWrappers::Vector")
   SET(DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR "TrilinosWrappers::BlockVector")
   SET(DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN "TrilinosWrappers::SparsityPattern")
index 529be4d846a7d01105f9e4fc365e7728d7f2c998..466cc628d602d11a5649bb5cc992e403d9217658 100644 (file)
@@ -29,8 +29,6 @@ MACRO(FEATURE_UMFPACK_CONFIGURE_EXTERNAL var)
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${UMFPACK_LIBRARIES})
   ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${UMFPACK_LINKER_FLAGS}")
 
-  SET(HAVE_LIBUMFPACK TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
@@ -45,8 +43,6 @@ MACRO(FEATURE_UMFPACK_CONFIGURE_BUNDLED var)
     ${UMFPACK_FOLDER}/AMD/Include
     )
 
-  SET(HAVE_LIBUMFPACK TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index fc835e8e3379ca24764c629c0605b057d25863a1..41fc235167cd8b8acb8c20fedb8f9d20a8435ee5 100644 (file)
@@ -20,8 +20,6 @@
 MACRO(FEATURE_ZLIB_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${ZLIB_LIBRARIES})
-  SET(HAVE_LIBZ TRUE)
-
   SET(${var} TRUE)
 ENDMACRO()
 
index a1f9fac40e7311d8bf16c9d8aa24b60f2659f9dd..fcaa0b4226186fe87280cd87b5d6381310eb76bb 100644 (file)
 
 #include <iostream>
 
-#ifdef HAVE_LIBUMFPACK
+#ifdef DEAL_II_WITH_UMFPACK
 extern "C" {
 #include <umfpack.h>
 }
 #endif
 
-#if defined(DEAL_II_COMPILER_SUPPORTS_MPI)
+#if defined(DEAL_II_WITH_MPI)
 #include <mpi.h>
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 #  include <Trilinos_version.h>
 #endif
 
-#ifdef DEAL_II_USE_MUMPS
+#ifdef DEAL_II_WITH_MUMPS
 #  include <deal.II/base/utilities.h>
 #  include <dmumps_c.h>
 #endif
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 #  include <petscversion.h>
 #endif
 
-#ifdef DEAL_II_USE_SLEPC
+#ifdef DEAL_II_WITH_SLEPC
 #  include <slepcversion.h>
 #endif
 
@@ -55,18 +55,18 @@ int main()
   std::cout << "dealii-feature: BLAS=yes" << std::endl;
 #endif
 
-#ifdef HAVE_LIBLAPACK
+#ifdef DEAL_II_WITH_LAPACK
   std::cout << "dealii-feature: LAPACK=yes" << std::endl;
 #endif
 
-#ifdef HAVE_LIBUMFPACK
+#ifdef DEAL_II_WITH_UMFPACK
   std::cout << "dealii-feature: UMFPACK="
            << UMFPACK_MAIN_VERSION << '.'
            << UMFPACK_SUB_VERSION << '.'
            << UMFPACK_SUBSUB_VERSION << std::endl;
 #endif
 
-#if defined(DEAL_II_COMPILER_SUPPORTS_MPI)
+#if defined(DEAL_II_WITH_MPI)
 #  ifdef OMPI_MAJOR_VERSION
   std::cout << "dealii-feature: MPI=OpenMPI-"
            << OMPI_MAJOR_VERSION << '.'
@@ -79,7 +79,7 @@ int main()
 #  endif
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 #  ifdef TRILINOS_VERSION_STRING
   std::cout << "dealii-feature: Trilinos=" << TRILINOS_VERSION_STRING << std::endl;
 #  else
@@ -92,11 +92,11 @@ int main()
 #  endif
 #endif
 
-#ifdef DEAL_II_USE_MUMPS
+#ifdef DEAL_II_WITH_MUMPS
   std::cout << "dealii-feature: MUMPS=yes" << std::endl;
 #endif
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
   std::cout << "dealii-feature: PETSc="
            << PETSC_VERSION_MAJOR << '.'
            << PETSC_VERSION_MINOR << '.'
@@ -104,7 +104,7 @@ int main()
            << PETSC_VERSION_PATCH << std::endl;
 #endif
 
-#ifdef DEAL_II_USE_SLEPC
+#ifdef DEAL_II_WITH_SLEPC
   std::cout << "dealii-feature: SLEPc="
            << SLEPC_VERSION_MAJOR << '.'
            << SLEPC_VERSION_MINOR << '.'
@@ -123,11 +123,11 @@ int main()
   std::cout << std::endl;
 #endif
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
   std::cout << "dealii-feature: P4est=yes" << std::endl;
 #endif
 
-#ifdef DEAL_II_HAVE_HDF5
+#ifdef DEAL_II_WITH_HDF5
    std::cout << "dealii-feature: HDF5=yes" << std::endl;
 #endif
 
@@ -135,15 +135,15 @@ int main()
    std::cout << "dealii-feature: Tecplot=yes" << std::endl;
 #endif
    
-#ifdef HAVE_LIBNETCDF
+#ifdef DEAL_II_WITH_NETCDF
   std::cout << "dealii-feature: NetCDF=yes" << std::endl;
 #endif
 
-#ifdef HAVE_LIBZ
+#ifdef DEAL_II_WITH_ZLIB
   std::cout << "dealii-feature: LibZ=yes" << std::endl;
 #endif
 
-#ifdef HAVE_FUNCTIONPARSER
+#ifdef DEAL_II_WITH_FUNCTIONPARSER
   std::cout << "dealii-feature: parser=yes" << std::endl;
 #else
   std::cout << "dealii-feature: parser=no" << std::endl;
index a5cf8929b1d57b788698ad24125f899a02fdfae1..7d3adb536720ec67e882980a7323dd1cd5494728 100644 (file)
@@ -992,15 +992,15 @@ INCLUDE_FILE_PATTERNS  =
 
 PREDEFINED             = DOXYGEN=1 \
                          DEBUG=1 \
-                         DEAL_II_USE_PETSC=1 \
-                         DEAL_II_USE_SLEPC=1 \
-                         DEAL_II_USE_TRILINOS=1 \
-                         DEAL_II_USE_MT=1 \
+                         DEAL_II_WITH_PETSC=1 \
+                         DEAL_II_WITH_SLEPC=1 \
+                         DEAL_II_WITH_TRILINOS=1 \
+                         DEAL_II_WITH_THREADS=1 \
                          DEAL_II_USE_MT_POSIX=1 \
                         DEAL_II_USE_ARPACK=1 \
-                        DEAL_II_USE_METIS=1 \
-                        DEAL_II_USE_MUMPS=1 \
-                        DEAL_II_USE_P4EST=1
+                        DEAL_II_WITH_METIS=1 \
+                        DEAL_II_WITH_MUMPS=1 \
+                        DEAL_II_WITH_P4EST=1
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
index 23fde020fa7e2d772d5d2b1b1e986fd84ebb11d3..b208e71bf770649304f4eba8dc2c7b14ab8b873d 100644 (file)
@@ -162,18 +162,18 @@ contributor's names are abbreviated by WB (Wolfgang Bangerth), GK
 
   <li> <p> 
        Changed: Previously, we just set the preprocessor variable
-       <code>DEAL_II_USE_MT</code>, when <code>--with-multithreading</code> was
+       <code>DEAL_II_WITH_THREADS</code>, when <code>--with-multithreading</code> was
        given as argument to <code>./configure</code>. Tests in the code
-       therefore looked like <code>#ifdef DEAL_II_USE_MT</code>. This has been
+       therefore looked like <code>#ifdef DEAL_II_WITH_THREADS</code>. This has been
        changed so that the variable is always defined, but its value is now
        equal to <code>1</code> 
        when multithreading was requested, and zero otherwise. The reason for
-       this is that you can now write <code>if (DEAL_II_USE_MT && ...)</code>
+       this is that you can now write <code>if (DEAL_II_WITH_THREADS && ...)</code>
        conditions, and need not interleave if-else clauses from regular code
        and the preprocessor, if conditions involve both the state of this
        preprocessor variable and the run-time state of your program. However,
        this change requires that all appearances of <code>#ifdef
-       DEAL_II_USE_MT</code> be changed to <code>#if DEAL_II_USE_MT ==
+       DEAL_II_WITH_THREADS</code> be changed to <code>#if DEAL_II_WITH_THREADS ==
        1</code>, since the variable is now defined unconditionally.
        <br>
        (WB 2002/11/14)
index 6de0c2aaa6301608d4e0f37ad206cd2f768fb012..844a442565cc983130f52248a8f76c316f55833f 100644 (file)
@@ -536,7 +536,7 @@ inconvenience this causes.
   <li>
   <p>
   New: If the compiler allows to do <code>\#include @<mpi.h@></code>, then
-  the preprocessor flag <code>DEAL_II_COMPILER_SUPPORTS_MPI</code> is now set in
+  the preprocessor flag <code>DEAL_II_WITH_MPI</code> is now set in
   <code>base/include/base/config.h</code>. This also fixes a problem in
   <code>base/include/base/utilities.h</code> if a compiler capable of
   including <code>mpi.h</code> was used but not PETSc.
index 24e88f32d08c740edf3370e1be2f2882e1d1ebbf..2c0c9f2a586dacb5c170544ff32307455dc971c8 100644 (file)
@@ -286,7 +286,7 @@ namespace Step48
     void assemble_system ();
     void output_results (const unsigned int timestep_number) const;
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
     parallel::distributed::Triangulation<dim>   triangulation;
 #else
     Triangulation<dim>   triangulation;
@@ -323,7 +323,7 @@ namespace Step48
     :
     pcout (std::cout,
            Utilities::System::get_this_mpi_process(MPI_COMM_WORLD)==0),
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
     triangulation (MPI_COMM_WORLD),
 #endif
     fe (QGaussLobatto<1>(fe_degree+1)),
@@ -371,7 +371,7 @@ namespace Step48
     }
 
     pcout << "   Number of global active cells: "
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
           << triangulation.n_global_active_cells()
 #else
           << triangulation.n_active_cells()
index cc908989382b0fd4906a3133b90d325e2a9e742d..88339eb5ab69b45225fd37dfaee157c9fcec5a9d 100644 (file)
 /* Defined if deal.II was configured on a native Windows platform. */
 #cmakedefine DEAL_II_MSVC
 
+/* Disable a bunch of warnings for Microsoft Visual C++. */
+//#ifdef DEAL_II_MSVC
+//#  pragma warning( disable : 4244 ) /* implied downcasting from double to float */
+//#  pragma warning( disable : 4267 ) /* implied downcasting from size_t to unsigned int */
+//#  pragma warning( disable : 4996 ) /* unsafe functions, such as strcat and sprintf */
+//#  pragma warning( disable : 4355 ) /* 'this' : used in base member initializer list */
+//#  pragma warning( disable : 4661 ) /* no suitable definition provided for explicit template instantiation request */
+//#  pragma warning( disable : 4800 ) /* forcing value to bool 'true' or 'false' (performance warning) */
+//#  pragma warning( disable : 4146 ) /* unary minus operator applied to unsigned type, result still unsigned */
+//#  pragma warning( disable : 4667 ) /* no function template defined that matches forced instantiation */
+//#  pragma warning( disable : 4520 ) /* multiple default constructors specified */
+//#  pragma warning( disable : 4700 ) /* uninitialized local variable */
+//#  pragma warning( disable : 4789 ) /* destination of memory copy is too small */
+//#  pragma warning( disable : 4808 ) /* case 'value' is not a valid value for switch condition of type 'bool */
+//#endif // DEAL_II_MSVC
+
 
 /****************************************
  * Configured in check_2_compiler_bugs: *
 #cmakedefine DEAL_II_BOOST_BIND_COMPILER_BUG
 
 
-
 /*****************************************
  * Configured in configure_arpack.cmake: *
  *****************************************/
 
-/* Defined if an ARPACK installation was found and is going to be used */
 #cmakedefine DEAL_II_USE_ARPACK
 
-
 /*************************************************
  * Configured in configure_functionparser.cmake: *
  *************************************************/
 
-/* Defined if you have the `functionparser' library */
-#cmakedefine HAVE_FUNCTIONPARSER
-
+#cmakedefine DEAL_II_WITH_FUNCTIONPARSER
 
 /***************************************
  * Configured in configure_hdf5.cmake: *
  ***************************************/
 
-/* Defined if deal.II was configured with hdf5 support */
-#cmakedefine DEAL_II_HAVE_HDF5
-
+#cmakedefine DEAL_II_WITH_HDF5
 
 /*****************************************
  * Configured in configure_lapack.cmake: *
  *****************************************/
 
-/* Defined if deal.II was configured with LAPACK support */
-#cmakedefine HAVE_LIBLAPACK
+#cmakedefine DEAL_II_WITH_LAPACK
 
-/* Defined if you have the `daxpy_' function. */
+/* Defined if the corresponding BLAS or LAPACK function is available */
 #cmakedefine HAVE_DAXPY_
-
-/* Defined if you have the `dgeevx_' function. */
 #cmakedefine HAVE_DGEEVX_
-
-/* Defined if you have the `dgeev_' function. */
 #cmakedefine HAVE_DGEEV_
-
-/* Defined if you have the `dgelsd_' function. */
 #cmakedefine HAVE_DGELSD_
-
-/* Defined if you have the `dgemm_' function. */
 #cmakedefine HAVE_DGEMM_
-
-/* Defined if you have the `dgemv_' function. */
 #cmakedefine HAVE_DGEMV_
-
-/* Defined if you have the `dgeqrf_' function. */
 #cmakedefine HAVE_DGEQRF_
-
-/* Defined if you have the `dgesdd_' function. */
 #cmakedefine HAVE_DGESDD_
-
-/* Defined if you have the `dgesvd_' function. */
 #cmakedefine HAVE_DGESVD_
-
-/* Defined if you have the `dgetrf_' function. */
 #cmakedefine HAVE_DGETRF_
-
-/* Defined if you have the `dgetri_' function. */
 #cmakedefine HAVE_DGETRI_
-
-/* Defined if you have the `dgetrs_' function. */
 #cmakedefine HAVE_DGETRS_
-
-/* Defined if you have the `dorgqr_' function. */
 #cmakedefine HAVE_DORGQR_
-
-/* Defined if you have the `dormqr_' function. */
 #cmakedefine HAVE_DORMQR_
-
-/* Defined if you have the `dstev_' function. */
 #cmakedefine HAVE_DSTEV_
-
-/* Defined if you have the `dsyevx_' function. */
 #cmakedefine HAVE_DSYEVX_
-
-/* Defined if you have the `dsygv_' function. */
 #cmakedefine HAVE_DSYGV_
-
-/* Defined if you have the `dsygvx_' function. */
 #cmakedefine HAVE_DSYGVX_
-
-/* Defined if you have the `dtrtrs_' function. */
 #cmakedefine HAVE_DTRTRS_
-
-/* Defined if you have the `saxpy_' function. */
 #cmakedefine HAVE_SAXPY_
-
-/* Defined if you have the `sgeevx_' function. */
 #cmakedefine HAVE_SGEEVX_
-
-/* Defined if you have the `sgeev_' function. */
 #cmakedefine HAVE_SGEEV_
-
-/* Defined if you have the `sgelsd_' function. */
 #cmakedefine HAVE_SGELSD_
-
-/* Defined if you have the `sgemm_' function. */
 #cmakedefine HAVE_SGEMM_
-
-/* Defined if you have the `sgemv_' function. */
 #cmakedefine HAVE_SGEMV_
-
-/* Defined if you have the `sgeqrf_' function. */
 #cmakedefine HAVE_SGEQRF_
-
-/* Defined if you have the `sgesdd_' function. */
 #cmakedefine HAVE_SGESDD_
-
-/* Defined if you have the `sgesvd_' function. */
 #cmakedefine HAVE_SGESVD_
-
-/* Defined if you have the `sgetrf_' function. */
 #cmakedefine HAVE_SGETRF_
-
-/* Defined if you have the `sgetri_' function. */
 #cmakedefine HAVE_SGETRI_
-
-/* Defined if you have the `sgetrs_' function. */
 #cmakedefine HAVE_SGETRS_
-
-/* Defined if you have the `sorgqr_' function. */
 #cmakedefine HAVE_SORGQR_
-
-/* Defined if you have the `sormqr_' function. */
 #cmakedefine HAVE_SORMQR_
-
-/* Defined if you have the `sstev_' function. */
 #cmakedefine HAVE_SSTEV_
-
-/* Defined if you have the `ssyevx_' function. */
 #cmakedefine HAVE_SSYEVX_
-
-/* Defined if you have the `ssygv_' function. */
 #cmakedefine HAVE_SSYGV_
-
-/* Defined if you have the `ssygvx_' function. */
 #cmakedefine HAVE_SSYGVX_
-
-/* Defined if you have the `strtrs_' function. */
 #cmakedefine HAVE_STRTRS_
 
 
  * Configured in configure_metis.cmake: *
  ****************************************/
 
-/* Defined if a Metis installation was found and is going to be used */
-#cmakedefine DEAL_II_USE_METIS
+#cmakedefine DEAL_II_WITH_METIS
 
 
 /**************************************
  * Configured in configure_mpi.cmake: *
  **************************************/
 
-/* Defined if the compiler supports mpi */
-#cmakedefine DEAL_II_COMPILER_SUPPORTS_MPI
+#cmakedefine DEAL_II_WITH_MPI
 
 
 /*****************************************
  * Configured in configure_mumps.cmake:  *
  *****************************************/
 
-/* Defined if an MUMPS installation was found and is going to be used */
-#cmakedefine DEAL_II_USE_MUMPS
+#cmakedefine DEAL_II_WITH_MUMPS
 
 
 /*****************************************
  * Configured in configure_netcdf.cmake: *
  *****************************************/
 
-/* Defined if you have the `NetCDF' library */
-#cmakedefine HAVE_LIBNETCDF
+#cmakedefine DEAL_II_WITH_NETCDF
 
 
 /****************************************
  * Configured in configure_p4est.cmake: *
  ****************************************/
 
-/* Defined if we are to use the p4est library to distribute meshes on a
-   cluster computer. */
-#cmakedefine DEAL_II_USE_P4EST
+#cmakedefine DEAL_II_WITH_P4EST
 
 
 /****************************************
  * Configured in configure_petsc.cmake: *
  ****************************************/
 
-/* Defined if a PETSc installation was found and is going to be used */
-#cmakedefine DEAL_II_USE_PETSC
+#cmakedefine DEAL_II_WITH_PETSC
+
 
 /*
  * Note: The following definitions will be set in petscconf.h and
     >=  \
     (major)*10000 + (minor)*100 + (subminor))
 
-
 /****************************************
  * Configured in configure_slepc.cmake: *
  ****************************************/
 
-/* Defined if a SLEPc installation was found and is going to be used */
-#cmakedefine DEAL_II_USE_SLEPC
+#cmakedefine DEAL_II_WITH_SLEPC
 
 
 /********************************************
  * Configured in configure_1_threads.cmake: *
  ********************************************/
 
-/* Flag indicating whether the library shall be compiled for multithreaded
- * applications. If so, then it is set to one, otherwise to zero.
- */
-#cmakedefine DEAL_II_USE_MT
+#cmakedefine DEAL_II_WITH_THREADS
 
 /* Defined if multi-threading is to be achieved by using the POSIX functions
  */
  * volatile. We do this here in a very old-fashioned C-style, but still
  * convenient way.
  */
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 #  define DEAL_VOLATILE volatile
 #else
 #  define DEAL_VOLATILE
  * Configured in configure_trilinos.cmake: *
  *******************************************/
 
-/* Defined if a Trilinos installation was found and is going to be used */
-#cmakedefine DEAL_II_USE_TRILINOS
+#cmakedefine DEAL_II_WITH_TRILINOS
 
 
 /******************************************
  * Configured in configure_umfpack.cmake: *
  ******************************************/
 
-/* Defined if deal.II was configured with UMFPACK support */
-#cmakedefine HAVE_LIBUMFPACK
+#cmakedefine DEAL_II_WITH_UMFPACK
 
 
 /***************************************
  * Configured in configure_zlib.cmake: *
  ***************************************/
 
-/* Defined if deal.II was configure with zlib support */
-#cmakedefine HAVE_LIBZ
-
-
-/* Disable a bunch of warnings for Microsoft Visual C++. */
-#ifdef DEAL_II_MSVC
-//#  pragma warning( disable : 4244 ) /* implied downcasting from double to float */
-//#  pragma warning( disable : 4267 ) /* implied downcasting from size_t to unsigned int */
-//#  pragma warning( disable : 4996 ) /* unsafe functions, such as strcat and sprintf */
-//#  pragma warning( disable : 4355 ) /* 'this' : used in base member initializer list */
-//#  pragma warning( disable : 4661 ) /* no suitable definition provided for explicit template instantiation request */
-//#  pragma warning( disable : 4800 ) /* forcing value to bool 'true' or 'false' (performance warning) */
-//#  pragma warning( disable : 4146 ) /* unary minus operator applied to unsigned type, result still unsigned */
-//#  pragma warning( disable : 4667 ) /* no function template defined that matches forced instantiation */
-//#  pragma warning( disable : 4520 ) /* multiple default constructors specified */
-//#  pragma warning( disable : 4700 ) /* uninitialized local variable */
-//#  pragma warning( disable : 4789 ) /* destination of memory copy is too small */
-//#  pragma warning( disable : 4808 ) /* case 'value' is not a valid value for switch condition of type 'bool */
-#endif // DEAL_II_MSVC
+#cmakedefine DEAL_II_WITH_ZLIB
 
 
 #include <deal.II/base/numbers.h>
index caca74ffa09167c73e271a81b6b45940a34807ec..b7dba6957633efadba5f97440f22943811c46a47 100644 (file)
@@ -905,7 +905,7 @@ namespace StandardExceptions
 /**
  * Assert support for the LAPACK library
  */
-#ifdef HAVE_LIBLAPACK
+#ifdef DEAL_II_WITH_LAPACK
 #  define AssertLAPACK {}
 #else
 #  define AssertLAPACK Assert(false, ExcNeedsLAPACK())
@@ -914,7 +914,7 @@ namespace StandardExceptions
 /**
  * Assert support for the UMFPACK library
  */
-#ifdef HAVE_LIBUMFPACK
+#ifdef DEAL_II_WITH_UMFPACK
 #  define AssertUMFPACK {}
 #else
 #  define AssertUMFPACK Assert(false, ExcNeedsUMFPACK())
index f8666206b629f16f836bbfc213a26bbcf3c4942a..0b2baecf3ea87ee6c33022d78367f45eaa69427d 100644 (file)
 #include <vector>
 #include <algorithm>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 #  include <Epetra_Map.h>
 #endif
 
-#if defined(DEAL_II_COMPILER_SUPPORTS_MPI) || defined(DEAL_II_USE_PETSC)
+#if defined(DEAL_II_WITH_MPI) || defined(DEAL_II_WITH_PETSC)
 #include <mpi.h>
 #else
 typedef int MPI_Comm;
@@ -328,7 +328,7 @@ public:
    */
   void block_read(std::istream &in);
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   /**
    * Given an MPI communicator,
    * create a Trilinos map object
index 912cbbf5128d74944623422a1262169c5a964832..1b1098f12d3750a1aa0cbed67ac2e4b2c1a723ed 100644 (file)
@@ -16,7 +16,7 @@
 #include <deal.II/base/config.h>
 #include <vector>
 
-#if defined(DEAL_II_COMPILER_SUPPORTS_MPI) || defined(DEAL_II_USE_PETSC)
+#if defined(DEAL_II_WITH_MPI) || defined(DEAL_II_WITH_PETSC)
 #  include <mpi.h>
 // Check whether <mpi.h> is a suitable
 // include for us (if MPI_SEEK_SET is not
@@ -336,7 +336,7 @@ namespace Utilities
 
     namespace internal
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       /**
        * Return the corresponding MPI data
        * type id for the argument given.
@@ -390,7 +390,7 @@ namespace Utilities
     T sum (const T &t,
            const MPI_Comm &mpi_communicator)
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       T sum;
       MPI_Allreduce (const_cast<void *>(static_cast<const void *>(&t)),
                      &sum, 1, internal::mpi_type_id(&t), MPI_SUM,
@@ -409,7 +409,7 @@ namespace Utilities
               const MPI_Comm &mpi_communicator,
               T (&sums)[N])
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       MPI_Allreduce (const_cast<void *>(static_cast<const void *>(&values[0])),
                      &sums[0], N, internal::mpi_type_id(values), MPI_SUM,
                      mpi_communicator);
@@ -427,7 +427,7 @@ namespace Utilities
               const MPI_Comm       &mpi_communicator,
               std::vector<T>       &sums)
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       sums.resize (values.size());
       MPI_Allreduce (const_cast<void *>(static_cast<const void *>(&values[0])),
                      &sums[0], values.size(), internal::mpi_type_id((T *)0), MPI_SUM,
@@ -444,7 +444,7 @@ namespace Utilities
     T max (const T &t,
            const MPI_Comm &mpi_communicator)
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       T sum;
       MPI_Allreduce (const_cast<void *>(static_cast<const void *>(&t)),
                      &sum, 1, internal::mpi_type_id(&t), MPI_MAX,
@@ -463,7 +463,7 @@ namespace Utilities
               const MPI_Comm &mpi_communicator,
               T (&maxima)[N])
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       MPI_Allreduce (const_cast<void *>(static_cast<const void *>(&values[0])),
                      &maxima[0], N, internal::mpi_type_id(values), MPI_MAX,
                      mpi_communicator);
@@ -481,7 +481,7 @@ namespace Utilities
               const MPI_Comm       &mpi_communicator,
               std::vector<T>       &maxima)
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       maxima.resize (values.size());
       MPI_Allreduce (const_cast<void *>(static_cast<const void *>(&values[0])),
                      &maxima[0], values.size(), internal::mpi_type_id((T *)0), MPI_MAX,
index 88cf788462676f6d996bcd4f95a79cbd8eb5507f..3ffdda181b6b2be35115d3c79da1c494fe0f1b38 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <cstddef>
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 #  include <tbb/parallel_for.h>
 #  include <tbb/parallel_reduce.h>
 #  include <tbb/partitioner.h>
@@ -176,7 +176,7 @@ namespace parallel
                   Predicate           &predicate,
                   const unsigned int   grainsize)
   {
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
     // make sure we don't get compiler
     // warnings about unused arguments
     (void) grainsize;
@@ -244,7 +244,7 @@ namespace parallel
                   Predicate            &predicate,
                   const unsigned int    grainsize)
   {
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
     // make sure we don't get compiler
     // warnings about unused arguments
     (void) grainsize;
@@ -314,7 +314,7 @@ namespace parallel
                   Predicate            &predicate,
                   const unsigned int    grainsize)
   {
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
     // make sure we don't get compiler
     // warnings about unused arguments
     (void) grainsize;
@@ -340,7 +340,7 @@ namespace parallel
 
   namespace internal
   {
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
     /**
      * Take a range argument and call the
      * given function with its begin and end.
@@ -461,7 +461,7 @@ namespace parallel
                            const Function                           &f,
                            const unsigned int                        grainsize)
   {
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
     // make sure we don't get compiler
     // warnings about unused arguments
     (void) grainsize;
@@ -546,7 +546,7 @@ namespace parallel
 
   namespace internal
   {
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
     /**
      * A class that conforms to the Body
      * requirements of the TBB
@@ -741,7 +741,7 @@ namespace parallel
                                         const typename identity<RangeType>::type &end,
                                         const unsigned int grainsize)
   {
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
     // make sure we don't get compiler
     // warnings about unused arguments
     (void) grainsize;
@@ -813,7 +813,7 @@ namespace internal
 namespace parallel
 {
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
   namespace internal
   {
@@ -851,7 +851,7 @@ namespace parallel
                                       const std::size_t end,
                                       const std::size_t minimum_parallel_grain_size) const
   {
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
     // make sure we don't get compiler
     // warnings about unused arguments
     (void) minimum_parallel_grain_size;
index 33aef09fcd9e921e9a9389d05f932e3a42248354..078266824a8ae387728114c45a072a8785468104 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 #  include <tbb/enumerable_thread_specific.h>
 #endif
 
@@ -121,7 +121,7 @@ namespace Threads
     ThreadLocalStorage<T> &operator = (const T &t);
 
   private:
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
     /**
      * The data element we store. If we support threads, then this
      * object will be of a type that provides a separate object
@@ -163,7 +163,7 @@ namespace Threads
   T &
   ThreadLocalStorage<T>::get ()
   {
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
     return data.local();
 #else
     return data;
index a8690dce35c1480457dfb0b2c307c4e7c2511af8..316ba303b32a9893951a6a6527e4bb235e6bc2ec 100644 (file)
@@ -21,7 +21,7 @@
 #include <deal.II/base/std_cxx1x/shared_ptr.h>
 #include <deal.II/base/std_cxx1x/bind.h>
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 #  include <deal.II/base/std_cxx1x/thread.h>
 #  include <deal.II/base/std_cxx1x/mutex.h>
 #  include <deal.II/base/std_cxx1x/condition_variable.h>
@@ -33,7 +33,7 @@
 #include <utility>
 
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 #  ifdef DEAL_II_USE_MT_POSIX
 #    include <pthread.h>
 #  endif
@@ -276,7 +276,7 @@ namespace Threads
   };
 
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
   /**
    * Class implementing a
@@ -1262,7 +1262,7 @@ namespace Threads
 
   namespace internal
   {
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
     /**
      * A class that represents threads. For
@@ -4037,7 +4037,7 @@ namespace Threads
 
   namespace internal
   {
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
     template <typename> struct TaskDescriptor;
 
index fed57a32bd70704b4fa3423c67aafa668809346c..fa2bf8a1459484c47d65be531687f02f1ffda9dd 100644 (file)
@@ -17,7 +17,7 @@
 #include <deal.II/base/thread_management.h>
 #include <deal.II/base/utilities.h>
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 #  include <mpi.h>
 #endif
 
@@ -76,7 +76,7 @@ public:
    */
   Timer ();
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   /**
    * Constructor that takes an MPI
    * communicator as input. A timer
@@ -233,7 +233,7 @@ private:
    */
   MPI_Comm            mpi_communicator;
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   /**
    * Store whether the wall time is
    * synchronized between machines.
@@ -351,7 +351,7 @@ public:
                const enum OutputFrequency output_frequency,
                const enum OutputType      output_type);
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   /**
    * Constructor that takes an MPI
    * communicator as input. A timer
@@ -533,7 +533,7 @@ void Timer::restart ()
 
 
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 
 inline
 const Utilities::System::MinMaxAvg &
index b5ac6022772b4309f71c56daf5fa15e0eb2ec55f..a4924d180024b9a8b698082ee420d44ab046d118 100644 (file)
 #include <functional>
 #include <string>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 #  include <Epetra_Comm.h>
 #  include <Epetra_Map.h>
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #  else
 #    include <Epetra_SerialComm.h>
@@ -485,7 +485,7 @@ namespace Utilities
   }
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   /**
    * This namespace provides some of the basic structures used in the
    * initialization of the Trilinos objects (e.g., matrices, vectors, and
index f1891d0936a942dcb175e3e8fc8d5407ed2d8ed0..b44ed33f2cfbd7b3c8b9337219dff882d829d154 100644 (file)
@@ -19,7 +19,7 @@
 #include <deal.II/base/std_cxx1x/function.h>
 #include <deal.II/base/std_cxx1x/bind.h>
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 #  include <deal.II/base/thread_management.h>
 #  include <tbb/pipeline.h>
 #endif
@@ -125,7 +125,7 @@ DEAL_II_NAMESPACE_OPEN
 namespace WorkStream
 {
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
 
   namespace internal
@@ -439,7 +439,7 @@ namespace WorkStream
   }
 
 
-#endif // DEAL_II_USE_MT
+#endif // DEAL_II_WITH_THREADS
 
 
 
@@ -527,7 +527,7 @@ namespace WorkStream
     if (!(begin != end))
       return;
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
     // create the three stages of the
     // pipeline
     internal::IteratorRangeToItemStream<Iterator,ScratchData,CopyData>
index 91fc256ede87e84b5553555ddf63ead8a717cf73..a9963c5439b512c50c0e46e5b6d92e86ecd5dc17 100644 (file)
 #include <list>
 #include <utility>
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 #  include <mpi.h>
 #endif
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
 #include <p4est_connectivity.h>
 #include <p4est.h>
 #include <p4est_ghost.h>
@@ -44,7 +44,7 @@ DEAL_II_NAMESPACE_OPEN
 
 template <int, int> class Triangulation;
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
 
 namespace internal
 {
@@ -894,7 +894,7 @@ namespace parallel
 }
 
 
-#else // DEAL_II_USE_P4EST
+#else // DEAL_II_WITH_P4EST
 
 namespace parallel
 {
@@ -950,7 +950,7 @@ namespace parallel
        * communicator used by this
        * triangulation.
        */
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       MPI_Comm get_communicator () const;
 #endif
     };
index 1211ac37de1e99e5a49937358d00ba46e9f10dfb..4758c761c02cae3bed651235c69ac5294bbbff23 100644 (file)
@@ -39,7 +39,7 @@
 // dummy include in order to have the
 // definition of PetscScalar available
 // without including other PETSc stuff
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 #  include <petsc.h>
 #endif
 
index b34c505fcb8b82d0b86e76c0af92562708d076eb..87eec9623a470d3c018674de7e0da9e50fe6bb4d 100644 (file)
@@ -2883,7 +2883,7 @@ inline
 bool
 CellAccessor<dim,spacedim>::is_locally_owned () const
 {
-#ifndef DEAL_II_USE_P4EST
+#ifndef DEAL_II_WITH_P4EST
   return true;
 #else
   const types::subdomain_id subdomain = this->subdomain_id();
@@ -2906,7 +2906,7 @@ inline
 bool
 CellAccessor<dim,spacedim>::is_ghost () const
 {
-#ifndef DEAL_II_USE_P4EST
+#ifndef DEAL_II_WITH_P4EST
   return false;
 #else
   const types::subdomain_id subdomain = this->subdomain_id();
@@ -2930,7 +2930,7 @@ inline
 bool
 CellAccessor<dim,spacedim>::is_artificial () const
 {
-#ifndef DEAL_II_USE_P4EST
+#ifndef DEAL_II_WITH_P4EST
   return false;
 #else
   return (this->subdomain_id() == numbers::artificial_subdomain_id);
index 9b412967b02bfb639c38a88c74319ab9f0e70dc1..21ee9f7a5bbf61388c2077d465c8d405e79f5211 100644 (file)
@@ -33,7 +33,7 @@ class BlockSparsityPattern;
 class BlockCompressedSparsityPattern;
 class BlockCompressedSimpleSparsityPattern;
 class BlockCompressedSetSparsityPattern;
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 namespace TrilinosWrappers
 {
   class BlockSparsityPattern;
@@ -976,7 +976,7 @@ public:
 
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 
 /**
index 5502e1ba7857c4d05ae7c2e9d9213a931c928abf..9d7185410817e2c163deb1018106c7740e0ef8ae 100644 (file)
@@ -24,7 +24,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 namespace TrilinosWrappers
 {
   class Vector;
@@ -139,7 +139,7 @@ public:
 #endif
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   /**
    * A copy constructor taking a
    * (parallel) Trilinos block
@@ -241,7 +241,7 @@ public:
   BlockVector &
   operator= (const Vector<Number> &V);
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   /**
    * A copy constructor from a
    * Trilinos block vector to a
index 5203de26fb534b8693893c75fd82b2b587745771..0e000748e4f135b1e7db944497b6f158d92223ac 100644 (file)
@@ -70,7 +70,7 @@ BlockVector<Number>::BlockVector (const BlockVector<OtherNumber> &v)
 #endif
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 template <typename Number>
 BlockVector<Number>::BlockVector (const TrilinosWrappers::BlockVector &v)
@@ -143,7 +143,7 @@ BlockVector<Number>::~BlockVector ()
 {}
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 template <typename Number>
 inline
 BlockVector<Number> &
index db910b11bd8ac69928f4d1ab1e6827eb5e73706c..088d0528e040e526cde2eb423cb1e9a8f712dbcc 100644 (file)
@@ -919,7 +919,7 @@ namespace parallel
        */
       VectorView<Number> vector_view;
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       /**
        * A vector that collects all requests from @p
        * compress() operations. This class uses
index 10b601f0cd66296f080b9768d3dbbb67e49a18b0..5622d55ba29470986be6df89893f55f28d39d2eb 100644 (file)
@@ -28,7 +28,7 @@ namespace parallel
     void
     Vector<Number>::clear_mpi_requests ()
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       for (unsigned int j=0; j<compress_requests.size(); j++)
         MPI_Request_free(&compress_requests[j]);
       compress_requests.clear();
@@ -202,7 +202,7 @@ namespace parallel
     void
     Vector<Number>::compress_start (const unsigned int counter)
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       const Utilities::MPI::Partitioner &part = *partitioner;
 
       // nothing to do when we neither have import
@@ -283,7 +283,7 @@ namespace parallel
     void
     Vector<Number>::compress_finish (const bool add_ghost_data)
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       const Utilities::MPI::Partitioner &part = *partitioner;
 
       // nothing to do when we neither have import
@@ -348,7 +348,7 @@ namespace parallel
     void
     Vector<Number>::update_ghost_values_start (const unsigned int counter) const
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       const Utilities::MPI::Partitioner &part = *partitioner;
 
       // nothing to do when we neither have import
@@ -441,7 +441,7 @@ namespace parallel
     void
     Vector<Number>::update_ghost_values_finish () const
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       // wait for both sends and receives to
       // complete, even though only receives are
       // really necessary. this gives (much) better
@@ -469,7 +469,7 @@ namespace parallel
     void
     Vector<Number>::swap (Vector<Number> &v)
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       // introduce a Barrier over all MPI processes
       // to make sure that the compress request are
       // no longer used before changing the owner
@@ -541,7 +541,7 @@ namespace parallel
       // information in order, use as many barriers
       // as there are processors and start writing
       // when it's our turn
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       for (unsigned int i=0; i<partitioner->this_mpi_process(); i++)
         MPI_Barrier (partitioner->get_communicator());
 #endif
@@ -570,7 +570,7 @@ namespace parallel
               << std::endl;
       out << std::endl << std::flush;
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       MPI_Barrier (partitioner->get_communicator());
 
       for (unsigned int i=partitioner->this_mpi_process()+1;
index c703fcd1cf827e5c27001dddfff4f41f0c70158c..22e19d22c41b9176e661ac5c387206f7cb252b47 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/base/table.h>
 #  include <deal.II/lac/block_matrix_base.h>
@@ -392,6 +392,6 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif    // DEAL_II_USE_PETSC
+#endif    // DEAL_II_WITH_PETSC
 
 #endif    // __deal2__petsc_block_sparse_matrix_h
index 8847069092ed5555e98c3bd5551a671f96cad732..788d8872b29a8f0899ca73d865f6d7ba9921418c 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/petsc_vector.h>
 #  include <deal.II/lac/petsc_parallel_block_vector.h>
@@ -512,6 +512,6 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif  // DEAL_II_USE_PETSC
+#endif  // DEAL_II_WITH_PETSC
 
 #endif
index b9575a75dc363bd0bbd01084d5cfb1fdae2c8233..d9752523d00e814f81b0c831f6ad7336fae7767f 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/petsc_matrix_base.h>
@@ -68,7 +68,7 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 /*----------------------------   petsc_full_matrix.h     ---------------------------*/
 
index 16ca5aec2b23b2d8197de242301761e2f4cfb883..7715d722dd3880aaacbcb17502344fc15c35f5ef 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/base/subscriptor.h>
 #  include <deal.II/lac/full_matrix.h>
@@ -1870,7 +1870,7 @@ namespace PETScWrappers
 DEAL_II_NAMESPACE_CLOSE
 
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 
 /*----------------------------   petsc_matrix_base.h     ---------------------------*/
index 2eec3536b772e9d18cbb12a3f6c751242b48d56e..c7217178d3066b5c0bc0a107e259d5b0516fdd53 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/petsc_matrix_base.h>
@@ -368,7 +368,7 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 
 /*----------------------------   petsc_matrix_free.h     ---------------------------*/
index 0274dd372b4f272b2d37a22e75a7a61babd48152..ac317b1fc09f168a46235d3421cb037a7218d025 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/base/table.h>
 #  include <deal.II/lac/block_matrix_base.h>
@@ -386,6 +386,6 @@ namespace PETScWrappers
 DEAL_II_NAMESPACE_CLOSE
 
 
-#endif    // DEAL_II_USE_PETSC
+#endif    // DEAL_II_WITH_PETSC
 
 #endif    // __deal2__petsc_parallel_block_sparse_matrix_h
index d507f3947e63bce96921da332ef79d02fe2399e7..33482381d21fe4c46b3c11cf964b765ac061de9a 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/petsc_parallel_vector.h>
 #  include <deal.II/lac/block_indices.h>
@@ -539,6 +539,6 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif  // DEAL_II_USE_PETSC
+#endif  // DEAL_II_WITH_PETSC
 
 #endif
index d3eb3a5780e37cfb7cab8b9e6a3897ad7c0cc6b3..29dded85910ed00dd69071d21199e1e7c7e1e212 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/petsc_matrix_base.h>
@@ -495,7 +495,7 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 /*----------------------------   petsc_parallel_sparse_matrix.h     ---------------------------*/
 
index c779eeaec43d813986a4065d635c8eecc120d62c..f2a3203ecac2c2b3b025272182be430c98591903 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/base/subscriptor.h>
 #  include <deal.II/lac/exceptions.h>
@@ -615,7 +615,7 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 /*----------------------------   petsc_parallel_vector.h     ---------------------------*/
 
index 402608ee224e3ea7a1743e4baf9480217afc439b..2c2a51dc28331bc76f23de7dbcb319a40a701c6b 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/exceptions.h>
 #  include <petscpc.h>
@@ -1064,7 +1064,7 @@ namespace PETScWrappers
 DEAL_II_NAMESPACE_CLOSE
 
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 /*----------------------------   petsc_precondition.h     ---------------------------*/
 
index f2806970f398d2374a0e46b43bbd7d3f76a2776e..5c4a10a0f4e638e70fb904c7dc5afcb6ae6d634d 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/solver_control.h>
@@ -1269,7 +1269,7 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 /*----------------------------   petsc_solver.h     ---------------------------*/
 
index 03bab185e32894ca5ff5f5b64a93d3b31d242cfb..bd5e41fcaef2bc685f2b954b7db32f117e07cc35 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/petsc_matrix_base.h>
@@ -359,7 +359,7 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 /*----------------------------   petsc_sparse_matrix.h     ---------------------------*/
 
index 3d1f9984a7135f8b22b945de6102f4b552538272..c7909f1f0c975fa5af0998d52daa0d56c61a034d 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/base/subscriptor.h>
 #  include <deal.II/lac/exceptions.h>
@@ -409,7 +409,7 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 /*----------------------------   petsc_vector.h     ---------------------------*/
 
index f96b53d85c5aa922f086dcfb42e05922d93a1c3b..3d22318d1a2a11cd98bd997d6021bd31697970ea 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/base/subscriptor.h>
 #  include <deal.II/lac/exceptions.h>
@@ -1218,7 +1218,7 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
 
 /*----------------------------   petsc_vector_base.h     ---------------------------*/
 
index 7c7a38f923f562dc79624e50e5d1116f093c1148..865296a36bd2500467384a6c07ac4941c471bb3d 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_SLEPC
+#ifdef DEAL_II_WITH_SLEPC
 
 #  include <deal.II/base/std_cxx1x/shared_ptr.h>
 #  include <deal.II/lac/exceptions.h>
@@ -693,7 +693,7 @@ namespace SLEPcWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_SLEPC
+#endif // DEAL_II_WITH_SLEPC
 
 /*----------------------------   slepc_solver.h  ---------------------------*/
 
index d890274aff44bf6874d1b6eadd75014f526317cc..4b8683408bfcfb0f88118b7eaea121dd3deb9e66 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_SLEPC
+#ifdef DEAL_II_WITH_SLEPC
 
 #  include <deal.II/base/std_cxx1x/shared_ptr.h>
 #  include <deal.II/lac/exceptions.h>
@@ -320,7 +320,7 @@ namespace SLEPcWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_SLEPC
+#endif // DEAL_II_WITH_SLEPC
 
 /*--------------------   slepc_spectral_transformation.h   ------------------*/
 
index d236fbd6c9a6400b7ec4b95adc61ba3c53e51f9d..5a5d9d673e3e4d93f6867c8f655b63bf28d03ee5 100644 (file)
@@ -23,7 +23,7 @@
 #include <deal.II/lac/sparse_matrix_ez.h>
 #include <deal.II/lac/block_sparse_matrix.h>
 
-#ifdef DEAL_II_USE_MUMPS
+#ifdef DEAL_II_WITH_MUMPS
 #  include <deal.II/base/utilities.h>
 #  include <dmumps_c.h>
 #endif
@@ -1300,9 +1300,9 @@ class SparseDirectMUMPS
 {
 private:
 
-#ifdef DEAL_II_USE_MUMPS
+#ifdef DEAL_II_WITH_MUMPS
   DMUMPS_STRUC_C id;
-#endif // DEAL_II_USE_MUMPS
+#endif // DEAL_II_WITH_MUMPS
 
   double       *a;
   double       *rhs;
index dd3d0293290ae9e2214454347f8e0f581113f673..6ae96146b4b532b372c93dd13fb172e8b6cf7495 100644 (file)
@@ -62,7 +62,7 @@ template <typename number>
 void
 SparseVanka<number>::compute_inverses ()
 {
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
   compute_inverses (0, matrix->m());
 #else
   const unsigned int n_inverses = std::count (selected.begin(),
@@ -556,7 +556,7 @@ void SparseBlockVanka<number>::vmult (Vector<number2>       &dst,
   else
     // otherwise: blocking requested
     {
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
       // spawn threads. since
       // some compilers have
       // trouble finding out
index e65cd32405538e46c84dd480b1931008a3c0a2f4..38567d370269b61f93b6e55929bd39e4965cf5fb 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <vector>
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 #include <mpi.h>
 #include <deal.II/base/index_set.h>
 #endif
@@ -195,7 +195,7 @@ namespace SparsityTools
                          const std::vector<unsigned int> &starting_indices = std::vector<unsigned int>());
 
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   /**
    * Communciate rows in a compressed
    * sparsity pattern over MPI.
index 215cd5a28a2ba71acea3b4e6090ef508f0668609..8be2192a61bbb6aeaa5336968a2ab05bd64da7bd 100644 (file)
@@ -145,7 +145,7 @@ void SwappableVector<number>::reload ()
 template <typename number>
 void SwappableVector<number>::alert ()
 {
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
   // note: this function does nothing
   // in non-MT mode
   return;
@@ -186,7 +186,7 @@ void SwappableVector<number>::reload_vector (const bool set_flag)
   this->block_read (tmp_in);
   tmp_in.close ();
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
   // release the lock that was
   // acquired by the calling
   // functions
index b49b57eb6cab0a95df902107fbaa65f983a46bb0..f298dad0cc7ef420f0bbee7277ff84bbff0e9684 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/base/table.h>
 #  include <deal.II/lac/block_matrix_base.h>
@@ -808,6 +808,6 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif    // DEAL_II_USE_TRILINOS
+#endif    // DEAL_II_WITH_TRILINOS
 
 #endif    // __deal2__trilinos_block_sparse_matrix_h
index 9583ff3d1b81de911a49cc53ab9f104088432e21..378a4a0d716a46fdc719b23e8b40b5c02127e26b 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/lac/trilinos_vector.h>
 #  include <deal.II/lac/trilinos_parallel_block_vector.h>
@@ -586,6 +586,6 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif  // DEAL_II_USE_TRILINOS
+#endif  // DEAL_II_WITH_TRILINOS
 
 #endif
index b255f5aff287dd592368e430b7f0a56bfe5389ae..937640f67293764935a373175fd264751c5f4dc3 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/lac/trilinos_vector.h>
 #  include <deal.II/lac/block_indices.h>
@@ -533,6 +533,6 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif  // DEAL_II_USE_TRILINOS
+#endif  // DEAL_II_WITH_TRILINOS
 
 #endif
index 4c349b153123744125015750f40acd68bedf76df..e958fc8e5eff3b02cbce7ca7a55671bbc30ab0be 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/base/subscriptor.h>
 #  include <deal.II/base/std_cxx1x/shared_ptr.h>
@@ -23,7 +23,7 @@
 #  include <deal.II/lac/trilinos_vector_base.h>
 #  include <deal.II/lac/parallel_vector.h>
 
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #  else
 #    include <Epetra_SerialComm.h>
@@ -187,7 +187,7 @@ namespace TrilinosWrappers
      * needs to be copied from
      * deal.II format.
      */
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     Epetra_MpiComm     communicator;
 #else
     Epetra_SerialComm  communicator;
@@ -1642,7 +1642,7 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
 
 /*----------------------------   trilinos_precondition.h     ---------------------------*/
 
index 57c37983382454ee8ee7ca9b5e53edf3a69a95ea..a0ed04362361110d832982b8f1bdd66b46d7bfa1 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/base/std_cxx1x/shared_ptr.h>
 #  include <deal.II/lac/exceptions.h>
@@ -658,7 +658,7 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
 
 /*----------------------------   trilinos_solver.h     ---------------------------*/
 
index 13cfcae00a7cc09caf8a8a5d06f672e94aa36c2f..36a7123ceddf9a75e7f0222c2672c44c305f31a0 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/base/std_cxx1x/shared_ptr.h>
 #  include <deal.II/base/subscriptor.h>
@@ -34,7 +34,7 @@
 #  include <Epetra_Map.h>
 #  include <Epetra_CrsGraph.h>
 #  include <Epetra_Vector.h>
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #    include "mpi.h"
 #  else
@@ -3971,7 +3971,7 @@ namespace TrilinosWrappers
 DEAL_II_NAMESPACE_CLOSE
 
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
 
 
 /*-----------------------   trilinos_sparse_matrix.h     --------------------*/
index 38aacf23b02d38c5a3372764d2fb2be330f00cc1..0fc964172728d52f8280a675a5e8673cdfee723f 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/base/subscriptor.h>
 #  include <deal.II/base/index_set.h>
@@ -29,7 +29,7 @@
 
 #  include <Epetra_FECrsGraph.h>
 #  include <Epetra_Map.h>
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #    include "mpi.h"
 #  else
@@ -1850,7 +1850,7 @@ namespace TrilinosWrappers
 DEAL_II_NAMESPACE_CLOSE
 
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
 
 
 /*--------------------   trilinos_sparsity_pattern.h     --------------------*/
index de581cf4608049f14334f110b942055aef86e8a0..374bc9a29bda2210ac0f4f9cd7317604c75533e6 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/base/std_cxx1x/shared_ptr.h>
 #  include <deal.II/base/subscriptor.h>
@@ -538,7 +538,7 @@ namespace TrilinosWrappers
         {
           vector.reset (new Epetra_FEVector(Epetra_Map
                                             (static_cast<int>(v.size()), 0,
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
                                              Epetra_MpiComm(MPI_COMM_SELF)
 #else
                                              Epetra_SerialComm()
@@ -835,7 +835,7 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
 
 /*----------------------------   trilinos_vector.h     ---------------------------*/
 
index 7f2b5faa4c3845e4dd95d8ea2be3d2c928d0510a..172bc1077763ba9a741ef00ca38160063c7fffad 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #include <deal.II/base/utilities.h>
 #  include <deal.II/base/std_cxx1x/shared_ptr.h>
@@ -29,7 +29,7 @@
 
 #  define TrilinosScalar double
 #  include "Epetra_ConfigDefs.h"
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI // only if MPI is installed
+#  ifdef DEAL_II_WITH_MPI // only if MPI is installed
 #    include "mpi.h"
 #    include "Epetra_MpiComm.h"
 #  else
@@ -1265,7 +1265,7 @@ namespace TrilinosWrappers
       }
 
 #ifdef DEBUG
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#  ifdef DEAL_II_WITH_MPI
     // check that every process has decided
     // to use the same mode. This will
     // otherwise result in undefined
@@ -1992,7 +1992,7 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
 
 /*----------------------------   trilinos_vector_base.h     ---------------------------*/
 
index 9e648e141940e884c23ee57e7305451ebb8a23fa..05ebaa680d5b2066f6613413f4f40cdec2a1c5f2 100644 (file)
@@ -28,7 +28,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 namespace PETScWrappers
 {
   class Vector;
@@ -39,7 +39,7 @@ namespace PETScWrappers
 }
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 namespace TrilinosWrappers
 {
   namespace MPI
@@ -190,7 +190,7 @@ public:
   Vector (const Vector<OtherNumber> &v);
 #endif
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
   /**
    * Another copy constructor: copy the
    * values from a sequential PETSc wrapper
@@ -219,7 +219,7 @@ public:
   Vector (const PETScWrappers::MPI::Vector &v);
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   /**
    * Another copy constructor: copy
    * the values from a Trilinos
@@ -427,7 +427,7 @@ public:
    */
   Vector<Number> &operator= (const BlockVector<Number> &v);
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
   /**
    * Another copy operator: copy the
    * values from a sequential PETSc
@@ -462,7 +462,7 @@ public:
 #endif
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   /**
    * Another copy operator: copy
    * the values from a (sequential
index 301c64e05f94f1244e454d95a29dcad21d7c8efe..aadddeec7d8c3d93914f777670680f0236a2b1f6 100644 (file)
 #include <deal.II/lac/vector.h>
 #include <deal.II/lac/block_vector.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 #  include <deal.II/lac/petsc_vector.h>
 #  include <deal.II/lac/petsc_parallel_vector.h>
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 #  include <deal.II/lac/trilinos_vector.h>
 #endif
 
@@ -152,7 +152,7 @@ Vector<Number>::Vector (const Vector<OtherNumber> &v)
 
 #endif
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 
 template <typename Number>
@@ -205,7 +205,7 @@ Vector<Number>::Vector (const PETScWrappers::MPI::Vector &v)
 
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 template <typename Number>
 Vector<Number>::Vector (const TrilinosWrappers::MPI::Vector &v)
@@ -659,7 +659,7 @@ namespace internal
             }
           result = outer_results[0];
         }
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
       else if (vec_size > 4 * internal::Vector::minimum_parallel_grain_size)
         {
           // split the vector into smaller pieces to be
@@ -1198,7 +1198,7 @@ Vector<Number>::operator = (const BlockVector<Number> &v)
 
 
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 template <typename Number>
 Vector<Number> &
@@ -1243,7 +1243,7 @@ Vector<Number>::operator = (const PETScWrappers::MPI::Vector &v)
 #endif
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 template <typename Number>
 Vector<Number> &
index 8878b70eed2d0562def66622291d84a897aa8ea8..7c7a57292b8d780642123415662719a72862f4dd 100644 (file)
@@ -861,7 +861,7 @@ end_set:
     {
       // print_memory_statistics involves global communication, so we can
       // disable the check here only if no processor has any such data
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       unsigned int general_size_glob = 0, general_size_loc = jacobians.size();
       MPI_Allreduce (&general_size_loc, &general_size_glob, 1, MPI_UNSIGNED,
                      MPI_MAX, size_info.communicator);
@@ -880,7 +880,7 @@ end_set:
            MemoryConsumption::memory_consumption (jacobians_grad_upper));
         }
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       unsigned int quad_size_glob = 0, quad_size_loc = quadrature_points.size();
       MPI_Allreduce (&quad_size_loc, &quad_size_glob, 1, MPI_UNSIGNED,
                      MPI_MAX, size_info.communicator);
index cab5642913d9d5b827d3f4dad1eeca9ba382a092..2ec5a1ac7fc38a255a02893995b5fabe056d4608 100644 (file)
@@ -33,7 +33,7 @@
 #include <deal.II/matrix_free/dof_info.h>
 #include <deal.II/matrix_free/mapping_info.h>
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 #include <tbb/task.h>
 #include <tbb/task_scheduler_init.h>
 #include <tbb/parallel_for.h>
@@ -1792,7 +1792,7 @@ namespace internal
   }
 
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
   // This defines the TBB data structures that are needed to schedule the
   // partition-partition variant
@@ -2043,7 +2043,7 @@ namespace internal
     VectorStruct &dst;
   };
 
-#endif // DEAL_II_USE_MT
+#endif // DEAL_II_WITH_THREADS
 
 } // end of namespace internal
 
@@ -2062,7 +2062,7 @@ MatrixFree<dim, Number>::cell_loop
  OutVector       &dst,
  const InVector  &src) const
 {
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
   // Use multithreading if so requested and if there is enough work to do in
   // parallel (the code might hang if there are less than two chunks!)
index a6c4f1915fd3984b20110c611e175442123b6033..ccb397894f85200ba25d66535e006386ffb49ff9 100644 (file)
@@ -72,7 +72,7 @@ namespace internal
   void assert_communicator_equality (const dealii::Triangulation<dim> &tria,
                                      const MPI_Comm                  &comm_mf)
   {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     const parallel::distributed::Triangulation<dim> *dist_tria =
       dynamic_cast<const parallel::distributed::Triangulation<dim>*>(&tria);
     if (dist_tria != 0)
@@ -136,7 +136,7 @@ internal_reinit(const Mapping<dim>                          &mapping,
 
       // initialize the basic multithreading information that needs to be
       // passed to the DoFInfo structure
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
       if (additional_data.tasks_parallel_scheme != AdditionalData::none)
         {
           task_info.use_multithreading = true;
@@ -231,7 +231,7 @@ internal_reinit(const Mapping<dim>                            &mapping,
 
       // initialize the basic multithreading information that needs to be
       // passed to the DoFInfo structure
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
       if (additional_data.tasks_parallel_scheme != AdditionalData::none)
         {
           task_info.use_multithreading = true;
@@ -913,7 +913,7 @@ namespace internal
       /*
       // try to balance the number of cells before and after the boundary part
       // on each processor. probably not worth it!
-      #ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+      #ifdef DEAL_II_WITH_MPI
       MPI_Allreduce (&n_boundary_cells, &n_max_boundary_cells, 1, MPI_UNSIGNED,
                      MPI_MAX, size_info.communicator);
       #endif
index b4117d4ea0861184a774b4ba1de8cc6edb503d4a..8ea9888b270dde2609dd363708e1fd3501f1bb34 100644 (file)
@@ -45,7 +45,7 @@ namespace internal
     typedef ::dealii::SparseMatrix<typename VECTOR::value_type> Matrix;
   };
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   template <>
   struct MatrixSelector<dealii::TrilinosWrappers::MPI::Vector>
   {
index 5b00fb46c6f0ac168649172e05052c8f9057ed18..eac5bb03d76df363b9400f6e0b531dbca63f834d 100644 (file)
@@ -101,7 +101,7 @@ namespace
       }
   }
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   /**
    * Adjust vectors on all levels to
    * correct size.  Here, we just
@@ -121,7 +121,7 @@ namespace
        (&mg_dof.get_tria()));
     AssertThrow(tria!=NULL, ExcMessage("multigrid with Trilinos vectors only works with distributed Triangulation!"));
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
     for (unsigned int level=v.min_level();
          level<=v.max_level(); ++level)
       {
index 96975a55fb6980e2a00b22572343727f89660870..38be9336e27a9a4abd2f6b779c09ba9bf3637d22 100644 (file)
@@ -46,7 +46,7 @@ namespace hp
 }
 
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 namespace PETScWrappers
 {
   class SparseMatrix;
@@ -61,7 +61,7 @@ namespace PETScWrappers
 }
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 namespace TrilinosWrappers
 {
   class SparseMatrix;
@@ -828,7 +828,7 @@ namespace MatrixTools
                          BlockVector<number>                 &right_hand_side,
                          const bool           eliminate_columns = true);
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
   /**
    * Apply dirichlet boundary conditions to
    * the system matrix and vectors as
@@ -928,7 +928,7 @@ namespace MatrixTools
 
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   /**
    * Apply dirichlet boundary
    * conditions to the system matrix
index 1122d97729344f76fa54a0107555e71dae932b92..b62546dbe2be788a1357bab6172f436177584684 100644 (file)
@@ -5671,7 +5671,7 @@ namespace VectorTools
             }
         }
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
     // if this was a distributed
     // DoFHandler, we need to do the
     // reduction over the entire domain
index 6c2f9984386fd6a9defaf94621525a2660c0b88d..6ce14e028e628f032a2236d6b4b44db9fc2ba2bd 100644 (file)
 // we use uint32_t and uint8_t below, which are declared here:
 #include <stdint.h>
 
-#ifdef HAVE_LIBZ
+#ifdef DEAL_II_WITH_ZLIB
 #  include <zlib.h>
 #endif
 
-#ifdef DEAL_II_HAVE_HDF5
+#ifdef DEAL_II_WITH_HDF5
 #include <hdf5.h>
 #endif
 
@@ -218,7 +218,7 @@ namespace
 
 
 
-#ifdef HAVE_LIBZ
+#ifdef DEAL_II_WITH_ZLIB
   /**
    * Do a zlib compression followed
    * by a base64 encoding of the
@@ -1435,7 +1435,7 @@ namespace
   VtuStream::write_point (const unsigned int,
                           const Point<dim> &p)
   {
-#if !defined(HAVE_LIBZ)
+#if !defined(DEAL_II_WITH_ZLIB)
     // write out coordinates
     stream << p;
     // fill with zeroes
@@ -1457,7 +1457,7 @@ namespace
   void
   VtuStream::flush_points ()
   {
-#ifdef HAVE_LIBZ
+#ifdef DEAL_II_WITH_ZLIB
     // compress the data we have in
     // memory and write them to the
     // stream. then release the data
@@ -1476,7 +1476,7 @@ namespace
     unsigned int d2,
     unsigned int d3)
   {
-#if !defined(HAVE_LIBZ)
+#if !defined(DEAL_II_WITH_ZLIB)
     stream << start << '\t'
            << start+d1;
     if (dim>=2)
@@ -1515,7 +1515,7 @@ namespace
   void
   VtuStream::flush_cells ()
   {
-#ifdef HAVE_LIBZ
+#ifdef DEAL_II_WITH_ZLIB
     // compress the data we have in
     // memory and write them to the
     // stream. then release the data
@@ -1529,7 +1529,7 @@ namespace
   std::ostream &
   VtuStream::operator<< (const std::vector<T> &data)
   {
-#ifdef HAVE_LIBZ
+#ifdef DEAL_II_WITH_ZLIB
     // compress the data we have in
     // memory and write them to the
     // stream. then release the data
@@ -2481,7 +2481,7 @@ void DataOutBase::write_ucd (const std::vector<Patch<dim,spacedim> > &patches,
 {
   AssertThrow (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -2580,7 +2580,7 @@ void DataOutBase::write_dx (const std::vector<Patch<dim,spacedim> > &patches,
 {
   AssertThrow (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -2878,7 +2878,7 @@ void DataOutBase::write_gnuplot (const std::vector<Patch<dim,spacedim> > &patche
 {
   AssertThrow (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -3113,7 +3113,7 @@ void DataOutBase::write_povray (const std::vector<Patch<dim,spacedim> > &patches
 {
   AssertThrow (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -3480,7 +3480,7 @@ void DataOutBase::write_eps (const std::vector<Patch<dim,spacedim> > &patches,
 {
   Assert (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -3862,7 +3862,7 @@ void DataOutBase::write_gmv (const std::vector<Patch<dim,spacedim> > &patches,
   Assert(dim<=3, ExcNotImplemented());
   AssertThrow (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -4016,7 +4016,7 @@ void DataOutBase::write_tecplot (const std::vector<Patch<dim,spacedim> > &patche
 {
   AssertThrow (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -4303,7 +4303,7 @@ void DataOutBase::write_tecplot_binary (const std::vector<Patch<dim,spacedim> >
 
   AssertThrow (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -4610,7 +4610,7 @@ DataOutBase::write_vtk (const std::vector<Patch<dim,spacedim> > &patches,
 {
   AssertThrow (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -4867,7 +4867,7 @@ void DataOutBase::write_vtu_header (std::ostream &out)
       << "\n-->\n";
 
   out << "<VTKFile type=\"UnstructuredGrid\" version=\"0.1\"";
-#ifdef HAVE_LIBZ
+#ifdef DEAL_II_WITH_ZLIB
   out << " compressor=\"vtkZLibDataCompressor\"";
 #endif
 #ifdef DEAL_II_WORDS_BIGENDIAN
@@ -4917,7 +4917,7 @@ void DataOutBase::write_vtu_main (const std::vector<Patch<dim,spacedim> > &patch
 {
   AssertThrow (out, ExcIO());
 
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   // verify that there are indeed
   // patches to be written out. most
   // of the times, people just forget
@@ -5008,7 +5008,7 @@ void DataOutBase::write_vtu_main (const std::vector<Patch<dim,spacedim> > &patch
                                 patches[0].data.n_rows()));
 
 
-#ifdef HAVE_LIBZ
+#ifdef DEAL_II_WITH_ZLIB
   const char *ascii_or_binary = "binary";
 #else
   const char *ascii_or_binary = "ascii";
@@ -5097,7 +5097,7 @@ void DataOutBase::write_vtu_main (const std::vector<Patch<dim,spacedim> > &patch
     // uint8_t might be a typedef to unsigned
     // char which is then not printed as
     // ascii integers
-#ifdef HAVE_LIBZ
+#ifdef DEAL_II_WITH_ZLIB
     std::vector<uint8_t> cell_types (n_cells,
                                      static_cast<uint8_t>(vtk_cell_type[dim]));
 #else
@@ -5473,7 +5473,7 @@ void DataOutInterface<dim,spacedim>::write_vtu (std::ostream &out) const
 template <int dim, int spacedim>
 void DataOutInterface<dim,spacedim>::write_vtu_in_parallel (const char *filename, MPI_Comm comm) const
 {
-#ifndef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifndef DEAL_II_WITH_MPI
   //without MPI fall back to the normal way to write a vtu file:
   (void)comm;
 
@@ -5718,7 +5718,7 @@ XDMFEntry DataOutBase::create_xdmf_entry (const std::vector<Patch<dim,spacedim>
   const unsigned int n_data_sets = data_names.size();
   int             myrank;
 
-#ifndef DEAL_II_HAVE_HDF5
+#ifndef DEAL_II_WITH_HDF5
   // throw an exception, but first make
   // sure the compiler does not warn about
   // the now unused function arguments
@@ -5735,7 +5735,7 @@ XDMFEntry DataOutBase::create_xdmf_entry (const std::vector<Patch<dim,spacedim>
   compute_sizes<dim,spacedim>(patches, local_node_cell_count[0], local_node_cell_count[1]);
 
   // And compute the global total
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   MPI_Comm_rank(comm, &myrank);
   MPI_Allreduce(local_node_cell_count, global_node_cell_count, 2, MPI_UNSIGNED, MPI_SUM, comm);
 #else
@@ -5826,7 +5826,7 @@ void DataOutBase::write_xdmf_file (const std::vector<Patch<dim,spacedim> > &,
 {
   int             myrank;
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   MPI_Comm_rank(comm, &myrank);
 #else
   (void)comm;
@@ -5909,7 +5909,7 @@ template <int dim, int spacedim>
 void DataOutInterface<dim,spacedim>::
 write_hdf5_parallel (const char *filename, MPI_Comm comm) const
 {
-#ifndef DEAL_II_HAVE_HDF5
+#ifndef DEAL_II_WITH_HDF5
   AssertThrow(false, ExcMessage ("HDF5 support is disabled."));
 #endif
   DataOutBase::write_hdf5_parallel(get_patches(), get_dataset_names(),
@@ -5924,7 +5924,7 @@ void DataOutBase::write_hdf5_parallel (const std::vector<Patch<dim,spacedim> > &
                                        const char *filename,
                                        MPI_Comm comm)
 {
-#ifndef DEAL_II_HAVE_HDF5
+#ifndef DEAL_II_WITH_HDF5
   // throw an exception, but first make
   // sure the compiler does not warn about
   // the now unused function arguments
@@ -5946,7 +5946,7 @@ void DataOutBase::write_hdf5_parallel (const std::vector<Patch<dim,spacedim> > &
 
   // If HDF5 is not parallel and we're using multiple processes, abort
 #ifndef H5_HAVE_PARALLEL
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   int world_size;
   MPI_Comm_size(comm, &world_size);
   AssertThrow (world_size <= 1,
@@ -5964,7 +5964,7 @@ void DataOutBase::write_hdf5_parallel (const std::vector<Patch<dim,spacedim> > &
   plist_id = H5Pcreate(H5P_FILE_ACCESS);
   AssertThrow(plist_id != -1, ExcIO());
   // If MPI is enabled *and* HDF5 is parallel, we can do parallel output
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 #ifdef H5_HAVE_PARALLEL
   // Set the access to use the specified MPI_Comm object
   status = H5Pset_fapl_mpio(plist_id, comm, MPI_INFO_NULL);
@@ -5980,7 +5980,7 @@ void DataOutBase::write_hdf5_parallel (const std::vector<Patch<dim,spacedim> > &
 
   // Compute the global total number of nodes/cells
   // And determine the offset of the data for this process
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   MPI_Allreduce(local_node_cell_count, global_node_cell_count, 2, MPI_UNSIGNED, MPI_SUM, comm);
   MPI_Scan(local_node_cell_count, global_node_cell_offsets, 2, MPI_UNSIGNED, MPI_SUM, comm);
   global_node_cell_offsets[0] -= local_node_cell_count[0];
@@ -6056,7 +6056,7 @@ void DataOutBase::write_hdf5_parallel (const std::vector<Patch<dim,spacedim> > &
   // Create the property list for a collective write
   plist_id = H5Pcreate(H5P_DATASET_XFER);
   AssertThrow(plist_id >= 0, ExcIO());
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 #ifdef H5_HAVE_PARALLEL
   status = H5Pset_dxpl_mpio(plist_id, H5FD_MPIO_COLLECTIVE);
   AssertThrow(status >= 0, ExcIO());
index 13630cf90a66383e1f75cdd3adef5846a138d6f8..72a1717f9aa28d051a2cd4a6803ad74e57bf4a13 100644 (file)
@@ -15,7 +15,7 @@
 #include <deal.II/base/utilities.h>
 #include <deal.II/lac/vector.h>
 
-#ifdef HAVE_FUNCTIONPARSER
+#ifdef DEAL_II_WITH_FUNCTIONPARSER
 #include <fparser.hh>
 namespace fparser
 {
@@ -55,7 +55,7 @@ FunctionParser<dim>::~FunctionParser()
 }
 
 
-#ifdef HAVE_FUNCTIONPARSER
+#ifdef DEAL_II_WITH_FUNCTIONPARSER
 template <int dim>
 void FunctionParser<dim>::initialize (const std::string                   &variables,
                                       const std::vector<std::string>      &expressions,
index 2b1c3f0d531133b77e1c88dcbcddec438fcf8328..0767f106f9c4e5d6121239e56160de65526928e7 100644 (file)
@@ -16,8 +16,8 @@
 #include <deal.II/base/index_set.h>
 #include <list>
 
-#ifdef DEAL_II_USE_TRILINOS
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_TRILINOS
+#  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #  endif
 #  include <Epetra_SerialComm.h>
@@ -371,7 +371,7 @@ void IndexSet::fill_index_vector(std::vector<unsigned int> &indices) const
 
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 Epetra_Map
 IndexSet::make_trilinos_map (const MPI_Comm &communicator,
@@ -383,7 +383,7 @@ IndexSet::make_trilinos_map (const MPI_Comm &communicator,
     return Epetra_Map (static_cast<int>(size()),
                        static_cast<int>(n_elements()),
                        0,
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
                        Epetra_MpiComm(communicator));
 #else
                        Epetra_SerialComm());
@@ -401,7 +401,7 @@ IndexSet::make_trilinos_map (const MPI_Comm &communicator,
                           :
                           0),
                          0,
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
                          Epetra_MpiComm(communicator));
 #else
                          Epetra_SerialComm());
index 67852cb616da770751d39d8ee068e75322565e39..475e30ffa5b6dc0a2ef8a1a21c853ceb04f566bd 100644 (file)
@@ -137,7 +137,7 @@ LogStream::~LogStream()
   // deliberate memory leak and
   // instead destroying an empty
   // object
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
   if (this == &deallog)
     {
       stream_map_type *dummy = new stream_map_type();
index ed1d8467809bffe7637b388227c89be6c4fa75c7..4d1a83c771582687e32ab1041308b5ba15a66e22 100644 (file)
@@ -19,8 +19,8 @@
 #include <cstddef>
 #include <iostream>
 
-#ifdef DEAL_II_USE_TRILINOS
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_TRILINOS
+#  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #    include <deal.II/lac/vector_memory.h>
 #    include <deal.II/lac/trilinos_vector.h>
@@ -28,8 +28,8 @@
 #  endif
 #endif
 
-#ifdef DEAL_II_USE_PETSC
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_PETSC
+#  ifdef DEAL_II_WITH_MPI
 #    include <petscsys.h>
 #    include <deal.II/lac/petsc_block_vector.h>
 #    include <deal.II/lac/petsc_parallel_block_vector.h>
@@ -38,8 +38,8 @@
 #  endif
 #endif
 
-#ifdef DEAL_II_USE_SLEPC
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_SLEPC
+#  ifdef DEAL_II_WITH_MPI
 #    include <slepcsys.h>
 #  endif
 #endif
@@ -52,7 +52,7 @@ namespace Utilities
 
   namespace MPI
   {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     // Unfortunately, we have to work
     // around an oddity in the way PETSc
     // and some gcc versions interact. If
@@ -317,11 +317,11 @@ namespace Utilities
               ExcMessage ("You can only create a single object of this class "
                           "in a program since it initializes the MPI system."));
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       // if we have PETSc, we will initialize it and let it handle MPI.
       // Otherwise, we will do it.
-#ifdef DEAL_II_USE_PETSC
-#  ifdef DEAL_II_USE_SLEPC
+#ifdef DEAL_II_WITH_PETSC
+#  ifdef DEAL_II_WITH_SLEPC
       // Initialise SLEPc (with PETSc):
       SlepcInitialize(&argc, &argv, PETSC_NULL, PETSC_NULL);
 #  else
@@ -353,14 +353,14 @@ namespace Utilities
 
     MPI_InitFinalize::~MPI_InitFinalize()
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 
       // make memory pool release all MPI-based vectors that are no
       // longer used at this point. this is relevant because the
       // static object destructors run for these vectors at the end of
       // the program would run after MPI_Finalize is called, leading
       // to errors
-#  if defined(DEAL_II_USE_TRILINOS)
+#  if defined(DEAL_II_WITH_TRILINOS)
       GrowingVectorMemory<TrilinosWrappers::MPI::Vector>
       ::release_unused_memory ();
       GrowingVectorMemory<TrilinosWrappers::MPI::BlockVector>
@@ -373,7 +373,7 @@ namespace Utilities
       // calling PETScFinalize. running the calls below after
       // PetscFinalize has already been called will therefore
       // yield errors of double deallocations
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
       if ((PetscInitializeCalled == PETSC_TRUE)
           &&
           (PetscFinalizeCalled == PETSC_FALSE))
@@ -387,7 +387,7 @@ namespace Utilities
           GrowingVectorMemory<PETScWrappers::BlockVector>
           ::release_unused_memory ();
 
-#  ifdef DEAL_II_USE_SLEPC
+#  ifdef DEAL_II_WITH_SLEPC
           // and now end SLEPc (with PETSc)
           SlepcFinalize();
 #  else
index 7bc1a74e28ec7f309343f3e54fa2182c7ecb1680..78ef8a56eaa0f56c93472496845f95cd69a7395c 100644 (file)
@@ -27,7 +27,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
 /* Detecting how many processors a given machine has is something that
    varies greatly between operating systems. For a few operating
index c9d482967f77585e8b7aeffe7cec709931e8b7f4..40cb4ebd1af92d568aeca33bc46bb3027253be6c 100644 (file)
@@ -147,7 +147,7 @@ namespace Utilities
       // find out the end index for each processor
       // and communicate it (this implies the start
       // index for the next processor)
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       if (n_procs < 2)
         {
           Assert (ghost_indices_data.n_elements() == 0, ExcInternalError());
index bb4638541a3c64514e30e51cb0e64a646da41aee..17278853fae2a7d8098ea23a006a788c166281b9 100644 (file)
@@ -147,7 +147,7 @@ void Subscriptor::do_subscribe (const char *id) const
   Threads::Mutex::ScopedLock lock (subscription_lock);
   ++counter;
 
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
   const char *const name = (id != 0) ? id : unknown_subscriber;
 
   map_iterator it = counter_map.find(name);
@@ -174,7 +174,7 @@ void Subscriptor::do_unsubscribe (const char *id) const
   Threads::Mutex::ScopedLock lock (subscription_lock);
   --counter;
 
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
   map_iterator it = counter_map.find(name);
   Assert (it != counter_map.end(), ExcNoSubscriber(object_info->name(), name));
   Assert (it->second > 0, ExcNoSubscriber(object_info->name(), name));
@@ -193,7 +193,7 @@ unsigned int Subscriptor::n_subscriptions () const
 
 void Subscriptor::list_subscribers () const
 {
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
   for (map_iterator it = counter_map.begin();
        it != counter_map.end(); ++it)
     deallog << it->second << '/'
index da4db796a264b61bb7d9646bd396c9b406cc9f95..47a38591209d22a42ca4d5dcc97079135a033de9 100644 (file)
@@ -147,7 +147,7 @@ namespace Threads
 
 
 
-#ifndef DEAL_II_USE_MT
+#ifndef DEAL_II_WITH_THREADS
   DummyBarrier::DummyBarrier (const unsigned int  count,
                               const char *,
                               void *)
index 633b1a32d75afb8f404d469ca228ca1474edd715..2cdda325706643f0481e05575133df3ea3e10d92 100644 (file)
@@ -44,7 +44,7 @@ Timer::Timer()
   :
   cumulative_time (0.),
   cumulative_wall_time (0.)
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   , mpi_communicator (MPI_COMM_SELF)
   , sync_wall_time (false)
 #endif
@@ -56,7 +56,7 @@ Timer::Timer()
 
 // in case we use an MPI compiler, use
 // the communicator given from input
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 Timer::Timer(MPI_Comm mpi_communicator,
              bool sync_wall_time_)
   :
@@ -105,7 +105,7 @@ void Timer::start ()
 {
   running    = true;
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   if (sync_wall_time)
     MPI_Barrier(mpi_communicator);
 #endif
@@ -168,7 +168,7 @@ double Timer::stop ()
 #  error Unsupported platform. Porting not finished.
 #endif
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       if (sync_wall_time && Utilities::System::job_supports_mpi())
         {
           this->mpi_data
@@ -271,7 +271,7 @@ TimerOutput::TimerOutput (std::ostream &stream,
   output_type (output_type),
   out_stream (stream, true),
   output_is_enabled (true)
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   , mpi_communicator (MPI_COMM_SELF)
 #endif
 {}
@@ -286,13 +286,13 @@ TimerOutput::TimerOutput (ConditionalOStream &stream,
   output_type (output_type),
   out_stream (stream),
   output_is_enabled (true)
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   , mpi_communicator (MPI_COMM_SELF)
 #endif
 {}
 
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 
 TimerOutput::TimerOutput (MPI_Comm      mpi_communicator,
                           std::ostream &stream,
index a934b69c9612669b238f2af06d0e8e70309fb1dc..47db7dd009eb2fb99c9a11a60f569c2cc60736b7 100644 (file)
@@ -34,8 +34,8 @@
 #endif
 
 
-#ifdef DEAL_II_USE_TRILINOS
-#  ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_TRILINOS
+#  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #    include <deal.II/lac/vector_memory.h>
 #    include <deal.II/lac/trilinos_vector.h>
@@ -557,7 +557,7 @@ namespace Utilities
 
     bool job_supports_mpi ()
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       int MPI_has_been_started = 0;
       MPI_Initialized(&MPI_has_been_started);
 
@@ -599,14 +599,14 @@ namespace Utilities
   }
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
   namespace Trilinos
   {
     const Epetra_Comm &
     comm_world()
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       static Teuchos::RCP<Epetra_MpiComm>
       communicator = Teuchos::rcp (new Epetra_MpiComm (MPI_COMM_WORLD), true);
 #else
@@ -622,7 +622,7 @@ namespace Utilities
     const Epetra_Comm &
     comm_self()
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       static Teuchos::RCP<Epetra_MpiComm>
       communicator = Teuchos::rcp (new Epetra_MpiComm (MPI_COMM_SELF), true);
 #else
@@ -638,7 +638,7 @@ namespace Utilities
     Epetra_Comm *
     duplicate_communicator (const Epetra_Comm &communicator)
     {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 
       // see if the communicator is in fact a
       // parallel MPI communicator; if so,
@@ -671,7 +671,7 @@ namespace Utilities
       // communicator if this whole
       // thing was created as an MPI
       // communicator
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
       Epetra_MpiComm
       *mpi_comm = dynamic_cast<Epetra_MpiComm *>(&communicator);
       if (mpi_comm != 0)
index ecd73bb4d2f4ea5b0972b0753f6e5a1ffcddc857..28acfffcd6eae7476bb5a7336ec3e1202d36aed9 100644 (file)
@@ -21,7 +21,7 @@
 #include <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/trilinos_block_vector.h>
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
 
 #include <deal.II/grid/grid_refinement.h>
 #include <deal.II/grid/tria_accessor.h>
index 7348b401a314713034c228e22764af1215beca6f..c328a6e230f55b4e7e71fe9619f6b292dfae9fab 100644 (file)
@@ -13,7 +13,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
 
 #include <deal.II/lac/vector.h>
 #include <deal.II/lac/block_vector.h>
index 746ca2552e1df8063183307b2e7dee20bd8d73ba..70d0ef4fab039c887259e4cf87bc7bb8693ef459 100644 (file)
@@ -26,7 +26,7 @@ for (deal_II_dimension : DIMENSIONS)
     template class SolutionTransfer<deal_II_dimension,::dealii::parallel::distributed::BlockVector<float>, DoFHandler<deal_II_dimension> >;
 
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
     template class SolutionTransfer<deal_II_dimension, PETScWrappers::Vector, DoFHandler<deal_II_dimension> >;
 
     template class SolutionTransfer<deal_II_dimension, PETScWrappers::BlockVector, DoFHandler<deal_II_dimension> >;
@@ -36,7 +36,7 @@ for (deal_II_dimension : DIMENSIONS)
     template class SolutionTransfer<deal_II_dimension, PETScWrappers::MPI::BlockVector, DoFHandler<deal_II_dimension> >;
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
     template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::Vector, DoFHandler<deal_II_dimension> >;
 
     template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::BlockVector, DoFHandler<deal_II_dimension> >;
index e43d03dc290512f362196308bd6ec15ce3b6cdc2..ebc48f14838a61ece8d9f6e10e7a066f07d251d5 100644 (file)
@@ -22,7 +22,7 @@
 #include <deal.II/distributed/tria.h>
 #include <deal.II/grid/grid_tools.h>
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
 #  include <p4est_bits.h>
 #  include <p4est_extended.h>
 #  include <p4est_vtk.h>
@@ -45,7 +45,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
 
 namespace internal
 {
@@ -3424,7 +3424,7 @@ namespace parallel
 }
 
 
-#else // DEAL_II_USE_P4EST
+#else // DEAL_II_WITH_P4EST
 
 namespace parallel
 {
@@ -3454,7 +3454,7 @@ namespace parallel
     }
 
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     template <int dim, int spacedim>
     MPI_Comm
     Triangulation<dim,spacedim>::get_communicator () const
@@ -3466,7 +3466,7 @@ namespace parallel
   }
 }
 
-#endif // DEAL_II_USE_P4EST
+#endif // DEAL_II_WITH_P4EST
 
 
 
index 15733e9d5029f04dc3b1f810493c8a9d75ce1bf0..9f1eae89b8dbecefc74bd2039f99de06b83ed69e 100644 (file)
@@ -15,7 +15,7 @@
 for (deal_II_dimension : DIMENSIONS)
   {
 
-#   ifdef DEAL_II_USE_P4EST
+#   ifdef DEAL_II_WITH_P4EST
 
     namespace internal
     \{
@@ -47,7 +47,7 @@ for (deal_II_dimension : DIMENSIONS)
 #      endif
       \}
     \}
-#   endif // DEAL_II_USE_P4EST
+#   endif // DEAL_II_WITH_P4EST
 
     namespace parallel
     \{
index 9c5cc034c43b220110d3781abff1c29e0cdce997..70050665a6e1974cc67ea348eae6032789110827 100644 (file)
@@ -958,7 +958,7 @@ namespace internal
 
       /* --------------------- class ParallelDistributed ---------------- */
 
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
 
       namespace
       {
@@ -1445,7 +1445,7 @@ namespace internal
          const std::vector<unsigned int> &coarse_cell_to_p4est_tree_permutation,
          const std::vector<unsigned int> &p4est_tree_to_coarse_cell_permutation)
         {
-#ifndef DEAL_II_USE_P4EST
+#ifndef DEAL_II_WITH_P4EST
           (void)vertices_with_ghost_neighbors;
           Assert (false, ExcNotImplemented());
 #else
@@ -1669,7 +1669,7 @@ namespace internal
          const std::vector<unsigned int> &p4est_tree_to_coarse_cell_permutation,
          const unsigned int level)
         {
-#ifndef DEAL_II_USE_P4EST
+#ifndef DEAL_II_WITH_P4EST
           (void)vertices_with_ghost_neighbors;
           Assert (false, ExcNotImplemented());
 #else
@@ -1878,7 +1878,7 @@ namespace internal
 
       }
 
-#endif // DEAL_II_USE_P4EST
+#endif // DEAL_II_WITH_P4EST
 
 
 
@@ -1889,7 +1889,7 @@ namespace internal
       {
         NumberCache number_cache;
 
-#ifndef DEAL_II_USE_P4EST
+#ifndef DEAL_II_WITH_P4EST
         (void)dof_handler;
         Assert (false, ExcNotImplemented());
 #else
@@ -2110,7 +2110,7 @@ namespace internal
               }
         }
 #endif // DEBUG
-#endif // DEAL_II_USE_P4EST
+#endif // DEAL_II_WITH_P4EST
 
         return number_cache;
       }
@@ -2122,7 +2122,7 @@ namespace internal
       distribute_mg_dofs (DoFHandler<dim,spacedim> &dof_handler,
                           std::vector<NumberCache> &number_caches) const
       {
-#ifndef DEAL_II_USE_P4EST
+#ifndef DEAL_II_WITH_P4EST
         (void)dof_handler;
         (void)number_caches;
         Assert (false, ExcNotImplemented());
@@ -2358,7 +2358,7 @@ namespace internal
 
           }
 
-#endif // DEAL_II_USE_P4EST
+#endif // DEAL_II_WITH_P4EST
       }
 
 
@@ -2373,7 +2373,7 @@ namespace internal
 
         NumberCache number_cache;
 
-#ifndef DEAL_II_USE_P4EST
+#ifndef DEAL_II_WITH_P4EST
         Assert (false, ExcNotImplemented());
 #else
 
index 3f0d782f33d3569a1a9983cfea8909aa39622442..8295743bfa0ccdfe770b6b78eef9fc2b9d16b659 100644 (file)
@@ -718,7 +718,7 @@ namespace DoFRenumbering
         = (dynamic_cast<const parallel::distributed::Triangulation<dim,spacedim>*>
            (&start->get_dof_handler().get_tria())))
       {
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
         std::vector<unsigned int> local_dof_count(n_buckets);
 
         for (unsigned int c=0; c<n_buckets; ++c)
@@ -1013,7 +1013,7 @@ namespace DoFRenumbering
         = (dynamic_cast<const parallel::distributed::Triangulation<dim,spacedim>*>
            (&start->get_dof_handler().get_tria())))
       {
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
         std::vector<unsigned int> local_dof_count(n_buckets);
 
         for (unsigned int c=0; c<n_buckets; ++c)
@@ -1161,7 +1161,7 @@ namespace DoFRenumbering
 
     if (tria)
       {
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
         //this is a distributed Triangulation. We need to traverse the coarse
         //cells in the order p4est does
         for (unsigned int c = 0; c < tria->n_cells (0); ++c)
index b9fea91748ddcf98581978749809b55c623663c6..45a2e0406f9cb2ee51a3d28835af00fd222c59dc 100644 (file)
@@ -3008,7 +3008,7 @@ namespace DoFTools
     Assert (0<=direction && direction<space_dim,
             ExcIndexRange (direction, 0, space_dim));
 
-#if defined(DEBUG) && defined(DEAL_II_USE_P4EST)
+#if defined(DEBUG) && defined(DEAL_II_WITH_P4EST)
     // Check whether we run on a non parallel mesh or on a
     // parallel::distributed::Triangulation in serial
     {
@@ -3102,7 +3102,7 @@ namespace DoFTools
     Assert(dim == space_dim,
            ExcNotImplemented());
 
-#if defined(DEBUG) && defined(DEAL_II_USE_P4EST)
+#if defined(DEBUG) && defined(DEAL_II_WITH_P4EST)
     // Check whether we run on a non parallel mesh or on a
     // parallel::distributed::Triangulation in serial
     {
@@ -4499,7 +4499,7 @@ namespace DoFTools
             ExcInternalError());
 
     // reduce information from all CPUs
-#if defined(DEAL_II_USE_P4EST) && defined(DEAL_II_COMPILER_SUPPORTS_MPI)
+#if defined(DEAL_II_WITH_P4EST) && defined(DEAL_II_WITH_MPI)
     const unsigned int dim = DH::dimension;
     const unsigned int spacedim = DH::space_dimension;
 
@@ -4574,8 +4574,8 @@ namespace DoFTools
           += std::count(dofs_by_block.begin(), dofs_by_block.end(),
                         block);
 
-#ifdef DEAL_II_USE_P4EST
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_P4EST
+#ifdef DEAL_II_WITH_MPI
         // if we are working on a parallel mesh, we now need to collect
         // this information from all processors
         if (const parallel::distributed::Triangulation<DH::dimension,DH::space_dimension> *tria
index 26ed3a42fa02dd22feb85a5f149ee4766192e3c9..6edaecf2a38407912a81e5bdc1eb2c834fe4124c 100644 (file)
@@ -1298,7 +1298,7 @@ namespace FETools
     Assert(u2.size()==dof2.n_dofs(),
            ExcDimensionMismatch(u2.size(), dof2.n_dofs()));
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
     if (dynamic_cast<const PETScWrappers::MPI::Vector *>(&u1) != 0)
       if (dynamic_cast<const DoFHandler<dim>*>(&dof1) != 0)
         {
@@ -1459,7 +1459,7 @@ namespace FETools
     Assert(u1_interpolated.size()==dof1.n_dofs(),
            ExcDimensionMismatch(u1_interpolated.size(), dof1.n_dofs()));
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
     if (dynamic_cast<const PETScWrappers::MPI::Vector *>(&u1) != 0)
       if (dynamic_cast<const DoFHandler<dim>*>(&dof1) != 0)
         {
@@ -1539,7 +1539,7 @@ namespace FETools
     Assert(u1_interpolated.size() == dof1.n_dofs(),
            ExcDimensionMismatch(u1_interpolated.size(), dof1.n_dofs()));
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
     if (dynamic_cast<const PETScWrappers::MPI::Vector *>(&u1) != 0)
       if (dynamic_cast<const DoFHandler<dim>*>(&dof1) != 0)
         {
@@ -1656,7 +1656,7 @@ namespace FETools
         // interpolate back to dof1
         // taking into account
         // constraints1
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
         if (dynamic_cast<const PETScWrappers::MPI::Vector *>(&u1) != 0)
           {
             AssertThrow (dynamic_cast<const PETScWrappers::MPI::Vector *>(&u1_interpolated) != 0,
@@ -1701,7 +1701,7 @@ namespace FETools
     Assert(u1_difference.size()==dof1.n_dofs(),
            ExcDimensionMismatch(u1_difference.size(), dof1.n_dofs()));
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
     if (dynamic_cast<const PETScWrappers::MPI::Vector *>(&u1) != 0)
       if (dynamic_cast<const DoFHandler<dim>*>(&dof1) != 0)
         {
index f54ca54f595da18da3900511b9160065b05465e5..b78de54520bb78298aaf09a56e9e239aaeb81946 100644 (file)
@@ -217,7 +217,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
         Vector<float> &);
 
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
       template
        void interpolate<deal_II_dimension>
@@ -252,7 +252,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
 #endif
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
       template
        void interpolate<deal_II_dimension>
@@ -389,7 +389,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
         Vector<float> &);
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
       template
        void interpolate<deal_II_dimension>
index cef3b9ec3dab31d822c94f52fce46a266d7a1503..e479e3590385c41b26d56e998122f7a1be1fbe02 100644 (file)
@@ -17,7 +17,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
 #if deal_II_dimension <= deal_II_space_dimension       
     template class MappingQ1Eulerian<deal_II_dimension, Vector<double>,        deal_II_space_dimension>;
     template class MappingQ1Eulerian<deal_II_dimension, Vector<float>, deal_II_space_dimension>;
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
     template class MappingQ1Eulerian<deal_II_dimension, PETScWrappers::Vector, deal_II_space_dimension>;
 #endif
 #endif
index 1bfedd75b373c2cbb696c7557b535de5963d0c43..4bed2047f6e6f00a6f5a783591819195a11f380b 100644 (file)
@@ -15,7 +15,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
   {
 #if deal_II_dimension <= deal_II_space_dimension       
     template class MappingQEulerian<deal_II_dimension, Vector<double>, deal_II_space_dimension>;
-#  ifdef DEAL_II_USE_PETSC
+#  ifdef DEAL_II_WITH_PETSC
     template class MappingQEulerian<deal_II_dimension,
                                    PETScWrappers::Vector, deal_II_space_dimension>;
     template class MappingQEulerian<deal_II_dimension,
index e61a7551aedbfc00ef9f5a28108d517d4fb03cfc..e49aea76f8691b866787367d8624a1d708a43f95 100644 (file)
@@ -26,7 +26,7 @@
 #include <cctype>
 
 
-#ifdef HAVE_LIBNETCDF
+#ifdef DEAL_II_WITH_NETCDF
 #include <netcdfcpp.h>
 #endif
 
@@ -1179,7 +1179,7 @@ void GridIn<2, 3>::read_netcdf (const std::string &)
 template <>
 void GridIn<2>::read_netcdf (const std::string &filename)
 {
-#ifndef HAVE_LIBNETCDF
+#ifndef DEAL_II_WITH_NETCDF
   // do something with unused
   // filename
   filename.c_str();
@@ -1451,7 +1451,7 @@ void GridIn<2>::read_netcdf (const std::string &filename)
 template <>
 void GridIn<3>::read_netcdf (const std::string &filename)
 {
-#ifndef HAVE_LIBNETCDF
+#ifndef DEAL_II_WITH_NETCDF
   // do something with the function argument
   // to make sure it at least looks used,
   // even if it is not
index ef37f953e9cd44ef683b41444bc2d8eb64668938..1e2f5406bd166d6dbc862d642f17fd91958c3517 100644 (file)
@@ -57,7 +57,7 @@ namespace
     }
 
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
     PetscScalar
     max_element (const PETScWrappers::Vector &criteria)
     {
@@ -85,7 +85,7 @@ namespace
 #endif
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
     TrilinosScalar
     max_element (const TrilinosWrappers::Vector &criteria)
     {
index 34269bade2df30fc9a5c6ff9f9747ca9a81973cd..7ee013a043059a58407e652452b78bc4ab23020a 100644 (file)
@@ -94,7 +94,7 @@ namespace GridTools
     // processor without being true on
     // all. however, we can ask for the global
     // number of active cells and use that
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
     if (const parallel::distributed::Triangulation<dim,spacedim> *p_tria
         = dynamic_cast<const parallel::distributed::Triangulation<dim,spacedim>*>(&tria))
       Assert (p_tria->n_global_active_cells() == tria.n_cells(0),
@@ -185,7 +185,7 @@ namespace GridTools
 
     double global_volume = 0;
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     if (const parallel::distributed::Triangulation<dim,spacedim> *p_tria
         = dynamic_cast<const parallel::distributed::Triangulation<dim,spacedim>*>(&triangulation))
       global_volume = Utilities::MPI::sum (local_volume, p_tria->get_communicator());
index f4fbb0d9e868c94d9a60b3581aa9422031721ec0..74db66d1904c195a9854a8f40418865e5c64f021 100644 (file)
@@ -336,7 +336,7 @@ template class BlockSparsityPatternBase<SparsityPattern>;
 template class BlockSparsityPatternBase<CompressedSparsityPattern>;
 template class BlockSparsityPatternBase<CompressedSimpleSparsityPattern>;
 template class BlockSparsityPatternBase<CompressedSetSparsityPattern>;
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 template class BlockSparsityPatternBase<TrilinosWrappers::SparsityPattern>;
 #endif
 
@@ -669,7 +669,7 @@ BlockCompressedSimpleSparsityPattern::reinit (
 }
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 namespace TrilinosWrappers
 {
 
index 20ec7a081cb0718a79505fa191a4be7deb2376e9..0c75accbb803a522092941e361131cd9b851098d 100644 (file)
@@ -1844,7 +1844,7 @@ void ConstraintMatrix::condense (BlockCompressedSimpleSparsityPattern &sparsity)
 
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 // this is a specialization for a
 // parallel (non-block) Trilinos
@@ -1902,7 +1902,7 @@ ConstraintMatrix::distribute (TrilinosWrappers::MPI::Vector &vec) const
                             individual_indices.end());
   }
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   const Epetra_MpiComm *mpi_comm
     = dynamic_cast<const Epetra_MpiComm *>(&vec.trilinos_vector().Comm());
 
@@ -1986,7 +1986,7 @@ ConstraintMatrix::distribute (TrilinosWrappers::MPI::BlockVector &vec) const
                               individual_indices.end());
     }
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   const Epetra_MpiComm *mpi_comm
     = dynamic_cast<const Epetra_MpiComm *>(&vec.block(0).trilinos_vector().Comm());
 
@@ -2035,7 +2035,7 @@ ConstraintMatrix::distribute (TrilinosWrappers::MPI::BlockVector &vec) const
 
 #endif
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 // this is a specialization for a
 // parallel (non-block) PETSc
@@ -2287,12 +2287,12 @@ ConstraintMatrix::memory_consumption () const
 // can't do that - we have to rewrite those functions by hand if we want to
 // use them. The key is to use local ranges etc., which still needs to be
 // implemented.
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 VECTOR_FUNCTIONS(PETScWrappers::MPI::Vector);
 VECTOR_FUNCTIONS(PETScWrappers::MPI::BlockVector);
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 PARALLEL_VECTOR_FUNCTIONS(TrilinosWrappers::MPI::Vector);
 PARALLEL_VECTOR_FUNCTIONS(TrilinosWrappers::MPI::BlockVector);
 #endif
@@ -2356,7 +2356,7 @@ MATRIX_VECTOR_FUNCTIONS(ChunkSparseMatrix<float>, Vector<float>);
 // BLOCK_MATRIX_FUNCTIONS(BlockSparseMatrixEZ<double>);
 // BLOCK_MATRIX_VECTOR_FUNCTIONS(BlockSparseMatrixEZ<float>,  Vector<float>);
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 MATRIX_FUNCTIONS(PETScWrappers::SparseMatrix);
 BLOCK_MATRIX_FUNCTIONS(PETScWrappers::BlockSparseMatrix);
 MATRIX_FUNCTIONS(PETScWrappers::MPI::SparseMatrix);
@@ -2367,7 +2367,7 @@ MATRIX_VECTOR_FUNCTIONS(PETScWrappers::MPI::SparseMatrix, PETScWrappers::MPI::Ve
 BLOCK_MATRIX_VECTOR_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix ,PETScWrappers::MPI::BlockVector);
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 MATRIX_FUNCTIONS(TrilinosWrappers::SparseMatrix);
 BLOCK_MATRIX_FUNCTIONS(TrilinosWrappers::BlockSparseMatrix);
 MATRIX_VECTOR_FUNCTIONS(TrilinosWrappers::SparseMatrix, TrilinosWrappers::Vector);
@@ -2413,7 +2413,7 @@ BLOCK_SPARSITY_FUNCTIONS(BlockCompressedSparsityPattern);
 BLOCK_SPARSITY_FUNCTIONS(BlockCompressedSetSparsityPattern);
 BLOCK_SPARSITY_FUNCTIONS(BlockCompressedSimpleSparsityPattern);
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 SPARSITY_FUNCTIONS(TrilinosWrappers::SparsityPattern);
 BLOCK_SPARSITY_FUNCTIONS(TrilinosWrappers::BlockSparsityPattern);
 #endif
@@ -2433,12 +2433,12 @@ ONLY_MATRIX_FUNCTIONS(MatrixBlock<SparseMatrix<double> >);
 ONLY_MATRIX_FUNCTIONS(BlockSparseMatrix<float>);
 ONLY_MATRIX_FUNCTIONS(BlockSparseMatrix<double>);
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 ONLY_MATRIX_FUNCTIONS(TrilinosWrappers::SparseMatrix);
 ONLY_MATRIX_FUNCTIONS(TrilinosWrappers::BlockSparseMatrix);
 #endif
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 ONLY_MATRIX_FUNCTIONS(PETScWrappers::SparseMatrix);
 ONLY_MATRIX_FUNCTIONS(PETScWrappers::BlockSparseMatrix);
 ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::SparseMatrix);
index b05b5fd4d718b1d2d0915d7c0a9aa43e025f8132..4701a9ff0541ceb14a1781b81c74b4c848effe37 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_block_sparse_matrix.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 DEAL_II_NAMESPACE_OPEN
 
index 50a1da2298798f8e9c9d52a90b69a8860e3156cc..fb5fbcd0537e44791fa35cbe1708d24e520b40d1 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_full_matrix.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/petsc_vector.h>
 
@@ -44,4 +44,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index 50962f17f480975c97a2ed8b69118636f8b8eb20..12820212a3cbc1694a2927646dbbce71db5a3caa 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_matrix_base.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/petsc_full_matrix.h>
 #  include <deal.II/lac/petsc_sparse_matrix.h>
@@ -644,4 +644,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index a0c656e66b624a05f5b38cd37758fd1a530ebb59..0a02fd6a27a0f873a0e132b1de32d4ca8d2a5f61 100644 (file)
@@ -13,7 +13,7 @@
 
 #include <deal.II/lac/petsc_matrix_free.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -285,4 +285,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index 5b46603bdb9f63afd520e664912dba0a31c6457e..e56704cb8f9b4223a8c751fd91ef74008e663213 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_parallel_block_sparse_matrix.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 DEAL_II_NAMESPACE_OPEN
 
index 7d029a7b759f6997c47f8dd67f34aae640cb4348..fc11d85a10e26022c0cb0a568a315577da83abcb 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_parallel_block_vector.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/petsc_block_vector.h>
 
@@ -41,4 +41,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index 6fc035b56c284d56b52734dd7bc5ad6df6a956b5..2120531cbdb69bd5090535f7758667d534a02c0c 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_parallel_sparse_matrix.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/petsc_vector.h>
 #  include <deal.II/lac/sparsity_pattern.h>
@@ -702,4 +702,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index 4f9d798a2dafd6714abb9bad0fb3e48b80c4ec8e..cf3bd0c4e72aaca4bfde7b15fdf1ff2dd11a8191 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_parallel_vector.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/petsc_vector.h>
 #  include <cmath>
@@ -377,4 +377,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index 10918954961cc6aad346eb2f63220fab0a81a994..d799ae708f32e15cf4b3f6239aa44624ff4132de 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_precondition.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/base/utilities.h>
 #  include <deal.II/lac/petsc_matrix_base.h>
@@ -693,4 +693,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index 65a4aa3b04c9336b74272537a6c458e9ca6b8048..67d38bf5efdbce9094f9d32742ce9f68f95bb08d 100644 (file)
@@ -14,7 +14,7 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/lac/petsc_solver.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/petsc_matrix_base.h>
 #  include <deal.II/lac/petsc_vector_base.h>
@@ -901,4 +901,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index d69aa37780ed820057f216f661c1cc578d58cc40..af1333c0402f82ece7e54a85df196aff937aa6c8 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_sparse_matrix.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/lac/petsc_vector.h>
 #  include <deal.II/lac/sparsity_pattern.h>
@@ -375,4 +375,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index 47e116bb5c1ad736d2d62b7fad97f29e9b77ab2c..31c9eb3427e4811f765d11fcef1ad4c6b5bc6627 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_vector.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <cmath>
 
@@ -118,4 +118,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index 4df8724dde9211a5f21e4a0de44bd1b175130212..439a6bfcaba59a75006e34209508019b0c556dc6 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/petsc_vector_base.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
 #  include <deal.II/base/memory_consumption.h>
 #  include <deal.II/lac/petsc_vector.h>
@@ -1161,4 +1161,4 @@ namespace PETScWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index c51f97ff56dcc0bf94daaf4f715021273327d10c..7e2682ad2d8c18c2aa8098c84d6b581f4d77634c 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/lac/slepc_solver.h>
 
-#ifdef DEAL_II_USE_SLEPC
+#ifdef DEAL_II_WITH_SLEPC
 
 #  include <deal.II/lac/petsc_matrix_base.h>
 #  include <deal.II/lac/petsc_vector_base.h>
@@ -468,5 +468,5 @@ namespace
 {
   void dummy () {}
 }
-#endif // DEAL_II_USE_SLEPC
+#endif // DEAL_II_WITH_SLEPC
 
index 90eaf291ec9c81f4d002de72f61e07235d978cc9..977e29876bf52997c882ff51b8d68d96e0fab424 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <deal.II/lac/slepc_spectral_transformation.h>
 
-#ifdef DEAL_II_USE_SLEPC
+#ifdef DEAL_II_WITH_SLEPC
 
 #  include <deal.II/lac/slepc_solver.h>
 #  include <deal.II/lac/petsc_matrix_base.h>
@@ -170,5 +170,5 @@ namespace
 {
   void dummy () {}
 }
-#endif // DEAL_II_USE_SLEPC
+#endif // DEAL_II_WITH_SLEPC
 
index 6b9f042fcc33f11aa4db1230494cda7620e410c4..88e1e0ee781dc1eb9327eff8c4a7dc9f46f4e144 100644 (file)
@@ -34,7 +34,7 @@ template class Solver<Vector<float> >;
 template class Solver<BlockVector<float> >;
 template class Solver<parallel::distributed::Vector<float> >;
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 template class Solver<PETScWrappers::Vector>;
 template class Solver<PETScWrappers::BlockVector>;
 #endif
index 7043349a5e834cae06b60b1ab8886ec614800f5e..316bfc10a4391945ab6541b5ef233b746146d2c6 100644 (file)
@@ -36,7 +36,7 @@ DEAL_II_NAMESPACE_OPEN
 #endif
 
 // include UMFPACK file.
-#ifdef HAVE_LIBUMFPACK
+#ifdef DEAL_II_WITH_UMFPACK
 #  include <umfpack.h>
 #endif
 
@@ -1491,7 +1491,7 @@ initialize (const SparsityPattern &)
 {}
 
 
-#ifdef HAVE_LIBUMFPACK
+#ifdef DEAL_II_WITH_UMFPACK
 
 SparseDirectUMFPACK::SparseDirectUMFPACK ()
   :
@@ -1904,7 +1904,7 @@ SparseDirectUMFPACK::Tvmult_add (
   Assert(false, ExcNotImplemented());
 }
 
-#ifdef DEAL_II_USE_MUMPS
+#ifdef DEAL_II_WITH_MUMPS
 SparseDirectMUMPS::SparseDirectMUMPS ()
   :
   initialize_called (false)
@@ -2080,7 +2080,7 @@ void SparseDirectMUMPS::vmult (Vector<double>       &dst,
   copy_solution (dst);
 }
 
-#endif // DEAL_II_USE_MUMPS
+#endif // DEAL_II_WITH_MUMPS
 
 // explicit instantiations for SparseMatrixMA27
 template
@@ -2117,7 +2117,7 @@ InstantiateUMFPACK(BlockSparseMatrix<double>)
 InstantiateUMFPACK(BlockSparseMatrix<float>)
 
 // explicit instantiations for SparseDirectMUMPS
-#ifdef DEAL_II_USE_MUMPS
+#ifdef DEAL_II_WITH_MUMPS
 #define InstantiateMUMPS(MATRIX) \
   template \
   void SparseDirectMUMPS::initialize (const MATRIX &, const Vector<double> &);
index 99e69a582ecc9451f2f8b61ce95f86014ece292c..218f348d8ed0a70d81dc84a60cbaa76e3ff33c8f 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <algorithm>
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 #include <deal.II/base/utilities.h>
 #include <deal.II/lac/compressed_sparsity_pattern.h>
 #include <deal.II/lac/compressed_set_sparsity_pattern.h>
@@ -26,7 +26,7 @@
 #include <deal.II/lac/block_sparsity_pattern.h>
 #endif
 
-#ifdef DEAL_II_USE_METIS
+#ifdef DEAL_II_WITH_METIS
 extern "C"
 {
 #include <metis.h>
@@ -62,7 +62,7 @@ namespace SparsityTools
 
     // Make sure that METIS is actually
     // installed and detected
-#ifndef DEAL_II_USE_METIS
+#ifndef DEAL_II_WITH_METIS
     AssertThrow (false, ExcMETISNotInstalled());
 #else
 
@@ -374,7 +374,7 @@ namespace SparsityTools
             ExcInternalError());
   }
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
   template <class CSP_t>
   void distribute_sparsity_pattern(CSP_t &csp,
                                    const std::vector<unsigned int> &rows_per_cpu,
@@ -511,7 +511,7 @@ namespace SparsityTools
       const MPI_Comm & mpi_comm,\
       const IndexSet & myrange)
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
 SPARSITY_FUNCTIONS(CompressedSparsityPattern);
 SPARSITY_FUNCTIONS(CompressedSimpleSparsityPattern);
 SPARSITY_FUNCTIONS(BlockCompressedSimpleSparsityPattern);
index 26531826da288d237831735d85e1b97ff1548d38..ede29f74c54edcd13c9c5b26c04fc733c067c6d0 100644 (file)
@@ -228,7 +228,7 @@ template<>
 void
 TridiagonalMatrix<double>::compute_eigenvalues()
 {
-#ifdef HAVE_LIBLAPACK
+#ifdef DEAL_II_WITH_LAPACK
   Assert(state == matrix, ExcState(state));
   Assert(is_symmetric, ExcNotImplemented());
 
index 3cc7c978e3a5bb84269604eb869ed7bb62425145..9c5cffcac36a19f4d614ffdbe6c838b0c1036b18 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/trilinos_block_sparse_matrix.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/lac/block_sparse_matrix.h>
 #  include <deal.II/lac/block_sparsity_pattern.h>
@@ -232,7 +232,7 @@ namespace TrilinosWrappers
 
     // produce a dummy local map and pass it
     // off to the other function
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     Epetra_MpiComm    trilinos_communicator (MPI_COMM_SELF);
 #else
     Epetra_SerialComm trilinos_communicator;
index 46e2db16cdb0d292f85f3c8166be14c6b28d5874..2d2b8cf7461251262015d6f3714cf65663bd67dc 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/trilinos_block_vector.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/lac/trilinos_block_sparse_matrix.h>
 
index 15d34d5d4bf8700b3b332b6224c137b49c8c92cd..b57d0d403e0e01fbe16c744d576a132b04a3bc31 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/trilinos_precondition.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/lac/vector.h>
 #  include <deal.II/lac/sparse_matrix.h>
@@ -34,7 +34,7 @@ namespace TrilinosWrappers
 {
 
   PreconditionBase::PreconditionBase()
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     :
     communicator (MPI_COMM_SELF)
 #endif
@@ -46,7 +46,7 @@ namespace TrilinosWrappers
     :
     Subscriptor (),
     preconditioner (base.preconditioner),
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     communicator (base.communicator),
 #endif
     vector_distributor (new Epetra_Map(*base.vector_distributor))
@@ -62,7 +62,7 @@ namespace TrilinosWrappers
   void PreconditionBase::clear ()
   {
     preconditioner.reset();
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     communicator = MPI_COMM_SELF;
 #endif
     vector_distributor.reset();
@@ -720,4 +720,4 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
index 3f1e06cf197cec9145fdd249138a5855c9d627a7..60ae66c5de613c98378c27bfa10f9e96c3183073 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/trilinos_solver.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/base/conditional_ostream.h>
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
@@ -529,4 +529,4 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_PETSC
+#endif // DEAL_II_WITH_PETSC
index ac8ef24006882be310823917e965883b6066b4a1..f01ada3dcca7b9bab3e106eaf627e5bbec800d58 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/trilinos_sparse_matrix.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/base/utilities.h>
 #  include <deal.II/lac/sparse_matrix.h>
@@ -1504,4 +1504,4 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
index 472ece1bd5bb5a994567d7d9dfe3c634a69f2623..f1d858b8d231fc6426014a08ecf143ba5479e3b6 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/trilinos_sparsity_pattern.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/base/utilities.h>
 #  include <deal.II/lac/sparsity_pattern.h>
@@ -742,4 +742,4 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
index 9a66831234449dcf136536e38d58bf661d9c7912..badd19f289fa200a215dafbaf079543502c1f7da 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <deal.II/lac/trilinos_vector.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 #  include <deal.II/lac/trilinos_block_vector.h>
@@ -399,7 +399,7 @@ namespace TrilinosWrappers
     last_action = Zero;
     Epetra_LocalMap map (static_cast<int>(partitioning.size()),
                          0,
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
                          Epetra_MpiComm(communicator));
 #else
                          Epetra_SerialComm());
@@ -491,7 +491,7 @@ namespace TrilinosWrappers
       {
         Epetra_LocalMap map (static_cast<int>(partitioning.size()),
                              0,
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
                              Epetra_MpiComm(communicator));
 #else
                              Epetra_SerialComm());
@@ -618,4 +618,4 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
index 63e8c4e9cae28386e4bdad8552af5b7b152964d6..9f52cb200f4e51a733cdf97e09f0c27e26a75662 100644 (file)
@@ -15,7 +15,7 @@
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/lac/trilinos_vector_base.h>
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
 #  include <cmath>
 #  include <Epetra_Import.h>
@@ -58,7 +58,7 @@ namespace TrilinosWrappers
     last_action (Zero),
     compressed  (true),
     has_ghosts  (false),
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     vector(new Epetra_FEVector(
              Epetra_Map(0,0,Epetra_MpiComm(MPI_COMM_SELF))))
 #else
@@ -91,7 +91,7 @@ namespace TrilinosWrappers
     // When we clear the vector,
     // reset the pointer and generate
     // an empty vector.
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     Epetra_Map map (0, 0, Epetra_MpiComm(MPI_COMM_SELF));
 #else
     Epetra_Map map (0, 0, Epetra_SerialComm());
@@ -285,7 +285,7 @@ namespace TrilinosWrappers
         ++ptr;
       }
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     // in parallel, check that the vector
     // is zero on _all_ processors.
     const Epetra_MpiComm *mpi_comm
@@ -303,7 +303,7 @@ namespace TrilinosWrappers
   bool
   VectorBase::is_non_negative () const
   {
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#ifdef DEAL_II_WITH_MPI
     // if this vector is a parallel one, then
     // we need to communicate to determine
     // the answer to the current
@@ -435,4 +435,4 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // DEAL_II_USE_TRILINOS
+#endif // DEAL_II_WITH_TRILINOS
index 71f90f8d3ae85d5342a49d5bdce6da9e05e3e334..47e315f22552037b89cb186fd7bb45dc16a9a6b7 100644 (file)
@@ -38,7 +38,7 @@ for (deal_II_dimension : DIMENSIONS; V1,V2 : DEAL_II_VEC_TEMPLATES; S1, S2 : REA
 
 for(deal_II_dimension : DIMENSIONS)
   {    
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
     template void
       MGTransferPrebuilt<TrilinosWrappers::MPI::Vector>::copy_to_mg (
index aab6f6c3f58f05d64057666b3cef0ce9a9dbd901..39dcf371240850f230adce89349adeb302707cbb 100644 (file)
@@ -126,7 +126,7 @@ INSTANTIATE(Vector<float>, hp::DoFHandler);
 INSTANTIATE(BlockVector<double>, hp::DoFHandler);
 INSTANTIATE(BlockVector<float>, hp::DoFHandler);
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 INSTANTIATE(PETScWrappers::Vector, DoFHandler);
 INSTANTIATE(PETScWrappers::BlockVector, DoFHandler);
 
@@ -134,7 +134,7 @@ INSTANTIATE(PETScWrappers::Vector, hp::DoFHandler);
 INSTANTIATE(PETScWrappers::BlockVector, hp::DoFHandler);
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 INSTANTIATE(TrilinosWrappers::Vector, DoFHandler);
 INSTANTIATE(TrilinosWrappers::BlockVector, DoFHandler);
 INSTANTIATE(TrilinosWrappers::MPI::Vector, DoFHandler);
index 3265d722335d62eace6e64b2ca9577c2cca863f3..676a4c7e7f47f6d82283f4e166290e79f9b4da29 100644 (file)
@@ -1172,7 +1172,7 @@ estimate (const Mapping<1,spacedim>                    &mapping,
           const types::subdomain_id         subdomain_id_,
           const types::material_id                  material_id)
 {
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
   if (dynamic_cast<const parallel::distributed::Triangulation<1,spacedim>*>
       (&dof_handler.get_tria())
       != 0)
@@ -1523,7 +1523,7 @@ estimate (const Mapping<dim, spacedim>                  &mapping,
           const types::subdomain_id          subdomain_id_,
           const types::material_id                   material_id)
 {
-#ifdef DEAL_II_USE_P4EST
+#ifdef DEAL_II_WITH_P4EST
   if (dynamic_cast<const parallel::distributed::Triangulation<dim,spacedim>*>
       (&dof_handler.get_tria())
       != 0)
index 97aefce001fcdfc9767c0014e00b47cf66856d8d..1b84c651f1faec344915fcb24c0f379741822258 100644 (file)
@@ -178,7 +178,7 @@ INSTANTIATE(parallel::distributed::Vector<float>,hp::DoFHandler)
 INSTANTIATE(parallel::distributed::BlockVector<double>,hp::DoFHandler)
 INSTANTIATE(parallel::distributed::BlockVector<float>,hp::DoFHandler)
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 INSTANTIATE(PETScWrappers::Vector,DoFHandler)
 INSTANTIATE(PETScWrappers::BlockVector,DoFHandler)
 
@@ -190,7 +190,7 @@ INSTANTIATE(PETScWrappers::MPI::BlockVector,DoFHandler)
 
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 INSTANTIATE(TrilinosWrappers::Vector,DoFHandler)
 INSTANTIATE(TrilinosWrappers::BlockVector,DoFHandler)
 
index ae1165ea5ddb2a9521aa92df95b94c0d0c4374d1..776031f0f55f748f3022edb412ce5709a19c8a84 100644 (file)
@@ -35,7 +35,7 @@
 #include <deal.II/lac/sparse_matrix.h>
 #include <deal.II/lac/block_sparse_matrix.h>
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 #  include <deal.II/lac/petsc_parallel_sparse_matrix.h>
 #  include <deal.II/lac/petsc_sparse_matrix.h>
 #  include <deal.II/lac/petsc_parallel_vector.h>
@@ -43,7 +43,7 @@
 #  include <deal.II/lac/petsc_parallel_block_sparse_matrix.h>
 #endif
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 #  include <deal.II/lac/trilinos_vector.h>
 #  include <deal.II/lac/trilinos_block_sparse_matrix.h>
@@ -2351,7 +2351,7 @@ namespace MatrixTools
 
 
 
-#ifdef DEAL_II_USE_PETSC
+#ifdef DEAL_II_WITH_PETSC
 
   namespace internal
   {
@@ -2561,7 +2561,7 @@ namespace MatrixTools
 
 
 
-#ifdef DEAL_II_USE_TRILINOS
+#ifdef DEAL_II_WITH_TRILINOS
 
   namespace internal
   {
index ad4470cbeaf560ed53cd692e6dc3ecee0e9810aa..52d8d4f726ed5e935918e93bc3bf79acb092c58f 100644 (file)
@@ -205,7 +205,7 @@ void TimeDependent::start_sweep (const unsigned int s)
 
 void TimeDependent::end_sweep (const unsigned int n_threads)
 {
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
   if (n_threads > 1)
     {
       const unsigned int stride = timesteps.size() / n_threads;

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.