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

[logari81]

Author: logari81
Date: Wed Dec 30 23:09:56 2015
New Revision: 5213

URL: http://svn.gna.org/viewcvs/getfem?rev=5213&view=rev
Log:
fix a bug in accessing the derivative of user defined generic assembly functions

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=5213&r1=5212&r2=5213&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Wed Dec 30 23:09:56 2015
@@ -7180,7 +7180,7 @@
                 || pnode->der2 > it->second.nbargs())
               ga_throw_error(expr, pnode->pos, "Invalid derivative.");
             const ga_predef_function &F = it->second;
-            if (F.ftype() == 0 && !(pnode->der2)) {
+            if ((F.ftype() == 0 || F.dtype() == 2) && !(pnode->der2)) {
               pnode->name = ((pnode->der1 == 1) ?
                              F.derivative1() : F.derivative2());
               pnode->der1 = pnode->der2 = 0;