From 7c1626ff87dfcbc20cf7a9f2a2fb81f084b47b8d Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Wed, 16 Feb 2022 08:18:26 +0100
Subject: [PATCH] [NL] Make data static local to avoid static init order fiasco
---
.../Integration/IntegrationMethodRegistry.cpp | 25 ++++++++++++-------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/NumLib/Fem/Integration/IntegrationMethodRegistry.cpp b/NumLib/Fem/Integration/IntegrationMethodRegistry.cpp
index b11841e5163..3139233a168 100644
--- a/NumLib/Fem/Integration/IntegrationMethodRegistry.cpp
+++ b/NumLib/Fem/Integration/IntegrationMethodRegistry.cpp
@@ -162,15 +162,6 @@ initIntegrationMethods()
return integration_methods_by_mesh_element_type;
}
-//! The actual integration method registry.
-//!
-//! A mapping \code [mesh element type] -> [list of integration
-//! methods]\endcode, where each entry in the list corresponds to integration
-//! order 0, 1, 2, ...
-static const std::unordered_map<std::type_index,
- std::vector<NumLib::GenericIntegrationMethod>>
- integration_methods_by_mesh_element_type = initIntegrationMethods();
-
namespace NumLib::IntegrationMethodRegistry
{
GenericIntegrationMethod const& getIntegrationMethod(
@@ -184,6 +175,22 @@ GenericIntegrationMethod const& getIntegrationMethod(
OGS_FATAL("An integration order of 0 is not supported.");
}
+ // The actual integration method registry.
+ //
+ // A mapping \code [mesh element type] -> [list of integration
+ // methods]\endcode, where each entry in the list corresponds to integration
+ // order 0, 1, 2, ...
+ //
+ // Having this as a static __local__ variable circumvents the static
+ // initialization order fiasco we would have if this was a static __global__
+ // variable. The fiasco arises, because this registry uses static global
+ // data from MathLib. Currently (Feb 2022) we cannot circumvent the problem
+ // with constinit due to lack of compiler support.
+ static const std::unordered_map<
+ std::type_index,
+ std::vector<NumLib::GenericIntegrationMethod>>
+ integration_methods_by_mesh_element_type = initIntegrationMethods();
+
if (auto it =
integration_methods_by_mesh_element_type.find(mesh_element_type);
it != integration_methods_by_mesh_element_type.end())
--
GitLab