Merge pull request #13 from kronbichler/master

Fetch from upstream
MeltPoolDG · Jul 5, 2023 · 6c504f7 · 6c504f7
2 parents 07b3a05 + 3c8110f
commit 6c504f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/source/navier_stokes.cc b/source/navier_stokes.cc
@@ -1415,7 +1415,7 @@ NavierStokes<dim>::interpolate_pressure_field(
       // set DG0 components to zero
       std::vector<std::vector<bool>> constant_modes;
       DoFTools::extract_constant_modes(dof_handler_p,
-                                       std::vector<bool>(1, true),
+                                       ComponentMask(std::vector<bool>(1, true)),
                                        constant_modes);
       AssertDimension(constant_modes.size(), 2);
       for (unsigned int i = 0; i < pressure_vector.locally_owned_size(); ++i)

diff --git a/source/navier_stokes_matrix.cc b/source/navier_stokes_matrix.cc
@@ -132,7 +132,7 @@ NavierStokesMatrix<dim>::initialize(const MatrixFree<dim> &matrix_free_in,
 
       std::vector<std::vector<bool>> constant_modes;
       DoFTools::extract_constant_modes(matrix_free->get_dof_handler(dof_index_p),
-                                       std::vector<bool>(1, true),
+                                       ComponentMask(std::vector<bool>(1, true)),
                                        constant_modes);
 
       for (unsigned int mode = 0; mode < 2; ++mode)

diff --git a/source/navier_stokes_preconditioner.cc b/source/navier_stokes_preconditioner.cc
@@ -1152,7 +1152,7 @@ NavierStokesPreconditioner<dim>::initialize_matrices(
     {
       std::vector<std::vector<bool>> constant_modes;
       DoFTools::extract_constant_modes(dof_handler_p,
-                                       std::vector<bool>(1, true),
+                                       ComponentMask(std::vector<bool>(1, true)),
                                        constant_modes);
       AssertDimension(constant_modes.size(), 2);
       int min_local_index = std::numeric_limits<int>::min();
@@ -1387,12 +1387,12 @@ NavierStokesPreconditioner<dim>::initialize_matrices(
   if (parameters.precondition_velocity == FlowParameters::u_amg ||
       parameters.precondition_velocity == FlowParameters::u_amg_linear)
     DoFTools::extract_constant_modes(dof_handler_u,
-                                     std::vector<bool>(dim, true),
+                                     ComponentMask(std::vector<bool>(dim, true)),
                                      constant_modes_u);
 
   if (parameters.density > 0 || parameters.augmented_taylor_hood)
     DoFTools::extract_constant_modes(dof_handler_p,
-                                     std::vector<bool>(1, true),
+                                     ComponentMask(std::vector<bool>(1, true)),
                                      constant_modes_p);