From: janssen Date: Mon, 22 Mar 2010 18:45:24 +0000 (+0000) Subject: distribute_local_to_global changed from Vector to a template X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6478288f7f9c6175f45911117c75475dbce144ab;p=dealii-svn.git distribute_local_to_global changed from Vector to a template git-svn-id: https://svn.dealii.org/trunk@20880 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/constraint_matrix.h b/deal.II/lac/include/lac/constraint_matrix.h index d66b846ce5..b31c279d63 100644 --- a/deal.II/lac/include/lac/constraint_matrix.h +++ b/deal.II/lac/include/lac/constraint_matrix.h @@ -1108,11 +1108,11 @@ class ConstraintMatrix : public Subscriptor * sure that only on process at a time * calls this function. */ - template + template void - distribute_local_to_global (const Vector &local_vector, + distribute_local_to_global (const InVector &local_vector, const std::vector &local_dof_indices, - VectorType &global_vector) const; + OutVector &global_vector) const; /** * This function takes a vector of @@ -2044,13 +2044,13 @@ ConstraintMatrix::is_inhomogeneously_constrained (const unsigned int index) cons -template +template inline void ConstraintMatrix:: -distribute_local_to_global (const Vector &local_vector, +distribute_local_to_global (const InVector &local_vector, const std::vector &local_dof_indices, - VectorType &global_vector) const + OutVector &global_vector) const { Assert (local_vector.size() == local_dof_indices.size(), ExcDimensionMismatch(local_vector.size(), local_dof_indices.size())); diff --git a/deal.II/lac/include/lac/constraint_matrix.templates.h b/deal.II/lac/include/lac/constraint_matrix.templates.h index ff84b0660d..2486511204 100644 --- a/deal.II/lac/include/lac/constraint_matrix.templates.h +++ b/deal.II/lac/include/lac/constraint_matrix.templates.h @@ -1325,6 +1325,7 @@ namespace internals // constraints are really empty. const unsigned int length = size(); #ifdef DEBUG + //make sure that we are in the range of the vector AssertIndexRange (length, total_row_indices.size()+1); for (unsigned int i=0; i &local_dof_indices, template inline void -ConstraintMatrix:: -make_sorted_row_list (const FullMatrix &local_matrix, - const std::vector &local_dof_indices, - MatrixType &global_matrix, - internals::GlobalRowsFromLocal &global_rows) const +ConstraintMatrix:: make_sorted_row_list ( + const FullMatrix &local_matrix, + const std::vector &local_dof_indices, + MatrixType &global_matrix, + internals::GlobalRowsFromLocal &global_rows) const { const unsigned int n_local_dofs = local_dof_indices.size();