[cig-commits] [commit] master: add SimulatorAccess::get_simulator() (926b664)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/dea94ae3fdac1f434e32718c384fe5ce83109802...db7eea299d721e7afa2dc72d8f42352dc88a9e16

>---------------------------------------------------------------

commit 926b66464c8896a6770138290641560890584922
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sun Jun 1 19:35:21 2014 -0400

    add SimulatorAccess::get_simulator()


>---------------------------------------------------------------

926b66464c8896a6770138290641560890584922
 include/aspect/simulator_access.h    | 10 ++++++++++
 source/simulator/simulator_access.cc |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/include/aspect/simulator_access.h b/include/aspect/simulator_access.h
index cae867c..2cf54e8 100644
--- a/include/aspect/simulator_access.h
+++ b/include/aspect/simulator_access.h
@@ -110,6 +110,16 @@ namespace aspect
       introspection () const;
 
       /**
+       * Returns a reference to the Simulator itself. Note that you can not access
+       * any members or functions of the Simulator. This function exists so that
+       * any class with SimulatorAccess can create other objects with
+       * SimulatorAccess (because initializing them requires a reference to the
+       * Simulator).
+       */
+      const Simulator<dim> &
+      get_simulator() const;
+
+      /**
        * Return the MPI communicator for this simulation.
        */
       MPI_Comm
diff --git a/source/simulator/simulator_access.cc b/source/simulator/simulator_access.cc
index 2875588..9c8989b 100644
--- a/source/simulator/simulator_access.cc
+++ b/source/simulator/simulator_access.cc
@@ -38,6 +38,13 @@ namespace aspect
     simulator = &simulator_object;
   }
 
+  template <int dim>
+  const Simulator<dim> &
+  SimulatorAccess<dim>::get_simulator() const
+  {
+    return *simulator;
+  }
+
 
 
   template <int dim>