Merge pull request #15308 from masterleinad/test_icpx

Test icpx instead of icpc
dealii · Jun 6, 2023 · 1a7fb37 · 1a7fb37
2 parents 5fe3a16 + 9662f5a
commit 1a7fb37
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -330,8 +330,8 @@ jobs:
         mkdir build
         cd build
         cmake -D CMAKE_BUILD_TYPE=Debug \
-              -D CMAKE_CXX_COMPILER=icpc \
-              -D DEAL_II_CXX_FLAGS='-Werror' \
+              -D CMAKE_CXX_COMPILER=icpx \
+              -D DEAL_II_CXX_FLAGS='-Werror -fno-finite-math-only' \
               -D DEAL_II_EARLY_DEPRECATIONS=ON \
               -D DEAL_II_WITH_MPI=ON \
               -D DEAL_II_WITH_LAPACK=ON \

diff --git a/include/deal.II/grid/grid_reordering.h b/include/deal.II/grid/grid_reordering.h
@@ -35,7 +35,7 @@ DEAL_II_NAMESPACE_OPEN
  * this class. Usage of the old-style numbering is deprecated.
  */
 template <int dim, int spacedim = dim>
-class DEAL_II_DEPRECATED GridReordering
+class GridReordering
 {
 public:
   /**

diff --git a/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h b/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h
@@ -3857,7 +3857,7 @@ MGTwoLevelTransferNonNested<dim, LinearAlgebra::distributed::Vector<Number>>::
     // on element faces or vertices and therefore, the partitioner is fine
     IndexSet locally_relevant_dofs(dof_handler_fine.n_dofs());
     if (!this->fine_element_is_continuous &&
-        !dof_handler_fine.get_fe().degree == 0)
+        dof_handler_fine.get_fe().degree != 0)
       locally_relevant_dofs.add_indices(global_dof_indices.begin(),
                                         global_dof_indices.end());
 

diff --git a/source/base/qprojector.cc b/source/base/qprojector.cc
@@ -769,11 +769,12 @@ QProjector<2>::project_to_all_faces(const ReferenceCell &     reference_cell,
     {
       const auto support_points_line =
         [](const auto &face, const auto &orientation) -> std::vector<Point<2>> {
-        std::array<Point<2>, 2> vertices;
-        std::copy_n(face.first.begin(), face.first.size(), vertices.begin());
-        const auto temp =
-          ReferenceCells::Line.permute_according_orientation(vertices,
-                                                             orientation);
+        // MSVC struggles when using face.first.begin()
+        const Point<2, double> *  vertices_ptr = &face.first[0];
+        ArrayView<const Point<2>> vertices(vertices_ptr, face.first.size());
+        const auto                temp =
+          ReferenceCells::Line.permute_by_combined_orientation(vertices,
+                                                               orientation);
         return std::vector<Point<2>>(temp.begin(),
                                      temp.begin() + face.first.size());
       };