From: Wolfgang Bangerth Date: Mon, 19 Jan 2009 01:31:43 +0000 (+0000) Subject: Generate an expansion variable for sparsity patterns. X-Git-Tag: v8.0.0~8100 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db777ce088cc1f73855919e02e7b45d4912b10e1;p=dealii.git 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 d28dbce4a9..bf81fe30cb 100644 --- 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 d434149ac7..687061fe3d 100644 --- a/deal.II/common/template-arguments.in +++ b/deal.II/common/template-arguments.in @@ -30,3 +30,14 @@ TRIANGULATION_AND_DOFHANDLERS := { Triangulation; DoFHandler; hp::DoFHandler; MGDoFHandler } + +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 5d582455e3..72d6ec8ec5 100755 --- 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