Another merge from mainline to petscscalar_complex...

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

diff --cc deal.II/include/deal.II/lac/parallel_vector.templates.h
Simple merge

diff --cc tests/petsc/deal_solver_02.cc
Simple merge

diff --cc tests/petsc/solver_02.cc
Simple merge

diff --cc tests/petsc/solver_06.cc
Simple merge

diff --cc tests/petsc/solver_11.cc
Simple merge

diff --cc tests/tests.h
index 968bf1de9cc45679790d0ca4db9451ebaeea35a6,ef37ca2046a016c9758b4900e5b45f7f451029db..75e21f8ab664214659775dc813c9810d56a69b89
--- 1/tests/tests.h
--- 2/tests/tests.h
+++ b/tests/tests.h
@@@ -142,14 -211,10 +211,10 @@@ namespac
  #endif
  
  
- // implicitly use the deal.II namespace everywhere, without us having to say
- // so in each and every testcase
- using namespace dealii;
- 
- // Function for initialize deallog. Normally, it should be called at
+ // Function to initialize deallog. Normally, it should be called at
  // the beginning of main() like
  //
 -// initlog();
 +// initlog(__FILE__);
  //
  // This will open the correct output file, divert log output there and
  // switch off screen output. If screen output is desired, provide the
@@@ -157,11 -222,10 +222,10 @@@
  std::string deallogname;
  std::ofstream deallogfile;
  
- inline
  void
 -initlog(bool console=false)
 +initlog(const char *filename, bool console=false)
  {
 -  deallogname = "output";
 +  deallogname = JobIdentifier::base_name(filename) + std::string("/output");
    deallogfile.open(deallogname.c_str());
    deallog.attach(deallogfile);
    if (!console)