Merge pull request #5933 from bangerth/manager-superfluous

Remove now superfluous Manager functions.

include/aspect/boundary_composition/interface.h

@@ -85,24 +85,6 @@ namespace aspect
     class Manager : public Plugins::ManagerBase<Interface<dim>>, public SimulatorAccess<dim>
     {
       public:
-        /**
-         * Destructor. Made virtual since this class has virtual member
-         * functions.
-         */
-        ~Manager () override;
-
-        /**
-         * A function that is called at the beginning of each time step and
-         * calls the corresponding functions of all created plugins.
-         *
-         * The point of this function is to allow complex boundary composition
-         * models to do an initialization step once at the beginning of each
-         * time step. An example would be a model that needs to call an
-         * external program to compute the composition change at a boundary.
-         */
-        void
-        update () override;
-
         /**
          * Declare the parameters of all known boundary composition plugins, as
          * well as the ones this class has itself.

include/aspect/boundary_temperature/interface.h

@@ -106,24 +106,6 @@ namespace aspect
     class Manager : public Plugins::ManagerBase<Interface<dim>>, public SimulatorAccess<dim>
     {
       public:
-        /**
-         * Destructor. Made virtual since this class has virtual member
-         * functions.
-         */
-        ~Manager () override;
-
-        /**
-         * A function that is called at the beginning of each time step and
-         * calls the corresponding functions of all created plugins.
-         *
-         * The point of this function is to allow complex boundary temperature
-         * models to do an initialization step once at the beginning of each
-         * time step. An example would be a model that needs to call an
-         * external program to compute the temperature change at a boundary.
-         */
-        void
-        update () override;
-
         /**
          * Declare the parameters of all known boundary temperature plugins, as
          * well as the ones this class has itself.

include/aspect/initial_composition/interface.h

@@ -74,18 +74,6 @@ namespace aspect
     class Manager : public Plugins::ManagerBase<Interface<dim>>, public SimulatorAccess<dim>
     {
       public:
-        /**
-         * Destructor. Made virtual since this class has virtual member
-         * functions.
-         */
-        ~Manager () override;
-
-        /**
-         * Update function. Called once at the beginning of a timestep to
-         * update all plugin objects.
-         */
-        void update () override;
-
         /**
          * Declare the parameters of all known initial composition plugins, as
          * well as of ones this class has itself.

include/aspect/initial_temperature/interface.h

@@ -73,19 +73,6 @@ namespace aspect
     class Manager : public Plugins::ManagerBase<Interface<dim>>, public SimulatorAccess<dim>
     {
       public:
-        /**
-         * Destructor. Made virtual since this class has virtual member
-         * functions.
-         */
-        ~Manager () override;
-
-        /**
-         * Update function. Called once at the beginning of a timestep to
-         * update all plugin objects.
-        */
-        void
-        update() override;
-
         /**
          * Declare the parameters of all known initial conditions plugins, as
          * well as of ones this class has itself.

include/aspect/mesh_refinement/interface.h

@@ -117,21 +117,6 @@ namespace aspect
     class Manager : public Plugins::ManagerBase<Interface<dim>>, public SimulatorAccess<dim>
     {
       public:
-        /**
-         * Destructor. Made virtual since this class has virtual member
-         * functions.
-         */
-        ~Manager () override;
-
-        /**
-         * Update all of the mesh refinement objects that have been requested
-         * in the input file. Individual mesh refinement objects may choose to
-         * implement an update function to modify object variables once per
-         * time step.
-         */
-        void
-        update () override;
-
         /**
          * Execute all of the mesh refinement objects that have been requested
          * in the input file. The error indicators are then each individually

include/aspect/particle/property/interface.h

@@ -516,30 +516,13 @@ namespace aspect
       class Manager : public Plugins::ManagerBase<Interface<dim>>, public SimulatorAccess<dim>
       {
         public:
-          /**
-           * Empty constructor for Manager
-           */
-          Manager ();
-
-          /**
-           * Destructor for Manager
-           */
-          ~Manager () override;
-
           /**
            * Initialization function. This function is called once at the
            * beginning of the program after parse_parameters is run.
            */
           void
           initialize () override;
 
-          /**
-           * Update function. This function is called once at the
-           * beginning of each timestep.
-           */
-          void
-          update () override;
-
           /**
            * Initialization function for particle properties. This function is
            * called once for each of the particles of a particle

source/boundary_composition/interface.cc

@@ -40,22 +40,6 @@ namespace aspect
     // -------------------------------- Deal with registering boundary_composition models and automating
     // -------------------------------- their setup and selection at run time
 
-    template <int dim>
-    Manager<dim>::~Manager()
-      = default;
-
-
-
-    template <int dim>
-    void
-    Manager<dim>::update ()
-    {
-      for (auto &p : this->plugin_objects)
-        p->update();
-    }
-
-
-
     namespace
     {
       std::tuple

source/boundary_temperature/interface.cc

@@ -40,22 +40,6 @@ namespace aspect
     // -------------------------------- Deal with registering boundary_temperature models and automating
     // -------------------------------- their setup and selection at run time
 
-    template <int dim>
-    Manager<dim>::~Manager()
-      = default;
-
-
-
-    template <int dim>
-    void
-    Manager<dim>::update ()
-    {
-      for (auto &p : this->plugin_objects)
-        p->update();
-    }
-
-
-
     namespace
     {
       std::tuple

source/initial_composition/interface.cc

@@ -37,12 +37,6 @@ namespace aspect
     // ------------------------------ Deal with registering initial composition models and automating
     // ------------------------------ their setup and selection at run time
 
-    template <int dim>
-    Manager<dim>::~Manager()
-      = default;
-
-
-
     namespace
     {
       std::tuple
@@ -132,16 +126,6 @@ namespace aspect
 
 
 
-    template <int dim>
-    void
-    Manager<dim>::update()
-    {
-      for (auto &initial_composition_object : this->plugin_objects)
-        initial_composition_object->update();
-    }
-
-
-
     template <int dim>
     double
     Manager<dim>::initial_composition (const Point<dim> &position,

source/initial_temperature/interface.cc

@@ -36,12 +36,6 @@ namespace aspect
     // -------------------------------- Deal with registering initial_temperature models and automating
     // -------------------------------- their setup and selection at run time
 
-    template <int dim>
-    Manager<dim>::~Manager()
-      = default;
-
-
-
     namespace
     {
       std::tuple
@@ -122,16 +116,6 @@ namespace aspect
 
 
 
-    template <int dim>
-    void
-    Manager<dim>::update()
-    {
-      for (auto &initial_temperature_object : this->plugin_objects)
-        initial_temperature_object->update();
-    }
-
-
-
     template <int dim>
     double
     Manager<dim>::initial_temperature (const Point<dim> &position) const

source/mesh_refinement/interface.cc

@@ -49,73 +49,6 @@ namespace aspect
 
 // ------------------------------ Manager -----------------------------
 
-    template <int dim>
-    Manager<dim>::~Manager()
-      = default;
-
-
-
-    template <int dim>
-    void
-    Manager<dim>::update ()
-    {
-      Assert (this->plugin_objects.size() > 0, ExcInternalError());
-
-      // call the update() functions of all refinement plugins.
-      for (const auto &p : this->plugin_objects)
-        {
-          try
-            {
-              p->update ();
-            }
-
-          // plugins that throw exceptions usually do not result in
-          // anything good because they result in an unwinding of the stack
-          // and, if only one processor triggers an exception, the
-          // destruction of objects often causes a deadlock. thus, if
-          // an exception is generated, catch it, print an error message,
-          // and abort the program
-          catch (std::exception &exc)
-            {
-              std::cerr << std::endl << std::endl
-                        << "----------------------------------------------------"
-                        << std::endl;
-              std::cerr << "Exception on MPI process <"
-                        << Utilities::MPI::this_mpi_process(MPI_COMM_WORLD)
-                        << "> while running mesh refinement plugin <"
-                        << typeid(*p).name()
-                        << ">: " << std::endl
-                        << exc.what() << std::endl
-                        << "Aborting!" << std::endl
-                        << "----------------------------------------------------"
-                        << std::endl;
-
-              // terminate the program!
-              MPI_Abort (MPI_COMM_WORLD, 1);
-            }
-          catch (...)
-            {
-              std::cerr << std::endl << std::endl
-                        << "----------------------------------------------------"
-                        << std::endl;
-              std::cerr << "Exception on MPI process <"
-                        << Utilities::MPI::this_mpi_process(MPI_COMM_WORLD)
-                        << "> while running mesh refinement plugin <"
-                        << typeid(*p).name()
-                        << ">: " << std::endl;
-              std::cerr << "Unknown exception!" << std::endl
-                        << "Aborting!" << std::endl
-                        << "----------------------------------------------------"
-                        << std::endl;
-
-              // terminate the program!
-              MPI_Abort (MPI_COMM_WORLD, 1);
-            }
-        }
-    }
-
-
-
     template <int dim>
     void
     Manager<dim>::execute (Vector<float> &error_indicators) const

source/particle/property/interface.cc

@@ -306,20 +306,6 @@ namespace aspect
 
 
 
-      template <int dim>
-      inline
-      Manager<dim>::Manager ()
-        = default;
-
-
-
-      template <int dim>
-      inline
-      Manager<dim>::~Manager ()
-        = default;
-
-
-
       template <int dim>
       void
       Manager<dim>::initialize ()
@@ -342,16 +328,6 @@ namespace aspect
 
 
 
-      template <int dim>
-      void
-      Manager<dim>::update ()
-      {
-        for (const auto &p : this->plugin_objects)
-          p->update();
-      }
-
-
-
       template <int dim>
       void
       Manager<dim>::initialize_one_particle (typename ParticleHandler<dim>::particle_iterator &particle) const