]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from trunk.
authorturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Mar 2014 20:57:13 +0000 (20:57 +0000)
committerturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Mar 2014 20:57:13 +0000 (20:57 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_paralution@32675 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/cmake/config/CMakeLists.txt
deal.II/cmake/scripts/run_testsuite.cmake
deal.II/include/deal.II/base/config.h.in
deal.II/include/deal.II/lac/trilinos_vector_base.h
deal.II/include/deal.II/numerics/vector_tools.templates.h
deal.II/source/algorithms/operator.cc
deal.II/source/numerics/derivative_approximation.cc
deal.II/source/numerics/point_value_history.cc

index e37d456fdb31475b1da566712fc02d6d1fb8d6a5,533753878f7c8e5b4a9eb2f912dbe793f06470b9..11cd692160682e2350cb7322ceb94a3d8d93e199
@@@ -320,19 -320,18 +320,19 @@@ IF(DEAL_II_COMPONENT_COMPAT_FILES
    COND_SET_TO_YES(DEAL_II_WITH_FUNCTIONPARSER MAKEFILE_enableparser)
    COND_SET_TO_YES(BUILD_SHARED_LIBS MAKEFILE_enableshared)
  
-   COND_SET_TO_YES(DEAL_II_WITH_PETSC MAKEFILE_PETSC)
-   COND_SET_TO_YES(DEAL_II_WITH_SLEPC MAKEFILE_SLEPC)
-   COND_SET_TO_YES(DEAL_II_WITH_TRILINOS MAKEFILE_TRILINOS)
-   COND_SET_TO_YES(DEAL_II_WITH_HDF5 MAKEFILE_HDF5)
+   COND_SET_TO_YES(DEAL_II_WITH_ARPACK MAKEFILE_ARPACK)
    COND_SET_TO_YES(DEAL_II_WITH_BLAS MAKEFILE_BLAS)
-   COND_SET_TO_YES(DEAL_II_WITH_MUMPS MAKEFILE_MUMPS)
+   COND_SET_TO_YES(DEAL_II_WITH_HDF5 MAKEFILE_HDF5)
    COND_SET_TO_YES(DEAL_II_WITH_LAPACK MAKEFILE_LAPACK)
-   COND_SET_TO_YES(DEAL_II_WITH_ARPACK MAKEFILE_ARPACK)
    COND_SET_TO_YES(DEAL_II_WITH_METIS MAKEFILE_METIS)
-   COND_SET_TO_YES(DEAL_II_WITH_UMFPACK MAKEFILE_UMFPACK)
-   COND_SET_TO_YES(DEAL_II_WITH_P4EST MAKEFILE_P4EST)
    COND_SET_TO_YES(DEAL_II_WITH_MPI MAKEFILE_MPI)
+   COND_SET_TO_YES(DEAL_II_WITH_MUMPS MAKEFILE_MUMPS)
+   COND_SET_TO_YES(DEAL_II_WITH_P4EST MAKEFILE_P4EST)
+   COND_SET_TO_YES(DEAL_II_WITH_PETSC MAKEFILE_PETSC)
+   COND_SET_TO_YES(DEAL_II_WITH_SLEPC MAKEFILE_SLEPC)
+   COND_SET_TO_YES(DEAL_II_WITH_TRILINOS MAKEFILE_TRILINOS)
+   COND_SET_TO_YES(DEAL_II_WITH_UMFPACK MAKEFILE_UMFPACK)
 +  COND_SET_TO_YES(DEAL_II_WITH_PARALUTION MAKEFILE_PARALUTION)
  
    #
    # For binary dir:
index 7c6f1229b19bd54492cf3b398a43e7a30fbdc348,bcc9e12fdbf54f0adad26406efe06e2587cb750e..67976ab0c8ff2c07c0eebcbc67f85cabc8b006a0
@@@ -276,7 -276,7 +276,7 @@@ FOREACH(_var ${_variables}
        _var MATCHES "^(COMPAT_FILES|DOCUMENTATION|EXAMPLES|MESH_CONVERTER|PARAMETER_GUI)" OR
        _var MATCHES "^(ARPACK|BOOST|FUNCTIONPARSER|HDF5|METIS|MPI|MUMPS)_" OR
        _var MATCHES "^(NETCDF|P4EST|PETSC|SLEPC|THREADS|TBB|TRILINOS)_" OR
-       _var MATCHES "^(UMFPACK|ZLIB|LAPACK|PARALUTION)_" OR
 -      _var MATCHES "^(UMFPACK|ZLIB|LAPACK|MUPARSER)_" OR
++      _var MATCHES "^(UMFPACK|ZLIB|LAPACK|MUPARSER|PARALUTION)_" OR
        _var MATCHES "^(CMAKE|DEAL_II)_(C|CXX|Fortran|BUILD)_(COMPILER|FLAGS)" OR
        _var MATCHES "^CMAKE_BUILD_TYPE$" OR
        _var MATCHES "MAKEOPTS" OR
Simple merge

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.