]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix compiling with complex-valued PETSc 3718/head
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Fri, 30 Dec 2016 00:07:47 +0000 (01:07 +0100)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Fri, 30 Dec 2016 00:08:10 +0000 (01:08 +0100)
include/deal.II/matrix_free/operators.h
include/deal.II/numerics/vector_tools.templates.h
source/numerics/vector_tools_project.inst.in

index 668e408a46ec0ad403f709a569f76e1ef96f1088..c653fc3c7dded069610cdf5006175a3e7110165b 100644 (file)
@@ -819,7 +819,7 @@ namespace MatrixFreeOperators
   Base<dim,Number>::vmult (LinearAlgebra::distributed::Vector<Number>       &dst,
                            const LinearAlgebra::distributed::Vector<Number> &src) const
   {
-    dst = 0;
+    dst = Number(0.);
     vmult_add (dst, src);
   }
 
@@ -922,7 +922,7 @@ namespace MatrixFreeOperators
     adjust_ghost_range_if_necessary(src);
     adjust_ghost_range_if_necessary(dst);
 
-    dst = 0;
+    dst = Number(0.);
 
     if (!have_interface_matrices)
       return;
@@ -964,7 +964,7 @@ namespace MatrixFreeOperators
     adjust_ghost_range_if_necessary(src);
     adjust_ghost_range_if_necessary(dst);
 
-    dst = 0;
+    dst = Number(0.);
 
     if (!have_interface_matrices)
       return;
@@ -995,7 +995,7 @@ namespace MatrixFreeOperators
   Base<dim,Number>::Tvmult (LinearAlgebra::distributed::Vector<Number>       &dst,
                             const LinearAlgebra::distributed::Vector<Number> &src) const
   {
-    dst = 0;
+    dst = Number(0.);
     Tvmult_add (dst,src);
   }
 
@@ -1125,7 +1125,7 @@ namespace MatrixFreeOperators
     LinearAlgebra::distributed::Vector<Number> ones;
     this->initialize_dof_vector(ones);
     this->initialize_dof_vector(inverse_diagonal_vector);
-    ones = 1.;
+    ones = Number(1.);
     apply_add(inverse_diagonal_vector, ones);
 
     this->set_constrained_entries_to_one(inverse_diagonal_vector);
index f10b5e810b79aac90af5a18b99a26d9ce8f4d3d3..a89258c0c4df4f7963a8ed0ce5e7c4a8cd573ec2 100644 (file)
@@ -1546,7 +1546,7 @@ namespace VectorTools
             ExcDimensionMismatch(fe.n_components(), rhs_function.n_components));
     Assert (rhs_vector.size() == dof_handler.n_dofs(),
             ExcDimensionMismatch(rhs_vector.size(), dof_handler.n_dofs()));
-    rhs_vector = 0;
+    rhs_vector = typename VectorType::value_type(0.);
 
     UpdateFlags update_flags = UpdateFlags(update_values   |
                                            update_quadrature_points |
index 7c045dd3f5d19ea3d5cb13701319ce86f62c87d7..b9c8f827f844e35f280f45ca41f1f046fbbe2e95 100644 (file)
@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------
 
 
-for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
+for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
 {
 #if deal_II_dimension <= deal_II_space_dimension
     namespace VectorTools \{

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.