Merge pull request #15314 from marcfehling/isfinite

Use numbers::is_finite whenever we compare with infinity.
dealii · Jun 6, 2023 · 9fcc068 · 9fcc068
2 parents 67f543b + d8bece7
commit 9fcc068
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/include/deal.II/lac/utilities.h b/include/deal.II/lac/utilities.h
@@ -432,7 +432,7 @@ namespace Utilities
       const double b = unwanted_spectrum.second;
       Assert(degree > 0, ExcMessage("Only positive degrees make sense."));
 
-      const bool scale = (a_L < std::numeric_limits<double>::infinity());
+      const bool scale = numbers::is_finite(a_L);
       Assert(
         a < b,
         ExcMessage(

diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc
@@ -580,9 +580,8 @@ MappingQ<dim, spacedim>::transform_real_to_unit_cell(
   // statement may throw an exception, which we simply pass up to the caller
   const Point<dim> p_unit =
     this->transform_real_to_unit_cell_internal(cell, p, initial_p_unit);
-  if (p_unit[0] == std::numeric_limits<double>::infinity())
-    AssertThrow(false,
-                (typename Mapping<dim, spacedim>::ExcTransformationFailed()));
+  AssertThrow(numbers::is_finite(p_unit[0]),
+              (typename Mapping<dim, spacedim>::ExcTransformationFailed()));
   return p_unit;
 }
 
@@ -646,17 +645,17 @@ MappingQ<dim, spacedim>::transform_points_real_to_unit_cell(
         // determinants) from other SIMD lanes. Repeat the computation in this
         // unlikely case with scalar arguments.
         for (unsigned int j = 0; j < n_lanes && i + j < n_points; ++j)
-          if (unit_point[0][j] == std::numeric_limits<double>::infinity())
+          if (numbers::is_finite(unit_point[0][j]))
+            for (unsigned int d = 0; d < dim; ++d)
+              unit_points[i + j][d] = unit_point[d][j];
+          else
             unit_points[i + j] = internal::MappingQImplementation::
               do_transform_real_to_unit_cell_internal<dim, spacedim>(
                 real_points[i + j],
                 inverse_approximation.compute(real_points[i + j]),
                 support_points,
                 polynomials_1d,
                 renumber_lexicographic_to_hierarchic);
-          else
-            for (unsigned int d = 0; d < dim; ++d)
-              unit_points[i + j][d] = unit_point[d][j];
       }
     else
       unit_points[i] = internal::MappingQImplementation::

diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc
@@ -1261,11 +1261,11 @@ namespace Particles
         auto particle = pic.begin();
         for (const auto &p_unit : reference_locations)
           {
-            if (p_unit[0] == std::numeric_limits<double>::infinity() ||
-                !GeometryInfo<dim>::is_inside_unit_cell(p_unit))
-              particles_out_of_cell.push_back(particle);
-            else
+            if (numbers::is_finite(p_unit[0]) &&
+                GeometryInfo<dim>::is_inside_unit_cell(p_unit))
               particle->set_reference_location(p_unit);
+            else
+              particles_out_of_cell.push_back(particle);
 
             ++particle;
           }