Merge pull request #6415 from alarshi/code_cleanup

Undo the previous change of moving a private member in class.

Author: gassmoeller

include/aspect/geometry_model/spherical_shell.h

@@ -153,13 +153,12 @@ namespace aspect
            */
           double topography_for_point (const Point<dim> &x_y_z) const;
 
+        private:
           /**
            * A pointer to the topography model.
            */
           const InitialTopographyModel::Interface<dim> *topo;
 
-        private:
-
           /**
            * Inner and outer radii of the spherical shell.
            */

source/geometry_model/spherical_shell.cc

@@ -713,7 +713,7 @@ namespace aspect
     double
     SphericalShell<dim>::maximal_depth() const
     {
-      return R1 + manifold->topo->max_topography() - R0;
+      return R1 + this->get_initial_topography_model().max_topography() - R0;
     }