[cig-commits] commit 2416 by bangerth to /var/svn/dealii/aspect
dealii.demon at gmail.com
dealii.demon at gmail.com
Mon Apr 7 08:19:25 PDT 2014
Revision 2416
Print a status message at the top of the program run. Adjust test output accordingly.
U trunk/aspect/doc/modules/changes.h
U trunk/aspect/source/main.cc
U trunk/aspect/source/simulator/core.cc
U trunk/aspect/tests/CMakeLists.txt
U trunk/aspect/tests/adiabatic_conditions/screen-output
U trunk/aspect/tests/adiabatic_initial_conditions/screen-output
U trunk/aspect/tests/adiabatic_initial_conditions_subadiabaticity/screen-output
U trunk/aspect/tests/box-end_time_1e7-terminate/screen-output
U trunk/aspect/tests/box-first-time-step/screen-output
U trunk/aspect/tests/box-first-time-step-alternate-bc/screen-output
U trunk/aspect/tests/box-steady-state-terminate/screen-output
U trunk/aspect/tests/composition-active/screen-output
U trunk/aspect/tests/composition-passive-tracers/screen-output
U trunk/aspect/tests/compositional_boundary_values/screen-output
U trunk/aspect/tests/compositional_boundary_values_02/screen-output
U trunk/aspect/tests/compositional_boundary_values_03/screen-output
U trunk/aspect/tests/compressibility/screen-output
U trunk/aspect/tests/compressibility_iterated_stokes/screen-output
U trunk/aspect/tests/conservative_with_mpi/screen-output
U trunk/aspect/tests/diffusion/screen-output
U trunk/aspect/tests/diffusion-velocity/screen-output
U trunk/aspect/tests/graphical_output/screen-output
U trunk/aspect/tests/inclusion_2/screen-output
U trunk/aspect/tests/inclusion_4/screen-output
U trunk/aspect/tests/inclusion_adaptive/screen-output
U trunk/aspect/tests/no_adiabatic_heating/screen-output
U trunk/aspect/tests/no_adiabatic_heating_02/screen-output
U trunk/aspect/tests/no_adiabatic_heating_03/screen-output
U trunk/aspect/tests/no_flow/screen-output
U trunk/aspect/tests/non_conservative_with_mpi/screen-output
U trunk/aspect/tests/passive_comp/screen-output
U trunk/aspect/tests/plugin/screen-output
U trunk/aspect/tests/refinement_topography/screen-output
U trunk/aspect/tests/shear-thinning/screen-output
U trunk/aspect/tests/sol_cx_2/screen-output
U trunk/aspect/tests/sol_cx_2_conservative/screen-output
U trunk/aspect/tests/sol_cx_2_normalized_pressure/screen-output
U trunk/aspect/tests/sol_cx_2_q3/screen-output
U trunk/aspect/tests/sol_cx_4/screen-output
U trunk/aspect/tests/sol_cx_4_conservative/screen-output
U trunk/aspect/tests/sol_cx_4_normalized_pressure/screen-output
U trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output
U trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output
U trunk/aspect/tests/sol_cx_tracers/screen-output
U trunk/aspect/tests/sol_kz_2/screen-output
U trunk/aspect/tests/sol_kz_2_cheaper_first_phase_solver/screen-output
U trunk/aspect/tests/sol_kz_2_conservative/screen-output
U trunk/aspect/tests/sol_kz_2_no_first_phase_solver/screen-output
U trunk/aspect/tests/sol_kz_2_q3/screen-output
U trunk/aspect/tests/sol_kz_4/screen-output
U trunk/aspect/tests/sol_kz_4_conservative/screen-output
U trunk/aspect/tests/stokes/screen-output
U trunk/aspect/tests/temperature-dependent-stokes-matrix/screen-output
U trunk/aspect/tests/terminate_user_request/screen-output
U trunk/aspect/tests/velocity_in_years/screen-output
http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2416&peg=2416
Diff:
Modified: trunk/aspect/doc/modules/changes.h
===================================================================
--- trunk/aspect/doc/modules/changes.h 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/doc/modules/changes.h 2014-04-07 15:19:22 UTC (rev 2416)
@@ -8,12 +8,18 @@
</p>
<ol>
+ <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)
Modified: trunk/aspect/source/main.cc
===================================================================
--- trunk/aspect/source/main.cc 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/source/main.cc 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/source/simulator/core.cc
===================================================================
--- trunk/aspect/source/simulator/core.cc 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/source/simulator/core.cc 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/CMakeLists.txt
===================================================================
--- trunk/aspect/tests/CMakeLists.txt 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/CMakeLists.txt 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/adiabatic_conditions/screen-output
===================================================================
--- trunk/aspect/tests/adiabatic_conditions/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/adiabatic_conditions/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/adiabatic_initial_conditions/screen-output
===================================================================
--- trunk/aspect/tests/adiabatic_initial_conditions/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/adiabatic_initial_conditions/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/adiabatic_initial_conditions_subadiabaticity/screen-output
===================================================================
--- trunk/aspect/tests/adiabatic_initial_conditions_subadiabaticity/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/adiabatic_initial_conditions_subadiabaticity/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/box-end_time_1e7-terminate/screen-output
===================================================================
--- trunk/aspect/tests/box-end_time_1e7-terminate/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/box-end_time_1e7-terminate/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/box-first-time-step/screen-output
===================================================================
--- trunk/aspect/tests/box-first-time-step/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/box-first-time-step/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/box-first-time-step-alternate-bc/screen-output
===================================================================
--- trunk/aspect/tests/box-first-time-step-alternate-bc/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/box-first-time-step-alternate-bc/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/box-steady-state-terminate/screen-output
===================================================================
--- trunk/aspect/tests/box-steady-state-terminate/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/box-steady-state-terminate/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/composition-active/screen-output
===================================================================
--- trunk/aspect/tests/composition-active/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/composition-active/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/composition-passive-tracers/screen-output
===================================================================
--- trunk/aspect/tests/composition-passive-tracers/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/composition-passive-tracers/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/compositional_boundary_values/screen-output
===================================================================
--- trunk/aspect/tests/compositional_boundary_values/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/compositional_boundary_values/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/compositional_boundary_values_02/screen-output
===================================================================
--- trunk/aspect/tests/compositional_boundary_values_02/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/compositional_boundary_values_02/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/compositional_boundary_values_03/screen-output
===================================================================
--- trunk/aspect/tests/compositional_boundary_values_03/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/compositional_boundary_values_03/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/compressibility/screen-output
===================================================================
--- trunk/aspect/tests/compressibility/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/compressibility/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,6 +1,7 @@
Loading shared library <./libcompressibility.so>
-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: trunk/aspect/tests/compressibility_iterated_stokes/screen-output
===================================================================
--- trunk/aspect/tests/compressibility_iterated_stokes/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/compressibility_iterated_stokes/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,6 +1,7 @@
Loading shared library <./libcompressibility_iterated_stokes.so>
-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: trunk/aspect/tests/conservative_with_mpi/screen-output
===================================================================
--- trunk/aspect/tests/conservative_with_mpi/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/conservative_with_mpi/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/diffusion/screen-output
===================================================================
--- trunk/aspect/tests/diffusion/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/diffusion/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/diffusion-velocity/screen-output
===================================================================
--- trunk/aspect/tests/diffusion-velocity/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/diffusion-velocity/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/graphical_output/screen-output
===================================================================
--- trunk/aspect/tests/graphical_output/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/graphical_output/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/inclusion_2/screen-output
===================================================================
--- trunk/aspect/tests/inclusion_2/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/inclusion_2/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/inclusion_4/screen-output
===================================================================
--- trunk/aspect/tests/inclusion_4/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/inclusion_4/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/inclusion_adaptive/screen-output
===================================================================
--- trunk/aspect/tests/inclusion_adaptive/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/inclusion_adaptive/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: 948 (578+81+289)
Modified: trunk/aspect/tests/no_adiabatic_heating/screen-output
===================================================================
--- trunk/aspect/tests/no_adiabatic_heating/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/no_adiabatic_heating/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,6 +1,7 @@
Loading shared library <./libno_adiabatic_heating.so>
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/no_adiabatic_heating_02/screen-output
===================================================================
--- trunk/aspect/tests/no_adiabatic_heating_02/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/no_adiabatic_heating_02/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,6 +1,7 @@
Loading shared library <./libno_adiabatic_heating_02.so>
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/no_adiabatic_heating_03/screen-output
===================================================================
--- trunk/aspect/tests/no_adiabatic_heating_03/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/no_adiabatic_heating_03/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,6 +1,7 @@
Loading shared library <./libno_adiabatic_heating_03.so>
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/no_flow/screen-output
===================================================================
--- trunk/aspect/tests/no_flow/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/no_flow/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/non_conservative_with_mpi/screen-output
===================================================================
--- trunk/aspect/tests/non_conservative_with_mpi/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/non_conservative_with_mpi/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: 268 (162+25+81)
Modified: trunk/aspect/tests/passive_comp/screen-output
===================================================================
--- trunk/aspect/tests/passive_comp/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/passive_comp/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 768 (on 4 levels)
Number of degrees of freedom: 13,920 (6,528+864+3,264+3,264)
Modified: trunk/aspect/tests/plugin/screen-output
===================================================================
--- trunk/aspect/tests/plugin/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/plugin/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,7 +1,8 @@
Loading shared library <./libplugin.so>
N6dealii13TriangulationILi2ELi2EEE N6aspect9SimulatorILi2EEE
-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: trunk/aspect/tests/refinement_topography/screen-output
===================================================================
--- trunk/aspect/tests/refinement_topography/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/refinement_topography/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/shear-thinning/screen-output
===================================================================
--- trunk/aspect/tests/shear-thinning/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/shear-thinning/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,6 +1,7 @@
Loading shared library <./libshear-thinning.so>
-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: 948 (578+81+289)
Modified: trunk/aspect/tests/sol_cx_2/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_2/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_2/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/sol_cx_2_conservative/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_2_conservative/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_2_conservative/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: 291 (162+48+81)
Modified: trunk/aspect/tests/sol_cx_2_normalized_pressure/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_2_normalized_pressure/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_2_normalized_pressure/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/sol_cx_2_q3/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_2_q3/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_2_q3/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: 500 (338+81+81)
Modified: trunk/aspect/tests/sol_cx_4/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_4/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/sol_cx_4_conservative/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4_conservative/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_4_conservative/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 4,035 (2,178+768+1,089)
Modified: trunk/aspect/tests/sol_cx_4_normalized_pressure/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4_normalized_pressure/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_4_normalized_pressure/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/sol_cx_tracers/screen-output
===================================================================
--- trunk/aspect/tests/sol_cx_tracers/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_cx_tracers/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/sol_kz_2/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_2/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_kz_2/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/sol_kz_2_cheaper_first_phase_solver/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_2_cheaper_first_phase_solver/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_kz_2_cheaper_first_phase_solver/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/sol_kz_2_conservative/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_2_conservative/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_kz_2_conservative/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/sol_kz_2_no_first_phase_solver/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_2_no_first_phase_solver/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_kz_2_no_first_phase_solver/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/sol_kz_2_q3/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_2_q3/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_kz_2_q3/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: 500 (338+81+81)
Modified: trunk/aspect/tests/sol_kz_4/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_4/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_kz_4/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/sol_kz_4_conservative/screen-output
===================================================================
--- trunk/aspect/tests/sol_kz_4_conservative/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/sol_kz_4_conservative/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
Modified: trunk/aspect/tests/stokes/screen-output
===================================================================
--- trunk/aspect/tests/stokes/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/stokes/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -1,4 +1,5 @@
-Running with 1 MPI task using Trilinos.
+-- Running with 1 MPI task using Trilinos.
+
Number of active cells: 64 (on 3 levels)
Number of degrees of freedom: 3,770 (2,187+125+729+729)
Modified: trunk/aspect/tests/temperature-dependent-stokes-matrix/screen-output
===================================================================
--- trunk/aspect/tests/temperature-dependent-stokes-matrix/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/temperature-dependent-stokes-matrix/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/terminate_user_request/screen-output
===================================================================
--- trunk/aspect/tests/terminate_user_request/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/terminate_user_request/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: trunk/aspect/tests/velocity_in_years/screen-output
===================================================================
--- trunk/aspect/tests/velocity_in_years/screen-output 2014-04-07 01:02:37 UTC (rev 2415)
+++ trunk/aspect/tests/velocity_in_years/screen-output 2014-04-07 15:19:22 UTC (rev 2416)
@@ -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: 948 (578+81+289)
More information about the CIG-COMMITS
mailing list