Revise the SPARSITY_PATTERN expansion.

git-svn-id: https://svn.dealii.org/trunk@18243 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index bf81fe30cb7c5b24eac003b455a58e1caed21ac9..05f473cf6fc7a3a8809a2799318a1245b2143880 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -5901,6 +5901,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl
     DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR="TrilinosWrappers::BlockVector"
     DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR="TrilinosWrappers::MPI::BlockVector"
     DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN="TrilinosWrappers::SparsityPattern"
+    DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN="TrilinosWrappers::BlockSparsityPattern"
 
     dnl Finally set with_trilinos if this hasn't happened yet
     if test "x$with_trilinos" = "x" ; then
@@ -5915,6 +5916,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl
   AC_SUBST(DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR)
   AC_SUBST(DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR)
   AC_SUBST(DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN)
+  AC_SUBST(DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN)
 ])
 
 

diff --git a/deal.II/common/template-arguments.in b/deal.II/common/template-arguments.in
index 687061fe3db308f2a9be8c291fcfba3845faaeca..e412dd9665b06dd72f840d5ffa676b4bccbe6619 100644 (file)
--- a/deal.II/common/template-arguments.in
+++ b/deal.II/common/template-arguments.in
@@ -35,9 +35,10 @@ SPARSITY_PATTERNS := { SparsityPattern;
                        CompressedSparsityPattern;
                        CompressedSetSparsityPattern;
                        CompressedSimpleSparsityPattern;
-                       @DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN@; }
+                       @DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN@;
 
-BLOCK_SPARSITY_PATTERNS := { BlockSparsityPattern;
-                             BlockCompressedSparsityPattern;
-                             BlockCompressedSetSparsityPattern;
-                             BlockCompressedSimpleSparsityPattern; }
+                       BlockSparsityPattern;
+                       BlockCompressedSparsityPattern;
+                       BlockCompressedSetSparsityPattern;
+                       BlockCompressedSimpleSparsityPattern;
+                       @DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN@; }

diff --git a/deal.II/configure b/deal.II/configure
index 72d6ec8ec5be88f2f4b9e1fa5c527a885dd8cf0a..86866628518a4bf0f696cfc28c926a9ed87be7af 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -734,6 +734,7 @@ DEAL_II_EXPAND_TRILINOS_MPI_VECTOR
 DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR
 DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR
 DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN
+DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN
 USE_CONTRIB_TRILINOS
 DEAL_II_TRILINOS_INCDIR
 DEAL_II_TRILINOS_LIBDIR
@@ -13442,6 +13443,7 @@ done
     DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR="TrilinosWrappers::BlockVector"
     DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR="TrilinosWrappers::MPI::BlockVector"
     DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN="TrilinosWrappers::SparsityPattern"
+    DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN="TrilinosWrappers::BlockSparsityPattern"
 
         if test "x$with_trilinos" = "x" ; then
       with_trilinos="yes"
@@ -13463,6 +13465,7 @@ done
 
 
 
+
 if test "x$with_umfpack" != "x" -a "x$with_umfpack" != "xno" ; then
   if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
     with_blas="yes"
@@ -17309,6 +17312,7 @@ DEAL_II_EXPAND_TRILINOS_MPI_VECTOR!$DEAL_II_EXPAND_TRILINOS_MPI_VECTOR$ac_delim
 DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR!$DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR$ac_delim
 DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR!$DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR$ac_delim
 DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN!$DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN$ac_delim
+DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN!$DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN$ac_delim
 USE_CONTRIB_TRILINOS!$USE_CONTRIB_TRILINOS$ac_delim
 DEAL_II_TRILINOS_INCDIR!$DEAL_II_TRILINOS_INCDIR$ac_delim
 DEAL_II_TRILINOS_LIBDIR!$DEAL_II_TRILINOS_LIBDIR$ac_delim
@@ -17335,7 +17339,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5