Generate an expansion variable for sparsity patterns.

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

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

diff --git a/deal.II/common/template-arguments.in b/deal.II/common/template-arguments.in
index d434149ac7cd773daaa6dfe86345cf536868f06b..687061fe3db308f2a9be8c291fcfba3845faaeca 100644 (file)
--- a/deal.II/common/template-arguments.in
+++ b/deal.II/common/template-arguments.in
@@ -30,3 +30,14 @@ TRIANGULATION_AND_DOFHANDLERS := { Triangulation<deal_II_dimension>;
                                    DoFHandler<deal_II_dimension>;
                                    hp::DoFHandler<deal_II_dimension>;
                                   MGDoFHandler<deal_II_dimension> }
+
+SPARSITY_PATTERNS := { SparsityPattern;
+                       CompressedSparsityPattern;
+                       CompressedSetSparsityPattern;
+                       CompressedSimpleSparsityPattern;
+                       @DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN@; }
+
+BLOCK_SPARSITY_PATTERNS := { BlockSparsityPattern;
+                             BlockCompressedSparsityPattern;
+                             BlockCompressedSetSparsityPattern;
+                             BlockCompressedSimpleSparsityPattern; }

diff --git a/deal.II/configure b/deal.II/configure
index 5d582455e3e4a179febcf27a72cb3dd36b6230ce..72d6ec8ec5be88f2f4b9e1fa5c527a885dd8cf0a 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -733,6 +733,7 @@ DEAL_II_EXPAND_TRILINOS_VECTOR
 DEAL_II_EXPAND_TRILINOS_MPI_VECTOR
 DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR
 DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR
+DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN
 USE_CONTRIB_TRILINOS
 DEAL_II_TRILINOS_INCDIR
 DEAL_II_TRILINOS_LIBDIR
@@ -13440,6 +13441,7 @@ done
     DEAL_II_EXPAND_TRILINOS_MPI_VECTOR="TrilinosWrappers::MPI::Vector"
     DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR="TrilinosWrappers::BlockVector"
     DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR="TrilinosWrappers::MPI::BlockVector"
+    DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN="TrilinosWrappers::SparsityPattern"
 
         if test "x$with_trilinos" = "x" ; then
       with_trilinos="yes"
@@ -13460,6 +13462,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"
@@ -17305,6 +17308,7 @@ DEAL_II_EXPAND_TRILINOS_VECTOR!$DEAL_II_EXPAND_TRILINOS_VECTOR$ac_delim
 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
 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
@@ -17331,7 +17335,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` = 42; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5