Merge pull request #1779 from vryy/compile-apple-clang

vryy · web-flow · commit 9e574908659d · 2026-02-28T18:03:19.000Z
Fixes to compile and run on Darwin
diff --git a/src/art_net/4C_art_net_artery_ele_calc_lin_exp.cpp b/src/art_net/4C_art_net_artery_ele_calc_lin_exp.cpp
@@ -26,7 +26,6 @@
 
 FOUR_C_NAMESPACE_OPEN
 
-
 /*----------------------------------------------------------------------*
  *----------------------------------------------------------------------*/
 template <Core::FE::CellType distype>
diff --git a/src/art_net/4C_art_net_artery_ele_calc_pres_based.cpp b/src/art_net/4C_art_net_artery_ele_calc_pres_based.cpp
@@ -21,7 +21,6 @@
 
 FOUR_C_NAMESPACE_OPEN
 
-
 /*----------------------------------------------------------------------*
  *----------------------------------------------------------------------*/
 template <Core::FE::CellType distype>
diff --git a/src/beaminteraction/src/potential/4C_beaminteraction_potential_pair_beam_to_beam.cpp b/src/beaminteraction/src/potential/4C_beaminteraction_potential_pair_beam_to_beam.cpp
@@ -235,19 +235,20 @@ void BeamInteraction::BeamToBeamPotentialPair<numnodes, numnodalvalues, T>::
   T norm_dist = 0.0;                                                       // = |r1-r2|
 
   // evaluate charge densities from DLINE charge condition specified in input file
-  double q1 = linechargeconds_[0]->parameters().get<double>("VAL");
-  double q2 = linechargeconds_[1]->parameters().get<double>("VAL");
+  double q1 = linechargeconds_[0]->parameters().template get<double>("VAL");
+  double q2 = linechargeconds_[1]->parameters().template get<double>("VAL");
 
   // evaluate function in time if specified in line charge conditions
   // TODO allow for functions in space, i.e. varying charge along beam centerline
-  auto function_number = linechargeconds_[0]->parameters().get<std::optional<int>>("FUNCT");
+  auto function_number =
+      linechargeconds_[0]->parameters().template get<std::optional<int>>("FUNCT");
 
   if (function_number.has_value() && function_number.value() > 0)
     q1 *= Global::Problem::instance()
               ->function_by_id<Core::Utils::FunctionOfTime>(function_number.value())
               .evaluate(time_);
 
-  function_number = linechargeconds_[1]->parameters().get<std::optional<int>>("FUNCT");
+  function_number = linechargeconds_[1]->parameters().template get<std::optional<int>>("FUNCT");
 
   if (function_number.has_value() && function_number.value() > 0)
     q2 *= Global::Problem::instance()
@@ -620,19 +621,20 @@ void BeamInteraction::BeamToBeamPotentialPair<numnodes, numnodalvalues, T>::
   T gap_regularized = 0.0;  // modified gap if a regularization of the force law is applied
 
   // evaluate charge/particle densities from DLINE charge condition specified in input file
-  double q1 = linechargeconds_[0]->parameters().get<double>("VAL");
-  double q2 = linechargeconds_[1]->parameters().get<double>("VAL");
+  double q1 = linechargeconds_[0]->parameters().template get<double>("VAL");
+  double q2 = linechargeconds_[1]->parameters().template get<double>("VAL");
 
   // evaluate function in time if specified in line charge conditions
   // TODO allow for functions in space, i.e. varying charge along beam centerline
-  auto function_number = linechargeconds_[0]->parameters().get<std::optional<int>>("FUNCT");
+  auto function_number =
+      linechargeconds_[0]->parameters().template get<std::optional<int>>("FUNCT");
 
   if (function_number.has_value() && function_number.value() > 0)
     q1 *= Global::Problem::instance()
               ->function_by_id<Core::Utils::FunctionOfTime>(function_number.value())
               .evaluate(time_);
 
-  function_number = linechargeconds_[1]->parameters().get<std::optional<int>>("FUNCT");
+  function_number = linechargeconds_[1]->parameters().template get<std::optional<int>>("FUNCT");
 
   if (function_number.has_value() && function_number.value() > 0)
     q2 *= Global::Problem::instance()
@@ -1231,19 +1233,20 @@ void BeamInteraction::BeamToBeamPotentialPair<numnodes, numnodalvalues, T>::
       Core::LinAlg::Initialization::zero);
 
   // evaluate charge/particle densities from DLINE charge condition specified in input file
-  double rho1 = linechargeconds_[0]->parameters().get<double>("VAL");
-  double rho2 = linechargeconds_[1]->parameters().get<double>("VAL");
+  double rho1 = linechargeconds_[0]->parameters().template get<double>("VAL");
+  double rho2 = linechargeconds_[1]->parameters().template get<double>("VAL");
 
   // evaluate function in time if specified in line charge conditions
   // TODO allow for functions in space, i.e. varying charge along beam centerline
-  auto function_number = linechargeconds_[0]->parameters().get<std::optional<int>>("FUNCT");
+  auto function_number =
+      linechargeconds_[0]->parameters().template get<std::optional<int>>("FUNCT");
 
   if (function_number.has_value() && function_number.value() > 0)
     rho1 *= Global::Problem::instance()
                 ->function_by_id<Core::Utils::FunctionOfTime>(function_number.value())
                 .evaluate(time_);
 
-  function_number = linechargeconds_[1]->parameters().get<std::optional<int>>("FUNCT");
+  function_number = linechargeconds_[1]->parameters().template get<std::optional<int>>("FUNCT");
 
   if (function_number.has_value() && function_number.value() > 0)
     rho2 *= Global::Problem::instance()
diff --git a/src/beaminteraction/src/potential/4C_beaminteraction_potential_pair_beam_to_sphere.cpp b/src/beaminteraction/src/potential/4C_beaminteraction_potential_pair_beam_to_sphere.cpp
@@ -241,22 +241,22 @@ void BeamInteraction::BeamToSpherePotentialPair<numnodes,
   get_shape_functions(N1_i, N1_i_xi, gausspoints);
 
   // evaluate charge density from DLINE charge condition specified in input file
-  double q1 = chargeconds_[0]->parameters().get<double>("VAL");
+  double q1 = chargeconds_[0]->parameters().template get<double>("VAL");
 
   // read charge of rigid sphere; note: this is NOT a charge density but the total charge of the
   // sphere!!!
-  double q2 = chargeconds_[1]->parameters().get<double>("VAL");
+  double q2 = chargeconds_[1]->parameters().template get<double>("VAL");
 
   // evaluate function in time if specified in line charge conditions
   // TODO allow for functions in space, i.e. varying charge along beam centerline
-  auto function_number = chargeconds_[0]->parameters().get<std::optional<int>>("FUNCT");
+  auto function_number = chargeconds_[0]->parameters().template get<std::optional<int>>("FUNCT");
 
   if (function_number.has_value() && function_number.value() > 0)
     q1 *= Global::Problem::instance()
               ->function_by_id<Core::Utils::FunctionOfTime>(function_number.value())
               .evaluate(time_);
 
-  function_number = chargeconds_[1]->parameters().get<std::optional<int>>("FUNCT");
+  function_number = chargeconds_[1]->parameters().template get<std::optional<int>>("FUNCT");
 
   if (function_number.has_value() and function_number.value() > 0)
     q2 *= Global::Problem::instance()
diff --git a/src/core/comm/src/4C_comm_pack_helpers.hpp b/src/core/comm/src/4C_comm_pack_helpers.hpp
@@ -34,8 +34,6 @@ namespace Core::Communication
     template <class T>
     using is_enum_class =
         std::integral_constant<bool, !std::is_convertible<T, int>::value && std::is_enum<T>::value>;
-
-
   }
 
 
@@ -117,7 +115,11 @@ namespace Core::Communication
     // If T is trivially copyable, we can just copy the bytes. Otherwise, recursively call the
     // pack function for every element. Note that vector<bool> is a special case, as it does not
     // provide the data() method.
-    if constexpr (std::is_trivially_copyable_v<T> && !std::is_same_v<T, bool>)
+    if constexpr (std::is_same_v<T, bool>)
+    {
+      for (bool b : stuff) add_to_pack(data, b);
+    }
+    else if constexpr (std::is_trivially_copyable_v<T>)
     {
       add_to_pack(data, stuff.data(), numele * sizeof(T));
     }
diff --git a/src/core/fem/src/general/utils/4C_fem_general_largerotations.hpp b/src/core/fem/src/general/utils/4C_fem_general_largerotations.hpp
@@ -13,8 +13,9 @@
 #include "4C_linalg_fixedsizematrix.hpp"
 #include "4C_utils_fad.hpp"
 
-FOUR_C_NAMESPACE_OPEN
+#include <numbers>
 
+FOUR_C_NAMESPACE_OPEN
 
 namespace Core::LargeRotations
 {
diff --git a/src/core/linalg/src/dense/4C_linalg_fixedsizematrix.hpp b/src/core/linalg/src/dense/4C_linalg_fixedsizematrix.hpp
@@ -13,7 +13,9 @@
 #include "4C_utils_exceptions.hpp"
 #include "4C_utils_mathoperations.hpp"
 
+#include <numbers>
 #include <ostream>
+#include <span>
 
 FOUR_C_NAMESPACE_OPEN
 
diff --git a/src/core/linalg/src/dense/4C_linalg_symmetric_tensor.hpp b/src/core/linalg/src/dense/4C_linalg_symmetric_tensor.hpp
@@ -638,7 +638,7 @@ namespace Core::LinAlg
           case 21:
             return 6;
           default:
-            FOUR_C_THROW("Unsupported symmetric tensor size: " + std::to_string(size));
+            FOUR_C_THROW("Unsupported symmetric tensor size: {}", size);
         }
       }(size);
 
diff --git a/src/core/linalg/src/sparse/4C_linalg_map.hpp b/src/core/linalg/src/sparse/4C_linalg_map.hpp
@@ -18,6 +18,7 @@
 #include <mpi.h>
 
 #include <memory>
+#include <span>
 #include <variant>
 
 FOUR_C_NAMESPACE_OPEN
diff --git a/src/core/linalg/src/sparse/4C_linalg_vector.hpp b/src/core/linalg/src/sparse/4C_linalg_vector.hpp
@@ -20,6 +20,8 @@
 #include <Epetra_Vector.h>
 
 #include <memory>
+#include <numbers>
+#include <span>
 
 FOUR_C_NAMESPACE_OPEN
 
diff --git a/src/core/utils/src/exceptions/4C_utils_exceptions.cpp b/src/core/utils/src/exceptions/4C_utils_exceptions.cpp
@@ -11,6 +11,9 @@
 
 #ifdef FOUR_C_WITH_BACKTRACE
 #define BOOST_STACKTRACE_USE_BACKTRACE
+#if defined(__APPLE__)
+#define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
+#endif
 #endif
 
 #include <boost/stacktrace.hpp>
diff --git a/src/core/utils/src/functions/4C_utils_function.hpp b/src/core/utils/src/functions/4C_utils_function.hpp
@@ -16,6 +16,7 @@
 #include "4C_utils_symbolic_expression.fwd.hpp"
 
 #include <memory>
+#include <numbers>
 #include <span>
 #include <string>
 #include <vector>
diff --git a/src/particle/src/interaction/4C_particle_interaction_utils.hpp b/src/particle/src/interaction/4C_particle_interaction_utils.hpp
@@ -16,6 +16,7 @@
 #include "4C_utils_exceptions.hpp"
 
 #include <cmath>
+#include <numbers>
 
 FOUR_C_NAMESPACE_OPEN
 
diff --git a/src/scatra/4C_scatra_functions.cpp b/src/scatra/4C_scatra_functions.cpp
@@ -12,6 +12,36 @@
 
 #include <cmath>
 
+#if defined(__cpp_lib_math_special_functions) && __cpp_lib_math_special_functions >= 201603L
+#define HAS_STD_COMP_ELLINT_X 1
+#else
+#define HAS_STD_COMP_ELLINT_X 0
+#endif
+
+#if HAS_STD_COMP_ELLINT_X
+namespace Internal
+{
+  using std::comp_ellint_1;
+  using std::comp_ellint_2;
+  using std::comp_ellint_3;
+}  // namespace Internal
+#else
+/* Implement the comp_ellint_x functions since they are missing in old version of llvm's libc++, see
+ * https://github.com/llvm/llvm-project/issues/99939*/
+#include <boost/math/special_functions/ellint_1.hpp>
+#include <boost/math/special_functions/ellint_2.hpp>
+#include <boost/math/special_functions/ellint_3.hpp>
+namespace Internal
+{
+  using boost::math::ellint_1;
+  using boost::math::ellint_2;
+  using boost::math::ellint_3;
+  inline double comp_ellint_1(double k) { return boost::math::ellint_1(k); }
+  inline double comp_ellint_2(double k) { return boost::math::ellint_2(k); }
+  inline double comp_ellint_3(double k, double nu) { return boost::math::ellint_3(k, nu); }
+}  // namespace Internal
+#endif
+
 FOUR_C_NAMESPACE_OPEN namespace
 {
   std::shared_ptr<Core::Utils::FunctionOfSpaceTime> create_scatra_function(
@@ -292,16 +322,16 @@ std::array<double, 3> ScaTra::CylinderMagnetFunction::evaluate_magnetic_field(
   auto P_1 = [](const double k)
   {
     const double k_squared = std::pow(k, 2.0);
-    const double K = std::comp_ellint_1(std::sqrt(1.0 - k_squared));
-    const double E = std::comp_ellint_2(std::sqrt(1.0 - k_squared));
+    const double K = Internal::comp_ellint_1(std::sqrt(1.0 - k_squared));
+    const double E = Internal::comp_ellint_2(std::sqrt(1.0 - k_squared));
     return K - (2.0 / (1.0 - k_squared)) * (K - E);
   };
 
   auto P_2 = [gamma](const double k)
   {
     const double gamma_squared = std::pow(gamma, 2.0);
     const double k_squared = std::pow(k, 2.0);
-    const double K = std::comp_ellint_1(std::sqrt(1.0 - k_squared));
+    const double K = Internal::comp_ellint_1(std::sqrt(1.0 - k_squared));
     const double P = safe_comp_ellint_3(std::sqrt(1.0 - k_squared), 1 - gamma_squared);
 
     return -(gamma / (1.0 - gamma_squared)) * (P - K) -
@@ -435,10 +465,10 @@ std::array<double, 3> ScaTra::CylinderMagnetFunction::evaluate_magnetic_force(
   const double c_4 = b_4 + std::pow(rho, 2.0);
 
   // precompute complete elliptic integrals
-  const double K_p = std::comp_ellint_1(std::sqrt(psi_p));
-  const double K_m = std::comp_ellint_1(std::sqrt(psi_m));
-  const double E_p = std::comp_ellint_2(std::sqrt(psi_p));
-  const double E_m = std::comp_ellint_2(std::sqrt(psi_m));
+  const double K_p = Internal::comp_ellint_1(std::sqrt(psi_p));
+  const double K_m = Internal::comp_ellint_1(std::sqrt(psi_m));
+  const double E_p = Internal::comp_ellint_2(std::sqrt(psi_p));
+  const double E_m = Internal::comp_ellint_2(std::sqrt(psi_m));
 
   // calculate auxiliary functions
   const double Q_1 =
@@ -497,7 +527,7 @@ double ScaTra::safe_comp_ellint_3(double k, double nu)
   k = std::clamp(k, -1.0 + safe_margin, 1.0 - safe_margin);
   nu = std::min(nu, 1.0 - safe_margin);
 
-  return std::comp_ellint_3(k, nu);
+  return Internal::comp_ellint_3(k, nu);
 }
 
 FOUR_C_NAMESPACE_CLOSE
diff --git a/src/truss3/4C_truss3.hpp b/src/truss3/4C_truss3.hpp
@@ -18,6 +18,7 @@
 #include <Sacado.hpp>
 
 FOUR_C_NAMESPACE_OPEN
+
 using FAD = Sacado::Fad::DFad<double>;
 
 namespace Solid
diff --git a/src/xfem/4C_xfem_interface_utils.hpp b/src/xfem/4C_xfem_interface_utils.hpp
@@ -17,6 +17,8 @@
 #include "4C_fluid_ele_calc_xfem_coupling.hpp"
 #include "4C_inpar_xfem.hpp"
 
+#include <numbers>
+
 FOUR_C_NAMESPACE_OPEN
 
 // forward declarations

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ namespace Core::Communication`
`34`	`34`	`template <class T>`
`35`	`35`	`using is_enum_class =`
`36`	`36`	`std::integral_constant<bool, !std::is_convertible<T, int>::value && std::is_enum<T>::value>;`
`37`		`-`
`38`		`-`
`39`	`37`	`}`
`40`	`38`
`41`	`39`
`@@ -117,7 +115,11 @@ namespace Core::Communication`
`117`	`115`	`// If T is trivially copyable, we can just copy the bytes. Otherwise, recursively call the`
`118`	`116`	`// pack function for every element. Note that vector<bool> is a special case, as it does not`
`119`	`117`	`// provide the data() method.`
`120`		`- if constexpr (std::is_trivially_copyable_v<T> && !std::is_same_v<T, bool>)`
	`118`	`+ if constexpr (std::is_same_v<T, bool>)`
	`119`	`+ {`
	`120`	`+ for (bool b : stuff) add_to_pack(data, b);`
	`121`	`+ }`
	`122`	`+ else if constexpr (std::is_trivially_copyable_v<T>)`
`121`	`123`	`{`
`122`	`124`	`add_to_pack(data, stuff.data(), numele * sizeof(T));`
`123`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,9 @@`
`13`	`13`	`#include "4C_linalg_fixedsizematrix.hpp"`
`14`	`14`	`#include "4C_utils_fad.hpp"`
`15`	`15`
`16`		`-FOUR_C_NAMESPACE_OPEN`
	`16`	`+#include <numbers>`
`17`	`17`
	`18`	`+FOUR_C_NAMESPACE_OPEN`
`18`	`19`
`19`	`20`	`namespace Core::LargeRotations`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ namespace Core::LinAlg`
`638`	`638`	`case 21:`
`639`	`639`	`return 6;`
`640`	`640`	`default:`
`641`		`- FOUR_C_THROW("Unsupported symmetric tensor size: " + std::to_string(size));`
	`641`	`+ FOUR_C_THROW("Unsupported symmetric tensor size: {}", size);`
`642`	`642`	`}`
`643`	`643`	`}(size);`
`644`	`644`