cdr: Use AffineConstraints<double>

diff --git a/cdr/common/include/deal.II-cdr/system_matrix.h b/cdr/common/include/deal.II-cdr/system_matrix.h
index 13717a30ce79ed5809ec96040e76a920c046b752..ccf95d7e5433fed5865b414c3810ca5f8e01cb42 100644 (file)
--- 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<Tensor<1, dim>(const Point<dim>)> &convection_function,
    const CDR::Parameters                                 &parameters,
    const double                                           time_step,
-   const ConstraintMatrix                                &constraints,
+   const AffineConstraints<double>                       &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 accb442862646157985d00ac2728896ef711fe2e..49238b50fe713fe560614b50c58d3afcb7250699 100644 (file)
--- 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<Tensor<1, dim>(const Point<dim>)> &convection_function,
    const CDR::Parameters                                 &parameters,
    const double                                           time_step,
-   const ConstraintMatrix                                &constraints,
+   const AffineConstraints<double>                       &constraints,
    MatrixType                                            &system_matrix)
   {
     internal_create_system_matrix<dim>

diff --git a/cdr/common/include/deal.II-cdr/system_rhs.h b/cdr/common/include/deal.II-cdr/system_rhs.h
index 5942cdad7d2b549d7a3ce4336443ea41e621cf6b..f37eb0189200feaf4987a6b8d063222ccfec3133 100644 (file)
--- 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<double(double, const Point<dim>)> &forcing_function,
    const CDR::Parameters                                 &parameters,
    const VectorType                                      &previous_solution,
-   const ConstraintMatrix                                &constraints,
+   const AffineConstraints<double>                       &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 44c768c7073fdd53d2895c56e5a2c14404fff894..a8e92e6893c297df2736dfa4737b86df0052c87b 100644 (file)
--- 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<double(double, const Point<dim>)> &forcing_function,
    const CDR::Parameters                                 &parameters,
    const VectorType                                      &previous_solution,
-   const ConstraintMatrix                                &constraints,
+   const AffineConstraints<double>                       &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 c080701f0ba05b638b1d8c14ff8669cc36b3cedd..4e18902d91577a8383847747f82aad27e5b9be68 100644 (file)
--- a/cdr/common/source/system_matrix.cc
+++ b/cdr/common/source/system_matrix.cc
@@ -38,7 +38,7 @@ namespace CDR
    const std::function<Tensor<1, 2>(const Point<2>)> &convection_function,
    const CDR::Parameters                             &parameters,
    const double                                       time_step,
-   const ConstraintMatrix                            &constraints,
+   const AffineConstraints<double>                   &constraints,
    SparseMatrix<double>                              &system_matrix);
 
   template
@@ -48,7 +48,7 @@ namespace CDR
    const std::function<Tensor<1, 3>(const Point<3>)> &convection_function,
    const CDR::Parameters                             &parameters,
    const double                                       time_step,
-   const ConstraintMatrix                            &constraints,
+   const AffineConstraints<double>                   &constraints,
    SparseMatrix<double>                              &system_matrix);
 
   template
@@ -76,7 +76,7 @@ namespace CDR
    const std::function<Tensor<1, 2>(const Point<2>)> &convection_function,
    const CDR::Parameters                             &parameters,
    const double                                       time_step,
-   const ConstraintMatrix                            &constraints,
+   const AffineConstraints<double>                   &constraints,
    TrilinosWrappers::SparseMatrix                    &system_matrix);
 
   template
@@ -86,6 +86,6 @@ namespace CDR
    const std::function<Tensor<1, 3>(const Point<3>)> &convection_function,
    const CDR::Parameters                             &parameters,
    const double                                       time_step,
-   const ConstraintMatrix                            &constraints,
+   const AffineConstraints<double>                   &constraints,
    TrilinosWrappers::SparseMatrix                    &system_matrix);
 }

diff --git a/cdr/common/source/system_rhs.cc b/cdr/common/source/system_rhs.cc
index 8436306296854cf86525a8bcfc063d9e3c98c43d..df70485a70c427be65fe1e543eae08e32c9ba85d 100644 (file)
--- a/cdr/common/source/system_rhs.cc
+++ b/cdr/common/source/system_rhs.cc
@@ -19,7 +19,7 @@ namespace CDR
    const std::function<double(double, const Point<2>)> &forcing_function,
    const CDR::Parameters                               &parameters,
    const Vector<double>                                &previous_solution,
-   const ConstraintMatrix                              &constraints,
+   const AffineConstraints<double>                     &constraints,
    const double                                         current_time,
    Vector<double>                                      &system_rhs);
 
@@ -31,7 +31,7 @@ namespace CDR
    const std::function<double(double, const Point<3>)> &forcing_function,
    const CDR::Parameters                               &parameters,
    const Vector<double>                                &previous_solution,
-   const ConstraintMatrix                              &constraints,
+   const AffineConstraints<double>                     &constraints,
    const double                                         current_time,
    Vector<double>                                      &system_rhs);
 
@@ -43,7 +43,7 @@ namespace CDR
    const std::function<double(double, const Point<2>)> &forcing_function,
    const CDR::Parameters                               &parameters,
    const TrilinosWrappers::MPI::Vector                 &previous_solution,
-   const ConstraintMatrix                              &constraints,
+   const AffineConstraints<double>                     &constraints,
    const double                                         current_time,
    TrilinosWrappers::MPI::Vector                       &system_rhs);
 
@@ -55,7 +55,7 @@ namespace CDR
    const std::function<double(double, const Point<3>)> &forcing_function,
    const CDR::Parameters                               &parameters,
    const TrilinosWrappers::MPI::Vector                 &previous_solution,
-   const ConstraintMatrix                              &constraints,
+   const AffineConstraints<double>                     &constraints,
    const double                                         current_time,
    TrilinosWrappers::MPI::Vector                       &system_rhs);
 }

diff --git a/cdr/solver/cdr.cc b/cdr/solver/cdr.cc
index b2391fad86a2b109bd52ff55c6d2d5f803669415..b307172dc53bf7a5ff3469e749465a7c3e12dc1e 100644 (file)
--- 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<double> constraints;
   bool first_run;
 
   // As is usual in parallel programs, I keep two copies of parts of the