From: denis.davydov Date: Thu, 27 Mar 2014 11:01:56 +0000 (+0000) Subject: Fixed whattodo in constraint_matrix; had to do with instantiation and TemporaryData... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=817e21e43c167d3f835e62b786e74854993f83c0;p=dealii-svn.git Fixed whattodo in constraint_matrix; had to do with instantiation and TemporaryData class in block_matrix_base git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32703 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/lac/block_matrix_base.h b/deal.II/include/deal.II/lac/block_matrix_base.h index cabac54324..ff6c9cf246 100644 --- a/deal.II/include/deal.II/lac/block_matrix_base.h +++ b/deal.II/include/deal.II/lac/block_matrix_base.h @@ -1282,7 +1282,7 @@ private: * reordered when writing local to * global). */ - std::vector > column_values; + std::vector > column_values; /** * A mutex variable used to guard access to the member @@ -2069,9 +2069,9 @@ BlockMatrixBase::set (const size_type row, // comes from an element matrix). for (size_type j=0; j @@ -2316,9 +2316,9 @@ BlockMatrixBase::add (const size_type row, // it comes from an element matrix). for (size_type j=0; j diff --git a/deal.II/include/deal.II/lac/constraint_matrix.templates.h b/deal.II/include/deal.II/lac/constraint_matrix.templates.h index 0b5a3bb027..51e1657a04 100644 --- a/deal.II/include/deal.II/lac/constraint_matrix.templates.h +++ b/deal.II/include/deal.II/lac/constraint_matrix.templates.h @@ -2637,11 +2637,7 @@ ConstraintMatrix::distribute_local_to_global ( local_matrix, col_ptr, val_ptr); const size_type n_values = col_ptr - &cols[0]; if (n_values > 0) - { - /* @whattodo Note, this is a tricky one! */ - /* global_matrix.add(row, n_values, &cols[0], &vals[0], false, true); */ - Assert ((false), ExcMessage ("This function is corrupt: @whattodo")); - } + global_matrix.add(row, n_values, &cols[0], &vals[0], false, true); } } diff --git a/deal.II/source/lac/constraint_matrix.cc b/deal.II/source/lac/constraint_matrix.cc index a64de0f95c..17c879a6ee 100644 --- a/deal.II/source/lac/constraint_matrix.cc +++ b/deal.II/source/lac/constraint_matrix.cc @@ -1975,10 +1975,10 @@ ONLY_MATRIX_FUNCTIONS(TrilinosWrappers::BlockSparseMatrix); #endif #ifdef DEAL_II_WITH_PETSC -ONLY_MATRIX_FUNCTIONS(PETScWrappers::SparseMatrix); -ONLY_MATRIX_FUNCTIONS(PETScWrappers::BlockSparseMatrix); -ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::SparseMatrix); -ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix); +COMPLEX_ONLY_MATRIX_FUNCTIONS(PETScWrappers::SparseMatrix); +COMPLEX_ONLY_MATRIX_FUNCTIONS(PETScWrappers::BlockSparseMatrix); +COMPLEX_ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::SparseMatrix); +COMPLEX_ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix); #endif #include "constraint_matrix.inst"