From: David Wells Date: Sat, 9 Jan 2016 21:37:13 +0000 (-0500) Subject: Prefer MatrixType to Matrix in templates. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0058b391883b10431fea3f233b1c6eecc3ca708;p=code-gallery.git Prefer MatrixType to Matrix in templates. --- diff --git a/cdr/common/include/deal.II-cdr/system_matrix.h b/cdr/common/include/deal.II-cdr/system_matrix.h index a4b4a2f..bb84c0d 100644 --- a/cdr/common/include/deal.II-cdr/system_matrix.h +++ b/cdr/common/include/deal.II-cdr/system_matrix.h @@ -14,16 +14,16 @@ namespace CDR { using namespace dealii; - template + template void create_system_matrix (const DoFHandler &dof_handler, const QGauss &quad, const std::function(const Point)> convection_function, const CDR::Parameters ¶meters, const double time_step, - Matrix &system_matrix); + MatrixType &system_matrix); - template + template void create_system_matrix (const DoFHandler &dof_handler, const QGauss &quad, @@ -31,6 +31,6 @@ namespace CDR const CDR::Parameters ¶meters, const double time_step, const ConstraintMatrix &constraints, - Matrix &system_matrix); + MatrixType &system_matrix); } #endif diff --git a/cdr/common/include/deal.II-cdr/system_matrix.templates.h b/cdr/common/include/deal.II-cdr/system_matrix.templates.h index 081fbd8..6589e83 100644 --- a/cdr/common/include/deal.II-cdr/system_matrix.templates.h +++ b/cdr/common/include/deal.II-cdr/system_matrix.templates.h @@ -73,7 +73,7 @@ namespace CDR } } - template + template void create_system_matrix (const DoFHandler &dof_handler, const QGauss &quad, @@ -81,7 +81,7 @@ namespace CDR const CDR::Parameters ¶meters, const double time_step, const ConstraintMatrix &constraints, - Matrix &system_matrix) + MatrixType &system_matrix) { internal_create_system_matrix (dof_handler, quad, convection_function, parameters, time_step, @@ -93,14 +93,14 @@ namespace CDR }); } - template + template void create_system_matrix (const DoFHandler &dof_handler, const QGauss &quad, const std::function(const Point)> convection_function, const CDR::Parameters ¶meters, const double time_step, - Matrix &system_matrix) + MatrixType &system_matrix) { internal_create_system_matrix (dof_handler, quad, convection_function, parameters, time_step,