Merge pull request #5942 from bangerth/manager-rename

Rename (has|get)_matching_plugin_object to just (has|get)_matching_plugin.
geodynamics · Jun 25, 2024 · 64f1603 · 64f1603
2 parents 03b29b8 + dde46a8
commit 64f1603
Show file tree

Hide file tree

Showing 37 changed files with 89 additions and 89 deletions.
diff --git a/include/aspect/boundary_composition/interface.h b/include/aspect/boundary_composition/interface.h
@@ -160,8 +160,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename BoundaryCompositionType,
@@ -182,8 +182,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename BoundaryCompositionType,
@@ -264,7 +264,7 @@ namespace aspect
     bool
     Manager<dim>::has_matching_boundary_composition_model () const
     {
-      return this->template has_matching_plugin_object<BoundaryCompositionType>();
+      return this->template has_matching_plugin<BoundaryCompositionType>();
     }
 
 
@@ -275,7 +275,7 @@ namespace aspect
     const BoundaryCompositionType &
     Manager<dim>::get_matching_boundary_composition_model () const
     {
-      return this->template get_matching_plugin_object<BoundaryCompositionType>();
+      return this->template get_matching_plugin<BoundaryCompositionType>();
     }
 
 

diff --git a/include/aspect/boundary_temperature/interface.h b/include/aspect/boundary_temperature/interface.h
@@ -194,8 +194,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename BoundaryTemperatureType,
@@ -216,8 +216,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename BoundaryTemperatureType,
@@ -298,7 +298,7 @@ namespace aspect
     bool
     Manager<dim>::has_matching_boundary_temperature_model () const
     {
-      return this->template has_matching_plugin_object<BoundaryTemperatureType>();
+      return this->template has_matching_plugin<BoundaryTemperatureType>();
     }
 
 
@@ -308,7 +308,7 @@ namespace aspect
     const BoundaryTemperatureType &
     Manager<dim>::get_matching_boundary_temperature_model () const
     {
-      return this->template get_matching_plugin_object<BoundaryTemperatureType>();
+      return this->template get_matching_plugin<BoundaryTemperatureType>();
     }
 
 

diff --git a/include/aspect/heating_model/interface.h b/include/aspect/heating_model/interface.h
@@ -275,8 +275,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename HeatingModelType,
@@ -297,8 +297,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename HeatingModelType,
@@ -345,7 +345,7 @@ namespace aspect
     bool
     Manager<dim>::has_matching_heating_model () const
     {
-      return this->template has_matching_plugin_object<HeatingModelType>();
+      return this->template has_matching_plugin<HeatingModelType>();
     }
 
 
@@ -355,7 +355,7 @@ namespace aspect
     const HeatingModelType &
     Manager<dim>::get_matching_heating_model () const
     {
-      return this->template get_matching_plugin_object<HeatingModelType>();
+      return this->template get_matching_plugin<HeatingModelType>();
     }
 
 

diff --git a/include/aspect/initial_composition/interface.h b/include/aspect/initial_composition/interface.h
@@ -149,8 +149,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename InitialCompositionType,
@@ -171,8 +171,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename InitialCompositionType,
@@ -226,7 +226,7 @@ namespace aspect
     bool
     Manager<dim>::has_matching_initial_composition_model () const
     {
-      return this->template has_matching_plugin_object<InitialCompositionType>();
+      return this->template has_matching_plugin<InitialCompositionType>();
     }
 
 
@@ -236,7 +236,7 @@ namespace aspect
     const InitialCompositionType &
     Manager<dim>::get_matching_initial_composition_model () const
     {
-      return this->template get_matching_plugin_object<InitialCompositionType>();
+      return this->template get_matching_plugin<InitialCompositionType>();
     }
 
 

diff --git a/include/aspect/initial_temperature/interface.h b/include/aspect/initial_temperature/interface.h
@@ -146,8 +146,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename InitialTemperatureType,
@@ -168,8 +168,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename InitialTemperatureType,
@@ -224,7 +224,7 @@ namespace aspect
     bool
     Manager<dim>::has_matching_initial_temperature_model () const
     {
-      return this->template has_matching_plugin_object<InitialTemperatureType>();
+      return this->template has_matching_plugin<InitialTemperatureType>();
     }
 
 
@@ -234,7 +234,7 @@ namespace aspect
     const InitialTemperatureType &
     Manager<dim>::get_matching_initial_temperature_model () const
     {
-      return this->template get_matching_plugin_object<InitialTemperatureType>();
+      return this->template get_matching_plugin<InitialTemperatureType>();
     }
 
 

diff --git a/include/aspect/mesh_refinement/interface.h b/include/aspect/mesh_refinement/interface.h
@@ -162,8 +162,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename MeshRefinementType,
@@ -184,8 +184,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename MeshRefinementType,
@@ -273,7 +273,7 @@ namespace aspect
     bool
     Manager<dim>::has_matching_mesh_refinement_strategy () const
     {
-      return this->template has_matching_plugin_object<MeshRefinementType>();
+      return this->template has_matching_plugin<MeshRefinementType>();
     }
 
 
@@ -284,7 +284,7 @@ namespace aspect
     const MeshRefinementType &
     Manager<dim>::get_matching_mesh_refinement_strategy () const
     {
-      return this->template get_matching_plugin_object<MeshRefinementType>();
+      return this->template get_matching_plugin<MeshRefinementType>();
     }
 
 

diff --git a/include/aspect/particle/property/interface.h b/include/aspect/particle/property/interface.h
@@ -616,8 +616,8 @@ namespace aspect
            * argument) is a class derived from the Interface class in this namespace.
            *
            * @deprecated Instead of this function, use the
-           *   Plugins::ManagerBase::has_matching_plugin_object() and
-           *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+           *   Plugins::ManagerBase::has_matching_plugin() and
+           *   Plugins::ManagerBase::get_matching_plugin() functions of the base
            *   class of the current class.
            */
           template <typename ParticlePropertyType,
@@ -638,8 +638,8 @@ namespace aspect
            * argument) is a class derived from the Interface class in this namespace.
            *
            * @deprecated Instead of this function, use the
-           *   Plugins::ManagerBase::has_matching_plugin_object() and
-           *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+           *   Plugins::ManagerBase::has_matching_plugin() and
+           *   Plugins::ManagerBase::get_matching_plugin() functions of the base
            *   class of the current class.
            */
           template <typename ParticlePropertyType,
@@ -771,7 +771,7 @@ namespace aspect
       bool
       Manager<dim>::has_matching_property () const
       {
-        return this->template has_matching_plugin_object<ParticlePropertyType>();
+        return this->template has_matching_plugin<ParticlePropertyType>();
       }
 
 
@@ -781,7 +781,7 @@ namespace aspect
       const ParticlePropertyType &
       Manager<dim>::get_matching_property () const
       {
-        return this->template get_matching_plugin_object<ParticlePropertyType>();
+        return this->template get_matching_plugin<ParticlePropertyType>();
       }
 
 

diff --git a/include/aspect/plugins.h b/include/aspect/plugins.h
@@ -232,7 +232,7 @@ namespace aspect
         template <typename PluginType,
                   typename = typename std::enable_if_t<std::is_base_of<InterfaceType,PluginType>::value>>
         bool
-        has_matching_plugin_object () const;
+        has_matching_plugin () const;
 
         /**
          * Go through the list of all plugins that have been selected
@@ -248,7 +248,7 @@ namespace aspect
         template <typename PluginType,
                   typename = typename std::enable_if_t<std::is_base_of<InterfaceType,PluginType>::value>>
         const PluginType &
-        get_matching_plugin_object () const;
+        get_matching_plugin () const;
 
       protected:
         /**
@@ -320,7 +320,7 @@ namespace aspect
     template <typename PluginType, typename>
     inline
     bool
-    ManagerBase<InterfaceType>::has_matching_plugin_object () const
+    ManagerBase<InterfaceType>::has_matching_plugin () const
     {
       for (const auto &p : plugin_objects)
         if (Plugins::plugin_type_matches<PluginType>(*p))
@@ -333,9 +333,9 @@ namespace aspect
     template <typename PluginType, typename>
     inline
     const PluginType &
-    ManagerBase<InterfaceType>::get_matching_plugin_object () const
+    ManagerBase<InterfaceType>::get_matching_plugin () const
     {
-      AssertThrow(has_matching_plugin_object<PluginType> (),
+      AssertThrow(has_matching_plugin<PluginType> (),
                   ExcMessage("You asked the object managing a collection of plugins for a "
                              "plugin object of type <" + boost::core::demangle(typeid(PluginType).name()) + "> "
                              "that could not be found in the current model. You need to "

diff --git a/include/aspect/postprocess/interface.h b/include/aspect/postprocess/interface.h
@@ -111,7 +111,7 @@ namespace aspect
          * This can be done by deriving your postprocessor from
          * SimulatorAccess, and then using the
          * SimulatorAccess::get_postprocess_manager() function, followed
-         * by asking the resulting object via get_matching_plugin_object()
+         * by asking the resulting object via get_matching_plugin()
          * for a specific postprocessor object.
          */
         virtual
@@ -196,8 +196,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename PostprocessorType,
@@ -218,8 +218,8 @@ namespace aspect
          * argument) is a class derived from the Interface class in this namespace.
          *
          * @deprecated Instead of this function, use the
-         *   Plugins::ManagerBase::has_matching_plugin_object() and
-         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   Plugins::ManagerBase::has_matching_plugin() and
+         *   Plugins::ManagerBase::get_matching_plugin() functions of the base
          *   class of the current class.
          */
         template <typename PostprocessorType,
@@ -352,7 +352,7 @@ namespace aspect
     bool
     Manager<dim>::has_matching_postprocessor () const
     {
-      return this->template has_matching_plugin_object<PostprocessorType>();
+      return this->template has_matching_plugin<PostprocessorType>();
     }
 
 
@@ -363,7 +363,7 @@ namespace aspect
     const PostprocessorType &
     Manager<dim>::get_matching_postprocessor () const
     {
-      return this->template get_matching_plugin_object<PostprocessorType>();
+      return this->template get_matching_plugin<PostprocessorType>();
     }
 
 

diff --git a/source/boundary_temperature/dynamic_core.cc b/source/boundary_temperature/dynamic_core.cc
@@ -594,11 +594,11 @@ namespace aspect
       // It is not available at the time initialize() function of boundary temperature is called.
       if (is_first_call==true)
         {
-          AssertThrow(this->get_postprocess_manager().template has_matching_plugin_object<const Postprocess::CoreStatistics<dim>>(),
+          AssertThrow(this->get_postprocess_manager().template has_matching_plugin<const Postprocess::CoreStatistics<dim>>(),
                       ExcMessage ("Dynamic core boundary condition has to work with dynamic core statistics postprocessor."));
 
           const Postprocess::CoreStatistics<dim> &core_statistics
-            = this->get_postprocess_manager().template get_matching_plugin_object<const Postprocess::CoreStatistics<dim>>();
+            = this->get_postprocess_manager().template get_matching_plugin<const Postprocess::CoreStatistics<dim>>();
           // The restart data is stored in 'core statistics' postprocessor.
           // If restart from checkpoint, extract data from there.
           core_data = core_statistics.get_core_data();

diff --git a/source/heating_model/interface.cc b/source/heating_model/interface.cc
@@ -59,7 +59,7 @@ namespace aspect
     bool
     Manager<dim>::adiabatic_heating_enabled() const
     {
-      return this->template has_matching_plugin_object<HeatingModel::AdiabaticHeating<dim>>() ;
+      return this->template has_matching_plugin<HeatingModel::AdiabaticHeating<dim>>() ;
     }
 
 
@@ -68,7 +68,7 @@ namespace aspect
     bool
     Manager<dim>::shear_heating_enabled() const
     {
-      return this->template has_matching_plugin_object<HeatingModel::ShearHeating<dim>>() ;
+      return this->template has_matching_plugin<HeatingModel::ShearHeating<dim>>() ;
     }