[cig-commits] r1326 - in trunk/aspect/tests: adiabatic_conditions box-first-time-step box-first-time-step-alternate-bc conservative_with_mpi graphical_output inclusion_2 inclusion_4 inclusion_adaptive non_conservative_with_mpi passive_comp sol_cx_2 sol_cx_2_conservative sol_cx_2_normalized_pressure sol_cx_2_q3 sol_cx_4 sol_cx_4_conservative sol_cx_4_normalized_pressure sol_cx_4_normalized_pressure_large_static_pressure sol_cx_4_normalized_pressure_low_solver_tolerance sol_cx_tracers sol_kz_2 sol_kz_2_conservative sol_kz_2_q3 sol_kz_4 sol_kz_4_conservative stokes

bangerth at dealii.org bangerth at dealii.org
Thu Oct 25 05:23:03 PDT 2012


Author: bangerth
Date: 2012-10-25 06:23:03 -0600 (Thu, 25 Oct 2012)
New Revision: 1326

Modified:
   trunk/aspect/tests/adiabatic_conditions/screen-output
   trunk/aspect/tests/adiabatic_conditions/statistics
   trunk/aspect/tests/box-first-time-step-alternate-bc/screen-output
   trunk/aspect/tests/box-first-time-step-alternate-bc/statistics
   trunk/aspect/tests/box-first-time-step/screen-output
   trunk/aspect/tests/box-first-time-step/statistics
   trunk/aspect/tests/conservative_with_mpi/screen-output
   trunk/aspect/tests/conservative_with_mpi/statistics
   trunk/aspect/tests/graphical_output/screen-output
   trunk/aspect/tests/graphical_output/statistics
   trunk/aspect/tests/inclusion_2/screen-output
   trunk/aspect/tests/inclusion_2/statistics
   trunk/aspect/tests/inclusion_4/screen-output
   trunk/aspect/tests/inclusion_4/statistics
   trunk/aspect/tests/inclusion_adaptive/screen-output
   trunk/aspect/tests/inclusion_adaptive/statistics
   trunk/aspect/tests/non_conservative_with_mpi/screen-output
   trunk/aspect/tests/non_conservative_with_mpi/statistics
   trunk/aspect/tests/passive_comp/screen-output
   trunk/aspect/tests/passive_comp/statistics
   trunk/aspect/tests/sol_cx_2/screen-output
   trunk/aspect/tests/sol_cx_2/statistics
   trunk/aspect/tests/sol_cx_2_conservative/screen-output
   trunk/aspect/tests/sol_cx_2_conservative/statistics
   trunk/aspect/tests/sol_cx_2_normalized_pressure/screen-output
   trunk/aspect/tests/sol_cx_2_normalized_pressure/statistics
   trunk/aspect/tests/sol_cx_2_q3/screen-output
   trunk/aspect/tests/sol_cx_2_q3/statistics
   trunk/aspect/tests/sol_cx_4/screen-output
   trunk/aspect/tests/sol_cx_4/statistics
   trunk/aspect/tests/sol_cx_4_conservative/screen-output
   trunk/aspect/tests/sol_cx_4_conservative/statistics
   trunk/aspect/tests/sol_cx_4_normalized_pressure/screen-output
   trunk/aspect/tests/sol_cx_4_normalized_pressure/statistics
   trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output
   trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/statistics
   trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output
   trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/statistics
   trunk/aspect/tests/sol_cx_tracers/screen-output
   trunk/aspect/tests/sol_kz_2/screen-output
   trunk/aspect/tests/sol_kz_2/statistics
   trunk/aspect/tests/sol_kz_2_conservative/screen-output
   trunk/aspect/tests/sol_kz_2_conservative/statistics
   trunk/aspect/tests/sol_kz_2_q3/screen-output
   trunk/aspect/tests/sol_kz_2_q3/statistics
   trunk/aspect/tests/sol_kz_4/screen-output
   trunk/aspect/tests/sol_kz_4/statistics
   trunk/aspect/tests/sol_kz_4_conservative/screen-output
   trunk/aspect/tests/sol_kz_4_conservative/statistics
   trunk/aspect/tests/stokes/screen-output
   trunk/aspect/tests/stokes/statistics
Log:
Remove number of compositional dofs from output files since we no longer print them. The rest of the numbers appears unchanged from previous versions of ASPECT after Timo's change re-introducing the location for the computation of the viscosity.

Modified: trunk/aspect/tests/adiabatic_conditions/screen-output
===================================================================
--- trunk/aspect/tests/adiabatic_conditions/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/adiabatic_conditions/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -29,18 +29,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      39.2s |            |
+| Total wallclock time elapsed since start    |      61.2s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |      2.19s |       5.6% |
-| Assemble temperature system     |         1 |      5.58s |        14% |
-| Build Stokes preconditioner     |         1 |      1.32s |       3.4% |
-| Build temperature preconditioner|         1 |    0.0928s |      0.24% |
-| Solve Stokes system             |         1 |      1.55s |       3.9% |
-| Solve temperature system        |         1 |     0.153s |      0.39% |
-| Initialization                  |         2 |      1.12s |       2.9% |
-| Postprocessing                  |         1 |        18s |        46% |
-| Setup dof systems               |         1 |      7.85s |        20% |
+| Assemble Stokes system          |         1 |      3.47s |       5.7% |
+| Assemble temperature system     |         1 |      10.1s |        17% |
+| Build Stokes preconditioner     |         1 |      2.94s |       4.8% |
+| Build temperature preconditioner|         1 |    0.0646s |      0.11% |
+| Solve Stokes system             |         1 |      2.37s |       3.9% |
+| Solve temperature system        |         1 |    0.0592s |     0.097% |
+| Initialization                  |         2 |       1.3s |       2.1% |
+| Postprocessing                  |         1 |      32.3s |        53% |
+| Setup dof systems               |         1 |      6.57s |        11% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/adiabatic_conditions/statistics
===================================================================
--- trunk/aspect/tests/adiabatic_conditions/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/adiabatic_conditions/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,19 +3,18 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-# 10: Visualization file name
-# 11: RMS velocity (m/s)
-# 12: Max. velocity (m/s)
-# 13: Minimal temperature (K)
-# 14: Average temperature (K)
-# 15: Maximal temperature (K)
-# 16: Average nondimensional temperature (K)
-# 17: Outward heat flux through boundary with indicator 0 (W)
-# 18: Outward heat flux through boundary with indicator 1 (W)
-# 19: Outward heat flux through boundary with indicator 2 (W)
-# 20: Outward heat flux through boundary with indicator 3 (W)
-0 0.0000e+00 3072 28291 12545 0 1 33 7.6904e-06 output-adiabatic_conditions/solution-00000 7.09365756e+08 4.38331430e+09 1.61300000e+03 1.61300000e+03 1.61300000e+03 1.00000000e+00 3.62797575e-17 6.09249752e-17 -2.62504621e-17 2.24556340e-17 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+# 9: Visualization file name
+# 10: RMS velocity (m/s)
+# 11: Max. velocity (m/s)
+# 12: Minimal temperature (K)
+# 13: Average temperature (K)
+# 14: Maximal temperature (K)
+# 15: Average nondimensional temperature (K)
+# 16: Outward heat flux through boundary with indicator 0 (W)
+# 17: Outward heat flux through boundary with indicator 1 (W)
+# 18: Outward heat flux through boundary with indicator 2 (W)
+# 19: Outward heat flux through boundary with indicator 3 (W)
+0 0.0000e+00 3072 28291 12545 1 33 7.6904e-06 output-adiabatic_conditions/solution-00000 7.09365756e+08 4.38331430e+09 1.61300000e+03 1.61300000e+03 1.61300000e+03 1.00000000e+00 3.62797575e-17 6.09249752e-17 -2.62504621e-17 2.24556340e-17 

Modified: trunk/aspect/tests/box-first-time-step/screen-output
===================================================================
--- trunk/aspect/tests/box-first-time-step/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/box-first-time-step/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -28,18 +28,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |        12s |            |
+| Total wallclock time elapsed since start    |      13.2s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |      0.87s |       7.2% |
-| Assemble temperature system     |         1 |      2.19s |        18% |
-| Build Stokes preconditioner     |         1 |     0.631s |       5.3% |
-| Build temperature preconditioner|         1 |    0.0313s |      0.26% |
-| Solve Stokes system             |         1 |     0.261s |       2.2% |
-| Solve temperature system        |         1 |    0.0394s |      0.33% |
-| Initialization                  |         2 |      0.16s |       1.3% |
-| Postprocessing                  |         1 |      4.84s |        40% |
-| Setup dof systems               |         1 |       2.2s |        18% |
+| Assemble Stokes system          |         1 |     0.905s |       6.9% |
+| Assemble temperature system     |         1 |      1.86s |        14% |
+| Build Stokes preconditioner     |         1 |      1.06s |       8.1% |
+| Build temperature preconditioner|         1 |    0.0195s |      0.15% |
+| Solve Stokes system             |         1 |     0.361s |       2.7% |
+| Solve temperature system        |         1 |    0.0189s |      0.14% |
+| Initialization                  |         2 |     0.151s |       1.1% |
+| Postprocessing                  |         1 |      6.61s |        50% |
+| Setup dof systems               |         1 |      1.69s |        13% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/box-first-time-step/statistics
===================================================================
--- trunk/aspect/tests/box-first-time-step/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/box-first-time-step/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,19 +3,18 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-# 10: Visualization file name
-# 11: RMS velocity (m/s)
-# 12: Max. velocity (m/s)
-# 13: Minimal temperature (K)
-# 14: Average temperature (K)
-# 15: Maximal temperature (K)
-# 16: Average nondimensional temperature (K)
-# 17: Outward heat flux through boundary with indicator 0 (W)
-# 18: Outward heat flux through boundary with indicator 1 (W)
-# 19: Outward heat flux through boundary with indicator 2 (W)
-# 20: Outward heat flux through boundary with indicator 3 (W)
-0 0.0000e+00 1024 9539 4225 0 1 21 4.7507e+05 output-box-first-time-step/solution-00000 9.06752486e-09 3.24958188e-08 0.00000000e+00 1.03532014e+00 1.10000000e+00 1.03532014e+00 1.66800424e-07 8.01668004e-05 2.40192611e-07 2.40192611e-07 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+# 9: Visualization file name
+# 10: RMS velocity (m/s)
+# 11: Max. velocity (m/s)
+# 12: Minimal temperature (K)
+# 13: Average temperature (K)
+# 14: Maximal temperature (K)
+# 15: Average nondimensional temperature (K)
+# 16: Outward heat flux through boundary with indicator 0 (W)
+# 17: Outward heat flux through boundary with indicator 1 (W)
+# 18: Outward heat flux through boundary with indicator 2 (W)
+# 19: Outward heat flux through boundary with indicator 3 (W)
+0 0.0000e+00 1024 9539 4225 1 21 4.7507e+05 output-box-first-time-step/solution-00000 9.06752486e-09 3.24958188e-08 0.00000000e+00 1.03532014e+00 1.10000000e+00 1.03532014e+00 1.66800424e-07 8.01668004e-05 2.40192611e-07 2.40192611e-07 

Modified: trunk/aspect/tests/box-first-time-step-alternate-bc/screen-output
===================================================================
--- trunk/aspect/tests/box-first-time-step-alternate-bc/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/box-first-time-step-alternate-bc/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -28,18 +28,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      11.1s |            |
+| Total wallclock time elapsed since start    |      12.6s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.908s |       8.2% |
-| Assemble temperature system     |         1 |      1.89s |        17% |
-| Build Stokes preconditioner     |         1 |     0.783s |       7.1% |
-| Build temperature preconditioner|         1 |    0.0595s |      0.54% |
-| Solve Stokes system             |         1 |     0.255s |       2.3% |
-| Solve temperature system        |         1 |    0.0591s |      0.53% |
-| Initialization                  |         2 |      0.19s |       1.7% |
-| Postprocessing                  |         1 |      4.42s |        40% |
-| Setup dof systems               |         1 |      1.46s |        13% |
+| Assemble Stokes system          |         1 |         1s |       7.9% |
+| Assemble temperature system     |         1 |      1.66s |        13% |
+| Build Stokes preconditioner     |         1 |     0.791s |       6.3% |
+| Build temperature preconditioner|         1 |    0.0484s |      0.38% |
+| Solve Stokes system             |         1 |     0.215s |       1.7% |
+| Solve temperature system        |         1 |    0.0405s |      0.32% |
+| Initialization                  |         2 |      0.15s |       1.2% |
+| Postprocessing                  |         1 |      6.55s |        52% |
+| Setup dof systems               |         1 |      1.28s |        10% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/box-first-time-step-alternate-bc/statistics
===================================================================
--- trunk/aspect/tests/box-first-time-step-alternate-bc/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/box-first-time-step-alternate-bc/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,19 +3,18 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-# 10: Visualization file name
-# 11: RMS velocity (m/s)
-# 12: Max. velocity (m/s)
-# 13: Minimal temperature (K)
-# 14: Average temperature (K)
-# 15: Maximal temperature (K)
-# 16: Average nondimensional temperature (K)
-# 17: Outward heat flux through boundary with indicator 0 (W)
-# 18: Outward heat flux through boundary with indicator 1 (W)
-# 19: Outward heat flux through boundary with indicator 2 (W)
-# 20: Outward heat flux through boundary with indicator 3 (W)
-0 0.0000e+00 1024 9539 4225 0 1 21 4.7507e+05 output-box-first-time-step-alternate-bc/solution-00000 9.06752486e-09 3.24958188e-08 0.00000000e+00 1.03532014e+00 1.10000000e+00 1.03532014e+00 1.66800424e-07 8.01668004e-05 2.40192611e-07 2.40192611e-07 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+# 9: Visualization file name
+# 10: RMS velocity (m/s)
+# 11: Max. velocity (m/s)
+# 12: Minimal temperature (K)
+# 13: Average temperature (K)
+# 14: Maximal temperature (K)
+# 15: Average nondimensional temperature (K)
+# 16: Outward heat flux through boundary with indicator 0 (W)
+# 17: Outward heat flux through boundary with indicator 1 (W)
+# 18: Outward heat flux through boundary with indicator 2 (W)
+# 19: Outward heat flux through boundary with indicator 3 (W)
+0 0.0000e+00 1024 9539 4225 1 21 4.7507e+05 output-box-first-time-step-alternate-bc/solution-00000 9.06752486e-09 3.24958188e-08 0.00000000e+00 1.03532014e+00 1.10000000e+00 1.03532014e+00 1.66800424e-07 8.01668004e-05 2.40192611e-07 2.40192611e-07 

Modified: trunk/aspect/tests/conservative_with_mpi/screen-output
===================================================================
--- trunk/aspect/tests/conservative_with_mpi/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/conservative_with_mpi/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -11,18 +11,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      1.04s |            |
+| Total wallclock time elapsed since start    |     0.947s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |    0.0775s |       7.5% |
-| Assemble temperature system     |         1 |     0.401s |        39% |
-| Build Stokes preconditioner     |         1 |     0.113s |        11% |
-| Build temperature preconditioner|         1 |   0.00113s |      0.11% |
-| Solve Stokes system             |         1 |    0.0348s |       3.4% |
-| Solve temperature system        |         1 |   0.00149s |      0.14% |
-| Initialization                  |         2 |    0.0834s |         8% |
-| Postprocessing                  |         1 |   0.00026s |     0.025% |
-| Setup dof systems               |         1 |      0.23s |        22% |
+| Assemble Stokes system          |         1 |    0.0593s |       6.3% |
+| Assemble temperature system     |         1 |     0.319s |        34% |
+| Build Stokes preconditioner     |         1 |    0.0523s |       5.5% |
+| Build temperature preconditioner|         1 |   0.00109s |      0.11% |
+| Solve Stokes system             |         1 |    0.0352s |       3.7% |
+| Solve temperature system        |         1 |   0.00142s |      0.15% |
+| Initialization                  |         2 |      0.11s |        12% |
+| Postprocessing                  |         1 |  0.000255s |     0.027% |
+| Setup dof systems               |         1 |     0.226s |        24% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/conservative_with_mpi/statistics
===================================================================
--- trunk/aspect/tests/conservative_with_mpi/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/conservative_with_mpi/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (years)
-0 0.0000e+00 16 210 81 0 0 32 1.1317e-06 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (years)
+0 0.0000e+00 16 210 81 0 32 1.1317e-06 

Modified: trunk/aspect/tests/graphical_output/screen-output
===================================================================
--- trunk/aspect/tests/graphical_output/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/graphical_output/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -13,18 +13,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      1.02s |            |
+| Total wallclock time elapsed since start    |      0.98s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |    0.0626s |       6.1% |
-| Assemble temperature system     |         1 |     0.323s |        32% |
-| Build Stokes preconditioner     |         1 |     0.102s |        10% |
-| Build temperature preconditioner|         1 |   0.00134s |      0.13% |
-| Solve Stokes system             |         1 |    0.0336s |       3.3% |
-| Solve temperature system        |         1 |   0.00111s |      0.11% |
-| Initialization                  |         2 |    0.0355s |       3.5% |
-| Postprocessing                  |         1 |     0.192s |        19% |
-| Setup dof systems               |         1 |     0.211s |        21% |
+| Assemble Stokes system          |         1 |     0.151s |        15% |
+| Assemble temperature system     |         1 |     0.371s |        38% |
+| Build Stokes preconditioner     |         1 |    0.0669s |       6.8% |
+| Build temperature preconditioner|         1 |   0.00136s |      0.14% |
+| Solve Stokes system             |         1 |    0.0236s |       2.4% |
+| Solve temperature system        |         1 |   0.00118s |      0.12% |
+| Initialization                  |         2 |     0.033s |       3.4% |
+| Postprocessing                  |         1 |     0.202s |        21% |
+| Setup dof systems               |         1 |    0.0693s |       7.1% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/graphical_output/statistics
===================================================================
--- trunk/aspect/tests/graphical_output/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/graphical_output/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,9 +3,8 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-# 10: Visualization file name
-0 0.0000e+00 16 187 81 0 0 28 3.4287e+01 output-graphical_output/solution-00000 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+# 9: Visualization file name
+0 0.0000e+00 16 187 81 0 28 3.4287e+01 output-graphical_output/solution-00000 

Modified: trunk/aspect/tests/inclusion_2/screen-output
===================================================================
--- trunk/aspect/tests/inclusion_2/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/inclusion_2/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -13,18 +13,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |     0.927s |            |
+| Total wallclock time elapsed since start    |         1s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |    0.0767s |       8.3% |
-| Assemble temperature system     |         1 |     0.334s |        36% |
-| Build Stokes preconditioner     |         1 |    0.0745s |         8% |
-| Build temperature preconditioner|         1 |   0.00128s |      0.14% |
-| Solve Stokes system             |         1 |    0.0475s |       5.1% |
-| Solve temperature system        |         1 |   0.00115s |      0.12% |
-| Initialization                  |         2 |    0.0353s |       3.8% |
-| Postprocessing                  |         1 |     0.211s |        23% |
-| Setup dof systems               |         1 |    0.0608s |       6.6% |
+| Assemble Stokes system          |         1 |    0.0729s |       7.3% |
+| Assemble temperature system     |         1 |     0.373s |        37% |
+| Build Stokes preconditioner     |         1 |    0.0495s |       4.9% |
+| Build temperature preconditioner|         1 |   0.00122s |      0.12% |
+| Solve Stokes system             |         1 |    0.0471s |       4.7% |
+| Solve temperature system        |         1 |    0.0011s |      0.11% |
+| Initialization                  |         2 |    0.0634s |       6.3% |
+| Postprocessing                  |         1 |     0.174s |        17% |
+| Setup dof systems               |         1 |    0.0983s |       9.8% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/inclusion_2/statistics
===================================================================
--- trunk/aspect/tests/inclusion_2/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/inclusion_2/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,9 +3,8 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-# 10: Visualization file name
-0 0.0000e+00 16 187 81 0 0 39 1.7685e-01 output-inclusion_2/solution-00000 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+# 9: Visualization file name
+0 0.0000e+00 16 187 81 0 39 1.7685e-01 output-inclusion_2/solution-00000 

Modified: trunk/aspect/tests/inclusion_4/screen-output
===================================================================
--- trunk/aspect/tests/inclusion_4/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/inclusion_4/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -13,18 +13,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      3.11s |            |
+| Total wallclock time elapsed since start    |      3.25s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.217s |         7% |
-| Assemble temperature system     |         1 |     0.692s |        22% |
-| Build Stokes preconditioner     |         1 |     0.174s |       5.6% |
-| Build temperature preconditioner|         1 |   0.00533s |      0.17% |
-| Solve Stokes system             |         1 |     0.256s |       8.3% |
-| Solve temperature system        |         1 |    0.0053s |      0.17% |
-| Initialization                  |         2 |    0.0767s |       2.5% |
-| Postprocessing                  |         1 |      1.02s |        33% |
-| Setup dof systems               |         1 |     0.348s |        11% |
+| Assemble Stokes system          |         1 |     0.249s |       7.7% |
+| Assemble temperature system     |         1 |     0.504s |        16% |
+| Build Stokes preconditioner     |         1 |      0.16s |       4.9% |
+| Build temperature preconditioner|         1 |   0.00535s |      0.16% |
+| Solve Stokes system             |         1 |     0.265s |       8.2% |
+| Solve temperature system        |         1 |    0.0049s |      0.15% |
+| Initialization                  |         2 |     0.112s |       3.5% |
+| Postprocessing                  |         1 |      1.01s |        31% |
+| Setup dof systems               |         1 |     0.452s |        14% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/inclusion_4/statistics
===================================================================
--- trunk/aspect/tests/inclusion_4/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/inclusion_4/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,9 +3,8 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-# 10: Visualization file name
-0 0.0000e+00 256 2467 1089 0 0 41 4.4212e-02 output-inclusion_4/solution-00000 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+# 9: Visualization file name
+0 0.0000e+00 256 2467 1089 0 41 4.4212e-02 output-inclusion_4/solution-00000 

Modified: trunk/aspect/tests/inclusion_adaptive/screen-output
===================================================================
--- trunk/aspect/tests/inclusion_adaptive/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/inclusion_adaptive/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -73,20 +73,20 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      25.5s |            |
+| Total wallclock time elapsed since start    |      30.9s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         6 |      2.24s |       8.8% |
-| Assemble temperature system     |         6 |      4.46s |        18% |
-| Build Stokes preconditioner     |         6 |      1.86s |       7.3% |
-| Build temperature preconditioner|         6 |    0.0253s |     0.099% |
-| Solve Stokes system             |         6 |      3.04s |        12% |
-| Solve temperature system        |         6 |    0.0567s |      0.22% |
-| Initialization                  |         7 |     0.642s |       2.5% |
-| Postprocessing                  |         6 |      4.72s |        19% |
-| Refine mesh structure, part 1   |         5 |      2.12s |       8.3% |
-| Refine mesh structure, part 2   |         5 |    0.0842s |      0.33% |
-| Setup dof systems               |         6 |      4.18s |        16% |
+| Assemble Stokes system          |         6 |      2.88s |       9.3% |
+| Assemble temperature system     |         6 |      5.33s |        17% |
+| Build Stokes preconditioner     |         6 |      2.58s |       8.3% |
+| Build temperature preconditioner|         6 |    0.0255s |     0.083% |
+| Solve Stokes system             |         6 |      3.65s |        12% |
+| Solve temperature system        |         6 |    0.0563s |      0.18% |
+| Initialization                  |         7 |     0.572s |       1.8% |
+| Postprocessing                  |         6 |      5.35s |        17% |
+| Refine mesh structure, part 1   |         5 |      2.55s |       8.2% |
+| Refine mesh structure, part 2   |         5 |     0.136s |      0.44% |
+| Setup dof systems               |         6 |      5.45s |        18% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/inclusion_adaptive/statistics
===================================================================
--- trunk/aspect/tests/inclusion_adaptive/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/inclusion_adaptive/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,14 +3,13 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-# 10: Visualization file name
-0 0.0000e+00  64  659  289 0 0 36 8.8424e-02 output-inclusion_adaptive/solution-00000 
-0 0.0000e+00  91  974  429 0 0 42 8.8424e-02 output-inclusion_adaptive/solution-00001 
-0 0.0000e+00 145 1586  701 0 0 43 8.6708e-02 output-inclusion_adaptive/solution-00002 
-0 0.0000e+00 229 2432 1077 0 0 44 7.5177e-02 output-inclusion_adaptive/solution-00003 
-0 0.0000e+00 325 3521 1561 0 0 43 6.3999e-02 output-inclusion_adaptive/solution-00004 
-0 0.0000e+00 505 5411 2401 0 0 42 4.5840e-02 output-inclusion_adaptive/solution-00005 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+# 9: Visualization file name
+0 0.0000e+00  64  659  289 0 36 8.8424e-02 output-inclusion_adaptive/solution-00000 
+0 0.0000e+00  91  974  429 0 42 8.8424e-02 output-inclusion_adaptive/solution-00001 
+0 0.0000e+00 145 1586  701 0 43 8.6708e-02 output-inclusion_adaptive/solution-00002 
+0 0.0000e+00 229 2432 1077 0 44 7.5177e-02 output-inclusion_adaptive/solution-00003 
+0 0.0000e+00 325 3521 1561 0 43 6.3999e-02 output-inclusion_adaptive/solution-00004 
+0 0.0000e+00 505 5411 2401 0 42 4.5840e-02 output-inclusion_adaptive/solution-00005 

Modified: trunk/aspect/tests/non_conservative_with_mpi/screen-output
===================================================================
--- trunk/aspect/tests/non_conservative_with_mpi/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/non_conservative_with_mpi/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -11,18 +11,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      0.73s |            |
+| Total wallclock time elapsed since start    |      3.18s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |    0.0992s |        14% |
-| Assemble temperature system     |         1 |     0.338s |        46% |
-| Build Stokes preconditioner     |         1 |    0.0858s |        12% |
-| Build temperature preconditioner|         1 |   0.00116s |      0.16% |
-| Solve Stokes system             |         1 |    0.0299s |       4.1% |
-| Solve temperature system        |         1 |   0.00146s |       0.2% |
-| Initialization                  |         2 |     0.039s |       5.3% |
-| Postprocessing                  |         1 |  0.000244s |     0.033% |
-| Setup dof systems               |         1 |    0.0834s |        11% |
+| Assemble Stokes system          |         1 |     0.129s |       4.1% |
+| Assemble temperature system     |         1 |     0.601s |        19% |
+| Build Stokes preconditioner     |         1 |     0.121s |       3.8% |
+| Build temperature preconditioner|         1 |   0.00136s |     0.043% |
+| Solve Stokes system             |         1 |    0.0896s |       2.8% |
+| Solve temperature system        |         1 |    0.0116s |      0.36% |
+| Initialization                  |         2 |     0.497s |        16% |
+| Postprocessing                  |         1 |  0.000305s |    0.0096% |
+| Setup dof systems               |         1 |      1.37s |        43% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/non_conservative_with_mpi/statistics
===================================================================
--- trunk/aspect/tests/non_conservative_with_mpi/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/non_conservative_with_mpi/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (years)
-0 0.0000e+00 16 187 81 0 0 28 1.0865e-06 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (years)
+0 0.0000e+00 16 187 81 0 28 1.0865e-06 

Modified: trunk/aspect/tests/passive_comp/screen-output
===================================================================
--- trunk/aspect/tests/passive_comp/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/passive_comp/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -42,7 +42,7 @@
 
 *** Timestep 2:  t=5.6325e+12 seconds
    Solving temperature system... 11 iterations.
-   Solving composition system 1... 12 iterations.
+   Solving composition system 1... 19 iterations.
    Rebuilding Stokes preconditioner...
    Solving Stokes system... 3 iterations.
 
@@ -56,21 +56,21 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      38.4s |            |
+| Total wallclock time elapsed since start    |      61.4s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         3 |      2.66s |       6.9% |
-| Assemble composition system     |         3 |      6.15s |        16% |
-| Assemble temperature system     |         3 |      6.92s |        18% |
-| Build Stokes preconditioner     |         3 |      1.96s |       5.1% |
-| Build composition preconditioner|         3 |    0.0809s |      0.21% |
-| Build temperature preconditioner|         3 |    0.0592s |      0.15% |
-| Solve Stokes system             |         3 |     0.778s |         2% |
-| Solve composition system        |         3 |    0.0752s |       0.2% |
-| Solve temperature system        |         3 |     0.101s |      0.26% |
-| Initialization                  |         2 |     0.465s |       1.2% |
-| Postprocessing                  |         3 |      14.6s |        38% |
-| Setup dof systems               |         1 |      2.67s |       6.9% |
+| Assemble Stokes system          |         3 |       5.2s |       8.5% |
+| Assemble composition system     |         3 |      11.2s |        18% |
+| Assemble temperature system     |         3 |      9.41s |        15% |
+| Build Stokes preconditioner     |         3 |      4.74s |       7.7% |
+| Build composition preconditioner|         3 |    0.0451s |     0.073% |
+| Build temperature preconditioner|         3 |    0.0925s |      0.15% |
+| Solve Stokes system             |         3 |      2.21s |       3.6% |
+| Solve composition system        |         3 |    0.0824s |      0.13% |
+| Solve temperature system        |         3 |     0.177s |      0.29% |
+| Initialization                  |         2 |     0.278s |      0.45% |
+| Postprocessing                  |         3 |      24.1s |        39% |
+| Setup dof systems               |         1 |      1.44s |       2.3% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/passive_comp/statistics
===================================================================
--- trunk/aspect/tests/passive_comp/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/passive_comp/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -19,4 +19,4 @@
 # 19: Outward heat flux through boundary with indicator 1 (W)
 0 0.0000e+00 768 7392 3264 3264  0  0 41 2.8162e+12 output-passive_comp/solution-00000 5.11003699e-08 6.29356648e-08 0.00000000e+00 0.00000000e+00 2.22507386e-308 nan 0.00000000e+00 0.00000000e+00 
 1 2.8162e+12 768 7392 3264 3264 17 18  0 2.8162e+12 output-passive_comp/solution-00001 5.11003699e-08 6.29356648e-08 0.00000000e+00 4.30823100e-04  2.00252996e-03 inf 2.73895241e-01 8.41541216e-01 
-2 5.6325e+12 768 7392 3264 3264 11 12  3 2.8162e+12 output-passive_comp/solution-00002 5.11003699e-08 6.29356648e-08 0.00000000e+00 8.46516240e-04  3.17635254e-03 inf 5.82945093e-01 1.87274139e+00 
+2 5.6325e+12 768 7392 3264 3264 11 19  3 2.8162e+12 output-passive_comp/solution-00002 5.11003699e-08 6.29356648e-08 0.00000000e+00 8.46516240e-04  3.17635254e-03 inf 5.82945093e-01 1.87274139e+00 

Modified: trunk/aspect/tests/sol_cx_2/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_2/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_2/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -16,14 +16,14 @@
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.222s |        15% |
-| Assemble temperature system     |         1 |     0.564s |        39% |
-| Build Stokes preconditioner     |         1 |     0.171s |        12% |
-| Build temperature preconditioner|         1 |   0.00121s |     0.083% |
-| Solve Stokes system             |         1 |     0.039s |       2.7% |
-| Solve temperature system        |         1 |   0.00112s |     0.077% |
-| Initialization                  |         2 |    0.0968s |       6.6% |
-| Postprocessing                  |         1 |     0.139s |       9.6% |
-| Setup dof systems               |         1 |     0.132s |       9.1% |
+| Assemble Stokes system          |         1 |     0.129s |       8.8% |
+| Assemble temperature system     |         1 |     0.619s |        42% |
+| Build Stokes preconditioner     |         1 |     0.147s |        10% |
+| Build temperature preconditioner|         1 |   0.00117s |      0.08% |
+| Solve Stokes system             |         1 |    0.0842s |       5.8% |
+| Solve temperature system        |         1 |   0.00104s |     0.072% |
+| Initialization                  |         2 |    0.0437s |         3% |
+| Postprocessing                  |         1 |     0.159s |        11% |
+| Setup dof systems               |         1 |     0.181s |        12% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_cx_2/statistics
===================================================================
--- trunk/aspect/tests/sol_cx_2/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_2/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 16 187 81 0 0 28 3.4287e+01 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 16 187 81 0 28 3.4287e+01 

Modified: trunk/aspect/tests/sol_cx_2_conservative/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_2_conservative/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_2_conservative/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |     0.847s |            |
+| Total wallclock time elapsed since start    |     0.994s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.101s |        12% |
-| Assemble temperature system     |         1 |     0.328s |        39% |
-| Build Stokes preconditioner     |         1 |     0.125s |        15% |
-| Build temperature preconditioner|         1 |   0.00124s |      0.15% |
-| Solve Stokes system             |         1 |    0.0317s |       3.7% |
-| Solve temperature system        |         1 |    0.0011s |      0.13% |
-| Initialization                  |         2 |    0.0405s |       4.8% |
-| Postprocessing                  |         1 |    0.0708s |       8.4% |
-| Setup dof systems               |         1 |    0.0677s |         8% |
+| Assemble Stokes system          |         1 |    0.0521s |       5.2% |
+| Assemble temperature system     |         1 |     0.445s |        45% |
+| Build Stokes preconditioner     |         1 |    0.0509s |       5.1% |
+| Build temperature preconditioner|         1 |   0.00119s |      0.12% |
+| Solve Stokes system             |         1 |     0.029s |       2.9% |
+| Solve temperature system        |         1 |   0.00109s |      0.11% |
+| Initialization                  |         2 |    0.0598s |         6% |
+| Postprocessing                  |         1 |     0.064s |       6.4% |
+| Setup dof systems               |         1 |     0.133s |        13% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_cx_2_conservative/statistics
===================================================================
--- trunk/aspect/tests/sol_cx_2_conservative/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_2_conservative/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (years)
-0 0.0000e+00 16 210 81 0 0 33 1.1317e-06 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (years)
+0 0.0000e+00 16 210 81 0 33 1.1317e-06 

Modified: trunk/aspect/tests/sol_cx_2_normalized_pressure/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_2_normalized_pressure/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_2_normalized_pressure/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      1.52s |            |
+| Total wallclock time elapsed since start    |      1.14s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |    0.0922s |       6.1% |
-| Assemble temperature system     |         1 |     0.501s |        33% |
-| Build Stokes preconditioner     |         1 |      0.21s |        14% |
-| Build temperature preconditioner|         1 |   0.00173s |      0.11% |
-| Solve Stokes system             |         1 |    0.0929s |       6.1% |
-| Solve temperature system        |         1 |   0.00126s |     0.083% |
-| Initialization                  |         2 |    0.0841s |       5.5% |
-| Postprocessing                  |         1 |     0.264s |        17% |
-| Setup dof systems               |         1 |     0.218s |        14% |
+| Assemble Stokes system          |         1 |     0.166s |        15% |
+| Assemble temperature system     |         1 |     0.488s |        43% |
+| Build Stokes preconditioner     |         1 |     0.124s |        11% |
+| Build temperature preconditioner|         1 |    0.0012s |      0.11% |
+| Solve Stokes system             |         1 |    0.0243s |       2.1% |
+| Solve temperature system        |         1 |   0.00105s |     0.092% |
+| Initialization                  |         2 |    0.0839s |       7.3% |
+| Postprocessing                  |         1 |    0.0653s |       5.7% |
+| Setup dof systems               |         1 |      0.13s |        11% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_cx_2_normalized_pressure/statistics
===================================================================
--- trunk/aspect/tests/sol_cx_2_normalized_pressure/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_2_normalized_pressure/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 16 187 81 0 0 28 3.4287e+01 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 16 187 81 0 28 3.4287e+01 

Modified: trunk/aspect/tests/sol_cx_2_q3/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_2_q3/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_2_q3/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      2.56s |            |
+| Total wallclock time elapsed since start    |      3.05s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.521s |        20% |
-| Assemble temperature system     |         1 |     0.844s |        33% |
-| Build Stokes preconditioner     |         1 |     0.195s |       7.6% |
-| Build temperature preconditioner|         1 |   0.00124s |     0.048% |
-| Solve Stokes system             |         1 |    0.0544s |       2.1% |
-| Solve temperature system        |         1 |   0.00139s |     0.054% |
-| Initialization                  |         2 |     0.105s |       4.1% |
-| Postprocessing                  |         1 |     0.171s |       6.7% |
-| Setup dof systems               |         1 |     0.458s |        18% |
+| Assemble Stokes system          |         1 |     0.559s |        18% |
+| Assemble temperature system     |         1 |     0.864s |        28% |
+| Build Stokes preconditioner     |         1 |     0.286s |       9.4% |
+| Build temperature preconditioner|         1 |   0.00141s |     0.046% |
+| Solve Stokes system             |         1 |     0.198s |       6.5% |
+| Solve temperature system        |         1 |   0.00146s |     0.048% |
+| Initialization                  |         2 |     0.112s |       3.7% |
+| Postprocessing                  |         1 |     0.561s |        18% |
+| Setup dof systems               |         1 |     0.232s |       7.6% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_cx_2_q3/statistics
===================================================================
--- trunk/aspect/tests/sol_cx_2_q3/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_2_q3/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 16 419 81 0 0 34 3.5414e+01 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 16 419 81 0 34 3.5414e+01 

Modified: trunk/aspect/tests/sol_cx_4/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      4.24s |            |
+| Total wallclock time elapsed since start    |      5.26s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.386s |       9.1% |
-| Assemble temperature system     |         1 |      1.22s |        29% |
-| Build Stokes preconditioner     |         1 |     0.258s |       6.1% |
-| Build temperature preconditioner|         1 |   0.00535s |      0.13% |
-| Solve Stokes system             |         1 |     0.103s |       2.4% |
-| Solve temperature system        |         1 |   0.00515s |      0.12% |
-| Initialization                  |         2 |     0.234s |       5.5% |
-| Postprocessing                  |         1 |     0.524s |        12% |
-| Setup dof systems               |         1 |      1.15s |        27% |
+| Assemble Stokes system          |         1 |     0.634s |        12% |
+| Assemble temperature system     |         1 |      1.73s |        33% |
+| Build Stokes preconditioner     |         1 |     0.602s |        11% |
+| Build temperature preconditioner|         1 |   0.00545s |       0.1% |
+| Solve Stokes system             |         1 |     0.102s |       1.9% |
+| Solve temperature system        |         1 |     0.035s |      0.66% |
+| Initialization                  |         2 |     0.201s |       3.8% |
+| Postprocessing                  |         1 |     0.751s |        14% |
+| Setup dof systems               |         1 |     0.764s |        15% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_cx_4/statistics
===================================================================
--- trunk/aspect/tests/sol_cx_4/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 256 2467 1089 0 0 33 8.8081e+00 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 256 2467 1089 0 33 8.8081e+00 

Modified: trunk/aspect/tests/sol_cx_4_conservative/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4_conservative/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4_conservative/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      5.06s |            |
+| Total wallclock time elapsed since start    |      6.22s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.388s |       7.7% |
-| Assemble temperature system     |         1 |      1.45s |        29% |
-| Build Stokes preconditioner     |         1 |     0.403s |         8% |
-| Build temperature preconditioner|         1 |   0.00531s |       0.1% |
-| Solve Stokes system             |         1 |     0.164s |       3.2% |
-| Solve temperature system        |         1 |    0.0256s |      0.51% |
-| Initialization                  |         2 |     0.937s |        19% |
-| Postprocessing                  |         1 |     0.859s |        17% |
-| Setup dof systems               |         1 |     0.424s |       8.4% |
+| Assemble Stokes system          |         1 |     0.489s |       7.9% |
+| Assemble temperature system     |         1 |      1.21s |        20% |
+| Build Stokes preconditioner     |         1 |     0.355s |       5.7% |
+| Build temperature preconditioner|         1 |   0.00529s |     0.085% |
+| Solve Stokes system             |         1 |     0.219s |       3.5% |
+| Solve temperature system        |         1 |   0.00547s |     0.088% |
+| Initialization                  |         2 |      1.24s |        20% |
+| Postprocessing                  |         1 |     0.884s |        14% |
+| Setup dof systems               |         1 |      1.25s |        20% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_cx_4_conservative/statistics
===================================================================
--- trunk/aspect/tests/sol_cx_4_conservative/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4_conservative/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (years)
-0 0.0000e+00 256 2946 1089 0 0 34 2.7917e-07 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (years)
+0 0.0000e+00 256 2946 1089 0 34 2.7917e-07 

Modified: trunk/aspect/tests/sol_cx_4_normalized_pressure/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4_normalized_pressure/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4_normalized_pressure/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      4.05s |            |
+| Total wallclock time elapsed since start    |      5.41s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |      0.39s |       9.6% |
-| Assemble temperature system     |         1 |      1.17s |        29% |
-| Build Stokes preconditioner     |         1 |     0.295s |       7.3% |
-| Build temperature preconditioner|         1 |   0.00545s |      0.13% |
-| Solve Stokes system             |         1 |     0.109s |       2.7% |
-| Solve temperature system        |         1 |    0.0252s |      0.62% |
-| Initialization                  |         2 |     0.221s |       5.5% |
-| Postprocessing                  |         1 |     0.541s |        13% |
-| Setup dof systems               |         1 |     0.977s |        24% |
+| Assemble Stokes system          |         1 |     0.602s |        11% |
+| Assemble temperature system     |         1 |      1.88s |        35% |
+| Build Stokes preconditioner     |         1 |     0.547s |        10% |
+| Build temperature preconditioner|         1 |   0.00525s |     0.097% |
+| Solve Stokes system             |         1 |     0.188s |       3.5% |
+| Solve temperature system        |         1 |   0.00483s |     0.089% |
+| Initialization                  |         2 |    0.0991s |       1.8% |
+| Postprocessing                  |         1 |     0.576s |        11% |
+| Setup dof systems               |         1 |     0.985s |        18% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_cx_4_normalized_pressure/statistics
===================================================================
--- trunk/aspect/tests/sol_cx_4_normalized_pressure/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4_normalized_pressure/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 256 2467 1089 0 0 33 8.8081e+00 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 256 2467 1089 0 33 8.8081e+00 

Modified: trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      4.45s |            |
+| Total wallclock time elapsed since start    |      6.98s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.521s |        12% |
-| Assemble temperature system     |         1 |      1.11s |        25% |
-| Build Stokes preconditioner     |         1 |     0.393s |       8.8% |
-| Build temperature preconditioner|         1 |    0.0054s |      0.12% |
-| Solve Stokes system             |         1 |     0.111s |       2.5% |
-| Solve temperature system        |         1 |    0.0251s |      0.56% |
-| Initialization                  |         2 |     0.108s |       2.4% |
-| Postprocessing                  |         1 |      1.28s |        29% |
-| Setup dof systems               |         1 |     0.574s |        13% |
+| Assemble Stokes system          |         1 |      0.58s |       8.3% |
+| Assemble temperature system     |         1 |      1.55s |        22% |
+| Build Stokes preconditioner     |         1 |     0.589s |       8.4% |
+| Build temperature preconditioner|         1 |   0.00533s |     0.076% |
+| Solve Stokes system             |         1 |     0.277s |         4% |
+| Solve temperature system        |         1 |    0.0249s |      0.36% |
+| Initialization                  |         2 |    0.0812s |       1.2% |
+| Postprocessing                  |         1 |      2.41s |        35% |
+| Setup dof systems               |         1 |     0.975s |        14% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/statistics
===================================================================
--- trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 256 2467 1089 0 0 19 8.8073e+00 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 256 2467 1089 0 19 8.8073e+00 

Modified: trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      4.53s |            |
+| Total wallclock time elapsed since start    |      5.57s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.353s |       7.8% |
-| Assemble temperature system     |         1 |       1.1s |        24% |
-| Build Stokes preconditioner     |         1 |     0.257s |       5.7% |
-| Build temperature preconditioner|         1 |   0.00563s |      0.12% |
-| Solve Stokes system             |         1 |    0.0391s |      0.86% |
-| Solve temperature system        |         1 |   0.00528s |      0.12% |
-| Initialization                  |         2 |     0.143s |       3.2% |
-| Postprocessing                  |         1 |     0.783s |        17% |
-| Setup dof systems               |         1 |      1.41s |        31% |
+| Assemble Stokes system          |         1 |     0.531s |       9.5% |
+| Assemble temperature system     |         1 |      1.64s |        29% |
+| Build Stokes preconditioner     |         1 |     0.489s |       8.8% |
+| Build temperature preconditioner|         1 |   0.00529s |     0.095% |
+| Solve Stokes system             |         1 |     0.204s |       3.7% |
+| Solve temperature system        |         1 |    0.0124s |      0.22% |
+| Initialization                  |         2 |     0.114s |         2% |
+| Postprocessing                  |         1 |     0.864s |        16% |
+| Setup dof systems               |         1 |      1.26s |        23% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/statistics
===================================================================
--- trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 256 2467 1089 0 0 14 8.8186e+00 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 256 2467 1089 0 14 8.8186e+00 

Modified: trunk/aspect/tests/sol_cx_tracers/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_tracers/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_cx_tracers/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -1,112 +0,0 @@
-Number of active cells: 256 (on 5 levels)
-Number of degrees of freedom: 3,556 (2,178+289+1,089)
-
-*** Timestep 0:  t=0 seconds
-   Solving temperature system... 0 iterations.
-   Rebuilding Stokes preconditioner...
-   Solving Stokes system... 30+3 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00000.
-
-*** Timestep 1:  t=8.80814 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00001.
-
-*** Timestep 2:  t=17.6163 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00002.
-
-*** Timestep 3:  t=26.4244 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00003.
-
-*** Timestep 4:  t=35.2326 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00004.
-
-*** Timestep 5:  t=44.0407 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00005.
-
-*** Timestep 6:  t=52.8489 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00006.
-
-*** Timestep 7:  t=61.657 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00007.
-
-*** Timestep 8:  t=70.4652 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00008.
-
-*** Timestep 9:  t=79.2733 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00009.
-
-*** Timestep 10:  t=88.0814 seconds
-   Solving temperature system... 0 iterations.
-   Solving Stokes system... 0 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00010.
-
-Number of active cells: 238 (on 5 levels)
-Number of degrees of freedom: 3,379 (2,070+274+1,035)
-
-*** Timestep 11:  t=96.8896 seconds
-   Solving temperature system... 0 iterations.
-   Rebuilding Stokes preconditioner...
-   Solving Stokes system... 29 iterations.
-
-   Postprocessing:
-     Advecting particles... done. Wrote particle graphics: output-sol_cx_tracers/particle-00011.
-
-
-
-+---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      57.6s |            |
-|                                             |            |            |
-| Section                         | no. calls |  wall time | % of total |
-+---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |        12 |     0.729s |       1.3% |
-| Assemble temperature system     |        12 |      5.51s |       9.6% |
-| Build Stokes preconditioner     |         2 |     0.471s |      0.82% |
-| Build temperature preconditioner|        12 |    0.0571s |     0.099% |
-| Solve Stokes system             |        12 |     0.309s |      0.54% |
-| Solve temperature system        |        12 |    0.0348s |      0.06% |
-| Initialization                  |         2 |    0.0694s |      0.12% |
-| Postprocessing                  |        12 |      48.5s |        84% |
-| Refine mesh structure, part 1   |         1 |     0.554s |      0.96% |
-| Refine mesh structure, part 2   |         1 |   0.00654s |     0.011% |
-| Setup dof systems               |         2 |     0.863s |       1.5% |
-+---------------------------------+-----------+------------+------------+
-

Modified: trunk/aspect/tests/sol_kz_2/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_2/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_2/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      1.67s |            |
+| Total wallclock time elapsed since start    |      2.93s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.177s |        11% |
-| Assemble temperature system     |         1 |     0.605s |        36% |
-| Build Stokes preconditioner     |         1 |      0.12s |       7.2% |
-| Build temperature preconditioner|         1 |   0.00124s |     0.074% |
-| Solve Stokes system             |         1 |    0.0294s |       1.8% |
-| Solve temperature system        |         1 |   0.00113s |     0.067% |
-| Initialization                  |         2 |      0.14s |       8.4% |
-| Postprocessing                  |         1 |     0.216s |        13% |
-| Setup dof systems               |         1 |     0.236s |        14% |
+| Assemble Stokes system          |         1 |     0.238s |       8.1% |
+| Assemble temperature system     |         1 |     0.839s |        29% |
+| Build Stokes preconditioner     |         1 |     0.378s |        13% |
+| Build temperature preconditioner|         1 |   0.00122s |     0.042% |
+| Solve Stokes system             |         1 |     0.167s |       5.7% |
+| Solve temperature system        |         1 |   0.00107s |     0.036% |
+| Initialization                  |         2 |     0.251s |       8.6% |
+| Postprocessing                  |         1 |     0.169s |       5.8% |
+| Setup dof systems               |         1 |     0.617s |        21% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_kz_2/statistics
===================================================================
--- trunk/aspect/tests/sol_kz_2/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_2/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 16 187 81 0 0 32 1.0995e+03 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 16 187 81 0 32 1.0995e+03 

Modified: trunk/aspect/tests/sol_kz_2_conservative/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_2_conservative/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_2_conservative/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      1.43s |            |
+| Total wallclock time elapsed since start    |      1.26s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.169s |        12% |
-| Assemble temperature system     |         1 |     0.549s |        38% |
-| Build Stokes preconditioner     |         1 |      0.14s |       9.8% |
-| Build temperature preconditioner|         1 |   0.00122s |     0.085% |
-| Solve Stokes system             |         1 |    0.0693s |       4.8% |
-| Solve temperature system        |         1 |   0.00112s |     0.078% |
-| Initialization                  |         2 |     0.077s |       5.4% |
-| Postprocessing                  |         1 |     0.137s |       9.6% |
-| Setup dof systems               |         1 |      0.16s |        11% |
+| Assemble Stokes system          |         1 |     0.157s |        13% |
+| Assemble temperature system     |         1 |     0.572s |        46% |
+| Build Stokes preconditioner     |         1 |     0.121s |       9.6% |
+| Build temperature preconditioner|         1 |   0.00123s |     0.098% |
+| Solve Stokes system             |         1 |    0.0587s |       4.7% |
+| Solve temperature system        |         1 |   0.00108s |     0.086% |
+| Initialization                  |         2 |    0.0333s |       2.7% |
+| Postprocessing                  |         1 |     0.139s |        11% |
+| Setup dof systems               |         1 |    0.0712s |       5.7% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_kz_2_conservative/statistics
===================================================================
--- trunk/aspect/tests/sol_kz_2_conservative/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_2_conservative/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (years)
-0 0.0000e+00 16 187 81 0 0 32 3.4841e-05 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (years)
+0 0.0000e+00 16 187 81 0 32 3.4841e-05 

Modified: trunk/aspect/tests/sol_kz_2_q3/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_2_q3/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_2_q3/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      2.96s |            |
+| Total wallclock time elapsed since start    |      2.75s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.568s |        19% |
-| Assemble temperature system     |         1 |      1.23s |        42% |
-| Build Stokes preconditioner     |         1 |     0.351s |        12% |
-| Build temperature preconditioner|         1 |   0.00127s |     0.043% |
-| Solve Stokes system             |         1 |    0.0872s |         3% |
-| Solve temperature system        |         1 |   0.00136s |     0.046% |
-| Initialization                  |         2 |     0.105s |       3.5% |
-| Postprocessing                  |         1 |    0.0933s |       3.2% |
-| Setup dof systems               |         1 |      0.35s |        12% |
+| Assemble Stokes system          |         1 |     0.578s |        21% |
+| Assemble temperature system     |         1 |     0.845s |        31% |
+| Build Stokes preconditioner     |         1 |     0.294s |        11% |
+| Build temperature preconditioner|         1 |   0.00121s |     0.044% |
+| Solve Stokes system             |         1 |    0.0498s |       1.8% |
+| Solve temperature system        |         1 |   0.00133s |     0.048% |
+| Initialization                  |         2 |     0.203s |       7.4% |
+| Postprocessing                  |         1 |     0.251s |       9.2% |
+| Setup dof systems               |         1 |     0.197s |       7.2% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_kz_2_q3/statistics
===================================================================
--- trunk/aspect/tests/sol_kz_2_q3/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_2_q3/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 16 419 81 0 0 39 9.7871e+02 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 16 419 81 0 39 9.7871e+02 

Modified: trunk/aspect/tests/sol_kz_4/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_4/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_4/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      3.54s |            |
+| Total wallclock time elapsed since start    |      4.41s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.353s |        10% |
-| Assemble temperature system     |         1 |      1.15s |        33% |
-| Build Stokes preconditioner     |         1 |     0.304s |       8.6% |
-| Build temperature preconditioner|         1 |   0.00536s |      0.15% |
-| Solve Stokes system             |         1 |     0.119s |       3.4% |
-| Solve temperature system        |         1 |   0.00508s |      0.14% |
-| Initialization                  |         2 |    0.0698s |         2% |
-| Postprocessing                  |         1 |     0.378s |        11% |
-| Setup dof systems               |         1 |     0.746s |        21% |
+| Assemble Stokes system          |         1 |     0.544s |        12% |
+| Assemble temperature system     |         1 |       1.4s |        32% |
+| Build Stokes preconditioner     |         1 |     0.459s |        10% |
+| Build temperature preconditioner|         1 |   0.00519s |      0.12% |
+| Solve Stokes system             |         1 |     0.238s |       5.4% |
+| Solve temperature system        |         1 |   0.00486s |      0.11% |
+| Initialization                  |         2 |    0.0909s |       2.1% |
+| Postprocessing                  |         1 |     0.594s |        13% |
+| Setup dof systems               |         1 |     0.669s |        15% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_kz_4/statistics
===================================================================
--- trunk/aspect/tests/sol_kz_4/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_4/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (seconds)
-0 0.0000e+00 256 2467 1089 0 0 37 2.8480e+02 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (seconds)
+0 0.0000e+00 256 2467 1089 0 37 2.8480e+02 

Modified: trunk/aspect/tests/sol_kz_4_conservative/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_4_conservative/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_4_conservative/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -12,18 +12,18 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      3.59s |            |
+| Total wallclock time elapsed since start    |      4.96s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |     0.456s |        13% |
-| Assemble temperature system     |         1 |     0.747s |        21% |
-| Build Stokes preconditioner     |         1 |     0.292s |       8.1% |
-| Build temperature preconditioner|         1 |   0.00536s |      0.15% |
-| Solve Stokes system             |         1 |     0.119s |       3.3% |
-| Solve temperature system        |         1 |   0.00509s |      0.14% |
-| Initialization                  |         2 |      0.15s |       4.2% |
-| Postprocessing                  |         1 |     0.541s |        15% |
-| Setup dof systems               |         1 |     0.944s |        26% |
+| Assemble Stokes system          |         1 |     0.494s |        10% |
+| Assemble temperature system     |         1 |      1.38s |        28% |
+| Build Stokes preconditioner     |         1 |     0.602s |        12% |
+| Build temperature preconditioner|         1 |   0.00527s |      0.11% |
+| Solve Stokes system             |         1 |     0.119s |       2.4% |
+| Solve temperature system        |         1 |   0.00582s |      0.12% |
+| Initialization                  |         2 |      0.24s |       4.8% |
+| Postprocessing                  |         1 |     0.539s |        11% |
+| Setup dof systems               |         1 |      1.12s |        23% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/sol_kz_4_conservative/statistics
===================================================================
--- trunk/aspect/tests/sol_kz_4_conservative/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/sol_kz_4_conservative/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -3,8 +3,7 @@
 # 3: Number of mesh cells
 # 4: Number of Stokes degrees of freedom
 # 5: Number of temperature degrees of freedom
-# 6: Number of composition degrees of freedom
-# 7: Iterations for temperature solver
-# 8: Iterations for Stokes solver
-# 9: Time step size (years)
-0 0.0000e+00 256 2467 1089 0 0 37 9.0249e-06 
+# 6: Iterations for temperature solver
+# 7: Iterations for Stokes solver
+# 8: Time step size (years)
+0 0.0000e+00 256 2467 1089 0 37 9.0249e-06 

Modified: trunk/aspect/tests/stokes/screen-output
===================================================================
--- trunk/aspect/tests/stokes/screen-output	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/stokes/screen-output	2012-10-25 12:23:03 UTC (rev 1326)
@@ -45,23 +45,23 @@
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      6.03s |            |
+| Total wallclock time elapsed since start    |       173s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         3 |     0.649s |        11% |
-| Assemble composition system     |         3 |      1.36s |        23% |
-| Assemble temperature system     |         3 |      1.72s |        29% |
-| Build Stokes preconditioner     |         3 |     0.379s |       6.3% |
-| Build composition preconditioner|         3 |    0.0403s |      0.67% |
-| Build temperature preconditioner|         3 |    0.0404s |      0.67% |
-| Solve Stokes system             |         3 |     0.599s |       9.9% |
-| Solve composition system        |         3 |   0.00294s |     0.049% |
-| Solve temperature system        |         3 |   0.00287s |     0.048% |
-| Initialization                  |         4 |    0.0752s |       1.2% |
-| Postprocessing                  |         1 |     0.321s |       5.3% |
-| Refine mesh structure, part 1   |         2 |     0.311s |       5.2% |
-| Refine mesh structure, part 2   |         2 |   0.00497s |     0.082% |
-| Setup dof systems               |         3 |     0.443s |       7.3% |
+| Assemble Stokes system          |         3 |      19.7s |        11% |
+| Assemble composition system     |         3 |      47.2s |        27% |
+| Assemble temperature system     |         3 |      50.5s |        29% |
+| Build Stokes preconditioner     |         3 |      13.6s |       7.9% |
+| Build composition preconditioner|         3 |    0.0511s |     0.029% |
+| Build temperature preconditioner|         3 |    0.0516s |      0.03% |
+| Solve Stokes system             |         3 |      1.94s |       1.1% |
+| Solve composition system        |         3 |    0.0347s |      0.02% |
+| Solve temperature system        |         3 |    0.0333s |     0.019% |
+| Initialization                  |         4 |       3.3s |       1.9% |
+| Postprocessing                  |         1 |        10s |       5.8% |
+| Refine mesh structure, part 1   |         2 |      6.45s |       3.7% |
+| Refine mesh structure, part 2   |         2 |    0.0582s |     0.034% |
+| Setup dof systems               |         3 |        17s |       9.8% |
 +---------------------------------+-----------+------------+------------+
 

Modified: trunk/aspect/tests/stokes/statistics
===================================================================
--- trunk/aspect/tests/stokes/statistics	2012-10-25 00:12:47 UTC (rev 1325)
+++ trunk/aspect/tests/stokes/statistics	2012-10-25 12:23:03 UTC (rev 1326)
@@ -13,4 +13,4 @@
 # 13: Max. velocity (m/s)
 0 0.0000e+00  64 2312  729  729 0 0 39 4.0417e+14                           "" 0.00000000e+00 0.00000000e+00 
 0 0.0000e+00 120 4438 1405 1405 0 0 40 1.8789e+14                           "" 0.00000000e+00 0.00000000e+00 
-0 0.0000e+00 120 4438 1405 1405 0 0 40 1.8789e+14 output-stokes/solution-00000 5.45841472e-11 7.70027618e-10 
+0 0.0000e+00 120 4438 1405 1405 0 0 40 1.8789e+14 output-stokes/solution-00000 5.45841473e-11 7.70027620e-10 



More information about the CIG-COMMITS mailing list