From: Denis Davydov <davydden@gmail.com>
Date: Mon, 22 Feb 2016 12:29:45 +0000 (+0100)
Subject: minor adjustments to block matrix and vector to work with complex PETSc
X-Git-Tag: v8.5.0-rc1~1298^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2216%2Fhead;p=dealii.git

minor adjustments to block matrix and vector to work with complex PETSc
---

diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h
index 6aed46afdf..17d5eebaeb 100644
--- a/include/deal.II/lac/block_vector_base.h
+++ b/include/deal.II/lac/block_vector_base.h
@@ -1686,10 +1686,11 @@ typename BlockVectorBase<VectorType>::value_type
 BlockVectorBase<VectorType>::mean_value () const
 {
   value_type sum = 0.;
+  // need to do static_cast as otherwise it won't work with value_type=complex<T>
   for (size_type i=0; i<n_blocks(); ++i)
-    sum += components[i].mean_value() * components[i].size();
+    sum += components[i].mean_value() * static_cast<double>(components[i].size());
 
-  return sum/size();
+  return sum/static_cast<double>(size());
 }
 
 
diff --git a/source/lac/block_matrix_array.cc b/source/lac/block_matrix_array.cc
index 58c4746291..c8dce1d78f 100644
--- a/source/lac/block_matrix_array.cc
+++ b/source/lac/block_matrix_array.cc
@@ -323,7 +323,7 @@ BlockTrianglePrecondition<number,BlockVectorType>::do_row
             m->matrix->Tvmult(aux, dst.block(j));
           else
             m->matrix->vmult(aux, dst.block(j));
-          dst.block(i).add (-1 * m->prefix, aux);
+          dst.block(i).add (-1.0 * m->prefix, aux);
         }
     }
   Assert (diagonals.size() != 0, ExcNoDiagonal(row_num));
@@ -438,10 +438,17 @@ template class BlockTrianglePrecondition<double, TrilinosWrappers::MPI::BlockVec
 #endif
 
 #ifdef DEAL_II_WITH_PETSC
+#ifdef PETSC_USE_COMPLEX
+template class BlockMatrixArray<std::complex<float>, PETScWrappers::MPI::BlockVector>;
+template class BlockMatrixArray<std::complex<double>, PETScWrappers::MPI::BlockVector>;
+template class BlockTrianglePrecondition<std::complex<float>, PETScWrappers::MPI::BlockVector>;
+template class BlockTrianglePrecondition<std::complex<double>, PETScWrappers::MPI::BlockVector>;
+#else
 template class BlockMatrixArray<float, PETScWrappers::MPI::BlockVector>;
 template class BlockMatrixArray<double, PETScWrappers::MPI::BlockVector>;
 template class BlockTrianglePrecondition<float, PETScWrappers::MPI::BlockVector>;
 template class BlockTrianglePrecondition<double, PETScWrappers::MPI::BlockVector>;
 #endif
+#endif
 
 DEAL_II_NAMESPACE_CLOSE