updated operator * (VectorBase), its description and the corresponding test

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

diff --git a/deal.II/include/deal.II/lac/petsc_vector_base.h b/deal.II/include/deal.II/lac/petsc_vector_base.h
index b8195d78ea38d49744fc5cdd3ffa0624ee9b0093..d19932da4efd3167838b839d349f86e1c19782a8 100644 (file)
--- a/deal.II/include/deal.II/lac/petsc_vector_base.h
+++ b/deal.II/include/deal.II/lac/petsc_vector_base.h
@@ -544,6 +544,9 @@ namespace PETScWrappers
      * Return the scalar product of two
      * vectors. The vectors must have the
      * same size.
+     *
+     * For complex valued vector, this gives
+     * $\left(v^\ast,vec\right)$.
      */
     PetscScalar operator * (const VectorBase &vec) const;
 

diff --git a/deal.II/source/lac/petsc_vector_base.cc b/deal.II/source/lac/petsc_vector_base.cc
index 3233797c69efbaea90e0eefcc46e9a6aa1f27758..e441b03e647bccc3ac85a9949c549f25b40de9b7 100644 (file)
--- a/deal.II/source/lac/petsc_vector_base.cc
+++ b/deal.II/source/lac/petsc_vector_base.cc
@@ -357,7 +357,11 @@ namespace PETScWrappers
 
     PetscScalar result;
 
-    const int ierr = VecDot (vector, vec.vector, &result);
+    //For complex vectors, VecDot() computes
+    //    val = (x,y) = y^H x,
+    //where y^H denotes the conjugate transpose of y.
+    //Note that this corresponds to the usual "mathematicians" complex inner product where the SECOND argument gets the complex conjugate.
+    const int ierr = VecDot (vec.vector, vector, &result);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
     return result;

diff --git a/tests/petsc_complex/20.cc b/tests/petsc_complex/20.cc
index f983727ff49a299bd8673920acf83c626c481e4d..0774b2cef247f2bac82ac9678806930a6ab43b70 100644 (file)
--- a/tests/petsc_complex/20.cc
+++ b/tests/petsc_complex/20.cc
@@ -41,7 +41,7 @@ void test (PETScWrappers::Vector &v,
         {
           const PetscScalar wi = std::complex<double> (5.0-i,2.5*(i%6));
           w(i) = wi;
-          product += vi*wi;
+          product += PetscConj(vi)*wi;
         }
     }
 

diff --git a/tests/petsc_complex/20.output b/tests/petsc_complex/20.output
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0fd8fc12f0b442283edd8868867114c242b04d11 100644 (file)
--- a/tests/petsc_complex/20.output
+++ b/tests/petsc_complex/20.output
@@ -0,0 +1,2 @@
+
+DEAL::OK