Fix tests.

Address suggestions from the PR.

Author: alarshi

include/aspect/geometry_model/chunk.h

@@ -124,13 +124,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:
-
           /**
            * The minimum longitude of the domain.
            */

source/geometry_model/chunk.cc

@@ -583,7 +583,7 @@ namespace aspect
     Chunk<dim>::depth(const Point<dim> &position) const
     {
       // depth is defined wrt the reference surface point2[0]
-      // plus topography. Negative depth is not allowed.
+      // plus initial topography. Negative depth is not allowed.
       if (this->simulator_is_past_initialization() &&
           !Plugins::plugin_type_matches<const InitialTopographyModel::ZeroTopography<dim>>(this->get_initial_topography_model()))
         return std::min(std::max(point2[0]+ manifold->topography_for_point(position) - position.norm(), 0.), maximal_depth());
@@ -694,7 +694,7 @@ namespace aspect
       // the maximal depth really is the formula below, unless one applies a
       // topography that is always strictly below zero (i.e., where the
       // actual surface lies strictly below the reference surface).
-      return point2[0] + manifold->topo->max_topography() - point1[0];
+      return point2[0] + this->get_initial_topography_model().max_topography() - point1[0];
     }
 
 

tests/chunk_initial_topography_ascii_data/screen-output

@@ -7,11 +7,11 @@ Number of degrees of freedom: 3,556 (2,178+289+1,089)
 
 *** Timestep 0:  t=0 years, dt=0 years
    Solving temperature system... 0 iterations.
-   Solving Stokes system (GMG)... 29+0 iterations.
+   Solving Stokes system (GMG)... 28+0 iterations.
 
    Postprocessing:
 
-     Model domain depth (m):                        3e+06
+     Model domain depth (m):                        3.09e+06
      Temperature contrast across model domain (K):  3500
      Reference depth (m):                           0
      Reference temperature (K):                     1613
@@ -23,7 +23,7 @@ Number of degrees of freedom: 3,556 (2,178+289+1,089)
      Reference thermal conductivity (W/(m*K)):      4.7
      Reference viscosity (Pa*s):                    1e+21
      Reference thermal diffusivity (m^2/s):         1.22101e-06
-     Rayleigh number:                               7.4479e+07
+     Rayleigh number:                               8.13852e+07
 
      RMS, max velocity:       0.0119 m/year, 0.0933 m/year
      Temperature min/avg/max: 1613 K, 1613 K, 1613 K

tests/chunk_initial_topography_ascii_data/statistics

@@ -16,4 +16,4 @@
 # 16: Average nondimensional temperature (K)
 # 17: Minimum topography (m)
 # 18: Maximum topography (m)
-0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 0 29 30 30 1.18604659e-02 9.33132004e-02 1.61300000e+03 1.61300000e+03 1.61300000e+03 4.40406633e-10 -4.75663606e+04 9.00000000e+04 
+0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 0 28 29 29 1.18604723e-02 9.33132938e-02 1.61300000e+03 1.61300000e+03 1.61300000e+03 4.40406633e-10 -4.75663606e+04 9.00000000e+04 

tests/chunk_initial_topography_ascii_data_3d/screen-output

@@ -11,7 +11,7 @@ Number of degrees of freedom: 3,041 (2,187+125+729)
 
    Postprocessing:
 
-     Model domain depth (m):                        3e+06
+     Model domain depth (m):                        3.009e+06
      Temperature contrast across model domain (K):  3500
      Reference depth (m):                           0
      Reference temperature (K):                     1613
@@ -23,7 +23,7 @@ Number of degrees of freedom: 3,041 (2,187+125+729)
      Reference thermal conductivity (W/(m*K)):      4.7
      Reference viscosity (Pa*s):                    1e+21
      Reference thermal diffusivity (m^2/s):         1.22101e-06
-     Rayleigh number:                               7.4479e+07
+     Rayleigh number:                               7.51513e+07
 
      RMS, max velocity:       0.0442 m/year, 0.113 m/year
      Temperature min/avg/max: 1613 K, 1613 K, 1613 K

tests/chunk_initial_topography_ascii_data_3d/statistics

@@ -16,4 +16,4 @@
 # 16: Average nondimensional temperature (K)
 # 17: Minimum topography (m)
 # 18: Maximum topography (m)
-0 0.000000000000e+00 0.000000000000e+00 64 2312 729 0 23 24 24 4.42347040e-02 1.13166975e-01 1.61300000e+03 1.61300006e+03 1.61300000e+03 1.71059328e-08 -1.98131486e+03 8.99532925e+03 
+0 0.000000000000e+00 0.000000000000e+00 64 2312 729 0 23 24 24 4.42347089e-02 1.13166977e-01 1.61300000e+03 1.61300006e+03 1.61300000e+03 1.71059328e-08 -1.98131486e+03 8.99532925e+03 

tests/chunk_initial_topography_ascii_data_3d_colatitude/screen-output

@@ -7,11 +7,11 @@ Number of degrees of freedom: 3,041 (2,187+125+729)
 
 *** Timestep 0:  t=0 years, dt=0 years
    Solving temperature system... 0 iterations.
-   Solving Stokes system (GMG)... 21+0 iterations.
+   Solving Stokes system (GMG)... 20+0 iterations.
 
    Postprocessing:
 
-     Model domain depth (m):                        3e+06
+     Model domain depth (m):                        3.009e+06
      Temperature contrast across model domain (K):  3500
      Reference depth (m):                           0
      Reference temperature (K):                     1613
@@ -23,7 +23,7 @@ Number of degrees of freedom: 3,041 (2,187+125+729)
      Reference thermal conductivity (W/(m*K)):      4.7
      Reference viscosity (Pa*s):                    1e+21
      Reference thermal diffusivity (m^2/s):         1.22101e-06
-     Rayleigh number:                               7.4479e+07
+     Rayleigh number:                               7.51513e+07
 
      RMS, max velocity:       0.0124 m/year, 0.0606 m/year
      Temperature min/avg/max: 1613 K, 1613 K, 1613 K

tests/chunk_initial_topography_ascii_data_3d_colatitude/statistics

@@ -16,4 +16,4 @@
 # 16: Average nondimensional temperature (K)
 # 17: Minimum topography (m)
 # 18: Maximum topography (m)
-0 0.000000000000e+00 0.000000000000e+00 64 2312 729 0 21 22 22 1.24375134e-02 6.06479500e-02 1.61300000e+03 1.61300000e+03 1.61300000e+03 -1.75439514e-10 -1.95928291e+03 8.99918928e+03 
+0 0.000000000000e+00 0.000000000000e+00 64 2312 729 0 20 21 21 1.24375096e-02 6.06479458e-02 1.61300000e+03 1.61300000e+03 1.61300000e+03 -1.75439514e-10 -1.95928291e+03 8.99918928e+03 

tests/chunk_lithostatic_pressure_2d_initial_topography/screen-output

@@ -11,8 +11,8 @@ Number of degrees of freedom: 109 (50+9+25+25)
    Solving Stokes system (GMG)... 13+0 iterations.
 
    Postprocessing:
-     RMS, max velocity:        0.261 m/year, 0.401 m/year
-     Pressure min/avg/max:     -2.139e+09 Pa, 3.927e+10 Pa, 9.249e+10 Pa
+     RMS, max velocity:        0.27 m/year, 0.427 m/year
+     Pressure min/avg/max:     -2.152e+09 Pa, 3.928e+10 Pa, 9.249e+10 Pa
      Writing graphical output: output-chunk_lithostatic_pressure_2d_initial_topography/solution/solution-00000
 
 Termination requested by criterion: end time