From: young <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 3 Oct 2013 14:17:15 +0000 (+0000)
Subject: Figure out where data_out was breaking... move @whattodo to data_out_dof_data.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c0a6bb69fcc98a0412d7845976303db26114101;p=dealii-svn.git

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 11fdd12258..5f06d6bca0 100644
--- 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 c541739d45..03e0cce91a 100644
--- 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 88e7508247..aa0101893f 100644
--- 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