From f7fee662fb69e53b1cafb75b9208db17c529c0f0 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 21 May 2019 14:40:17 -0500 Subject: [PATCH] cdr: Use AffineConstraints --- cdr/common/include/deal.II-cdr/system_matrix.h | 2 +- cdr/common/include/deal.II-cdr/system_matrix.templates.h | 2 +- cdr/common/include/deal.II-cdr/system_rhs.h | 2 +- cdr/common/include/deal.II-cdr/system_rhs.templates.h | 2 +- cdr/common/source/system_matrix.cc | 8 ++++---- cdr/common/source/system_rhs.cc | 8 ++++---- cdr/solver/cdr.cc | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cdr/common/include/deal.II-cdr/system_matrix.h b/cdr/common/include/deal.II-cdr/system_matrix.h index 13717a3..ccf95d7 100644 --- a/cdr/common/include/deal.II-cdr/system_matrix.h +++ b/cdr/common/include/deal.II-cdr/system_matrix.h @@ -34,7 +34,7 @@ namespace CDR const std::function(const Point)> &convection_function, const CDR::Parameters ¶meters, const double time_step, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, 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 accb442..49238b5 100644 --- a/cdr/common/include/deal.II-cdr/system_matrix.templates.h +++ b/cdr/common/include/deal.II-cdr/system_matrix.templates.h @@ -83,7 +83,7 @@ namespace CDR const std::function(const Point)> &convection_function, const CDR::Parameters ¶meters, const double time_step, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, MatrixType &system_matrix) { internal_create_system_matrix diff --git a/cdr/common/include/deal.II-cdr/system_rhs.h b/cdr/common/include/deal.II-cdr/system_rhs.h index 5942cda..f37eb01 100644 --- a/cdr/common/include/deal.II-cdr/system_rhs.h +++ b/cdr/common/include/deal.II-cdr/system_rhs.h @@ -26,7 +26,7 @@ namespace CDR const std::function)> &forcing_function, const CDR::Parameters ¶meters, const VectorType &previous_solution, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, const double current_time, VectorType &system_rhs); } diff --git a/cdr/common/include/deal.II-cdr/system_rhs.templates.h b/cdr/common/include/deal.II-cdr/system_rhs.templates.h index 44c768c..a8e92e6 100644 --- a/cdr/common/include/deal.II-cdr/system_rhs.templates.h +++ b/cdr/common/include/deal.II-cdr/system_rhs.templates.h @@ -30,7 +30,7 @@ namespace CDR const std::function)> &forcing_function, const CDR::Parameters ¶meters, const VectorType &previous_solution, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, const double current_time, VectorType &system_rhs) { diff --git a/cdr/common/source/system_matrix.cc b/cdr/common/source/system_matrix.cc index c080701..4e18902 100644 --- a/cdr/common/source/system_matrix.cc +++ b/cdr/common/source/system_matrix.cc @@ -38,7 +38,7 @@ namespace CDR const std::function(const Point<2>)> &convection_function, const CDR::Parameters ¶meters, const double time_step, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, SparseMatrix &system_matrix); template @@ -48,7 +48,7 @@ namespace CDR const std::function(const Point<3>)> &convection_function, const CDR::Parameters ¶meters, const double time_step, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, SparseMatrix &system_matrix); template @@ -76,7 +76,7 @@ namespace CDR const std::function(const Point<2>)> &convection_function, const CDR::Parameters ¶meters, const double time_step, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, TrilinosWrappers::SparseMatrix &system_matrix); template @@ -86,6 +86,6 @@ namespace CDR const std::function(const Point<3>)> &convection_function, const CDR::Parameters ¶meters, const double time_step, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, TrilinosWrappers::SparseMatrix &system_matrix); } diff --git a/cdr/common/source/system_rhs.cc b/cdr/common/source/system_rhs.cc index 8436306..df70485 100644 --- a/cdr/common/source/system_rhs.cc +++ b/cdr/common/source/system_rhs.cc @@ -19,7 +19,7 @@ namespace CDR const std::function)> &forcing_function, const CDR::Parameters ¶meters, const Vector &previous_solution, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, const double current_time, Vector &system_rhs); @@ -31,7 +31,7 @@ namespace CDR const std::function)> &forcing_function, const CDR::Parameters ¶meters, const Vector &previous_solution, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, const double current_time, Vector &system_rhs); @@ -43,7 +43,7 @@ namespace CDR const std::function)> &forcing_function, const CDR::Parameters ¶meters, const TrilinosWrappers::MPI::Vector &previous_solution, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, const double current_time, TrilinosWrappers::MPI::Vector &system_rhs); @@ -55,7 +55,7 @@ namespace CDR const std::function)> &forcing_function, const CDR::Parameters ¶meters, const TrilinosWrappers::MPI::Vector &previous_solution, - const ConstraintMatrix &constraints, + const AffineConstraints &constraints, const double current_time, TrilinosWrappers::MPI::Vector &system_rhs); } diff --git a/cdr/solver/cdr.cc b/cdr/solver/cdr.cc index b2391fa..b307172 100644 --- a/cdr/solver/cdr.cc +++ b/cdr/solver/cdr.cc @@ -69,7 +69,7 @@ private: IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; bool first_run; // As is usual in parallel programs, I keep two copies of parts of the -- 2.39.5