Merge pull request #5964 from bangerth/manager-names

Use emplace_back() over push_back().
geodynamics · Jul 11, 2024 · 96a3ad0 · 96a3ad0
2 parents 7472950 + f852c68
commit 96a3ad0
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 36 deletions.
diff --git a/source/boundary_composition/interface.cc b/source/boundary_composition/interface.cc
@@ -140,10 +140,9 @@ namespace aspect
       for (auto &model_name : this->plugin_names)
         {
           // create boundary composition objects
-          this->plugin_objects.push_back (std::unique_ptr<Interface<dim>>
-                                          (std::get<dim>(registered_plugins)
-                                           .create_plugin (model_name,
-                                                           "Boundary composition::Model names")));
+          this->plugin_objects.emplace_back (std::get<dim>(registered_plugins)
+                                             .create_plugin (model_name,
+                                                             "Boundary composition::Model names"));
 
           if (SimulatorAccess<dim> *sim = dynamic_cast<SimulatorAccess<dim>*>(this->plugin_objects.back().get()))
             sim->initialize_simulator (this->get_simulator());

diff --git a/source/boundary_temperature/interface.cc b/source/boundary_temperature/interface.cc
@@ -137,10 +137,9 @@ namespace aspect
       for (auto &model_name : this->plugin_names)
         {
           // create boundary temperature objects
-          this->plugin_objects.push_back (std::unique_ptr<Interface<dim>>
-                                          (std::get<dim>(registered_plugins)
-                                           .create_plugin (model_name,
-                                                           "Boundary temperature::Model names")));
+          this->plugin_objects.emplace_back (std::get<dim>(registered_plugins)
+                                             .create_plugin (model_name,
+                                                             "Boundary temperature::Model names"));
 
           if (SimulatorAccess<dim> *sim = dynamic_cast<SimulatorAccess<dim>*>(this->plugin_objects.back().get()))
             sim->initialize_simulator (this->get_simulator());

diff --git a/source/heating_model/interface.cc b/source/heating_model/interface.cc
@@ -119,10 +119,9 @@ namespace aspect
       // their own parameters
       for (auto &model_name : this->plugin_names)
         {
-          this->plugin_objects.push_back (std::unique_ptr<Interface<dim>>
-                                          (std::get<dim>(registered_plugins)
-                                           .create_plugin (model_name,
-                                                           "Heating model::Model names")));
+          this->plugin_objects.emplace_back (std::get<dim>(registered_plugins)
+                                             .create_plugin (model_name,
+                                                             "Heating model::Model names"));
 
           if (SimulatorAccess<dim> *sim = dynamic_cast<SimulatorAccess<dim>*>(&*this->plugin_objects.back()))
             sim->initialize_simulator (this->get_simulator());

diff --git a/source/initial_composition/interface.cc b/source/initial_composition/interface.cc
@@ -111,10 +111,9 @@ namespace aspect
       // their own parameters
       for (const auto &model_name : this->plugin_names)
         {
-          this->plugin_objects.push_back (std::unique_ptr<Interface<dim>>
-                                          (std::get<dim>(registered_plugins)
-                                           .create_plugin (model_name,
-                                                           "Initial composition model::Model names")));
+          this->plugin_objects.emplace_back (std::get<dim>(registered_plugins)
+                                             .create_plugin (model_name,
+                                                             "Initial composition model::Model names"));
 
           if (SimulatorAccess<dim> *sim = dynamic_cast<SimulatorAccess<dim>*>(&*this->plugin_objects.back()))
             sim->initialize_simulator (this->get_simulator());

diff --git a/source/initial_temperature/interface.cc b/source/initial_temperature/interface.cc
@@ -101,10 +101,9 @@ namespace aspect
       for (auto &model_name : this->plugin_names)
         {
           // create initial temperature objects
-          this->plugin_objects.push_back (std::unique_ptr<Interface<dim>>
-                                          (std::get<dim>(registered_plugins)
-                                           .create_plugin (model_name,
-                                                           "Initial temperature model::Model names")));
+          this->plugin_objects.emplace_back (std::get<dim>(registered_plugins)
+                                             .create_plugin (model_name,
+                                                             "Initial temperature model::Model names"));
 
           if (SimulatorAccess<dim> *sim = dynamic_cast<SimulatorAccess<dim>*>(&*this->plugin_objects.back()))
             sim->initialize_simulator (this->get_simulator());

diff --git a/source/mesh_refinement/interface.cc b/source/mesh_refinement/interface.cc
@@ -382,10 +382,9 @@ namespace aspect
                    ExcMessage ("You need to provide at least one mesh refinement criterion in the input file!"));
       for (auto &plugin_name : plugin_names)
         {
-          this->plugin_objects.push_back (std::unique_ptr<Interface<dim>>
-                                          (std::get<dim>(registered_plugins)
-                                           .create_plugin (plugin_name,
-                                                           "Mesh refinement::Refinement criteria merge operation")));
+          this->plugin_objects.emplace_back (std::get<dim>(registered_plugins)
+                                             .create_plugin (plugin_name,
+                                                             "Mesh refinement::Refinement criteria merge operation"));
 
           if (SimulatorAccess<dim> *sim = dynamic_cast<SimulatorAccess<dim>*>(&*this->plugin_objects.back()))
             sim->initialize_simulator (this->get_simulator());

diff --git a/source/postprocess/interface.cc b/source/postprocess/interface.cc
@@ -226,10 +226,9 @@ namespace aspect
       // their own parameters
       for (unsigned int name=0; name<postprocessor_names.size(); ++name)
         {
-          this->plugin_objects.push_back (std::unique_ptr<Interface<dim>>
-                                          (std::get<dim>(registered_plugins)
-                                           .create_plugin (postprocessor_names[name],
-                                                           "Postprocessor plugins")));
+          this->plugin_objects.emplace_back (std::get<dim>(registered_plugins)
+                                             .create_plugin (postprocessor_names[name],
+                                                             "Postprocessor plugins"));
           if (SimulatorAccess<dim> *sim = dynamic_cast<SimulatorAccess<dim>*>(&*this->plugin_objects.back()))
             sim->initialize_simulator (this->get_simulator());
 

diff --git a/source/termination_criteria/interface.cc b/source/termination_criteria/interface.cc
@@ -214,10 +214,9 @@ namespace aspect
       // their own parameters
       for (const auto &plugin_name : plugin_names)
         {
-          this->plugin_objects.push_back (std::unique_ptr<Interface<dim>>
-                                          (std::get<dim>(registered_plugins)
-                                           .create_plugin (plugin_name,
-                                                           "Termination criteria::Termination criteria")));
+          this->plugin_objects.emplace_back (std::get<dim>(registered_plugins)
+                                             .create_plugin (plugin_name,
+                                                             "Termination criteria::Termination criteria"));
           if (SimulatorAccess<dim> *sim = dynamic_cast<SimulatorAccess<dim>*>(&*this->plugin_objects.back()))
             sim->initialize_simulator (this->get_simulator());
           this->plugin_objects.back()->parse_parameters (prm);

diff --git a/source/time_stepping/interface.cc b/source/time_stepping/interface.cc
@@ -308,10 +308,9 @@ namespace aspect
 
         for (const auto &model_name : model_names)
           {
-            this->plugin_objects.push_back (std::unique_ptr<Interface<dim>>
-                                            (std::get<dim>(registered_plugins)
-                                             .create_plugin (model_name,
-                                                             "Time stepping::Model names")));
+            this->plugin_objects.emplace_back (std::get<dim>(registered_plugins)
+                                               .create_plugin (model_name,
+                                                               "Time stepping::Model names"));
 
             if (SimulatorAccess<dim> *sim = dynamic_cast<SimulatorAccess<dim>*>(&*this->plugin_objects.back()))
               sim->initialize_simulator (this->get_simulator());