From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Wed, 16 Oct 2013 07:04:04 +0000 (+0000)
Subject: Merge trunk into branch_port_the_testsuite
X-Git-Tag: v8.1.0~570^2~52
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ae9d535dbeb04b60d2e67897b11bf90c7245b03;p=dealii.git

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
---

9ae9d535dbeb04b60d2e67897b11bf90c7245b03
diff --cc tests/trilinos/mg_transfer_prebuilt_01.cc
index 7468f345de,26fb2d4caa..51b1012775
--- a/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);