[Getfem-commits] r4832 - /trunk/getfem/src/getfem_generic_assembly.cc

[logari81]

Author: logari81
Date: Wed Dec 10 13:32:43 2014
New Revision: 4832

URL: http://svn.gna.org/viewcvs/getfem?rev=4832&view=rev
Log:
fix interpolation of generic assembly expressions to scalar im_data

Modified:
    trunk/getfem/src/getfem_generic_assembly.cc

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4832&r1=4831&r2=4832&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Wed Dec 10 13:32:43 2014
@@ -8688,9 +8688,13 @@
       size_type si = t.size();
       if (!initialized) {
         s = si;
-        GMM_ASSERT1(imd.tensor_size() == t.sizes(),
-                    "Im_data tensor size does not match the size of "
-                    "the interpolated expression.");
+        GMM_ASSERT1(imd.tensor_size() == t.sizes() ||
+                    (imd.tensor_size().size() == size_type(1) &&
+                     imd.tensor_size()[0] == size_type(1) &&
+                     si == size_type(1)),
+                    "Im_data tensor size " << imd.tensor_size() <<
+                    " does not match the size of the interpolated "
+                    "expression " << t.sizes() << ".");
         gmm::resize(result, s * imd.nb_filtered_index());
         gmm::clear(result);
         initialized = true;