[cig-commits] [commit] master: Fix a bug and add a test. (f78b8ac)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Aug 19 11:38:07 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/43f425f57ef5959f8b3b406b08aea3cf203cd979...449120eb5efbd20a34e046b56ed2f049cfa841c3
>---------------------------------------------------------------
commit f78b8ac20460f19c6eda62e88b52b51b1de49b03
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date: Tue Aug 19 18:00:38 2014 +0200
Fix a bug and add a test.
>---------------------------------------------------------------
f78b8ac20460f19c6eda62e88b52b51b1de49b03
doc/modules/changes.h | 9 +
source/initial_conditions/adiabatic.cc | 7 +-
...m => adiabatic_initial_conditions_constant.prm} | 18 +-
.../depth_average.gnuplot | 707 +++++++++++++++++++++
.../screen-output | 26 +-
.../statistics | 2 +-
6 files changed, 745 insertions(+), 24 deletions(-)
diff --git a/doc/modules/changes.h b/doc/modules/changes.h
index fcb193c..f0ad2fa 100644
--- a/doc/modules/changes.h
+++ b/doc/modules/changes.h
@@ -6,6 +6,15 @@
*
*
* <ol>
+ * <li> Fixed: The initial condition 'adiabatic' had a minor bug in the case
+ * of using a model without adiabatic heating and a prescribed bottom boundary
+ * layer. In this case the model should create a constant temperature profile
+ * with boundary layers to the boundary temperature. Due to a bug the bottom
+ * boundary layer amplitude was calculated against an adiabatic profile instead
+ * of a constant temperature. This is fixed now.
+ * <br>
+ * (Rene Gassmoeller, 2014/08/19)
+
* <li> Changed: The GPlates velocity boundary plugin prescribed only the normal
* vector of the model plane of 2D models. Therefore it was very hard to rotate
* the model into its actual orientation, when comparing it with other datasets.
diff --git a/source/initial_conditions/adiabatic.cc b/source/initial_conditions/adiabatic.cc
index 8bfcf93..e526e2c 100644
--- a/source/initial_conditions/adiabatic.cc
+++ b/source/initial_conditions/adiabatic.cc
@@ -48,10 +48,15 @@ namespace aspect
// then, get the temperature of the adiabatic profile at a representative
// point at the top and bottom boundary of the model
+ // if adiabatic heating is switched off, assume a constant profile
const Point<dim> surface_point = this->get_geometry_model().representative_point(0.0);
const Point<dim> bottom_point = this->get_geometry_model().representative_point(this->get_geometry_model().maximal_depth());
const double adiabatic_surface_temperature = this->get_adiabatic_conditions().temperature(surface_point);
- const double adiabatic_bottom_temperature = this->get_adiabatic_conditions().temperature(bottom_point);
+ const double adiabatic_bottom_temperature = (this->include_adiabatic_heating())
+ ?
+ this->get_adiabatic_conditions().temperature(bottom_point)
+ :
+ adiabatic_surface_temperature;
// get a representative profile of the compositional fields as an input
// for the material model
diff --git a/tests/adiabatic_initial_conditions.prm b/tests/adiabatic_initial_conditions_constant.prm
similarity index 83%
copy from tests/adiabatic_initial_conditions.prm
copy to tests/adiabatic_initial_conditions_constant.prm
index f745ea4..1da7ee6 100644
--- a/tests/adiabatic_initial_conditions.prm
+++ b/tests/adiabatic_initial_conditions_constant.prm
@@ -1,8 +1,8 @@
-# In ASPECT 0.2, we managed to get the adiabatic initial conditions
-# wrong. This was fixed in r1678 by Juliane Dannberg
-#
-# The computation was only wrong if one specified boundary layers. This
-# test verifies this.
+# The adiabatic initial conditions are intended to work
+# as well for models without adiabatic heating, by using
+# the adiabatic surface temperature.
+# This test ensures that boundary layers are handled
+# correctly in this case.
set Dimension = 2
set CFL number = 1.0
@@ -26,14 +26,14 @@ subsection Boundary temperature model
end
-set Adiabatic surface temperature = 1200
+set Adiabatic surface temperature = 1600
subsection Initial conditions
set Model name = adiabatic
subsection Adiabatic
set Age top boundary layer = 3.16e15
set Age bottom boundary layer = 3.16e15
- set Subadiabaticity = 0
+ set Subadiabaticity = 200
end
end
@@ -69,7 +69,7 @@ subsection Material model
set Reference specific heat = 1250
set Reference temperature = 1613 # default: 293
set Thermal conductivity = 4.125 # default: 4.7
- set Thermal expansion coefficient = 2e-5
+ set Thermal expansion coefficient = 4e-5
set Viscosity = 1 # default: 5e24
end
end
@@ -86,7 +86,7 @@ subsection Model settings
set Prescribed velocity boundary indicators =
set Tangential velocity boundary indicators = 0, 2, 3
set Zero velocity boundary indicators = 1
- set Include adiabatic heating = true
+ set Include adiabatic heating = false
end
subsection Postprocess
diff --git a/tests/adiabatic_initial_conditions_constant/depth_average.gnuplot b/tests/adiabatic_initial_conditions_constant/depth_average.gnuplot
new file mode 100644
index 0000000..84d08ad
--- /dev/null
+++ b/tests/adiabatic_initial_conditions_constant/depth_average.gnuplot
@@ -0,0 +1,707 @@
+# This file was generated by the deal.II library.
+
+
+#
+# For a description of the GNUPLOT format see the GNUPLOT manual.
+#
+# <x> <y> <temperature> <adiabatic_temperature> <velocity_magnitude> <sinking_velocity> <Vs> <Vp> <viscosity>
+0 0 496.607 1600 1.07472e+20 3.1557e-09 -1 -1 1
+28900 0 496.607 1600 1.07472e+20 3.1557e-09 -1 -1 1
+
+0 0 496.607 1600 1.07472e+20 3.1557e-09 -1 -1 1
+28900 0 496.607 1600 1.07472e+20 3.1557e-09 -1 -1 1
+
+
+28900 0 845.34 1614.72 1.61159e+20 3.1557e-09 -1 -1 1
+57800 0 845.34 1614.72 1.61159e+20 3.1557e-09 -1 -1 1
+
+28900 0 845.34 1614.72 1.61159e+20 3.1557e-09 -1 -1 1
+57800 0 845.34 1614.72 1.61159e+20 3.1557e-09 -1 -1 1
+
+
+57800 0 1128.19 1629.58 1.77254e+20 3.1557e-09 -1 -1 1
+86700 0 1128.19 1629.58 1.77254e+20 3.1557e-09 -1 -1 1
+
+57800 0 1128.19 1629.58 1.77254e+20 3.1557e-09 -1 -1 1
+86700 0 1128.19 1629.58 1.77254e+20 3.1557e-09 -1 -1 1
+
+
+86700 0 1336.33 1644.58 9.92753e+20 3.1557e-09 -1 -1 1
+115600 0 1336.33 1644.58 9.92753e+20 3.1557e-09 -1 -1 1
+
+86700 0 1336.33 1644.58 9.92753e+20 3.1557e-09 -1 -1 1
+115600 0 1336.33 1644.58 9.92753e+20 3.1557e-09 -1 -1 1
+
+
+115600 0 1464.03 1659.71 6.16253e+19 3.1557e-09 -1 -1 1
+144500 0 1464.03 1659.71 6.16253e+19 3.1557e-09 -1 -1 1
+
+115600 0 1464.03 1659.71 6.16253e+19 3.1557e-09 -1 -1 1
+144500 0 1464.03 1659.71 6.16253e+19 3.1557e-09 -1 -1 1
+
+
+144500 0 1542.37 1674.98 1.81715e+20 3.1557e-09 -1 -1 1
+173400 0 1542.37 1674.98 1.81715e+20 3.1557e-09 -1 -1 1
+
+144500 0 1542.37 1674.98 1.81715e+20 3.1557e-09 -1 -1 1
+173400 0 1542.37 1674.98 1.81715e+20 3.1557e-09 -1 -1 1
+
+
+173400 0 1577.89 1690.4 6.83427e+19 3.1557e-09 -1 -1 1
+202300 0 1577.89 1690.4 6.83427e+19 3.1557e-09 -1 -1 1
+
+173400 0 1577.89 1690.4 6.83427e+19 3.1557e-09 -1 -1 1
+202300 0 1577.89 1690.4 6.83427e+19 3.1557e-09 -1 -1 1
+
+
+202300 0 1589.63 1705.95 1.86938e+17 3.1557e-09 -1 -1 1
+231200 0 1589.63 1705.95 1.86938e+17 3.1557e-09 -1 -1 1
+
+202300 0 1589.63 1705.95 1.86938e+17 3.1557e-09 -1 -1 1
+231200 0 1589.63 1705.95 1.86938e+17 3.1557e-09 -1 -1 1
+
+
+231200 0 1597.16 1721.65 2.53147e+17 3.1557e-09 -1 -1 1
+260100 0 1597.16 1721.65 2.53147e+17 3.1557e-09 -1 -1 1
+
+231200 0 1597.16 1721.65 2.53147e+17 3.1557e-09 -1 -1 1
+260100 0 1597.16 1721.65 2.53147e+17 3.1557e-09 -1 -1 1
+
+
+260100 0 1599.97 1737.49 1.29823e+17 3.1557e-09 -1 -1 1
+289000 0 1599.97 1737.49 1.29823e+17 3.1557e-09 -1 -1 1
+
+260100 0 1599.97 1737.49 1.29823e+17 3.1557e-09 -1 -1 1
+289000 0 1599.97 1737.49 1.29823e+17 3.1557e-09 -1 -1 1
+
+
+289000 0 1599.84 1753.48 2.26407e+17 3.1557e-09 -1 -1 1
+317900 0 1599.84 1753.48 2.26407e+17 3.1557e-09 -1 -1 1
+
+289000 0 1599.84 1753.48 2.26407e+17 3.1557e-09 -1 -1 1
+317900 0 1599.84 1753.48 2.26407e+17 3.1557e-09 -1 -1 1
+
+
+317900 0 1599.95 1769.61 7.38209e+16 3.1557e-09 -1 -1 1
+346800 0 1599.95 1769.61 7.38209e+16 3.1557e-09 -1 -1 1
+
+317900 0 1599.95 1769.61 7.38209e+16 3.1557e-09 -1 -1 1
+346800 0 1599.95 1769.61 7.38209e+16 3.1557e-09 -1 -1 1
+
+
+346800 0 1600.01 1785.9 9.85256e+16 3.1557e-09 -1 -1 1
+375700 0 1600.01 1785.9 9.85256e+16 3.1557e-09 -1 -1 1
+
+346800 0 1600.01 1785.9 9.85256e+16 3.1557e-09 -1 -1 1
+375700 0 1600.01 1785.9 9.85256e+16 3.1557e-09 -1 -1 1
+
+
+375700 0 1600 1802.33 8.63576e+16 3.1557e-09 -1 -1 1
+404600 0 1600 1802.33 8.63576e+16 3.1557e-09 -1 -1 1
+
+375700 0 1600 1802.33 8.63576e+16 3.1557e-09 -1 -1 1
+404600 0 1600 1802.33 8.63576e+16 3.1557e-09 -1 -1 1
+
+
+404600 0 1600 1818.92 5.53193e+16 3.1557e-09 -1 -1 1
+433500 0 1600 1818.92 5.53193e+16 3.1557e-09 -1 -1 1
+
+404600 0 1600 1818.92 5.53193e+16 3.1557e-09 -1 -1 1
+433500 0 1600 1818.92 5.53193e+16 3.1557e-09 -1 -1 1
+
+
+433500 0 1600 1835.65 5.00469e+16 3.1557e-09 -1 -1 1
+462400 0 1600 1835.65 5.00469e+16 3.1557e-09 -1 -1 1
+
+433500 0 1600 1835.65 5.00469e+16 3.1557e-09 -1 -1 1
+462400 0 1600 1835.65 5.00469e+16 3.1557e-09 -1 -1 1
+
+
+462400 0 1600 1852.54 4.96002e+16 3.1557e-09 -1 -1 1
+491300 0 1600 1852.54 4.96002e+16 3.1557e-09 -1 -1 1
+
+462400 0 1600 1852.54 4.96002e+16 3.1557e-09 -1 -1 1
+491300 0 1600 1852.54 4.96002e+16 3.1557e-09 -1 -1 1
+
+
+491300 0 1600 1869.59 4.64163e+16 3.1557e-09 -1 -1 1
+520200 0 1600 1869.59 4.64163e+16 3.1557e-09 -1 -1 1
+
+491300 0 1600 1869.59 4.64163e+16 3.1557e-09 -1 -1 1
+520200 0 1600 1869.59 4.64163e+16 3.1557e-09 -1 -1 1
+
+
+520200 0 1599.96 1886.79 4.35053e+16 3.1557e-09 -1 -1 1
+549100 0 1599.96 1886.79 4.35053e+16 3.1557e-09 -1 -1 1
+
+520200 0 1599.96 1886.79 4.35053e+16 3.1557e-09 -1 -1 1
+549100 0 1599.96 1886.79 4.35053e+16 3.1557e-09 -1 -1 1
+
+
+549100 0 1599.87 1904.16 4.20387e+16 3.1557e-09 -1 -1 1
+578000 0 1599.87 1904.16 4.20387e+16 3.1557e-09 -1 -1 1
+
+549100 0 1599.87 1904.16 4.20387e+16 3.1557e-09 -1 -1 1
+578000 0 1599.87 1904.16 4.20387e+16 3.1557e-09 -1 -1 1
+
+
+578000 0 1599.72 1921.68 4.11271e+16 3.1557e-09 -1 -1 1
+606900 0 1599.72 1921.68 4.11271e+16 3.1557e-09 -1 -1 1
+
+578000 0 1599.72 1921.68 4.11271e+16 3.1557e-09 -1 -1 1
+606900 0 1599.72 1921.68 4.11271e+16 3.1557e-09 -1 -1 1
+
+
+606900 0 1599.51 1939.36 3.99359e+16 3.1557e-09 -1 -1 1
+635800 0 1599.51 1939.36 3.99359e+16 3.1557e-09 -1 -1 1
+
+606900 0 1599.51 1939.36 3.99359e+16 3.1557e-09 -1 -1 1
+635800 0 1599.51 1939.36 3.99359e+16 3.1557e-09 -1 -1 1
+
+
+635800 0 1599.24 1957.21 3.89048e+16 3.1557e-09 -1 -1 1
+664700 0 1599.24 1957.21 3.89048e+16 3.1557e-09 -1 -1 1
+
+635800 0 1599.24 1957.21 3.89048e+16 3.1557e-09 -1 -1 1
+664700 0 1599.24 1957.21 3.89048e+16 3.1557e-09 -1 -1 1
+
+
+664700 0 1598.91 1975.22 3.8966e+16 3.1557e-09 -1 -1 1
+693600 0 1598.91 1975.22 3.8966e+16 3.1557e-09 -1 -1 1
+
+664700 0 1598.91 1975.22 3.8966e+16 3.1557e-09 -1 -1 1
+693600 0 1598.91 1975.22 3.8966e+16 3.1557e-09 -1 -1 1
+
+
+693600 0 1598.52 1993.39 3.79484e+16 3.1557e-09 -1 -1 1
+722500 0 1598.52 1993.39 3.79484e+16 3.1557e-09 -1 -1 1
+
+693600 0 1598.52 1993.39 3.79484e+16 3.1557e-09 -1 -1 1
+722500 0 1598.52 1993.39 3.79484e+16 3.1557e-09 -1 -1 1
+
+
+722500 0 1598.07 2011.74 3.60556e+16 3.1557e-09 -1 -1 1
+751400 0 1598.07 2011.74 3.60556e+16 3.1557e-09 -1 -1 1
+
+722500 0 1598.07 2011.74 3.60556e+16 3.1557e-09 -1 -1 1
+751400 0 1598.07 2011.74 3.60556e+16 3.1557e-09 -1 -1 1
+
+
+751400 0 1597.57 2030.25 3.49868e+16 3.1557e-09 -1 -1 1
+780300 0 1597.57 2030.25 3.49868e+16 3.1557e-09 -1 -1 1
+
+751400 0 1597.57 2030.25 3.49868e+16 3.1557e-09 -1 -1 1
+780300 0 1597.57 2030.25 3.49868e+16 3.1557e-09 -1 -1 1
+
+
+780300 0 1597 2048.93 3.48518e+16 3.1557e-09 -1 -1 1
+809200 0 1597 2048.93 3.48518e+16 3.1557e-09 -1 -1 1
+
+780300 0 1597 2048.93 3.48518e+16 3.1557e-09 -1 -1 1
+809200 0 1597 2048.93 3.48518e+16 3.1557e-09 -1 -1 1
+
+
+809200 0 1596.37 2067.78 3.32863e+16 3.1557e-09 -1 -1 1
+838100 0 1596.37 2067.78 3.32863e+16 3.1557e-09 -1 -1 1
+
+809200 0 1596.37 2067.78 3.32863e+16 3.1557e-09 -1 -1 1
+838100 0 1596.37 2067.78 3.32863e+16 3.1557e-09 -1 -1 1
+
+
+838100 0 1595.69 2086.81 3.28969e+16 3.1557e-09 -1 -1 1
+867000 0 1595.69 2086.81 3.28969e+16 3.1557e-09 -1 -1 1
+
+838100 0 1595.69 2086.81 3.28969e+16 3.1557e-09 -1 -1 1
+867000 0 1595.69 2086.81 3.28969e+16 3.1557e-09 -1 -1 1
+
+
+867000 0 1594.95 2106.01 3.31217e+16 3.1557e-09 -1 -1 1
+895900 0 1594.95 2106.01 3.31217e+16 3.1557e-09 -1 -1 1
+
+867000 0 1594.95 2106.01 3.31217e+16 3.1557e-09 -1 -1 1
+895900 0 1594.95 2106.01 3.31217e+16 3.1557e-09 -1 -1 1
+
+
+895900 0 1594.15 2125.39 3.19905e+16 3.1557e-09 -1 -1 1
+924800 0 1594.15 2125.39 3.19905e+16 3.1557e-09 -1 -1 1
+
+895900 0 1594.15 2125.39 3.19905e+16 3.1557e-09 -1 -1 1
+924800 0 1594.15 2125.39 3.19905e+16 3.1557e-09 -1 -1 1
+
+
+924800 0 1593.29 2144.95 3.07797e+16 3.1557e-09 -1 -1 1
+953700 0 1593.29 2144.95 3.07797e+16 3.1557e-09 -1 -1 1
+
+924800 0 1593.29 2144.95 3.07797e+16 3.1557e-09 -1 -1 1
+953700 0 1593.29 2144.95 3.07797e+16 3.1557e-09 -1 -1 1
+
+
+953700 0 1592.38 2164.69 3.04581e+16 3.1557e-09 -1 -1 1
+982600 0 1592.38 2164.69 3.04581e+16 3.1557e-09 -1 -1 1
+
+953700 0 1592.38 2164.69 3.04581e+16 3.1557e-09 -1 -1 1
+982600 0 1592.38 2164.69 3.04581e+16 3.1557e-09 -1 -1 1
+
+
+982600 0 1591.42 2184.61 3.02589e+16 3.1557e-09 -1 -1 1
+1.0115e+06 0 1591.42 2184.61 3.02589e+16 3.1557e-09 -1 -1 1
+
+982600 0 1591.42 2184.61 3.02589e+16 3.1557e-09 -1 -1 1
+1.0115e+06 0 1591.42 2184.61 3.02589e+16 3.1557e-09 -1 -1 1
+
+
+1.0115e+06 0 1590.39 2204.71 2.91159e+16 3.1557e-09 -1 -1 1
+1.0404e+06 0 1590.39 2204.71 2.91159e+16 3.1557e-09 -1 -1 1
+
+1.0115e+06 0 1590.39 2204.71 2.91159e+16 3.1557e-09 -1 -1 1
+1.0404e+06 0 1590.39 2204.71 2.91159e+16 3.1557e-09 -1 -1 1
+
+
+1.0404e+06 0 1589.31 2225 2.8614e+16 3.1557e-09 -1 -1 1
+1.0693e+06 0 1589.31 2225 2.8614e+16 3.1557e-09 -1 -1 1
+
+1.0404e+06 0 1589.31 2225 2.8614e+16 3.1557e-09 -1 -1 1
+1.0693e+06 0 1589.31 2225 2.8614e+16 3.1557e-09 -1 -1 1
+
+
+1.0693e+06 0 1588.16 2245.47 2.92373e+16 3.1557e-09 -1 -1 1
+1.0982e+06 0 1588.16 2245.47 2.92373e+16 3.1557e-09 -1 -1 1
+
+1.0693e+06 0 1588.16 2245.47 2.92373e+16 3.1557e-09 -1 -1 1
+1.0982e+06 0 1588.16 2245.47 2.92373e+16 3.1557e-09 -1 -1 1
+
+
+1.0982e+06 0 1586.96 2266.13 2.75248e+16 3.1557e-09 -1 -1 1
+1.1271e+06 0 1586.96 2266.13 2.75248e+16 3.1557e-09 -1 -1 1
+
+1.0982e+06 0 1586.96 2266.13 2.75248e+16 3.1557e-09 -1 -1 1
+1.1271e+06 0 1586.96 2266.13 2.75248e+16 3.1557e-09 -1 -1 1
+
+
+1.1271e+06 0 1585.69 2286.99 2.71511e+16 3.1557e-09 -1 -1 1
+1.156e+06 0 1585.69 2286.99 2.71511e+16 3.1557e-09 -1 -1 1
+
+1.1271e+06 0 1585.69 2286.99 2.71511e+16 3.1557e-09 -1 -1 1
+1.156e+06 0 1585.69 2286.99 2.71511e+16 3.1557e-09 -1 -1 1
+
+
+1.156e+06 0 1584.37 2308.03 2.73583e+16 3.1557e-09 -1 -1 1
+1.1849e+06 0 1584.37 2308.03 2.73583e+16 3.1557e-09 -1 -1 1
+
+1.156e+06 0 1584.37 2308.03 2.73583e+16 3.1557e-09 -1 -1 1
+1.1849e+06 0 1584.37 2308.03 2.73583e+16 3.1557e-09 -1 -1 1
+
+
+1.1849e+06 0 1582.99 2329.27 2.64309e+16 3.1557e-09 -1 -1 1
+1.2138e+06 0 1582.99 2329.27 2.64309e+16 3.1557e-09 -1 -1 1
+
+1.1849e+06 0 1582.99 2329.27 2.64309e+16 3.1557e-09 -1 -1 1
+1.2138e+06 0 1582.99 2329.27 2.64309e+16 3.1557e-09 -1 -1 1
+
+
+1.2138e+06 0 1581.55 2350.7 2.58511e+16 3.1557e-09 -1 -1 1
+1.2427e+06 0 1581.55 2350.7 2.58511e+16 3.1557e-09 -1 -1 1
+
+1.2138e+06 0 1581.55 2350.7 2.58511e+16 3.1557e-09 -1 -1 1
+1.2427e+06 0 1581.55 2350.7 2.58511e+16 3.1557e-09 -1 -1 1
+
+
+1.2427e+06 0 1580.05 2372.33 2.5621e+16 3.1557e-09 -1 -1 1
+1.2716e+06 0 1580.05 2372.33 2.5621e+16 3.1557e-09 -1 -1 1
+
+1.2427e+06 0 1580.05 2372.33 2.5621e+16 3.1557e-09 -1 -1 1
+1.2716e+06 0 1580.05 2372.33 2.5621e+16 3.1557e-09 -1 -1 1
+
+
+1.2716e+06 0 1578.49 2394.16 2.53886e+16 3.1557e-09 -1 -1 1
+1.3005e+06 0 1578.49 2394.16 2.53886e+16 3.1557e-09 -1 -1 1
+
+1.2716e+06 0 1578.49 2394.16 2.53886e+16 3.1557e-09 -1 -1 1
+1.3005e+06 0 1578.49 2394.16 2.53886e+16 3.1557e-09 -1 -1 1
+
+
+1.3005e+06 0 1576.87 2416.19 2.42437e+16 3.1557e-09 -1 -1 1
+1.3294e+06 0 1576.87 2416.19 2.42437e+16 3.1557e-09 -1 -1 1
+
+1.3005e+06 0 1576.87 2416.19 2.42437e+16 3.1557e-09 -1 -1 1
+1.3294e+06 0 1576.87 2416.19 2.42437e+16 3.1557e-09 -1 -1 1
+
+
+1.3294e+06 0 1575.19 2438.43 2.41659e+16 3.1557e-09 -1 -1 1
+1.3583e+06 0 1575.19 2438.43 2.41659e+16 3.1557e-09 -1 -1 1
+
+1.3294e+06 0 1575.19 2438.43 2.41659e+16 3.1557e-09 -1 -1 1
+1.3583e+06 0 1575.19 2438.43 2.41659e+16 3.1557e-09 -1 -1 1
+
+
+1.3583e+06 0 1573.45 2460.86 2.40577e+16 3.1557e-09 -1 -1 1
+1.3872e+06 0 1573.45 2460.86 2.40577e+16 3.1557e-09 -1 -1 1
+
+1.3583e+06 0 1573.45 2460.86 2.40577e+16 3.1557e-09 -1 -1 1
+1.3872e+06 0 1573.45 2460.86 2.40577e+16 3.1557e-09 -1 -1 1
+
+
+1.3872e+06 0 1571.64 2483.51 2.26271e+16 3.1557e-09 -1 -1 1
+1.4161e+06 0 1571.64 2483.51 2.26271e+16 3.1557e-09 -1 -1 1
+
+1.3872e+06 0 1571.64 2483.51 2.26271e+16 3.1557e-09 -1 -1 1
+1.4161e+06 0 1571.64 2483.51 2.26271e+16 3.1557e-09 -1 -1 1
+
+
+1.4161e+06 0 1569.79 2506.36 2.2412e+16 3.1557e-09 -1 -1 1
+1.445e+06 0 1569.79 2506.36 2.2412e+16 3.1557e-09 -1 -1 1
+
+1.4161e+06 0 1569.79 2506.36 2.2412e+16 3.1557e-09 -1 -1 1
+1.445e+06 0 1569.79 2506.36 2.2412e+16 3.1557e-09 -1 -1 1
+
+
+1.445e+06 0 1567.87 2529.43 2.43008e+16 3.1557e-09 -1 -1 1
+1.4739e+06 0 1567.87 2529.43 2.43008e+16 3.1557e-09 -1 -1 1
+
+1.445e+06 0 1567.87 2529.43 2.43008e+16 3.1557e-09 -1 -1 1
+1.4739e+06 0 1567.87 2529.43 2.43008e+16 3.1557e-09 -1 -1 1
+
+
+1.4739e+06 0 1565.89 2552.7 2.44954e+16 3.1557e-09 -1 -1 1
+1.5028e+06 0 1565.89 2552.7 2.44954e+16 3.1557e-09 -1 -1 1
+
+1.4739e+06 0 1565.89 2552.7 2.44954e+16 3.1557e-09 -1 -1 1
+1.5028e+06 0 1565.89 2552.7 2.44954e+16 3.1557e-09 -1 -1 1
+
+
+1.5028e+06 0 1563.86 2576.19 2.07941e+16 3.1557e-09 -1 -1 1
+1.5317e+06 0 1563.86 2576.19 2.07941e+16 3.1557e-09 -1 -1 1
+
+1.5028e+06 0 1563.86 2576.19 2.07941e+16 3.1557e-09 -1 -1 1
+1.5317e+06 0 1563.86 2576.19 2.07941e+16 3.1557e-09 -1 -1 1
+
+
+1.5317e+06 0 1561.76 2599.9 1.82718e+16 3.1557e-09 -1 -1 1
+1.5606e+06 0 1561.76 2599.9 1.82718e+16 3.1557e-09 -1 -1 1
+
+1.5317e+06 0 1561.76 2599.9 1.82718e+16 3.1557e-09 -1 -1 1
+1.5606e+06 0 1561.76 2599.9 1.82718e+16 3.1557e-09 -1 -1 1
+
+
+1.5606e+06 0 1559.64 2623.82 1.90131e+16 3.1557e-09 -1 -1 1
+1.5895e+06 0 1559.64 2623.82 1.90131e+16 3.1557e-09 -1 -1 1
+
+1.5606e+06 0 1559.64 2623.82 1.90131e+16 3.1557e-09 -1 -1 1
+1.5895e+06 0 1559.64 2623.82 1.90131e+16 3.1557e-09 -1 -1 1
+
+
+1.5895e+06 0 1557.44 2647.96 2.00351e+16 3.1557e-09 -1 -1 1
+1.6184e+06 0 1557.44 2647.96 2.00351e+16 3.1557e-09 -1 -1 1
+
+1.5895e+06 0 1557.44 2647.96 2.00351e+16 3.1557e-09 -1 -1 1
+1.6184e+06 0 1557.44 2647.96 2.00351e+16 3.1557e-09 -1 -1 1
+
+
+1.6184e+06 0 1555.19 2672.33 2.15942e+16 3.1557e-09 -1 -1 1
+1.6473e+06 0 1555.19 2672.33 2.15942e+16 3.1557e-09 -1 -1 1
+
+1.6184e+06 0 1555.19 2672.33 2.15942e+16 3.1557e-09 -1 -1 1
+1.6473e+06 0 1555.19 2672.33 2.15942e+16 3.1557e-09 -1 -1 1
+
+
+1.6473e+06 0 1552.87 2696.92 1.96476e+16 3.1557e-09 -1 -1 1
+1.6762e+06 0 1552.87 2696.92 1.96476e+16 3.1557e-09 -1 -1 1
+
+1.6473e+06 0 1552.87 2696.92 1.96476e+16 3.1557e-09 -1 -1 1
+1.6762e+06 0 1552.87 2696.92 1.96476e+16 3.1557e-09 -1 -1 1
+
+
+1.6762e+06 0 1550.49 2721.74 1.75839e+16 3.1557e-09 -1 -1 1
+1.7051e+06 0 1550.49 2721.74 1.75839e+16 3.1557e-09 -1 -1 1
+
+1.6762e+06 0 1550.49 2721.74 1.75839e+16 3.1557e-09 -1 -1 1
+1.7051e+06 0 1550.49 2721.74 1.75839e+16 3.1557e-09 -1 -1 1
+
+
+1.7051e+06 0 1548.05 2746.78 1.69261e+16 3.1557e-09 -1 -1 1
+1.734e+06 0 1548.05 2746.78 1.69261e+16 3.1557e-09 -1 -1 1
+
+1.7051e+06 0 1548.05 2746.78 1.69261e+16 3.1557e-09 -1 -1 1
+1.734e+06 0 1548.05 2746.78 1.69261e+16 3.1557e-09 -1 -1 1
+
+
+1.734e+06 0 1545.56 2772.06 1.66083e+16 3.1557e-09 -1 -1 1
+1.7629e+06 0 1545.56 2772.06 1.66083e+16 3.1557e-09 -1 -1 1
+
+1.734e+06 0 1545.56 2772.06 1.66083e+16 3.1557e-09 -1 -1 1
+1.7629e+06 0 1545.56 2772.06 1.66083e+16 3.1557e-09 -1 -1 1
+
+
+1.7629e+06 0 1543 2797.57 1.63063e+16 3.1557e-09 -1 -1 1
+1.7918e+06 0 1543 2797.57 1.63063e+16 3.1557e-09 -1 -1 1
+
+1.7629e+06 0 1543 2797.57 1.63063e+16 3.1557e-09 -1 -1 1
+1.7918e+06 0 1543 2797.57 1.63063e+16 3.1557e-09 -1 -1 1
+
+
+1.7918e+06 0 1540.39 2823.31 1.60632e+16 3.1557e-09 -1 -1 1
+1.8207e+06 0 1540.39 2823.31 1.60632e+16 3.1557e-09 -1 -1 1
+
+1.7918e+06 0 1540.39 2823.31 1.60632e+16 3.1557e-09 -1 -1 1
+1.8207e+06 0 1540.39 2823.31 1.60632e+16 3.1557e-09 -1 -1 1
+
+
+1.8207e+06 0 1537.7 2849.29 1.51899e+16 3.1557e-09 -1 -1 1
+1.8496e+06 0 1537.7 2849.29 1.51899e+16 3.1557e-09 -1 -1 1
+
+1.8207e+06 0 1537.7 2849.29 1.51899e+16 3.1557e-09 -1 -1 1
+1.8496e+06 0 1537.7 2849.29 1.51899e+16 3.1557e-09 -1 -1 1
+
+
+1.8496e+06 0 1534.98 2875.51 1.49947e+16 3.1557e-09 -1 -1 1
+1.8785e+06 0 1534.98 2875.51 1.49947e+16 3.1557e-09 -1 -1 1
+
+1.8496e+06 0 1534.98 2875.51 1.49947e+16 3.1557e-09 -1 -1 1
+1.8785e+06 0 1534.98 2875.51 1.49947e+16 3.1557e-09 -1 -1 1
+
+
+1.8785e+06 0 1532.18 2901.97 1.44933e+16 3.1557e-09 -1 -1 1
+1.9074e+06 0 1532.18 2901.97 1.44933e+16 3.1557e-09 -1 -1 1
+
+1.8785e+06 0 1532.18 2901.97 1.44933e+16 3.1557e-09 -1 -1 1
+1.9074e+06 0 1532.18 2901.97 1.44933e+16 3.1557e-09 -1 -1 1
+
+
+1.9074e+06 0 1529.34 2928.67 1.39601e+16 3.1557e-09 -1 -1 1
+1.9363e+06 0 1529.34 2928.67 1.39601e+16 3.1557e-09 -1 -1 1
+
+1.9074e+06 0 1529.34 2928.67 1.39601e+16 3.1557e-09 -1 -1 1
+1.9363e+06 0 1529.34 2928.67 1.39601e+16 3.1557e-09 -1 -1 1
+
+
+1.9363e+06 0 1526.42 2955.62 1.37241e+16 3.1557e-09 -1 -1 1
+1.9652e+06 0 1526.42 2955.62 1.37241e+16 3.1557e-09 -1 -1 1
+
+1.9363e+06 0 1526.42 2955.62 1.37241e+16 3.1557e-09 -1 -1 1
+1.9652e+06 0 1526.42 2955.62 1.37241e+16 3.1557e-09 -1 -1 1
+
+
+1.9652e+06 0 1523.46 2982.82 1.34276e+16 3.1557e-09 -1 -1 1
+1.9941e+06 0 1523.46 2982.82 1.34276e+16 3.1557e-09 -1 -1 1
+
+1.9652e+06 0 1523.46 2982.82 1.34276e+16 3.1557e-09 -1 -1 1
+1.9941e+06 0 1523.46 2982.82 1.34276e+16 3.1557e-09 -1 -1 1
+
+
+1.9941e+06 0 1520.43 3010.26 1.27704e+16 3.1557e-09 -1 -1 1
+2.023e+06 0 1520.43 3010.26 1.27704e+16 3.1557e-09 -1 -1 1
+
+1.9941e+06 0 1520.43 3010.26 1.27704e+16 3.1557e-09 -1 -1 1
+2.023e+06 0 1520.43 3010.26 1.27704e+16 3.1557e-09 -1 -1 1
+
+
+2.023e+06 0 1517.35 3037.96 1.26616e+16 3.1557e-09 -1 -1 1
+2.0519e+06 0 1517.35 3037.96 1.26616e+16 3.1557e-09 -1 -1 1
+
+2.023e+06 0 1517.35 3037.96 1.26616e+16 3.1557e-09 -1 -1 1
+2.0519e+06 0 1517.35 3037.96 1.26616e+16 3.1557e-09 -1 -1 1
+
+
+2.0519e+06 0 1514.2 3065.92 1.22137e+16 3.1557e-09 -1 -1 1
+2.0808e+06 0 1514.2 3065.92 1.22137e+16 3.1557e-09 -1 -1 1
+
+2.0519e+06 0 1514.2 3065.92 1.22137e+16 3.1557e-09 -1 -1 1
+2.0808e+06 0 1514.2 3065.92 1.22137e+16 3.1557e-09 -1 -1 1
+
+
+2.0808e+06 0 1511.02 3094.13 1.18217e+16 3.1557e-09 -1 -1 1
+2.1097e+06 0 1511.02 3094.13 1.18217e+16 3.1557e-09 -1 -1 1
+
+2.0808e+06 0 1511.02 3094.13 1.18217e+16 3.1557e-09 -1 -1 1
+2.1097e+06 0 1511.02 3094.13 1.18217e+16 3.1557e-09 -1 -1 1
+
+
+2.1097e+06 0 1507.75 3122.6 1.16736e+16 3.1557e-09 -1 -1 1
+2.1386e+06 0 1507.75 3122.6 1.16736e+16 3.1557e-09 -1 -1 1
+
+2.1097e+06 0 1507.75 3122.6 1.16736e+16 3.1557e-09 -1 -1 1
+2.1386e+06 0 1507.75 3122.6 1.16736e+16 3.1557e-09 -1 -1 1
+
+
+2.1386e+06 0 1504.44 3151.34 1.16526e+16 3.1557e-09 -1 -1 1
+2.1675e+06 0 1504.44 3151.34 1.16526e+16 3.1557e-09 -1 -1 1
+
+2.1386e+06 0 1504.44 3151.34 1.16526e+16 3.1557e-09 -1 -1 1
+2.1675e+06 0 1504.44 3151.34 1.16526e+16 3.1557e-09 -1 -1 1
+
+
+2.1675e+06 0 1501.06 3180.33 1.12686e+16 3.1557e-09 -1 -1 1
+2.1964e+06 0 1501.06 3180.33 1.12686e+16 3.1557e-09 -1 -1 1
+
+2.1675e+06 0 1501.06 3180.33 1.12686e+16 3.1557e-09 -1 -1 1
+2.1964e+06 0 1501.06 3180.33 1.12686e+16 3.1557e-09 -1 -1 1
+
+
+2.1964e+06 0 1497.63 3209.6 1.08059e+16 3.1557e-09 -1 -1 1
+2.2253e+06 0 1497.63 3209.6 1.08059e+16 3.1557e-09 -1 -1 1
+
+2.1964e+06 0 1497.63 3209.6 1.08059e+16 3.1557e-09 -1 -1 1
+2.2253e+06 0 1497.63 3209.6 1.08059e+16 3.1557e-09 -1 -1 1
+
+
+2.2253e+06 0 1494.13 3239.13 1.08355e+16 3.1557e-09 -1 -1 1
+2.2542e+06 0 1494.13 3239.13 1.08355e+16 3.1557e-09 -1 -1 1
+
+2.2253e+06 0 1494.13 3239.13 1.08355e+16 3.1557e-09 -1 -1 1
+2.2542e+06 0 1494.13 3239.13 1.08355e+16 3.1557e-09 -1 -1 1
+
+
+2.2542e+06 0 1490.58 3268.94 1.07061e+16 3.1557e-09 -1 -1 1
+2.2831e+06 0 1490.58 3268.94 1.07061e+16 3.1557e-09 -1 -1 1
+
+2.2542e+06 0 1490.58 3268.94 1.07061e+16 3.1557e-09 -1 -1 1
+2.2831e+06 0 1490.58 3268.94 1.07061e+16 3.1557e-09 -1 -1 1
+
+
+2.2831e+06 0 1486.96 3299.02 1.06341e+16 3.1557e-09 -1 -1 1
+2.312e+06 0 1486.96 3299.02 1.06341e+16 3.1557e-09 -1 -1 1
+
+2.2831e+06 0 1486.96 3299.02 1.06341e+16 3.1557e-09 -1 -1 1
+2.312e+06 0 1486.96 3299.02 1.06341e+16 3.1557e-09 -1 -1 1
+
+
+2.312e+06 0 1483.29 3329.38 1.07968e+16 3.1557e-09 -1 -1 1
+2.3409e+06 0 1483.29 3329.38 1.07968e+16 3.1557e-09 -1 -1 1
+
+2.312e+06 0 1483.29 3329.38 1.07968e+16 3.1557e-09 -1 -1 1
+2.3409e+06 0 1483.29 3329.38 1.07968e+16 3.1557e-09 -1 -1 1
+
+
+2.3409e+06 0 1479.56 3360.01 1.09219e+16 3.1557e-09 -1 -1 1
+2.3698e+06 0 1479.56 3360.01 1.09219e+16 3.1557e-09 -1 -1 1
+
+2.3409e+06 0 1479.56 3360.01 1.09219e+16 3.1557e-09 -1 -1 1
+2.3698e+06 0 1479.56 3360.01 1.09219e+16 3.1557e-09 -1 -1 1
+
+
+2.3698e+06 0 1475.77 3390.93 1.11472e+16 3.1557e-09 -1 -1 1
+2.3987e+06 0 1475.77 3390.93 1.11472e+16 3.1557e-09 -1 -1 1
+
+2.3698e+06 0 1475.77 3390.93 1.11472e+16 3.1557e-09 -1 -1 1
+2.3987e+06 0 1475.77 3390.93 1.11472e+16 3.1557e-09 -1 -1 1
+
+
+2.3987e+06 0 1471.9 3422.13 1.17639e+16 3.1557e-09 -1 -1 1
+2.4276e+06 0 1471.9 3422.13 1.17639e+16 3.1557e-09 -1 -1 1
+
+2.3987e+06 0 1471.9 3422.13 1.17639e+16 3.1557e-09 -1 -1 1
+2.4276e+06 0 1471.9 3422.13 1.17639e+16 3.1557e-09 -1 -1 1
+
+
+2.4276e+06 0 1468.01 3453.62 1.27268e+16 3.1557e-09 -1 -1 1
+2.4565e+06 0 1468.01 3453.62 1.27268e+16 3.1557e-09 -1 -1 1
+
+2.4276e+06 0 1468.01 3453.62 1.27268e+16 3.1557e-09 -1 -1 1
+2.4565e+06 0 1468.01 3453.62 1.27268e+16 3.1557e-09 -1 -1 1
+
+
+2.4565e+06 0 1464.02 3485.4 1.39491e+16 3.1557e-09 -1 -1 1
+2.4854e+06 0 1464.02 3485.4 1.39491e+16 3.1557e-09 -1 -1 1
+
+2.4565e+06 0 1464.02 3485.4 1.39491e+16 3.1557e-09 -1 -1 1
+2.4854e+06 0 1464.02 3485.4 1.39491e+16 3.1557e-09 -1 -1 1
+
+
+2.4854e+06 0 1460.02 3517.48 1.59092e+16 3.1557e-09 -1 -1 1
+2.5143e+06 0 1460.02 3517.48 1.59092e+16 3.1557e-09 -1 -1 1
+
+2.4854e+06 0 1460.02 3517.48 1.59092e+16 3.1557e-09 -1 -1 1
+2.5143e+06 0 1460.02 3517.48 1.59092e+16 3.1557e-09 -1 -1 1
+
+
+2.5143e+06 0 1455.96 3549.84 1.80517e+16 3.1557e-09 -1 -1 1
+2.5432e+06 0 1455.96 3549.84 1.80517e+16 3.1557e-09 -1 -1 1
+
+2.5143e+06 0 1455.96 3549.84 1.80517e+16 3.1557e-09 -1 -1 1
+2.5432e+06 0 1455.96 3549.84 1.80517e+16 3.1557e-09 -1 -1 1
+
+
+2.5432e+06 0 1451.85 3582.51 2.45032e+16 3.1557e-09 -1 -1 1
+2.5721e+06 0 1451.85 3582.51 2.45032e+16 3.1557e-09 -1 -1 1
+
+2.5432e+06 0 1451.85 3582.51 2.45032e+16 3.1557e-09 -1 -1 1
+2.5721e+06 0 1451.85 3582.51 2.45032e+16 3.1557e-09 -1 -1 1
+
+
+2.5721e+06 0 1447.92 3615.47 3.77963e+16 3.1557e-09 -1 -1 1
+2.601e+06 0 1447.92 3615.47 3.77963e+16 3.1557e-09 -1 -1 1
+
+2.5721e+06 0 1447.92 3615.47 3.77963e+16 3.1557e-09 -1 -1 1
+2.601e+06 0 1447.92 3615.47 3.77963e+16 3.1557e-09 -1 -1 1
+
+
+2.601e+06 0 1445.12 3648.74 4.71138e+16 3.1557e-09 -1 -1 1
+2.6299e+06 0 1445.12 3648.74 4.71138e+16 3.1557e-09 -1 -1 1
+
+2.601e+06 0 1445.12 3648.74 4.71138e+16 3.1557e-09 -1 -1 1
+2.6299e+06 0 1445.12 3648.74 4.71138e+16 3.1557e-09 -1 -1 1
+
+
+2.6299e+06 0 1443.28 3682.32 1.48517e+18 3.1557e-09 -1 -1 1
+2.6588e+06 0 1443.28 3682.32 1.48517e+18 3.1557e-09 -1 -1 1
+
+2.6299e+06 0 1443.28 3682.32 1.48517e+18 3.1557e-09 -1 -1 1
+2.6588e+06 0 1443.28 3682.32 1.48517e+18 3.1557e-09 -1 -1 1
+
+
+2.6588e+06 0 1448.84 3716.2 4.24553e+18 3.1557e-09 -1 -1 1
+2.6877e+06 0 1448.84 3716.2 4.24553e+18 3.1557e-09 -1 -1 1
+
+2.6588e+06 0 1448.84 3716.2 4.24553e+18 3.1557e-09 -1 -1 1
+2.6877e+06 0 1448.84 3716.2 4.24553e+18 3.1557e-09 -1 -1 1
+
+
+2.6877e+06 0 1471.35 3750.4 6.42103e+18 3.1557e-09 -1 -1 1
+2.7166e+06 0 1471.35 3750.4 6.42103e+18 3.1557e-09 -1 -1 1
+
+2.6877e+06 0 1471.35 3750.4 6.42103e+18 3.1557e-09 -1 -1 1
+2.7166e+06 0 1471.35 3750.4 6.42103e+18 3.1557e-09 -1 -1 1
+
+
+2.7166e+06 0 1514.47 3784.91 2.69995e+19 3.1557e-09 -1 -1 1
+2.7455e+06 0 1514.47 3784.91 2.69995e+19 3.1557e-09 -1 -1 1
+
+2.7166e+06 0 1514.47 3784.91 2.69995e+19 3.1557e-09 -1 -1 1
+2.7455e+06 0 1514.47 3784.91 2.69995e+19 3.1557e-09 -1 -1 1
+
+
+2.7455e+06 0 1611.09 3819.74 5.80947e+19 3.1557e-09 -1 -1 1
+2.7744e+06 0 1611.09 3819.74 5.80947e+19 3.1557e-09 -1 -1 1
+
+2.7455e+06 0 1611.09 3819.74 5.80947e+19 3.1557e-09 -1 -1 1
+2.7744e+06 0 1611.09 3819.74 5.80947e+19 3.1557e-09 -1 -1 1
+
+
+2.7744e+06 0 1780.4 3854.89 1.13371e+20 3.1557e-09 -1 -1 1
+2.8033e+06 0 1780.4 3854.89 1.13371e+20 3.1557e-09 -1 -1 1
+
+2.7744e+06 0 1780.4 3854.89 1.13371e+20 3.1557e-09 -1 -1 1
+2.8033e+06 0 1780.4 3854.89 1.13371e+20 3.1557e-09 -1 -1 1
+
+
+2.8033e+06 0 2029.58 3890.36 2.13463e+20 3.1557e-09 -1 -1 1
+2.8322e+06 0 2029.58 3890.36 2.13463e+20 3.1557e-09 -1 -1 1
+
+2.8033e+06 0 2029.58 3890.36 2.13463e+20 3.1557e-09 -1 -1 1
+2.8322e+06 0 2029.58 3890.36 2.13463e+20 3.1557e-09 -1 -1 1
+
+
+2.8322e+06 0 2373.82 3926.16 3.94538e+19 3.1557e-09 -1 -1 1
+2.8611e+06 0 2373.82 3926.16 3.94538e+19 3.1557e-09 -1 -1 1
+
+2.8322e+06 0 2373.82 3926.16 3.94538e+19 3.1557e-09 -1 -1 1
+2.8611e+06 0 2373.82 3926.16 3.94538e+19 3.1557e-09 -1 -1 1
+
+
+2.8611e+06 0 2772.99 3962.28 3.97722e+19 3.1557e-09 -1 -1 1
+2.89e+06 0 2772.99 3962.28 3.97722e+19 3.1557e-09 -1 -1 1
+
+2.8611e+06 0 2772.99 3962.28 3.97722e+19 3.1557e-09 -1 -1 1
+2.89e+06 0 2772.99 3962.28 3.97722e+19 3.1557e-09 -1 -1 1
+
+
diff --git a/tests/adiabatic_initial_conditions_subadiabaticity/screen-output b/tests/adiabatic_initial_conditions_constant/screen-output
similarity index 58%
copy from tests/adiabatic_initial_conditions_subadiabaticity/screen-output
copy to tests/adiabatic_initial_conditions_constant/screen-output
index 2cd623b..ad725ef 100644
--- a/tests/adiabatic_initial_conditions_subadiabaticity/screen-output
+++ b/tests/adiabatic_initial_conditions_constant/screen-output
@@ -1,6 +1,6 @@
-----------------------------------------------------------------------------
-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
--- . version 1.1.pre
+-- . version 1.2.pre
-- . running in DEBUG mode
-- . running with 1 MPI process
-- . using Trilinos
@@ -15,25 +15,25 @@ Number of degrees of freedom: 40,836 (25,090+3,201+12,545)
Solving Stokes system... 30+6 iterations.
Postprocessing:
- Writing graphical output: output-adiabatic_initial_conditions_subadiabaticity/solution-00000
- Writing depth average output-adiabatic_initial_conditions_subadiabaticity/depth_average.gnuplot
+ Writing graphical output: output-adiabatic_initial_conditions_constant/solution-00000
+ Writing depth average output-adiabatic_initial_conditions_constant/depth_average.gnuplot
Termination requested by criterion: end time
+---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start | 10.7s | |
+| Total wallclock time elapsed since start | 31.6s | |
| | | |
| Section | no. calls | wall time | % of total |
+---------------------------------+-----------+------------+------------+
-| Assemble Stokes system | 1 | 1.07s | 10% |
-| Assemble temperature system | 1 | 1.47s | 14% |
-| Build Stokes preconditioner | 1 | 1.1s | 10% |
-| Build temperature preconditioner| 1 | 0.0582s | 0.55% |
-| Solve Stokes system | 1 | 0.98s | 9.2% |
-| Solve temperature system | 1 | 0.00375s | 0.035% |
-| Initialization | 2 | 0.216s | 2% |
-| Postprocessing | 1 | 5.05s | 47% |
-| Setup dof systems | 1 | 0.415s | 3.9% |
+| Assemble Stokes system | 1 | 3.99s | 13% |
+| Assemble temperature system | 1 | 3.45s | 11% |
+| Build Stokes preconditioner | 1 | 2.77s | 8.8% |
+| Build temperature preconditioner| 1 | 0.0369s | 0.12% |
+| Solve Stokes system | 1 | 1.11s | 3.5% |
+| Solve temperature system | 1 | 0.00748s | 0.024% |
+| Initialization | 2 | 1.11s | 3.5% |
+| Postprocessing | 1 | 15.5s | 49% |
+| Setup dof systems | 1 | 2.19s | 6.9% |
+---------------------------------+-----------+------------+------------+
diff --git a/tests/graphical_output/statistics b/tests/adiabatic_initial_conditions_constant/statistics
similarity index 77%
copy from tests/graphical_output/statistics
copy to tests/adiabatic_initial_conditions_constant/statistics
index edf1a72..9a9b448 100644
--- a/tests/graphical_output/statistics
+++ b/tests/adiabatic_initial_conditions_constant/statistics
@@ -9,4 +9,4 @@
# 9: Schur complement iterations in Stokes preconditioner
# 10: Time step size (seconds)
# 11: Visualization file name
-0 0.0000e+00 16 187 81 0 17 18 17 3.4287e+01 output-graphical_output/solution-00000
+0 0.0000e+00 3072 28291 12545 0 36 49 14 8.7965e-07 output-adiabatic_initial_conditions_constant/solution-00000
More information about the CIG-COMMITS
mailing list