From: young <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 11 Dec 2013 11:25:57 +0000 (+0000)
Subject: Merge from trunk.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=470b530a0ee5f068cfe12a14231c40ec45d9e5c3;p=dealii-svn.git

Merge from trunk.

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

470b530a0ee5f068cfe12a14231c40ec45d9e5c3
diff --cc deal.II/include/deal.II/lac/block_vector_base.h
index ede21a4ed2,a924af5d66..d5b2bad048
--- a/deal.II/include/deal.II/lac/block_vector_base.h
+++ b/deal.II/include/deal.II/lac/block_vector_base.h
@@@ -2567,15 -2564,16 +2567,16 @@@ void BlockVectorBase<VectorType>::extra
  template <typename VectorType>
  template <typename ForwardIterator, typename OutputIterator>
  inline
 -void BlockVectorBase<VectorType>::extract_subvector_to (ForwardIterator          indices_begin,
 -                                                        const ForwardIterator    indices_end,
 -                                                        OutputIterator           values_begin) const
 +void BlockVectorBase<VectorType>::extract_subvector_to (ForwardIterator       indices_begin,
 +                                                        const ForwardIterator indices_end,
 +                                                        OutputIterator        values_begin) const
  {
-   while (indices_begin != indices_end) 
-     { 
-       *values_begin = operator()(*indices_begin); 
-       indices_begin++; values_begin++; 
-     } 
+   while (indices_begin != indices_end)
+     {
+       *values_begin = operator()(*indices_begin);
+       indices_begin++;
+       values_begin++;
+     }
  }
  
  #endif // DOXYGEN
diff --cc deal.II/include/deal.II/lac/constraint_matrix.templates.h
index 28cc4d4a59,36c3304668..e8464dafc4
--- a/deal.II/include/deal.II/lac/constraint_matrix.templates.h
+++ b/deal.II/include/deal.II/lac/constraint_matrix.templates.h
@@@ -2241,18 -2252,12 +2257,16 @@@ add_this_index
                   std::fabs(local_matrix(local_row,local_row)) : average_diagonal);
              global_matrix.add(global_row, global_row, new_diagonal);
  
-             // if the use_inhomogeneities_for_rhs flag is
-             // set to true, the inhomogeneities are used
-             // to create the global vector. instead of
-             // fill in a zero in the ith components with an
-             // inhomogeneity, we set those to:
-             //    inhomogeneity(i)*global_matrix (i,i).
+             // if the use_inhomogeneities_for_rhs flag is set to true, the
+             // inhomogeneities are used to create the global vector. instead
+             // of fill in a zero in the ith components with an inhomogeneity,
+             // we set those to: inhomogeneity(i)*global_matrix (i,i).
              if (use_inhomogeneities_for_rhs == true)
 -              global_vector(global_row) += constraints.get_inhomogeneity(global_row) * new_diagonal;
 +	      {
 +		/* @whattodo */
 +		/* global_vector(global_row) += constraints.get_inhomogeneity(global_row) * new_diagonal; */
 +		Assert ((false), ExcMessage ("This function is corrupt: @whattodo"));
 +	      }
            }
        }
    }
@@@ -2650,14 -2632,8 +2641,12 @@@ ConstraintMatrix::distribute_local_to_g
                                       n_actual_col_dofs,
                                       local_matrix, col_ptr, val_ptr);
        const size_type n_values = col_ptr - &cols[0];
-       Assert (n_values == (size_type)(val_ptr - &vals[0]),
-               ExcInternalError());
        if (n_values > 0)
 -        global_matrix.add(row, n_values, &cols[0], &vals[0], false, true);
 +	{
 +	  /* @whattodo Note, this is a tricky one! */
 +	  /* global_matrix.add(row, n_values, &cols[0], &vals[0], false, true); */
 +	  Assert ((false), ExcMessage ("This function is corrupt: @whattodo"));
 +	}
      }
  }
  
diff --cc tests/tests.h
index 0bb6b97f58,76ceab1f2e..3fc48df336
--- a/tests/tests.h
+++ b/tests/tests.h
@@@ -236,9 -267,43 +288,25 @@@ private
  
  
  
 -/*
 - * Some tests (notably base/thread*, base/task*) create output that
 - * comes out in random order. To make the output of these tests comparable,
 - * we need to sort them.
 - *
 - * This function does just that with the file given. All streams writing
 - * to this should be closed when calling this function.
 - */
 -void sort_file_contents (const std::string &filename)
 -{
 -  int error = std::system ((std::string ("LC_ALL=C sort ") + filename + " -o " + filename).c_str());
 -  Assert (error == 0,
 -	  ExcInternalError());
 -}
  
  
+ /*
+  * Replace all occurences of ' &' by '& ' from the given file to hopefully be
+  * more compiler independent with respect to __PRETTY_FUNCTION__
+  *
+  * Also, while GCC prepends the name by "virtual " if the function is virtual,
+  * Intel's ICC does not do that, so filter that out as well.
+  */
+ void unify_pretty_function (const std::string &filename)
+ {
+ 
+   int error = std::system ((std::string ("sed -i -e 's/ \\&/ \\& /g' -e 's/ & ,/\\&,/g' -e 's/ \\& )/\\&)/g' -e 's/ \\& /\\& /g' -e 's/^DEAL::virtual /DEAL::/g' ") + filename).c_str());
+ 
+   Assert (error == 0,
+ 	  ExcInternalError());
+ 
+ }
  
 -
 -
 -
 -
  #ifndef DEAL_II_STACKTRACE_SWITCH
  #define DEAL_II_STACKTRACE_SWITCH