Figure out where data_out was breaking... move @whattodo to data_out_dof_data.

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

diff --git a/deal.II/source/lac/slepc_solver.cc b/deal.II/source/lac/slepc_solver.cc
index 11fdd122582b0f4f1f39bfa1a924976d1aed7326..5f06d6bca095837e2602432d33695a28a7e12236 100644 (file)
--- a/deal.II/source/lac/slepc_solver.cc
+++ b/deal.II/source/lac/slepc_solver.cc
@@ -263,7 +263,7 @@ namespace SLEPcWrappers
     Assert ((false),
             ExcMessage ("Your PETSc/SLEPc installation was configured with scalar-type complex "
                         "but this function is not defined for complex types. Instead use the   "
-                        "usual function:                                                       "
+                        "standard function:                                                    "
                         "                                                                      "
                         "void                                                                  "
                         "   SolverBase::get_eigenpair (const unsigned int            index,    "

diff --git a/deal.II/source/numerics/data_out.cc b/deal.II/source/numerics/data_out.cc
index c541739d453e01c25cdabe4c4f932ebbb6846b49..03e0cce91a1e16a2624a516831e7c2aedc2ced83 100644 (file)
--- a/deal.II/source/numerics/data_out.cc
+++ b/deal.II/source/numerics/data_out.cc
@@ -515,8 +515,6 @@ DataOut<dim,DH>::next_locally_owned_cell (const typename DataOut<dim,DH>::cell_i
 
 
 // explicit instantiations
-#ifndef PETSC_USE_COMPLEX
-   #include "data_out.inst"
-#endif
+#include "data_out.inst"
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/deal.II/source/numerics/data_out_dof_data.cc b/deal.II/source/numerics/data_out_dof_data.cc
index 88e7508247e829ceaeb82864f9d25aa8f9132608..aa0101893f524a20e1838e4918299c25aa3741e3 100644 (file)
--- a/deal.II/source/numerics/data_out_dof_data.cc
+++ b/deal.II/source/numerics/data_out_dof_data.cc
@@ -518,7 +518,13 @@ namespace internal
       get_vector_element (const VectorType &vector,
                           const unsigned int cell_number)
       {
-        return vector[cell_number];
+// @whattodo Note, there must be a way to get the value type from a
+// vector type! I assuem we can simply return that - right?
+        // return vector[cell_number];
+
+       Assert ((false),
+               ExcMessage ("Your PETSc/SLEPc installation was configured with scalar-type complex "
+                           "but this function is not defined for complex types. "));
       }
 
 
@@ -1139,8 +1145,6 @@ DataOut_DoFData<DH,patch_dim,patch_space_dim>::memory_consumption () const
 }
 
 // explicit instantiations
-#ifndef PETSC_USE_COMPLEX
-   #include "data_out_dof_data.inst"
-#endif
+#include "data_out_dof_data.inst"
 
 DEAL_II_NAMESPACE_CLOSE