Merge pull request #6238 from jdannberg/cookbook_fix

Make christensen yuen cookbook run again

cookbooks/christensen_yuen_phase_function/christensen_yuen_phase_function.prm

@@ -134,7 +134,7 @@ subsection Material model
     set Viscosity                                      = 1e20
     set Minimum viscosity                              = 1e20
     set Maximum viscosity                              = 1e20
-    set Viscosity prefactors                           = 1,1
+    set Viscosity prefactors                           = all:1
     set Thermal viscosity exponent                     = 0.0
   end
 end

tests/christensen_yuen_cookbook.prm

@@ -0,0 +1,9 @@
+# Test for the christensen_yuen_phase_function cookbook
+
+include $ASPECT_SOURCE_DIR/cookbooks/christensen_yuen_phase_function/christensen_yuen_phase_function.prm
+
+set End time = 5000
+
+subsection Mesh refinement
+  set Initial global refinement                = 4
+end

tests/christensen_yuen_cookbook/screen-output

@@ -0,0 +1,55 @@
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+Number of active cells: 256 (on 5 levels)
+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)... 8+0 iterations.
+      Relative nonlinear residuals (temperature, Stokes system): 1.53346e-16, 0.121857
+      Relative nonlinear residual (total system) after nonlinear iteration 1: 0.121857
+
+   Solving temperature system... 0 iterations.
+   Solving Stokes system (GMG)... 2+0 iterations.
+      Relative nonlinear residuals (temperature, Stokes system): 1.53346e-16, 2.98719e-09
+      Relative nonlinear residual (total system) after nonlinear iteration 2: 2.98719e-09
+
+
+   Postprocessing:
+     RMS, max velocity:                  0.0448 m/year, 0.126 m/year
+     Temperature min/avg/max:            0 K, 500 K, 1000 K
+     Heat fluxes through boundary parts: 0 W, 0 W, -1.382e+06 W, 1.382e+06 W
+     Heating rate (average/total):       0 W/kg, 0 W
+     Writing graphical output:           output-christensen_yuen_cookbook/solution/solution-00000
+
+*** Timestep 1:  t=5000 years, dt=5000 years
+   Solving temperature system... 7 iterations.
+   Solving Stokes system (GMG)... 6+0 iterations.
+      Relative nonlinear residuals (temperature, Stokes system): 0.000838057, 3.8353e-05
+      Relative nonlinear residual (total system) after nonlinear iteration 1: 0.000838057
+
+   Solving temperature system... 5 iterations.
+   Solving Stokes system (GMG)... 3+0 iterations.
+      Relative nonlinear residuals (temperature, Stokes system): 7.80621e-07, 3.56952e-08
+      Relative nonlinear residual (total system) after nonlinear iteration 2: 7.80621e-07
+
+
+   Postprocessing:
+     RMS, max velocity:                  0.0449 m/year, 0.126 m/year
+     Temperature min/avg/max:            0 K, 500 K, 1000 K
+     Heat fluxes through boundary parts: 0 W, 0 W, -1.386e+06 W, 1.386e+06 W
+     Heating rate (average/total):       0 W/kg, 0 W
+
+Termination requested by criterion: end time
+
+
++----------------------------------------------+------------+------------+
++----------------------------------+-----------+------------+------------+
++----------------------------------+-----------+------------+------------+
+
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------

tests/christensen_yuen_cookbook/statistics

@@ -0,0 +1,24 @@
+# 1: Time step number
+# 2: Time (years)
+# 3: Time step size (years)
+# 4: Number of mesh cells
+# 5: Number of Stokes degrees of freedom
+# 6: Number of temperature degrees of freedom
+# 7: Number of nonlinear iterations
+# 8: Iterations for temperature solver
+# 9: Iterations for Stokes solver
+# 10: Velocity iterations in Stokes preconditioner
+# 11: Schur complement iterations in Stokes preconditioner
+# 12: RMS velocity (m/year)
+# 13: Max. velocity (m/year)
+# 14: Minimal temperature (K)
+# 15: Average temperature (K)
+# 16: Maximal temperature (K)
+# 17: Average nondimensional temperature (K)
+# 18: Outward heat flux through boundary with indicator 0 ("left") (W)
+# 19: Outward heat flux through boundary with indicator 1 ("right") (W)
+# 20: Outward heat flux through boundary with indicator 2 ("bottom") (W)
+# 21: Outward heat flux through boundary with indicator 3 ("top") (W)
+# 22: Visualization file name
+0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 2  0 8 12 12 4.47674564e-02 1.25823200e-01 0.00000000e+00 5.00000000e+02 1.00000000e+03 5.00000000e-01 0.00000000e+00 0.00000000e+00 -1.38242904e+06 1.38241488e+06 output-christensen_yuen_cookbook/solution/solution-00000 
+1 5.000000000000e+03 5.000000000000e+03 256 2467 1089 2 12 7 11 11 4.48965253e-02 1.26412968e-01 0.00000000e+00 5.00000004e+02 1.00000000e+03 5.00000004e-01 0.00000000e+00 0.00000000e+00 -1.38557376e+06 1.38552200e+06                                                       ""