From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 9 Apr 2013 21:16:53 +0000 (+0000)
Subject: Instantiate VectorTools::subtract_mean_value for all serial vector types. Throw an... 
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a757194a2adecd2567a8693e4bd647def8cd8b42;p=dealii-svn.git

Instantiate VectorTools::subtract_mean_value for all serial vector types. Throw an error if a distributed one is used.

git-svn-id: https://svn.dealii.org/trunk@29231 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/include/deal.II/numerics/vector_tools.templates.h b/deal.II/include/deal.II/numerics/vector_tools.templates.h
index 01b12b9a27..129cc5f779 100644
--- a/deal.II/include/deal.II/numerics/vector_tools.templates.h
+++ b/deal.II/include/deal.II/numerics/vector_tools.templates.h
@@ -5641,10 +5641,6 @@ namespace VectorTools
   subtract_mean_value(VECTOR                  &v,
                       const std::vector<bool> &p_select)
   {
-    const unsigned int n = v.size();
-    Assert(p_select.size() == 0 || p_select.size() == n,
-           ExcDimensionMismatch(p_select.size(), n));
-
     if(p_select.size() == 0)
       {
         // In case of an empty boolean mask operate on the whole vector:
@@ -5652,6 +5648,21 @@ namespace VectorTools
       }
     else
       {
+        // This function is not implemented for distributed vectors, so
+        // if v is not a boring Vector or BlockVector:
+        Assert(   dynamic_cast<Vector<double> *>(& v)
+               || dynamic_cast<Vector<float> *>(& v)
+               || dynamic_cast<Vector<long double> *>(& v)
+               || dynamic_cast<BlockVector<double> *>(& v)
+               || dynamic_cast<BlockVector<float> *>(& v)
+               || dynamic_cast<BlockVector<long double> *>(& v),
+               ExcNotImplemented());
+
+        const unsigned int n = v.size();
+
+        Assert(p_select.size() == n,
+               ExcDimensionMismatch(p_select.size(), n));
+
         typename VECTOR::value_type s = 0.;
         unsigned int counter = 0;
         for (unsigned int i=0; i<n; ++i)
diff --git a/deal.II/source/numerics/vector_tools.inst.in b/deal.II/source/numerics/vector_tools.inst.in
index 31dc829f4f..d4f394f95c 100644
--- a/deal.II/source/numerics/vector_tools.inst.in
+++ b/deal.II/source/numerics/vector_tools.inst.in
@@ -268,11 +268,11 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
   }
 
 
-for (VEC : DEAL_II_VEC_TEMPLATES; real : REAL_SCALARS)
+for (VEC : SERIAL_VECTORS)
 {
     namespace VectorTools \{
       template
-        void subtract_mean_value(VEC<real> &, const std::vector<bool> &);
+        void subtract_mean_value(VEC &, const std::vector<bool> &);
     \}
 }