Merge trunk into branch_port_the_testsuite

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31249 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/cmake/setup_compiler_flags_intel.cmake
Simple merge

diff --cc deal.II/source/base/data_out_base.cc
Simple merge

diff --cc tests/trilinos/mg_transfer_prebuilt_01.cc
index 7468f345decfdd01c3d7606480e48af8b01badfa,26fb2d4caa04ef4c313cd7d7051005c2dd5b9296..51b10127755e034c203b927909d7359adef8f11d
--- 1/tests/trilinos/mg_transfer_prebuilt_01.cc
--- 2/tests/trilinos/mg_transfer_prebuilt_01.cc
+++ b/tests/trilinos/mg_transfer_prebuilt_01.cc
@@@ -145,8 -145,10 +145,9 @@@ int main(int argc, char **argv
  {
    Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
  
 -  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
 -  std::ofstream logfile(logname.c_str());
 +  std::ofstream logfile("output");
    deallog << std::setprecision(6);
+   deallog.depth_console(0);
    deallog.threshold_double(1.e-10);
    deallog.attach(logfile);
  //  deallog.depth_console (0);