[cig-commits] [commit] aspect-1.1: use the official initialize() (0d715e1)

[cig_noreply at geodynamics.org]

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

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

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

commit 0d715e10f2306ff74866c717ce422801463ecdcd
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sun Jun 1 12:34:59 2014 -0400

    use the official initialize()


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

0d715e10f2306ff74866c717ce422801463ecdcd
 include/aspect/boundary_composition/box.h | 8 ++------
 source/boundary_composition/box.cc        | 7 ++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/include/aspect/boundary_composition/box.h b/include/aspect/boundary_composition/box.h
index 6f6e94c..2085c25 100644
--- a/include/aspect/boundary_composition/box.h
+++ b/include/aspect/boundary_composition/box.h
@@ -77,15 +77,11 @@ namespace aspect
         parse_parameters (ParameterHandler &prm);
 
         /**
-         * Initialize this class for a given simulator. This function
-         * overloads that of the SimulatorAccess base class. It calls the
-         * respective function of the base class and then performs some basic
+         * It performs some basic
          * sanity checks on the parameter values previously read from the
          * input file.
-         *
-         * @param simulator A reference to the main simulator object.
          */
-        virtual void initialize (const Simulator<dim> &simulator);
+        virtual void initialize ();
 
       private:
         /**
diff --git a/source/boundary_composition/box.cc b/source/boundary_composition/box.cc
index 692a279..326c603 100644
--- a/source/boundary_composition/box.cc
+++ b/source/boundary_composition/box.cc
@@ -141,12 +141,9 @@ namespace aspect
 
     template <int dim>
     void
-    Box<dim>::initialize(const Simulator<dim> &simulator)
+    Box<dim>::initialize()
     {
-      // first call the corresponding function of the base class.
-      SimulatorAccess<dim>::initialize (simulator);
-
-      // then verify that each of the lists for boundary values
+      // verify that each of the lists for boundary values
       // has the requisite number of elements
       for (unsigned int f=0; f<2*dim; ++f)
         AssertThrow (composition_values[f].size() == this->n_compositional_fields(),