[cig-commits] commit 2430 by heister to /var/svn/dealii/aspect

dealii.demon at gmail.com dealii.demon at gmail.com
Tue Apr 8 07:41:20 PDT 2014


Revision 2430

merge from mainline

_U  branches/freesurface/
D   branches/freesurface/TODO
U   branches/freesurface/doc/modules/changes.h
A   branches/freesurface/doc/modules/todo.h
A   branches/freesurface/doc/release-tasklist
U   branches/freesurface/include/aspect/geometry_model/box.h
U   branches/freesurface/readme.html
U   branches/freesurface/source/geometry_model/box.cc
U   branches/freesurface/source/main.cc
U   branches/freesurface/source/material_model/simple.cc
U   branches/freesurface/source/simulator/core.cc
UU  branches/freesurface/source/simulator/nullspace.cc
U   branches/freesurface/tests/CMakeLists.txt
U   branches/freesurface/tests/adiabatic_conditions/screen-output
U   branches/freesurface/tests/adiabatic_initial_conditions/screen-output
U   branches/freesurface/tests/adiabatic_initial_conditions_subadiabaticity/screen-output
U   branches/freesurface/tests/box-end_time_1e7-terminate/screen-output
U   branches/freesurface/tests/box-first-time-step/screen-output
U   branches/freesurface/tests/box-first-time-step-alternate-bc/screen-output
A   branches/freesurface/tests/box-repetitions/
D   branches/freesurface/tests/box-repetitions/screen-output
A   branches/freesurface/tests/box-repetitions/screen-output
D   branches/freesurface/tests/box-repetitions/solution-00000.0000.vtu
A   branches/freesurface/tests/box-repetitions/solution-00000.0000.vtu
A   branches/freesurface/tests/box-repetitions.prm
U   branches/freesurface/tests/box-steady-state-terminate/screen-output
U   branches/freesurface/tests/composition-active/screen-output
U   branches/freesurface/tests/composition-active/statistics
U   branches/freesurface/tests/composition-passive-tracers/screen-output
U   branches/freesurface/tests/compositional_boundary_values/screen-output
U   branches/freesurface/tests/compositional_boundary_values_02/screen-output
U   branches/freesurface/tests/compositional_boundary_values_03/screen-output
U   branches/freesurface/tests/compressibility/screen-output
U   branches/freesurface/tests/compressibility_iterated_stokes/screen-output
U   branches/freesurface/tests/conservative_with_mpi/screen-output
U   branches/freesurface/tests/diffusion/screen-output
U   branches/freesurface/tests/diffusion-velocity/screen-output
U   branches/freesurface/tests/graphical_output/screen-output
U   branches/freesurface/tests/inclusion_2/screen-output
U   branches/freesurface/tests/inclusion_4/screen-output
U   branches/freesurface/tests/inclusion_adaptive/screen-output
U   branches/freesurface/tests/no_adiabatic_heating/screen-output
U   branches/freesurface/tests/no_adiabatic_heating_02/screen-output
U   branches/freesurface/tests/no_adiabatic_heating_03/screen-output
U   branches/freesurface/tests/no_flow/screen-output
U   branches/freesurface/tests/non_conservative_with_mpi/screen-output
U   branches/freesurface/tests/passive_comp/screen-output
U   branches/freesurface/tests/plugin/screen-output
U   branches/freesurface/tests/refinement_topography/screen-output
U   branches/freesurface/tests/shear-thinning/screen-output
U   branches/freesurface/tests/sol_cx_2/screen-output
U   branches/freesurface/tests/sol_cx_2_conservative/screen-output
U   branches/freesurface/tests/sol_cx_2_normalized_pressure/screen-output
U   branches/freesurface/tests/sol_cx_2_q3/screen-output
U   branches/freesurface/tests/sol_cx_4/screen-output
U   branches/freesurface/tests/sol_cx_4_conservative/screen-output
U   branches/freesurface/tests/sol_cx_4_normalized_pressure/screen-output
U   branches/freesurface/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output
U   branches/freesurface/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output
U   branches/freesurface/tests/sol_cx_tracers/screen-output
U   branches/freesurface/tests/sol_kz_2/screen-output
U   branches/freesurface/tests/sol_kz_2_cheaper_first_phase_solver/screen-output
U   branches/freesurface/tests/sol_kz_2_conservative/screen-output
U   branches/freesurface/tests/sol_kz_2_no_first_phase_solver/screen-output
U   branches/freesurface/tests/sol_kz_2_q3/screen-output
U   branches/freesurface/tests/sol_kz_4/screen-output
U   branches/freesurface/tests/sol_kz_4_conservative/screen-output
U   branches/freesurface/tests/stokes/screen-output
U   branches/freesurface/tests/stokes/statistics
U   branches/freesurface/tests/temperature-dependent-stokes-matrix/screen-output
U   branches/freesurface/tests/terminate_user_request/screen-output
U   branches/freesurface/tests/velocity_in_years/screen-output


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2430&peg=2430

Diff:
Index: branches/freesurface
===================================================================
--- branches/freesurface	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface	2014-04-08 14:41:18 UTC (rev 2430)

Property changes on: branches/freesurface
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/compositional:1141-1251
 /branches/fully-nonlinear:542-728
 /branches/j-dannberg:1679,1875-1882
-/trunk/aspect:2386-2414
+/trunk/aspect:2386-2429
\ No newline at end of property
Modified: branches/freesurface/doc/modules/changes.h
===================================================================
--- branches/freesurface/doc/modules/changes.h	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/doc/modules/changes.h	2014-04-08 14:41:18 UTC (rev 2430)
@@ -8,12 +8,35 @@
 </p>
 
 <ol>
+  <li>Fixed: the simple material model now ignores negative
+  compositional values that can occur from numerical undershoots
+  and even interpolation onto the FE space. This makes the
+  cookbook/composition-active.prm work again.
+  <br>
+  (Timo Heister, 2014/04/08)
+
+  <li>New: New options to remove rotational/translational modes
+  from the solution.
+  <br>
+  (Ian Rose, Timo Heister, 2014/04/07)
+
+  <li>New: The box geometry allows you to specify a repetition
+  argument in each coordinate direction.
+  <br>
+  (Timo Heister, 2014/04/07)
+
+  <li>New: On startup, ASPECT now prints out whether it is
+  running in debug or optimized mode. This is now part of a general
+  status message at the top of every run.
+  <br>
+  (Wolfgang Bangerth, Juliane Dannberg, 2014/04/7)
+
   <li>Changed: The GPlates plugin for surface velocities always
   interpreted the start time of the model and the time increment
   between individual input files in seconds. It now honors the
   'Use years in output instead of seconds' flag in the input file.
   <br>
-  (Wolfgang Bangerth, Rene Gassmoeller, 2014/04/1)
+  (Wolfgang Bangerth, Rene Gassmoeller, 2014/04/01)
 
   <li>New: CMake now passes down a preprocessor defined string constant
   called <code>ASPECT_SOURCE_DIR</code> that is set to the (top level)

Copied: branches/freesurface/doc/modules/todo.h (from rev 2429, trunk/aspect/doc/modules/todo.h)
===================================================================
--- branches/freesurface/doc/modules/todo.h	                        (rev 0)
+++ branches/freesurface/doc/modules/todo.h	2014-04-08 14:41:18 UTC (rev 2430)
@@ -0,0 +1,74 @@
+/**
+ * @page TODO TODOs -- Things that eventually will need to be addressed
+
+<h3>Extensions we'd like to implement</h3>
+ 
+<ol>
+  <li>Mark compositional fields as to their meaning. This may include:
+  <ol>
+    <li>concentration: $0 \leq c \leq 1$
+    <li>binary: $c \in \{0,1\}$
+    <li>positive: $c \geq 0$
+    <li>level set: $c \in \mathbb{R}$
+    <li>arbitrary: $c \in \mathbb{R}$
+  </ol>
+  Depending on the meaning of a field, we may want to use different artificial viscosity approaches, compression, etc. We may also want to project back into the feasible set when passing compositional values to material models.
+
+  <li>Implement "open boundary conditions" as described in "Using open
+  sidewalls for modelling self-consistent lithosphere subduction dynamics",
+  M. V. Chertova, T. Geenen, A. van den Berg, and W. Spakman see discussion on
+  the aspect mailing list "[aspect-devel] strain rate corner values and velocity
+  boundary conditions"
+  
+  <li>Make snapshotting as atomic as possible so that a job that is terminated while creating a snapshot doesn't get us in trouble
+  <li>Provide an option to store not only the last snapshot but many
+  <li>Move the adiabatic heating term (the last one in the temperature equation)
+  to the left hand side and make it implicit
+  <li>The nonlinear solvers are at best lightly tested. Do this more systemtically.
+  <li>The same can be said of the compressible solvers
+  <li>Rewrite the tracer code
+  <li>Free surfaces (Ian Rose has something initial)
+  <li>Self gravity (Ian Rose has something initial)
+  <li>We need a scheme to verify that plugins are compiled against
+  the same version of ASPECT that they are running under.
+</ol>
+
+
+<h3>Bugs we know of</h3>
+ 
+<ol>
+  <li>The temperature equation must contain adiabatic terms in the compressible case.
+  <li>Name the "table" material model better than "table"
+  <li>Re-write the geometry section of the manual since information on the boundary components
+  is no longer there
+
+</ol>
+
+
+<h3>Features missing tests</h3>
+ 
+<ol>
+  <li>tests for the various refinement criteria
+  <li>write a testcase for friction heating (Poiseulle flow) and
+  adiabatic heating (constant downward velocity)
+  <li>write tests for the depth averaging functions (test adaptive refinement,
+  averaged composition, non-zero average/sinking velocity)
+</ol>
+
+
+<h3>Other issues to address</h3>
+ 
+<ol>
+  <li>We should collect a list of publications and posters created with the help of Aspect
+
+  <li>Unify readme.html in aspect/ and from the webpage again
+
+  <li>Use extrapolated solution for grid refinement
+
+  <li>Make initial conditions class say whether it implements a temperature
+  or a temperature perturbation
+
+</ol>
+
+
+*/

Copied: branches/freesurface/doc/release-tasklist (from rev 2429, trunk/aspect/doc/release-tasklist)
===================================================================
--- branches/freesurface/doc/release-tasklist	                        (rev 0)
+++ branches/freesurface/doc/release-tasklist	2014-04-08 14:41:18 UTC (rev 2430)
@@ -0,0 +1,62 @@
+- Create a task list for a release that includes:
+  . go through the list of TODOs in the source code and see what can be done
+  . make sure the description of the interfaces that need to be updated
+    are up to date in the manual
+  . update copyright years of all files
+  . update changes.h in doc/modules:
+    1. svn cp changes.h <oldversion>-<newversion>.h
+    2. remove entries from changes.h
+    3. update headers of both files
+    4. svn commit
+  . create a branch:
+    svn cp https://svn.aspect.dealii.org/trunk/aspect https://svn.aspect.dealii.org/branches/releases/aspect-0.2
+  . remove TODO on the branch
+  . update the version number on the front page of doc/manual.pdf (and also on trunk!)
+  . remove the various table_* postprocessors
+  . update doc/manual/parameters.tex by "cd doc;./update_parameters.sh"
+  . run
+      cd doc ; make manual.pdf
+  . check in doc/manual.pdf
+  . make sure the .prm and .xml files we ship match the default values
+    of parameters
+  . create a tar file (do svn export): 
+    tar --exclude-vcs -czf aspect-0.3.tar.gz aspect-0.3/
+  . upload tar file (deal homepage svn in aspect/download)
+  . link in on download.html (same location)
+  . announce on
+       cig-all at geodynamics.org
+       aspect-devel at geodynamics.org
+       cig-mc at geodynamics.org
+       cig-cs at geodynamics.org
+       dealii at googlegroups.com
+
+Announcement for 0.2:
+---------------------
+We are pleased to announce the release of ASPECT 0.2. ASPECT is the Advanced
+Solver for Problems in Earth ConvecTion. It uses modern numerical methods such
+as adaptive mesh refinement, multigrid, and a modular software design to
+provide a fast, flexible and extensible mantle convection solver. ASPECT is
+available from
+
+                    http://aspect.dealii.org/
+
+This release adds a significant number of new features, including:
+   - support for active and passive "compositional" fields (courtesy of
+     Juliane Dannberg)
+   - more flexibility to output only some variables, drastically reducing
+     the amount of data written
+   - support for user-defined mesh refinement criteria
+   - support for GPlates-generated velocity boundary conditions (courtesy
+     of Rene Gassmoeller)
+   - support for passive tracer particles
+   - provision of an "introspection" module as part of the source code
+     to make it easier and less error-prone to write extension code
+In addition, the manual has been significantly expanded, with many new
+cookbooks, and we have fixed a number of bugs. A list of changes is
+available here:
+
+  http://aspect.dealii.org/doc/doxygen/changes_between_0_81_and_0_82.html
+
+Wolfgang Bangerth, Timo Heister, and many other contributors.
+
+

Modified: branches/freesurface/include/aspect/geometry_model/box.h
===================================================================
--- branches/freesurface/include/aspect/geometry_model/box.h	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/include/aspect/geometry_model/box.h	2014-04-08 14:41:18 UTC (rev 2430)
@@ -115,6 +115,12 @@
          * Flag whether the box is periodic in the x-, y-, and z-direction.
          */
         bool periodic[dim];
+
+        /**
+         * The number of cells in each coordinate direction
+         */
+        unsigned int repetitions[dim];
+
     };
   }
 }

Modified: branches/freesurface/readme.html
===================================================================
--- branches/freesurface/readme.html	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/readme.html	2014-04-08 14:41:18 UTC (rev 2430)
@@ -26,12 +26,11 @@
       discussed in the <a href="doc/manual.pdf">Installation instructions
       section of the ASPECT manual</a>.
       Detailed installation instructions are also provided by all of these
-      libraries on their webpages as well as <i>much</i> more information
-      about details of thse libraries.
+      libraries on their webpages.
     </p>
 
     <p>
-      One you have installed these three underlying libraries, compiling
+      Once you have installed these three underlying libraries, compiling
       ASPECT is relatively simple. More information can again be found in the
       corresponding section of the <a href="doc/manual.pdf">ASPECT manual</a>.
     </p>

Modified: branches/freesurface/source/geometry_model/box.cc
===================================================================
--- branches/freesurface/source/geometry_model/box.cc	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/source/geometry_model/box.cc	2014-04-08 14:41:18 UTC (rev 2430)
@@ -37,11 +37,12 @@
     Box<dim>::
     create_coarse_mesh (parallel::distributed::Triangulation<dim> &coarse_grid) const
     {
-      GridGenerator::hyper_rectangle (coarse_grid,
-                                      Point<dim>(),
-                                      extents);
-      for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
-        coarse_grid.begin_active()->face(f)->set_boundary_indicator(f);
+      std::vector<unsigned int> rep_vec(repetitions, repetitions+dim);
+      GridGenerator::subdivided_hyper_rectangle (coarse_grid,
+          rep_vec,
+          Point<dim>(),
+          extents,
+          true);
 
       //Tell p4est about the periodicity of the mesh.
 #if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) >= 801
@@ -173,6 +174,17 @@
                              Patterns::Double (0),
                              "Extent of the box in z-direction. This value is ignored "
                              "if the simulation is in 2d Units: m.");
+
+          prm.declare_entry ("X repetitions", "1",
+                             Patterns::Integer (1),
+                             "Number of cells in X direction.");
+          prm.declare_entry ("Y repetitions", "1",
+                             Patterns::Integer (1),
+                             "Number of cells in Y direction.");
+          prm.declare_entry ("Z repetitions", "1",
+                             Patterns::Integer (1),
+                             "Number of cells in Z direction.");
+
           prm.declare_entry ("X periodic", "false",
                              Patterns::Bool (),
                              "Whether the box should be periodic in X direction");
@@ -182,6 +194,7 @@
           prm.declare_entry ("Z periodic", "false",
                              Patterns::Bool (),
                              "Whether the box should be periodic in Z direction");
+
         }
         prm.leave_subsection();
       }
@@ -200,17 +213,20 @@
         {
           extents[0] = prm.get_double ("X extent");
           periodic[0] = prm.get_bool ("X periodic");
+          repetitions[0] = prm.get_integer ("X repetitions");
 
           if (dim >= 2)
             {
               extents[1] = prm.get_double ("Y extent");
               periodic[1] = prm.get_bool ("Y periodic");
+              repetitions[1] = prm.get_integer ("Y repetitions");
             }
 
           if (dim >= 3)
             {
               extents[2] = prm.get_double ("Z extent");
               periodic[2] = prm.get_bool ("Z periodic");
+              repetitions[2] = prm.get_integer ("Z repetitions");
             }
         }
         prm.leave_subsection();

Modified: branches/freesurface/source/main.cc
===================================================================
--- branches/freesurface/source/main.cc	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/source/main.cc	2014-04-08 14:41:18 UTC (rev 2430)
@@ -24,6 +24,7 @@
 
 #include <deal.II/base/utilities.h>
 #include <deal.II/base/mpi.h>
+#include <deal.II/base/multithread_info.h>
 
 #include <dlfcn.h>
 
@@ -169,6 +170,34 @@
     {
       deallog.depth_console(0);
 
+      // print some status messages at the top
+      if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0)
+      {
+        const int n_tasks = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD);
+
+        std::cout << "-----------------------------------------------------------------------------
"
+              << "-- This is ASPECT, the Advanced Simulator for Problems in Earth's ConvecTion.
"
+#ifdef DEBUG
+              << "--     . running in DEBUG mode
"
+#else
+              << "--     . running in OPTIMIZED mode
"
+#endif
+              << "--     . running with " << n_tasks << " MPI process" << (n_tasks == 1 ? "
" : "es
");
+#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) >= 801
+        const int n_threads = multithread_info.n_threads();
+        if (n_threads>1)
+          std::cout << "--     . using " << n_threads << " threads " << (n_tasks == 1 ? "
" : "each
");
+#endif
+#ifdef USE_PETSC
+        std::cout << "--     . using PETSc
";
+#else
+        std::cout << "--     . using Trilinos
";
+#endif
+        std::cout << "-----------------------------------------------------------------------------
"
+            << std::endl;
+      }
+
+
       // see which parameter file to use
       std::string parameter_filename;
       if (argc >= 2)

Modified: branches/freesurface/source/material_model/simple.cc
===================================================================
--- branches/freesurface/source/material_model/simple.cc	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/source/material_model/simple.cc	2014-04-08 14:41:18 UTC (rev 2430)
@@ -127,13 +127,12 @@
              const std::vector<double> &compositional_fields, /*composition*/
              const Point<dim> &) const
     {
-      return (reference_rho * (1 - thermal_alpha * (temperature - reference_T))
-              +
-              (compositional_fields.size()>0
-               ?
-               compositional_delta_rho * compositional_fields[0]
+      const double c = compositional_fields.size()>0?
+               std::max(0.0, compositional_fields[0])
                :
-               0));
+               0.0;
+      return reference_rho * (1 - thermal_alpha * (temperature - reference_T))
+              + compositional_delta_rho * c;
     }
 
 

Modified: branches/freesurface/source/simulator/core.cc
===================================================================
--- branches/freesurface/source/simulator/core.cc	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/source/simulator/core.cc	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1305,24 +1305,6 @@
   template <int dim>
   void Simulator<dim>::run ()
   {
-    {
-      const int n_tasks = Utilities::MPI::n_mpi_processes(mpi_communicator);
-      pcout << "Running with " << n_tasks << " MPI task" << (n_tasks == 1 ? "" : "s");
-#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) >= 801
-      const int n_threads = multithread_info.n_threads();
-      if (n_threads>1)
-        pcout << " using " << n_threads << " threads " << (n_tasks == 1 ? "" : "each");
-#endif
-      pcout << " using ";
-#ifdef USE_PETSC
-      pcout << "PETSc";
-#else
-      pcout << "Trilinos";
-#endif
-      pcout << "." << std::endl;
-    }
-
-
     unsigned int max_refinement_level = parameters.initial_global_refinement +
                                         parameters.initial_adaptive_refinement;
     unsigned int pre_refinement_step = 0;

Modified: branches/freesurface/source/simulator/nullspace.cc
===================================================================
--- branches/freesurface/source/simulator/nullspace.cc	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/source/simulator/nullspace.cc	2014-04-08 14:41:18 UTC (rev 2430)
@@ -17,7 +17,7 @@
   along with ASPECT; see the file doc/COPYING.  If not see
   <http://www.gnu.org/licenses/>.
 */
-/*  $Id: solver.cc 2325 2014-02-27 23:21:30Z bangerth $  */
+/*  $Id$  */
 
 
 #include <aspect/simulator.h>


Property changes on: branches/freesurface/source/simulator/nullspace.cc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/freesurface/tests/CMakeLists.txt
===================================================================
--- branches/freesurface/tests/CMakeLists.txt	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/CMakeLists.txt	2014-04-08 14:41:18 UTC (rev 2430)
@@ -155,10 +155,14 @@
     # avoids the need to strip timing information from files we may
     # copy from tests we have just run to the directory where we save
     # these files
+    #
+    # do the same with the second egrep command to strip out the status
+    # message at the top of the run
     ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.cmp.notime
       COMMAND
 	cat ${CMAKE_CURRENT_SOURCE_DIR}/${_test}/${_output}
         | egrep -v '^\|'
+	| egrep -v '^--'
         > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.cmp.notime
       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_test}/${_output}
     )
@@ -167,6 +171,7 @@
       COMMAND
 	cat ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}
         | egrep -v '^\|.*\|'
+	| egrep -v '^--'
         > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.notime
       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
               ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.cmp.notime

Modified: branches/freesurface/tests/adiabatic_conditions/screen-output
===================================================================
--- branches/freesurface/tests/adiabatic_conditions/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/adiabatic_conditions/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 3,072 (on 6 levels)
 Number of degrees of freedom: 40,836 (25,090+3,201+12,545)
 

Modified: branches/freesurface/tests/adiabatic_initial_conditions/screen-output
===================================================================
--- branches/freesurface/tests/adiabatic_initial_conditions/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/adiabatic_initial_conditions/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 3,072 (on 6 levels)
 Number of degrees of freedom: 40,836 (25,090+3,201+12,545)
 

Modified: branches/freesurface/tests/adiabatic_initial_conditions_subadiabaticity/screen-output
===================================================================
--- branches/freesurface/tests/adiabatic_initial_conditions_subadiabaticity/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/adiabatic_initial_conditions_subadiabaticity/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 3,072 (on 6 levels)
 Number of degrees of freedom: 40,836 (25,090+3,201+12,545)
 

Modified: branches/freesurface/tests/box-end_time_1e7-terminate/screen-output
===================================================================
--- branches/freesurface/tests/box-end_time_1e7-terminate/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/box-end_time_1e7-terminate/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 1,024 (on 6 levels)
 Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
 

Modified: branches/freesurface/tests/box-first-time-step/screen-output
===================================================================
--- branches/freesurface/tests/box-first-time-step/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/box-first-time-step/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 1,024 (on 6 levels)
 Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
 

Modified: branches/freesurface/tests/box-first-time-step-alternate-bc/screen-output
===================================================================
--- branches/freesurface/tests/box-first-time-step-alternate-bc/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/box-first-time-step-alternate-bc/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 1,024 (on 6 levels)
 Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
 

Copied: branches/freesurface/tests/box-repetitions/screen-output (from rev 2429, trunk/aspect/tests/box-repetitions/screen-output)
===================================================================
--- branches/freesurface/tests/box-repetitions/screen-output	                        (rev 0)
+++ branches/freesurface/tests/box-repetitions/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -0,0 +1,37 @@
+-----------------------------------------------------------------------------
+-- This is ASPECT, the Advanced Simulator for Problems in Earth's ConvecTion.
+--     . running in DEBUG mode
+--     . running with 1 MPI process
+--     . using Trilinos
+-----------------------------------------------------------------------------
+
+Number of active cells: 21 (on 1 levels)
+Number of degrees of freedom: 347 (210+32+105)
+
+*** Timestep 0:  t=0 seconds
+   Solving temperature system... 0 iterations.
+   Rebuilding Stokes preconditioner...
+   Solving Stokes system... 13 iterations.
+
+   Postprocessing:
+     Writing graphical output: output-box-repetitions/solution-00000
+
+Termination requested by criterion: end time
+
+
++---------------------------------------------+------------+------------+
+| Total wallclock time elapsed since start    |    0.0851s |            |
+|                                             |            |            |
+| Section                         | no. calls |  wall time | % of total |
++---------------------------------+-----------+------------+------------+
+| Assemble Stokes system          |         1 |    0.0141s |        17% |
+| Assemble temperature system     |         1 |    0.0151s |        18% |
+| Build Stokes preconditioner     |         1 |    0.0121s |        14% |
+| Build temperature preconditioner|         1 |  0.000215s |      0.25% |
+| Solve Stokes system             |         1 |   0.00259s |         3% |
+| Solve temperature system        |         1 |  0.000268s |      0.31% |
+| Initialization                  |         2 |    0.0169s |        20% |
+| Postprocessing                  |         1 |   0.00199s |       2.3% |
+| Setup dof systems               |         1 |    0.0173s |        20% |
++---------------------------------+-----------+------------+------------+
+

Copied: branches/freesurface/tests/box-repetitions/solution-00000.0000.vtu (from rev 2429, trunk/aspect/tests/box-repetitions/solution-00000.0000.vtu)
===================================================================
--- branches/freesurface/tests/box-repetitions/solution-00000.0000.vtu	                        (rev 0)
+++ branches/freesurface/tests/box-repetitions/solution-00000.0000.vtu	2014-04-08 14:41:18 UTC (rev 2430)
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?> 
+<!-- 
+# vtk DataFile Version 3.0
+#This file was generated 
+-->
+<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
+<UnstructuredGrid>
+<FieldData>
+<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">0</DataArray>
+</FieldData>
+<Piece NumberOfPoints="84" NumberOfCells="21" >
+  <Points>
+    <DataArray type="Float64" NumberOfComponents="3" format="binary">
+AQAAAOAHAADgBwAA0AAAAA==eNqllb0JwzAQRjVMNsgAqjNMlknnRTJARlAX0qkIHGoMWcCOgwh31sP6OVR9+njiCYGcK8+0zdPDtrudLut6eNunvMwXT+eWOYK55Zy3+eC5lpP7Nm/11f0A/eDHfIkjB/mxL3F0P3T75nndr9+161Pe5kscwbzWlzi5b/NWX32fEe4hDvoSRzCv9SWOvs/Y7Zvnd+x716e8zZc4gnmtL3Fy3+atvvq9JXgnadCXOIJ5rS9x9HtL3b56Zvin5kFf4gjmtb7E0f/dP18AqsJW+Q==
+    </DataArray>
+  </Points>
+
+  <Cells>
+    <DataArray type="Int32" Name="connectivity" format="binary">
+AQAAAFABAABQAQAAjAAAAA==eNoNw4lSAVAAAMCniOhAJZQOdBeRFDqIVJRU//8v7c5sCCFEXHTBqDHjLplw2ZRJV1x13TXTZtww66Zbbpszb8Edi+5act89Dzy0YtmqR5547KlnXnjupVfWrXltwxubtrz1zrb3duzZ9cFHn32y78ChL4589c2x7344deKnX347c+6Pf/76DwlGDZ8=
+    </DataArray>
+    <DataArray type="Int32" Name="offsets" format="binary">
+AQAAAFQAAABUAAAAPQAAAA==eNoNw5EWgDAUANAHg2AQBEEQDAZBEASDYBAEQf//Ld17zk0RMZgdnZxdXC1WN3cPT5uX3dvH188fbwQDnQ==
+    </DataArray>
+    <DataArray type="UInt8" Name="types" format="binary">
+AQAAABUAAAAVAAAACwAAAA==eNrj5MQCAAg0AL4=
+    </DataArray>
+  </Cells>
+  <PointData Scalars="scalars">
+    <DataArray type="Float64" Name="velocity" NumberOfComponents="3" format="binary">
+AQAAAOAHAADgBwAA4gAAAA==eNpjYKAaSAg2N9kHpBvOVZnb0cAcBQGTbJD4ga9+gZSYT8icA9Oji/fRwr+F7tYg9QtW//e2o8S/OMw5YJCdCRJ/0DUt1Y4C/+IyBw5EpjTto8C/OMNzVrUm2J3MhiGU+BeXOQkPY4PB6qUmZdtR4F9c5sDBJpX2fZT4F496O2z+ItG/OM0BqrfDpp5E/+Iyh5zwsSMhfEDpxA5b/iLRv7jMAaUTO2zpjUT/4jKHnPxlR0r+ApYzdtjKK1L9i8McUDljh6WcIdW/uMwhp3y2o1J9RIp/yamPqOFfrAAAVZfk0Q==    </DataArray>
+    <DataArray type="Float64" Name="p" format="binary">
+AQAAAKACAACgAgAAygAAAA==eNptkCEOwjAUhl/CIbAjgQUuUSYwM5yhF1i4wk5BgqvB4UggQZAGh8DMzjQIDAJOwFjX9yfjUfUlX//3iRJR2TSvORElTH0onp7EhLefQHgLsncDeve9OQXKni7qh2fGlD14x5Q9eLMKlD0zzu99yh68A0UPPpv8dkB7LOpux/zrsdfYiR58+y91rJekeeVZMmUPvu1VsR68GwXKnp3ml+59Fih78DYNlD34csg72VPGKH933W9VrMfeLDY7FenBm/Xydv4CoRXVfA==    </DataArray>
+    <DataArray type="Float64" Name="T" format="binary">
+AQAAAKACAACgAgAAZAAAAA==eNpjYACBD/YMmPSBFzPximORBwMkcRjAqn5BqOhHbObBxNHlYQAmjm4+kjiEfyXyIzbz4OJo8nDzoeIY5iPEP2A1hwBNsvkE3IsuT2r4EApvdHlS45eI9PLBHo95YAAAnGGkew==    </DataArray>
+  </PointData>
+ </Piece>
+ </UnstructuredGrid>
+</VTKFile>

Copied: branches/freesurface/tests/box-repetitions.prm (from rev 2429, trunk/aspect/tests/box-repetitions.prm)
===================================================================
--- branches/freesurface/tests/box-repetitions.prm	                        (rev 0)
+++ branches/freesurface/tests/box-repetitions.prm	2014-04-08 14:41:18 UTC (rev 2430)
@@ -0,0 +1,71 @@
+set Dimension = 2
+set CFL number                             = 1.0
+set End time                               = 0
+set Start time                             = 0
+set Adiabatic surface temperature          = 0
+set Surface pressure                       = 0
+set Use years in output instead of seconds = false  # default: true
+set Nonlinear solver scheme                = IMPES
+
+
+subsection Boundary temperature model
+  set Model name = box
+end
+
+
+
+subsection Gravity model
+  set Model name = vertical
+end
+
+
+subsection Geometry model
+  set Model name = box
+
+  subsection Box
+    set X extent = 1.2 # default: 1
+    set Y extent = 1
+    set Z extent = 1
+
+    set X repetitions = 3
+    set Y repetitions = 7
+  end
+end
+
+
+subsection Initial conditions
+  set Model name = perturbed box
+end
+
+
+subsection Material model
+  set Model name = simple
+
+  subsection Simple model
+    set Reference density             = 1    # default: 3300
+    set Reference specific heat       = 1250
+    set Reference temperature         = 1    # default: 293
+    set Thermal conductivity          = 1e-6 # default: 4.7
+    set Thermal expansion coefficient = 2e-5
+    set Viscosity                     = 1    # default: 5e24
+  end
+end
+
+
+subsection Mesh refinement
+  set Initial adaptive refinement        = 0
+  set Initial global refinement          = 0
+end
+
+
+subsection Model settings
+  set Fixed temperature boundary indicators   = 0, 1
+  set Prescribed velocity boundary indicators =
+  set Tangential velocity boundary indicators = 1
+  set Zero velocity boundary indicators       = 0, 2, 3
+end
+
+subsection Postprocess
+  set List of postprocessors = visualization#, velocity statistics, temperature statistics, heat flux statistics
+end
+

Modified: branches/freesurface/tests/box-steady-state-terminate/screen-output
===================================================================
--- branches/freesurface/tests/box-steady-state-terminate/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/box-steady-state-terminate/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 1,024 (on 6 levels)
 Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
 

Modified: branches/freesurface/tests/composition-active/screen-output
===================================================================
--- branches/freesurface/tests/composition-active/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/composition-active/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 64 (on 4 levels)
 Number of degrees of freedom: 1,526 (578+81+289+289+289)
 

Modified: branches/freesurface/tests/composition-active/statistics
===================================================================
--- branches/freesurface/tests/composition-active/statistics	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/composition-active/statistics	2014-04-08 14:41:18 UTC (rev 2430)
@@ -22,66 +22,66 @@
 # 22: Global mass for composition 1
  0 0.0000e+00 64 659 289 289  0  0  0 22 6.2500e-02 output-composition-active/solution-00000 0.00000000e+00 5.00000000e-01 1.00000000e+00 5.00000000e-01  0.00000000e+00 1.00000000e+00 4.58333333e-01  0.00000000e+00 1.00000000e+00 4.58333333e-01 
  1 6.2500e-02 64 659 289 289  8 10 11 18 6.2500e-02                                       "" 0.00000000e+00 5.00578265e-01 1.00000000e+00 5.00578265e-01 -1.79934049e-02 1.04760379e+00 4.59149777e-01 -3.49465850e-02 1.04146595e+00 4.58312607e-01 
- 2 1.2500e-01 64 659 289 289 10 11 10 22 6.2500e-02 output-composition-active/solution-00001 0.00000000e+00 5.02697282e-01 1.00000000e+00 5.02697282e-01 -6.82596315e-03 1.06055763e+00 4.59703321e-01 -1.89006759e-02 1.03223674e+00 4.58275152e-01 
- 3 1.8750e-01 64 659 289 289  9 11 11 22 6.2500e-02                                       "" 0.00000000e+00 5.04998984e-01 1.00000000e+00 5.04998984e-01 -4.53586828e-03 1.05282440e+00 4.60034022e-01 -7.17699397e-03 1.01982441e+00 4.58208246e-01 
- 4 2.5000e-01 64 659 289 289  8 11 10 22 6.2500e-02 output-composition-active/solution-00002 0.00000000e+00 5.06948229e-01 1.00000000e+00 5.06948229e-01 -2.77634533e-03 1.04073405e+00 4.60228509e-01 -4.41781159e-03 1.00976962e+00 4.58250351e-01 
- 5 3.1250e-01 64 659 289 289  9 11 11 22 6.2500e-02 output-composition-active/solution-00003 0.00000000e+00 5.08394397e-01 1.00000000e+00 5.08394397e-01 -1.18538313e-03 1.03110881e+00 4.60348580e-01 -1.23135279e-03 1.00587645e+00 4.58176545e-01 
- 6 3.7500e-01 64 659 289 289  8 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.09007451e-01 1.00000000e+00 5.09007451e-01 -1.25508037e-03 1.02225785e+00 4.60421415e-01 -4.73406440e-03 1.00456577e+00 4.58087242e-01 
- 7 4.3750e-01 64 659 289 289  8 10  9 22 6.2500e-02 output-composition-active/solution-00004 0.00000000e+00 5.09203021e-01 1.00000000e+00 5.09203021e-01 -1.26816450e-03 1.01460886e+00 4.60464045e-01 -2.78846246e-03 1.00356969e+00 4.58131774e-01 
- 8 5.0000e-01 64 659 289 289  9 10 11 22 6.2500e-02 output-composition-active/solution-00005 0.00000000e+00 5.09476486e-01 1.00000000e+00 5.09476486e-01 -1.22234480e-03 1.00991931e+00 4.60482775e-01 -1.78093222e-03 1.00258196e+00 4.58051605e-01 
- 9 5.6250e-01 64 659 289 289  9 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.09536438e-01 1.00000000e+00 5.09536438e-01 -1.22252927e-03 1.00881498e+00 4.60482751e-01 -1.56583733e-03 1.00384170e+00 4.57951492e-01 
-10 6.2500e-01 64 659 289 289  8 10  9 22 6.2500e-02 output-composition-active/solution-00006 0.00000000e+00 5.09719283e-01 1.00000000e+00 5.09719283e-01 -1.44029118e-03 1.00765548e+00 4.60474696e-01 -1.40518146e-03 1.00474195e+00 4.58034608e-01 
-11 6.8750e-01 64 659 289 289  9  9  9 22 6.2500e-02                                       "" 0.00000000e+00 5.10213901e-01 1.00000000e+00 5.10213901e-01 -1.52335918e-03 1.00659402e+00 4.60464961e-01 -1.29073591e-03 1.00351192e+00 4.58090471e-01 
-12 7.5000e-01 64 659 289 289  9 11 11 22 6.2500e-02 output-composition-active/solution-00007 0.00000000e+00 5.11275568e-01 1.00000000e+00 5.11275568e-01 -1.51199406e-03 1.00551036e+00 4.60456195e-01 -1.21264965e-03 1.00250919e+00 4.58086002e-01 
-13 8.1250e-01 64 659 289 289  8  9 10 17 6.2500e-02 output-composition-active/solution-00008 0.00000000e+00 5.12183783e-01 1.00000000e+00 5.12183783e-01 -1.44754277e-03 1.00459499e+00 4.60448673e-01 -1.11227898e-03 1.00087618e+00 4.58081255e-01 
-14 8.7500e-01 64 659 289 289  8  9  9 16 6.2500e-02                                       "" 0.00000000e+00 5.12999018e-01 1.00000000e+00 5.12999018e-01 -1.36114248e-03 1.00357400e+00 4.60442559e-01 -1.01008786e-03 9.99617329e-01 4.58077831e-01 
-15 9.3750e-01 64 659 289 289  8  9  9 16 6.2500e-02 output-composition-active/solution-00009 0.00000000e+00 5.13687827e-01 1.00000000e+00 5.13687827e-01 -1.27336775e-03 1.00299452e+00 4.60437630e-01 -9.43109523e-04 9.97033786e-01 4.58076364e-01 
-16 1.0000e+00 64 659 289 289  8  9  9 16 6.2500e-02 output-composition-active/solution-00010 0.00000000e+00 5.14163685e-01 1.00000000e+00 5.14163685e-01 -1.20260968e-03 1.00310398e+00 4.60433809e-01 -1.09663897e-03 9.93926855e-01 4.58076647e-01 
-17 1.0625e+00 64 659 289 289  9  9  9 16 6.2500e-02                                       "" 0.00000000e+00 5.14470147e-01 1.00000000e+00 5.14470147e-01 -1.15862131e-03 1.00298763e+00 4.60431153e-01 -1.16556079e-03 9.92817109e-01 4.58078866e-01 
-18 1.1250e+00 64 659 289 289  9  9  9 16 6.2500e-02 output-composition-active/solution-00011 0.00000000e+00 5.14640145e-01 1.00000000e+00 5.14640145e-01 -1.13712824e-03 1.00297431e+00 4.60429478e-01 -1.21263806e-03 9.91015840e-01 4.58083105e-01 
-19 1.1875e+00 64 659 289 289  8  9  9 16 6.2500e-02                                       "" 0.00000000e+00 5.14660537e-01 1.00000000e+00 5.14660537e-01 -1.11921832e-03 1.00282801e+00 4.60428694e-01 -1.24713671e-03 9.87853880e-01 4.58089068e-01 
-20 1.2500e+00 64 659 289 289  8  9  9 16 6.2500e-02 output-composition-active/solution-00012 0.00000000e+00 5.14583061e-01 1.00000000e+00 5.14583061e-01 -1.08746566e-03 1.00270210e+00 4.60428667e-01 -1.26413865e-03 9.85409369e-01 4.58096488e-01 
-21 1.3125e+00 64 659 289 289  8  9  9 16 6.2500e-02 output-composition-active/solution-00013 0.00000000e+00 5.14413339e-01 1.00000000e+00 5.14413339e-01 -1.06998966e-03 1.00247704e+00 4.60429276e-01 -1.26504215e-03 9.83075668e-01 4.58105179e-01 
-22 1.3750e+00 64 659 289 289  9  9 10 22 6.2500e-02                                       "" 0.00000000e+00 5.14197447e-01 1.00000000e+00 5.14197447e-01 -1.06323383e-03 1.00223615e+00 4.60430318e-01 -1.23903025e-03 9.78979154e-01 4.58114356e-01 
-23 1.4375e+00 64 659 289 289  9 10 10 22 6.2500e-02 output-composition-active/solution-00014 0.00000000e+00 5.14179885e-01 1.00000000e+00 5.14179885e-01 -1.06550703e-03 1.00221177e+00 4.60428808e-01 -1.09841723e-03 9.78161396e-01 4.58061898e-01 
-24 1.5000e+00 64 659 289 289  8  9 10 22 6.2500e-02 output-composition-active/solution-00015 0.00000000e+00 5.13915412e-01 1.00000000e+00 5.13915412e-01 -1.07213557e-03 1.00268079e+00 4.60428074e-01 -1.04783435e-03 9.76229754e-01 4.58039516e-01 
-25 1.5625e+00 64 659 289 289  9 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.13560320e-01 1.00000000e+00 5.13560320e-01 -1.08286105e-03 1.00336091e+00 4.60426320e-01 -9.33732879e-04 9.72261848e-01 4.57986403e-01 
-26 1.6250e+00 64 659 289 289  9  9  9 22 6.2500e-02 output-composition-active/solution-00016 0.00000000e+00 5.12962729e-01 1.00000000e+00 5.12962729e-01 -1.09235074e-03 1.00371846e+00 4.60425311e-01 -1.10447039e-03 9.66186230e-01 4.57943456e-01 
-27 1.6875e+00 64 659 289 289  9 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.12771512e-01 1.00000000e+00 5.12771512e-01 -1.07576217e-03 1.00352401e+00 4.60425947e-01 -1.14895360e-03 9.65278413e-01 4.57860449e-01 
-28 1.7500e+00 64 659 289 289  9 11  9 22 6.2500e-02 output-composition-active/solution-00017 0.00000000e+00 5.12394061e-01 1.00000000e+00 5.12394061e-01 -1.04242701e-03 1.00302379e+00 4.60427602e-01 -1.05633044e-03 9.62564703e-01 4.57847057e-01 
-29 1.8125e+00 64 659 289 289  9 10  9 22 6.2500e-02 output-composition-active/solution-00018 0.00000000e+00 5.11772308e-01 1.00000000e+00 5.11772308e-01 -1.01329379e-03 1.00261075e+00 4.60430720e-01 -1.04967593e-03 9.57936436e-01 4.57829743e-01 
-30 1.8750e+00 64 659 289 289  9 12 10 22 6.2500e-02                                       "" 0.00000000e+00 5.11597358e-01 1.00000000e+00 5.11597358e-01 -9.42865156e-04 1.00185818e+00 4.60434997e-01 -7.68576644e-04 9.51353119e-01 4.57771981e-01 
-31 1.9375e+00 64 659 289 289  9 11 10 22 6.2500e-02 output-composition-active/solution-00019 0.00000000e+00 5.11426782e-01 1.00000000e+00 5.11426782e-01 -8.09144717e-04 1.00071886e+00 4.60438701e-01 -8.06618556e-04 9.43127690e-01 4.57773870e-01 
-32 2.0000e+00 64 659 289 289  9 12 10 22 6.2500e-02 output-composition-active/solution-00020 0.00000000e+00 5.11474673e-01 1.00000000e+00 5.11474673e-01 -8.67267007e-04 9.98496264e-01 4.60442534e-01 -8.16562126e-04 9.40571416e-01 4.57726828e-01 
-33 2.0625e+00 64 659 289 289  9 11  9 22 6.2500e-02                                       "" 0.00000000e+00 5.11288651e-01 1.00000000e+00 5.11288651e-01 -1.00531987e-03 9.96116612e-01 4.60446220e-01 -8.83753529e-04 9.36800197e-01 4.57681653e-01 
-34 2.1250e+00 64 659 289 289  9 11  9 22 6.2500e-02 output-composition-active/solution-00021 0.00000000e+00 5.11066293e-01 1.00000000e+00 5.11066293e-01 -9.93575410e-04 9.93524972e-01 4.60446769e-01 -9.34045726e-04 9.31892000e-01 4.57693782e-01 
-35 2.1875e+00 64 659 289 289 10 12 10 22 6.2500e-02                                       "" 0.00000000e+00 5.11239018e-01 1.00000000e+00 5.11239018e-01 -1.08289595e-03 9.90484366e-01 4.60445079e-01 -1.01334105e-03 9.25708682e-01 4.57634405e-01 
-36 2.2500e+00 64 659 289 289  9 11 10 22 6.2500e-02 output-composition-active/solution-00022 0.00000000e+00 5.11327923e-01 1.00000000e+00 5.11327923e-01 -1.14735899e-03 9.87824516e-01 4.60441723e-01 -1.04232403e-03 9.18213527e-01 4.57648696e-01 
-37 2.3125e+00 64 659 289 289 10 11 11 22 6.2500e-02 output-composition-active/solution-00023 0.00000000e+00 5.11512144e-01 1.00000000e+00 5.11512144e-01 -9.19507597e-04 9.85127029e-01 4.60438362e-01 -1.16695392e-03 9.05308950e-01 4.57652603e-01 
-38 2.3750e+00 64 659 289 289  9 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.11434673e-01 1.00000000e+00 5.11434673e-01 -1.27454422e-03 9.82448624e-01 4.60435791e-01 -1.28733163e-03 8.99952366e-01 4.57651797e-01 
-39 2.4375e+00 64 659 289 289  9 11 10 22 6.2500e-02 output-composition-active/solution-00024 0.00000000e+00 5.11312283e-01 1.00000000e+00 5.11312283e-01 -1.30936915e-03 9.79402178e-01 4.60433386e-01 -1.35211174e-03 8.97169079e-01 4.57672849e-01 
-40 2.5000e+00 64 659 289 289 10 11 10 22 6.2500e-02 output-composition-active/solution-00025 0.00000000e+00 5.11516394e-01 1.00000000e+00 5.11516394e-01 -1.22104217e-03 9.76204442e-01 4.60431315e-01 -1.39137565e-03 8.77125425e-01 4.57677994e-01 
-41 2.5625e+00 64 659 289 289  9 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.11747378e-01 1.00000000e+00 5.11747378e-01 -1.07233223e-03 9.72566434e-01 4.60429504e-01 -1.45890607e-03 8.63186143e-01 4.57690745e-01 
-42 2.6250e+00 64 659 289 289 10 11 10 22 6.2500e-02 output-composition-active/solution-00026 0.00000000e+00 5.12083940e-01 1.00000000e+00 5.12083940e-01 -9.42909554e-04 9.68562420e-01 4.60426699e-01 -1.46507354e-03 8.50013086e-01 4.57635055e-01 
-43 2.6875e+00 64 659 289 289  9 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.12395373e-01 1.00000000e+00 5.12395373e-01 -8.51886659e-04 9.64529048e-01 4.60422586e-01 -1.39636752e-03 8.37046235e-01 4.57590513e-01 
-44 2.7500e+00 64 659 289 289 10 11 10 22 6.2500e-02 output-composition-active/solution-00027 0.00000000e+00 5.12877549e-01 1.00000000e+00 5.12877549e-01 -7.87638436e-04 9.60531903e-01 4.60416914e-01 -1.30394737e-03 8.25928268e-01 4.57582380e-01 
-45 2.8125e+00 64 659 289 289  9 10 10 17 6.2500e-02 output-composition-active/solution-00028 0.00000000e+00 5.13229819e-01 1.00000000e+00 5.13229819e-01 -7.72734518e-04 9.56357520e-01 4.60409508e-01 -1.18137582e-03 8.10245949e-01 4.57575297e-01 
-46 2.8750e+00 64 659 289 289  9 11 10 16 6.2500e-02                                       "" 0.00000000e+00 5.13571488e-01 1.00000000e+00 5.13571488e-01 -7.77497389e-04 9.51016590e-01 4.60401815e-01 -1.01543797e-03 8.02131435e-01 4.57568033e-01 
-47 2.9375e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00029 0.00000000e+00 5.13904023e-01 1.00000000e+00 5.13904023e-01 -7.96996134e-04 9.45031117e-01 4.60394115e-01 -8.31249280e-04 7.98747442e-01 4.57559809e-01 
-48 3.0000e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00030 0.00000000e+00 5.14246227e-01 1.00000000e+00 5.14246227e-01 -8.12862400e-04 9.39176825e-01 4.60386836e-01 -6.37526888e-04 7.87777685e-01 4.57550218e-01 
-49 3.0625e+00 64 659 289 289  9 10 10 16 6.2500e-02                                       "" 0.00000000e+00 5.14608066e-01 1.00000000e+00 5.14608066e-01 -8.26042825e-04 9.33613061e-01 4.60380312e-01 -4.75855693e-04 7.80536568e-01 4.57539507e-01 
-50 3.1250e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00031 0.00000000e+00 5.15014801e-01 1.00000000e+00 5.15014801e-01 -8.37202914e-04 9.28275878e-01 4.60374739e-01 -3.88372133e-04 7.70993176e-01 4.57527956e-01 
-51 3.1875e+00 64 659 289 289  9 10 10 16 6.2500e-02                                       "" 0.00000000e+00 5.15444781e-01 1.00000000e+00 5.15444781e-01 -8.47465933e-04 9.23098549e-01 4.60370182e-01 -3.28751650e-04 7.60996773e-01 4.57515893e-01 
-52 3.2500e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00032 0.00000000e+00 5.15861799e-01 1.00000000e+00 5.15861799e-01 -8.57944725e-04 9.18005406e-01 4.60366816e-01 -2.63616838e-04 7.53455558e-01 4.57503821e-01 
-53 3.3125e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00033 0.00000000e+00 5.16271239e-01 1.00000000e+00 5.16271239e-01 -8.68287539e-04 9.12922986e-01 4.60364565e-01 -2.56097999e-04 7.41025446e-01 4.57492597e-01 
-54 3.3750e+00 64 659 289 289  9 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.16689008e-01 1.00000000e+00 5.16689008e-01 -9.06861099e-04 9.07814090e-01 4.60363307e-01 -2.62511218e-04 7.36967853e-01 4.57482862e-01 
-55 3.4375e+00 64 659 289 289  9 10 10 22 6.2500e-02 output-composition-active/solution-00034 0.00000000e+00 5.17335383e-01 1.00000000e+00 5.17335383e-01 -9.75334682e-04 9.02640323e-01 4.60358909e-01 -2.71604854e-04 7.37051743e-01 4.57461563e-01 
-56 3.5000e+00 64 659 289 289  9 10  9 22 6.2500e-02 output-composition-active/solution-00035 0.00000000e+00 5.17970953e-01 1.00000000e+00 5.17970953e-01 -1.00706112e-03 8.97449570e-01 4.60355924e-01 -2.74922617e-04 7.35792118e-01 4.57441316e-01 
-57 3.5625e+00 64 659 289 289  9 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.18497628e-01 1.00000000e+00 5.18497628e-01 -1.00333956e-03 8.92266504e-01 4.60347661e-01 -2.80700861e-04 7.34859202e-01 4.57445291e-01 
-58 3.6250e+00 64 659 289 289  9 10 10 22 6.2500e-02 output-composition-active/solution-00036 0.00000000e+00 5.18894350e-01 1.00000000e+00 5.18894350e-01 -9.77168651e-04 8.87103831e-01 4.60341730e-01 -2.80218056e-04 7.34049983e-01 4.57441198e-01 
-59 3.6875e+00 64 659 289 289 10 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.19523769e-01 1.00000000e+00 5.19523769e-01 -9.43905557e-04 8.81970944e-01 4.60338666e-01 -3.77130837e-04 7.33974551e-01 4.57430972e-01 
-60 3.7500e+00 64 659 289 289  9 10 10 22 6.2500e-02 output-composition-active/solution-00037 0.00000000e+00 5.19965484e-01 1.00000000e+00 5.19965484e-01 -9.04909183e-04 8.76922806e-01 4.60337819e-01 -4.87709576e-04 7.33335777e-01 4.57419684e-01 
-61 3.8125e+00 64 659 289 289  9 10  9 22 6.2500e-02 output-composition-active/solution-00038 0.00000000e+00 5.20282521e-01 1.00000000e+00 5.20282521e-01 -8.81713991e-04 8.72084583e-01 4.60338424e-01 -5.21348733e-04 7.31936208e-01 4.57401824e-01 
-62 3.8750e+00 64 659 289 289 10 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.20882702e-01 1.00000000e+00 5.20882702e-01 -8.64687361e-04 8.67442409e-01 4.60338012e-01 -6.06673173e-04 7.30385921e-01 4.57369731e-01 
-63 3.9375e+00 64 659 289 289  9 11 10 22 6.2500e-02 output-composition-active/solution-00039 0.00000000e+00 5.21185057e-01 1.00000000e+00 5.21185057e-01 -8.42126506e-04 8.63067235e-01 4.60336461e-01 -6.94645459e-04 7.28770698e-01 4.57367970e-01 
-64 4.0000e+00 64 659 289 289 10 11 10 22 6.2500e-02 output-composition-active/solution-00040 0.00000000e+00 5.21702627e-01 1.00000000e+00 5.21702627e-01 -8.28423715e-04 8.58508255e-01 4.60336638e-01 -6.88279818e-04 7.27395149e-01 4.57330989e-01 
+ 2 1.2500e-01 64 659 289 289  9 11 10 22 6.2500e-02 output-composition-active/solution-00001 0.00000000e+00 5.01651340e-01 1.00000000e+00 5.01651340e-01 -6.83372919e-03 1.06057051e+00 4.59706608e-01 -1.88923095e-02 1.03223420e+00 4.58275146e-01 
+ 3 1.8750e-01 64 659 289 289  8 11 11 22 6.2500e-02                                       "" 0.00000000e+00 5.03299772e-01 1.00000000e+00 5.03299772e-01 -4.52633708e-03 1.05288562e+00 4.60042495e-01 -7.17469086e-03 1.01982666e+00 4.58208136e-01 
+ 4 2.5000e-01 64 659 289 289  8 11 10 22 6.2500e-02 output-composition-active/solution-00002 0.00000000e+00 5.04807017e-01 1.00000000e+00 5.04807017e-01 -2.78010876e-03 1.04083211e+00 4.60239983e-01 -4.41778565e-03 1.00977168e+00 4.58250180e-01 
+ 5 3.1250e-01 64 659 289 289  9 11 11 22 6.2500e-02 output-composition-active/solution-00003 0.00000000e+00 5.06040846e-01 1.00000000e+00 5.06040846e-01 -1.18716209e-03 1.03121248e+00 4.60361396e-01 -1.23091268e-03 1.00587962e+00 4.58176346e-01 
+ 6 3.7500e-01 64 659 289 289  8 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.06584293e-01 1.00000000e+00 5.06584293e-01 -1.25699420e-03 1.02236742e+00 4.60434795e-01 -4.74038505e-03 1.00456656e+00 4.58087057e-01 
+ 7 4.3750e-01 64 659 289 289  8 10 10 22 6.2500e-02 output-composition-active/solution-00004 0.00000000e+00 5.06797713e-01 1.00000000e+00 5.06797713e-01 -1.26972759e-03 1.01471508e+00 4.60477811e-01 -2.76368765e-03 1.00357004e+00 4.58131596e-01 
+ 8 5.0000e-01 64 659 289 289  9 10 11 22 6.2500e-02 output-composition-active/solution-00005 0.00000000e+00 5.07074836e-01 1.00000000e+00 5.07074836e-01 -1.22323978e-03 1.00992509e+00 4.60496773e-01 -1.78392178e-03 1.00258173e+00 4.58051421e-01 
+ 9 5.6250e-01 64 659 289 289  8 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.07118037e-01 1.00000000e+00 5.07118037e-01 -1.22280906e-03 1.00882262e+00 4.60496650e-01 -1.56813408e-03 1.00384185e+00 4.57951259e-01 
+10 6.2500e-01 64 659 289 289  9 10  9 22 6.2500e-02 output-composition-active/solution-00006 0.00000000e+00 5.07284754e-01 1.00000000e+00 5.07284754e-01 -1.44092910e-03 1.00766185e+00 4.60488538e-01 -1.40552687e-03 1.00474242e+00 4.58034356e-01 
+11 6.8750e-01 64 659 289 289  8  9  9 22 6.2500e-02                                       "" 0.00000000e+00 5.07775917e-01 1.00000000e+00 5.07775917e-01 -1.52441703e-03 1.00659723e+00 4.60478764e-01 -1.29107036e-03 1.00351268e+00 4.58090198e-01 
+12 7.5000e-01 64 659 289 289  9 11 11 22 6.2500e-02 output-composition-active/solution-00007 0.00000000e+00 5.08856365e-01 1.00000000e+00 5.08856365e-01 -1.51321712e-03 1.00551308e+00 4.60469975e-01 -1.21275864e-03 1.00250928e+00 4.58085730e-01 
+13 8.1250e-01 64 659 289 289  8  9 10 17 6.2500e-02 output-composition-active/solution-00008 0.00000000e+00 5.09816009e-01 1.00000000e+00 5.09816009e-01 -1.44872612e-03 1.00459668e+00 4.60462441e-01 -1.11230756e-03 1.00087558e+00 4.58080981e-01 
+14 8.7500e-01 64 659 289 289  8  9  9 16 6.2500e-02                                       "" 0.00000000e+00 5.10681390e-01 1.00000000e+00 5.10681390e-01 -1.36215265e-03 1.00357526e+00 4.60456324e-01 -1.01003151e-03 9.99615699e-01 4.58077556e-01 
+15 9.3750e-01 64 659 289 289  8  9  9 16 6.2500e-02 output-composition-active/solution-00009 0.00000000e+00 5.11413362e-01 1.00000000e+00 5.11413362e-01 -1.27419314e-03 1.00299491e+00 4.60451395e-01 -9.43093300e-04 9.97030822e-01 4.58076087e-01 
+16 1.0000e+00 64 659 289 289  8  9  9 16 6.2500e-02 output-composition-active/solution-00010 0.00000000e+00 5.11936356e-01 1.00000000e+00 5.11936356e-01 -1.20332721e-03 1.00309946e+00 4.60447577e-01 -1.09643044e-03 9.93924137e-01 4.58076367e-01 
+17 1.0625e+00 64 659 289 289  9  9  9 16 6.2500e-02                                       "" 0.00000000e+00 5.12292936e-01 1.00000000e+00 5.12292936e-01 -1.15927456e-03 1.00298405e+00 4.60444925e-01 -1.16534735e-03 9.92814381e-01 4.58078583e-01 
+18 1.1250e+00 64 659 289 289  8  9  9 16 6.2500e-02 output-composition-active/solution-00011 0.00000000e+00 5.12498454e-01 1.00000000e+00 5.12498454e-01 -1.13770503e-03 1.00297095e+00 4.60443254e-01 -1.21241851e-03 9.91011560e-01 4.58082818e-01 
+19 1.1875e+00 64 659 289 289  8  9  9 16 6.2500e-02                                       "" 0.00000000e+00 5.12552142e-01 1.00000000e+00 5.12552142e-01 -1.11966206e-03 1.00282441e+00 4.60442476e-01 -1.24691297e-03 9.87848257e-01 4.58088781e-01 
+20 1.2500e+00 64 659 289 289  8  9  9 16 6.2500e-02 output-composition-active/solution-00012 0.00000000e+00 5.12499969e-01 1.00000000e+00 5.12499969e-01 -1.08810107e-03 1.00269904e+00 4.60442452e-01 -1.26390751e-03 9.85410117e-01 4.58096208e-01 
+21 1.3125e+00 64 659 289 289  8  9  9 16 6.2500e-02 output-composition-active/solution-00013 0.00000000e+00 5.12358906e-01 1.00000000e+00 5.12358906e-01 -1.07071709e-03 1.00247428e+00 4.60443063e-01 -1.26480039e-03 9.83072584e-01 4.58104908e-01 
+22 1.3750e+00 64 659 289 289  8  9 10 22 6.2500e-02                                       "" 0.00000000e+00 5.12148799e-01 1.00000000e+00 5.12148799e-01 -1.06382492e-03 1.00223399e+00 4.60444107e-01 -1.23877652e-03 9.78971972e-01 4.58114094e-01 
+23 1.4375e+00 64 659 289 289  9 10 10 22 6.2500e-02 output-composition-active/solution-00014 0.00000000e+00 5.12128327e-01 1.00000000e+00 5.12128327e-01 -1.06627028e-03 1.00220872e+00 4.60442592e-01 -1.09821486e-03 9.78162260e-01 4.58061639e-01 
+24 1.5000e+00 64 659 289 289  8  9 10 22 6.2500e-02 output-composition-active/solution-00015 0.00000000e+00 5.11870211e-01 1.00000000e+00 5.11870211e-01 -1.07198729e-03 1.00267817e+00 4.60441872e-01 -1.04764845e-03 9.76226077e-01 4.58039253e-01 
+25 1.5625e+00 64 659 289 289  9 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.11521331e-01 1.00000000e+00 5.11521331e-01 -1.08235677e-03 1.00335689e+00 4.60440142e-01 -9.34152944e-04 9.72252775e-01 4.57986152e-01 
+26 1.6250e+00 64 659 289 289  9  9  9 22 6.2500e-02 output-composition-active/solution-00016 0.00000000e+00 5.10928868e-01 1.00000000e+00 5.10928868e-01 -1.08997757e-03 1.00371368e+00 4.60439139e-01 -1.10467609e-03 9.66170450e-01 4.57943210e-01 
+27 1.6875e+00 64 659 289 289  9 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.10742040e-01 1.00000000e+00 5.10742040e-01 -1.07268004e-03 1.00351865e+00 4.60439802e-01 -1.14905904e-03 9.65276341e-01 4.57860219e-01 
+28 1.7500e+00 64 659 289 289  9 11  9 22 6.2500e-02 output-composition-active/solution-00017 0.00000000e+00 5.10354557e-01 1.00000000e+00 5.10354557e-01 -1.04000038e-03 1.00301919e+00 4.60441500e-01 -1.05560365e-03 9.62557576e-01 4.57846796e-01 
+29 1.8125e+00 64 659 289 289  9 10  9 22 6.2500e-02 output-composition-active/solution-00018 0.00000000e+00 5.09727111e-01 1.00000000e+00 5.09727111e-01 -1.00833718e-03 1.00260674e+00 4.60444687e-01 -1.04912576e-03 9.57923828e-01 4.57829454e-01 
+30 1.8750e+00 64 659 289 289  9 12 10 22 6.2500e-02                                       "" 0.00000000e+00 5.09556120e-01 1.00000000e+00 5.09556120e-01 -9.34522043e-04 1.00185541e+00 4.60449038e-01 -7.68622108e-04 9.51334953e-01 4.57771674e-01 
+31 1.9375e+00 64 659 289 289  9 11 10 22 6.2500e-02 output-composition-active/solution-00019 0.00000000e+00 5.09390481e-01 1.00000000e+00 5.09390481e-01 -8.06344813e-04 1.00071741e+00 4.60452785e-01 -8.06338819e-04 9.43141674e-01 4.57773535e-01 
+32 2.0000e+00 64 659 289 289  9 12 10 22 6.2500e-02 output-composition-active/solution-00020 0.00000000e+00 5.09323556e-01 1.00000000e+00 5.09323556e-01 -8.67088694e-04 9.98495945e-01 4.60456604e-01 -8.16352567e-04 9.40579369e-01 4.57726477e-01 
+33 2.0625e+00 64 659 289 289  9 11  9 22 6.2500e-02                                       "" 0.00000000e+00 5.09073645e-01 1.00000000e+00 5.09073645e-01 -1.00478014e-03 9.96117163e-01 4.60460284e-01 -8.83670812e-04 9.36803395e-01 4.57681299e-01 
+34 2.1250e+00 64 659 289 289  9 11  9 22 6.2500e-02 output-composition-active/solution-00021 0.00000000e+00 5.08805751e-01 1.00000000e+00 5.08805751e-01 -9.92037122e-04 9.93527665e-01 4.60460782e-01 -9.34098812e-04 9.31891951e-01 4.57693408e-01 
+35 2.1875e+00 64 659 289 289 10 12 10 22 6.2500e-02                                       "" 0.00000000e+00 5.08933835e-01 1.00000000e+00 5.08933835e-01 -1.08158841e-03 9.90488483e-01 4.60459017e-01 -1.01362901e-03 9.25708234e-01 4.57634029e-01 
+36 2.2500e+00 64 659 289 289  9 11 10 22 6.2500e-02 output-composition-active/solution-00022 0.00000000e+00 5.08960450e-01 1.00000000e+00 5.08960450e-01 -1.14573521e-03 9.87830499e-01 4.60455598e-01 -1.04325051e-03 9.18212518e-01 4.57648295e-01 
+37 2.3125e+00 64 659 289 289 10 11 11 22 6.2500e-02 output-composition-active/solution-00023 0.00000000e+00 5.09101323e-01 1.00000000e+00 5.09101323e-01 -9.17498627e-04 9.85134652e-01 4.60452219e-01 -1.16889935e-03 9.05314052e-01 4.57652184e-01 
+38 2.3750e+00 64 659 289 289  9 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.08987949e-01 1.00000000e+00 5.08987949e-01 -1.27449930e-03 9.82458339e-01 4.60449634e-01 -1.28908142e-03 8.99930327e-01 4.57651336e-01 
+39 2.4375e+00 64 659 289 289  9 11 10 22 6.2500e-02 output-composition-active/solution-00024 0.00000000e+00 5.08831637e-01 1.00000000e+00 5.08831637e-01 -1.30920448e-03 9.79412465e-01 4.60447221e-01 -1.35403820e-03 8.97157658e-01 4.57672316e-01 
+40 2.5000e+00 64 659 289 289 10 11 10 22 6.2500e-02 output-composition-active/solution-00025 0.00000000e+00 5.08987292e-01 1.00000000e+00 5.08987292e-01 -1.22058754e-03 9.76216045e-01 4.60445139e-01 -1.39394547e-03 8.77143154e-01 4.57677347e-01 
+41 2.5625e+00 64 659 289 289  9 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.09170367e-01 1.00000000e+00 5.09170367e-01 -1.07172404e-03 9.72580868e-01 4.60443336e-01 -1.46121835e-03 8.63168410e-01 4.57690016e-01 
+42 2.6250e+00 64 659 289 289 10 11 10 22 6.2500e-02 output-composition-active/solution-00026 0.00000000e+00 5.09460877e-01 1.00000000e+00 5.09460877e-01 -9.41959682e-04 9.68578635e-01 4.60440568e-01 -1.46711838e-03 8.50012033e-01 4.57634343e-01 
+43 2.6875e+00 64 659 289 289  9 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.09732301e-01 1.00000000e+00 5.09732301e-01 -8.51053834e-04 9.64548874e-01 4.60436515e-01 -1.39814991e-03 8.37022455e-01 4.57589813e-01 
+44 2.7500e+00 64 659 289 289 10 11 10 22 6.2500e-02 output-composition-active/solution-00027 0.00000000e+00 5.10187214e-01 1.00000000e+00 5.10187214e-01 -7.87674235e-04 9.60568809e-01 4.60430931e-01 -1.30528605e-03 8.25928351e-01 4.57581691e-01 
+45 2.8125e+00 64 659 289 289  9 10 10 17 6.2500e-02 output-composition-active/solution-00028 0.00000000e+00 5.10526748e-01 1.00000000e+00 5.10526748e-01 -7.71084185e-04 9.56353835e-01 4.60423669e-01 -1.18220369e-03 8.10235446e-01 4.57574614e-01 
+46 2.8750e+00 64 659 289 289  9 11 10 16 6.2500e-02                                       "" 0.00000000e+00 5.10862339e-01 1.00000000e+00 5.10862339e-01 -7.76754209e-04 9.51037606e-01 4.60415986e-01 -1.01564340e-03 8.02125808e-01 4.57567357e-01 
+47 2.9375e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00029 0.00000000e+00 5.11209858e-01 1.00000000e+00 5.11209858e-01 -7.96247634e-04 9.45000808e-01 4.60408489e-01 -8.31397955e-04 7.98732977e-01 4.57559134e-01 
+48 3.0000e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00030 0.00000000e+00 5.11586851e-01 1.00000000e+00 5.11586851e-01 -8.12348349e-04 9.39112853e-01 4.60401161e-01 -6.37347349e-04 7.87761518e-01 4.57549554e-01 
+49 3.0625e+00 64 659 289 289  9 10 10 16 6.2500e-02                                       "" 0.00000000e+00 5.11985414e-01 1.00000000e+00 5.11985414e-01 -8.25961879e-04 9.33582237e-01 4.60394401e-01 -4.75546126e-04 7.80514450e-01 4.57538864e-01 
+50 3.1250e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00031 0.00000000e+00 5.12427913e-01 1.00000000e+00 5.12427913e-01 -8.37240567e-04 9.28291218e-01 4.60388548e-01 -3.88046773e-04 7.70967482e-01 4.57527335e-01 
+51 3.1875e+00 64 659 289 289  9 10 10 16 6.2500e-02                                       "" 0.00000000e+00 5.12868072e-01 1.00000000e+00 5.12868072e-01 -8.47426961e-04 9.23140592e-01 4.60383812e-01 -3.30244963e-04 7.60969492e-01 4.57515293e-01 
+52 3.2500e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00032 0.00000000e+00 5.13335397e-01 1.00000000e+00 5.13335397e-01 -8.57596979e-04 9.18053801e-01 4.60380312e-01 -2.65042421e-04 7.53424035e-01 4.57503228e-01 
+53 3.3125e+00 64 659 289 289  9 10 10 16 6.2500e-02 output-composition-active/solution-00033 0.00000000e+00 5.13775728e-01 1.00000000e+00 5.13775728e-01 -8.67911000e-04 9.12966761e-01 4.60378016e-01 -2.56249394e-04 7.40988731e-01 4.57491997e-01 
+54 3.3750e+00 64 659 289 289  9 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.14237808e-01 1.00000000e+00 5.14237808e-01 -8.86534667e-04 9.07833823e-01 4.60376927e-01 -2.62853898e-04 7.36936132e-01 4.57482263e-01 
+55 3.4375e+00 64 659 289 289  9 10 10 22 6.2500e-02 output-composition-active/solution-00034 0.00000000e+00 5.14896660e-01 1.00000000e+00 5.14896660e-01 -9.59611315e-04 9.02641783e-01 4.60372806e-01 -2.72109366e-04 7.37019159e-01 4.57460994e-01 
+56 3.5000e+00 64 659 289 289  9 10  9 22 6.2500e-02 output-composition-active/solution-00035 0.00000000e+00 5.15534660e-01 1.00000000e+00 5.15534660e-01 -9.92808436e-04 8.97409100e-01 4.60370259e-01 -2.75566271e-04 7.35758181e-01 4.57440751e-01 
+57 3.5625e+00 64 659 289 289  9 10 10 22 6.2500e-02                                       "" 0.00000000e+00 5.16047878e-01 1.00000000e+00 5.16047878e-01 -9.98943264e-04 8.92191189e-01 4.60362513e-01 -2.81564849e-04 7.34825335e-01 4.57444767e-01 
+58 3.6250e+00 64 659 289 289  9 10 10 22 6.2500e-02 output-composition-active/solution-00036 0.00000000e+00 5.16426010e-01 1.00000000e+00 5.16426010e-01 -9.87421845e-04 8.87021179e-01 4.60357141e-01 -2.81411033e-04 7.34016660e-01 4.57440697e-01 
+59 3.6875e+00 64 659 289 289 10 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.17042750e-01 1.00000000e+00 5.17042750e-01 -9.58442881e-04 8.81884817e-01 4.60354721e-01 -3.75926665e-04 7.33942128e-01 4.57430485e-01 
+60 3.7500e+00 64 659 289 289  9 10 10 22 6.2500e-02 output-composition-active/solution-00037 0.00000000e+00 5.17464418e-01 1.00000000e+00 5.17464418e-01 -9.11569568e-04 8.76835441e-01 4.60354516e-01 -4.86638509e-04 7.33302465e-01 4.57419128e-01 
+61 3.8125e+00 64 659 289 289  9 10  9 22 6.2500e-02 output-composition-active/solution-00038 0.00000000e+00 5.17774885e-01 1.00000000e+00 5.17774885e-01 -8.81677452e-04 8.71983023e-01 4.60355552e-01 -5.20241766e-04 7.31902038e-01 4.57401238e-01 
+62 3.8750e+00 64 659 289 289 10 11 10 22 6.2500e-02                                       "" 0.00000000e+00 5.18366828e-01 1.00000000e+00 5.18366828e-01 -8.64597563e-04 8.67317441e-01 4.60355322e-01 -6.05113280e-04 7.30351165e-01 4.57369138e-01 
+63 3.9375e+00 64 659 289 289 10 10 10 22 6.2500e-02 output-composition-active/solution-00039 0.00000000e+00 5.18639529e-01 1.00000000e+00 5.18639529e-01 -8.45073546e-04 8.62916595e-01 4.60353718e-01 -6.92030376e-04 7.28735542e-01 4.57367417e-01 
+64 4.0000e+00 64 659 289 289 10 11 10 22 6.2500e-02 output-composition-active/solution-00040 0.00000000e+00 5.19145380e-01 1.00000000e+00 5.19145380e-01 -8.44079045e-04 8.58334297e-01 4.60353630e-01 -6.85456683e-04 7.27360325e-01 4.57330519e-01 

Modified: branches/freesurface/tests/composition-passive-tracers/screen-output
===================================================================
--- branches/freesurface/tests/composition-passive-tracers/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/composition-passive-tracers/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 64 (on 4 levels)
 Number of degrees of freedom: 1,526 (578+81+289+289+289)
 

Modified: branches/freesurface/tests/compositional_boundary_values/screen-output
===================================================================
--- branches/freesurface/tests/compositional_boundary_values/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/compositional_boundary_values/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 64 (on 4 levels)
 Number of degrees of freedom: 1,526 (578+81+289+289+289)
 

Modified: branches/freesurface/tests/compositional_boundary_values_02/screen-output
===================================================================
--- branches/freesurface/tests/compositional_boundary_values_02/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/compositional_boundary_values_02/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 64 (on 4 levels)
 Number of degrees of freedom: 1,526 (578+81+289+289+289)
 

Modified: branches/freesurface/tests/compositional_boundary_values_03/screen-output
===================================================================
--- branches/freesurface/tests/compositional_boundary_values_03/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/compositional_boundary_values_03/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 64 (on 4 levels)
 Number of degrees of freedom: 1,526 (578+81+289+289+289)
 

Modified: branches/freesurface/tests/compressibility/screen-output
===================================================================
--- branches/freesurface/tests/compressibility/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/compressibility/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,6 +1,6 @@
+
 Loading shared library <./libcompressibility.so>
 
-Running with 1 MPI task using Trilinos.
 Number of active cells: 1,024 (on 6 levels)
 Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
 

Modified: branches/freesurface/tests/compressibility_iterated_stokes/screen-output
===================================================================
--- branches/freesurface/tests/compressibility_iterated_stokes/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/compressibility_iterated_stokes/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,6 +1,12 @@
+-----------------------------------------------------------------------------
+-- This is ASPECT, the Advanced Simulator for Problems in Earth's ConvecTion.
+--     . running in DEBUG mode
+--     . running with 1 MPI process
+--     . using Trilinos
+-----------------------------------------------------------------------------
+
 Loading shared library <./libcompressibility_iterated_stokes.so>
 
-Running with 1 MPI task using Trilinos.
 Number of active cells: 1,024 (on 6 levels)
 Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
 

Modified: branches/freesurface/tests/conservative_with_mpi/screen-output
===================================================================
--- branches/freesurface/tests/conservative_with_mpi/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/conservative_with_mpi/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 2 MPI tasks using Trilinos.
+-- Running with 2 MPI tasks using Trilinos.
+
 Number of active cells: 16 (on 3 levels)
 Number of degrees of freedom: 291 (162+48+81)
 

Modified: branches/freesurface/tests/diffusion/screen-output
===================================================================
--- branches/freesurface/tests/diffusion/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/diffusion/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 1,024 (on 6 levels)
 Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
 

Modified: branches/freesurface/tests/diffusion-velocity/screen-output
===================================================================
--- branches/freesurface/tests/diffusion-velocity/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/diffusion-velocity/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 1,024 (on 6 levels)
 Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
 

Modified: branches/freesurface/tests/graphical_output/screen-output
===================================================================
--- branches/freesurface/tests/graphical_output/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/graphical_output/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
 Number of active cells: 16 (on 3 levels)
 Number of degrees of freedom: 268 (162+25+81)
 

Modified: branches/freesurface/tests/inclusion_2/screen-output
===================================================================
--- branches/freesurface/tests/inclusion_2/screen-output	2014-04-08 14:20:20 UTC (rev 2429)
+++ branches/freesurface/tests/inclusion_2/screen-output	2014-04-08 14:41:18 UTC (rev 2430)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+


More information about the CIG-COMMITS mailing list