Merge pull request #6885 from gassmoeller/fix_double_instantiations

tjhei · web-flow · commit b9a61a5321b8 · 2026-03-07T06:55:16.000-05:00
Remove unnecessary explicit instantiations
diff --git a/include/aspect/plugins.h b/include/aspect/plugins.h
@@ -604,10 +604,10 @@ namespace aspect
          * reason: objects with static initializers (such as =0) are
          * initialized before any objects for which one needs to run
          * constructors. Consequently, we can be sure that this pointer is set
-         * to zero before we ever try to register a postprocessor, and
-         * consequently whenever we run Manager::register_postprocessor, we
+         * to zero before we ever try to register a plugin, and
+         * consequently whenever we run register_plugin(), we
          * need not worry whether we try to add something to this list before
-         * the lists's constructor has successfully run
+         * the lists's constructor has successfully run.
          */
         static std::list<PluginInfo> *plugins;
 
diff --git a/source/adiabatic_conditions/interface.cc b/source/adiabatic_conditions/interface.cc
@@ -176,19 +176,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<AdiabaticConditions::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<AdiabaticConditions::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<AdiabaticConditions::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<AdiabaticConditions::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace AdiabaticConditions
   {
 #define INSTANTIATE(dim) \
diff --git a/source/boundary_composition/interface.cc b/source/boundary_composition/interface.cc
@@ -332,19 +332,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryComposition::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryComposition::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryComposition::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryComposition::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace BoundaryComposition
   {
 #define INSTANTIATE(dim) \
diff --git a/source/boundary_convective_heating/interface.cc b/source/boundary_convective_heating/interface.cc
@@ -400,19 +400,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryConvectiveHeating::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryConvectiveHeating::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryConvectiveHeating::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryConvectiveHeating::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace BoundaryConvectiveHeating
   {
 #define INSTANTIATE(dim) \
diff --git a/source/boundary_fluid_pressure/interface.cc b/source/boundary_fluid_pressure/interface.cc
@@ -109,19 +109,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryFluidPressure::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryFluidPressure::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryFluidPressure::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryFluidPressure::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace BoundaryFluidPressure
   {
 #define INSTANTIATE(dim) \
diff --git a/source/boundary_heat_flux/interface.cc b/source/boundary_heat_flux/interface.cc
@@ -109,19 +109,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryHeatFlux::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryHeatFlux::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryHeatFlux::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryHeatFlux::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace BoundaryHeatFlux
   {
 #define INSTANTIATE(dim) \
diff --git a/source/boundary_temperature/interface.cc b/source/boundary_temperature/interface.cc
@@ -346,19 +346,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryTemperature::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryTemperature::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryTemperature::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryTemperature::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace BoundaryTemperature
   {
 #define INSTANTIATE(dim) \
diff --git a/source/boundary_traction/interface.cc b/source/boundary_traction/interface.cc
@@ -351,19 +351,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryTraction::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryTraction::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryTraction::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryTraction::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace BoundaryTraction
   {
 #define INSTANTIATE(dim) \
diff --git a/source/boundary_velocity/interface.cc b/source/boundary_velocity/interface.cc
@@ -444,19 +444,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryVelocity::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryVelocity::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<BoundaryVelocity::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<BoundaryVelocity::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace BoundaryVelocity
   {
 #define INSTANTIATE(dim) \
diff --git a/source/geometry_model/initial_topography_model/interface.cc b/source/geometry_model/initial_topography_model/interface.cc
@@ -130,20 +130,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<InitialTopographyModel::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<InitialTopographyModel::Interface<2>>::plugins = nullptr;
-
-      template <>
-      std::list<internal::Plugins::PluginList<InitialTopographyModel::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<InitialTopographyModel::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace InitialTopographyModel
   {
 #define INSTANTIATE(dim) \
diff --git a/source/geometry_model/interface.cc b/source/geometry_model/interface.cc
@@ -324,20 +324,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<GeometryModel::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<GeometryModel::Interface<2>>::plugins = nullptr;
-
-      template <>
-      std::list<internal::Plugins::PluginList<GeometryModel::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<GeometryModel::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace GeometryModel
   {
 #define INSTANTIATE(dim) \
diff --git a/source/gravity_model/interface.cc b/source/gravity_model/interface.cc
@@ -121,19 +121,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<GravityModel::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<GravityModel::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<GravityModel::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<GravityModel::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace GravityModel
   {
 #define INSTANTIATE(dim) \
diff --git a/source/heating_model/interface.cc b/source/heating_model/interface.cc
@@ -303,19 +303,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<HeatingModel::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<HeatingModel::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<HeatingModel::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<HeatingModel::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace HeatingModel
   {
 #define INSTANTIATE(dim) \
diff --git a/source/initial_composition/interface.cc b/source/initial_composition/interface.cc
@@ -225,19 +225,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<InitialComposition::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<InitialComposition::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<InitialComposition::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<InitialComposition::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace InitialComposition
   {
 #define INSTANTIATE(dim) \
diff --git a/source/initial_temperature/interface.cc b/source/initial_temperature/interface.cc
@@ -215,19 +215,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<InitialTemperature::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<InitialTemperature::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<InitialTemperature::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<InitialTemperature::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace InitialTemperature
   {
 #define INSTANTIATE(dim) \
diff --git a/source/material_model/interface.cc b/source/material_model/interface.cc
@@ -1205,20 +1205,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<MaterialModel::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<MaterialModel::Interface<2>>::plugins = nullptr;
-
-      template <>
-      std::list<internal::Plugins::PluginList<MaterialModel::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<MaterialModel::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace MaterialModel
   {
 #define INSTANTIATE(dim) \
diff --git a/source/mesh_deformation/interface.cc b/source/mesh_deformation/interface.cc
@@ -1730,19 +1730,6 @@ namespace aspect
 // explicit instantiation of the functions we implement in this file
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<MeshDeformation::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<MeshDeformation::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<MeshDeformation::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<MeshDeformation::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace MeshDeformation
   {
 #define INSTANTIATE(dim) \
diff --git a/source/mesh_refinement/interface.cc b/source/mesh_refinement/interface.cc
@@ -423,19 +423,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<MeshRefinement::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<MeshRefinement::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<MeshRefinement::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<MeshRefinement::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace MeshRefinement
   {
 #define INSTANTIATE(dim) \
diff --git a/source/particle/generator/interface.cc b/source/particle/generator/interface.cc
@@ -248,19 +248,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<Particle::Generator::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<Particle::Generator::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<Particle::Generator::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<Particle::Generator::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace Particle
   {
     namespace Generator
diff --git a/source/particle/integrator/interface.cc b/source/particle/integrator/interface.cc
@@ -201,19 +201,6 @@ namespace aspect
 // explicit instantiations
 namespace aspect
 {
-  namespace internal
-  {
-    namespace Plugins
-    {
-      template <>
-      std::list<internal::Plugins::PluginList<Particle::Integrator::Interface<2>>::PluginInfo> *
-      internal::Plugins::PluginList<Particle::Integrator::Interface<2>>::plugins = nullptr;
-      template <>
-      std::list<internal::Plugins::PluginList<Particle::Integrator::Interface<3>>::PluginInfo> *
-      internal::Plugins::PluginList<Particle::Integrator::Interface<3>>::plugins = nullptr;
-    }
-  }
-
   namespace Particle
   {
     namespace Integrator
diff --git a/source/particle/interpolator/interface.cc b/source/particle/interpolator/interface.cc
diff --git a/source/particle/property/interface.cc b/source/particle/property/interface.cc
diff --git a/source/postprocess/interface.cc b/source/postprocess/interface.cc
diff --git a/source/postprocess/visualization.cc b/source/postprocess/visualization.cc
diff --git a/source/prescribed_solution/interface.cc b/source/prescribed_solution/interface.cc
diff --git a/source/prescribed_stokes_solution/interface.cc b/source/prescribed_stokes_solution/interface.cc
diff --git a/source/termination_criteria/interface.cc b/source/termination_criteria/interface.cc
diff --git a/source/time_stepping/interface.cc b/source/time_stepping/interface.cc
