[Getfem-commits] r4542 - /trunk/getfem/src/getfem_models.cc

[logari81]

Author: logari81
Date: Mon Mar 17 00:01:46 2014
New Revision: 4542

URL: http://svn.gna.org/viewcvs/getfem?rev=4542&view=rev
Log:
fix an issue with the addition of high level generic assembly terms to a model

Modified:
    trunk/getfem/src/getfem_models.cc

Modified: trunk/getfem/src/getfem_models.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4542&r1=4541&r2=4542&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc   (original)
+++ trunk/getfem/src/getfem_models.cc   Mon Mar 17 00:01:46 2014
@@ -1326,8 +1326,8 @@
       // Disables the brick if all its variables are disabled.
       bool auto_disabled_brick = true;
       for (size_type j = 0; j < brick.vlist.size(); ++j) {
-       if (!(variables[brick.vlist[j]].is_disabled))
-         auto_disabled_brick = false;
+        if (!(variables[brick.vlist[j]].is_disabled))
+          auto_disabled_brick = false;
       }
       if (auto_disabled_brick) continue;
 
@@ -2041,7 +2041,7 @@
     ga_workspace workspace(md);
     size_type order = workspace.add_expression(expr, mim, region);
     model::varnamelist vl, dl;
-    workspace.used_variables(vl, dl, 2);
+    workspace.used_variables(vl, dl, order);
     if (order == 0) { is_coercive = is_sym = true; }
     pbrick pbr = new gen_linear_assembly_brick(expr, is_sym, is_coercive,
                                                (order == 0), brickname);
@@ -2120,7 +2120,7 @@
     GMM_ASSERT1(order < 2, "Order two test functions (Test2) are not allowed"
                 " in assembly string for nonlinear terms");
     model::varnamelist vl, dl;
-    workspace.used_variables(vl, dl, 2);
+    workspace.used_variables(vl, dl, order);
     if (order == 0) { is_coercive = is_sym = true; }
     pbrick pbr = new gen_nonlinear_assembly_brick(expr, is_sym, is_coercive,
                                                   (order == 0), brickname);
@@ -2213,7 +2213,7 @@
     ga_workspace workspace(md);
     size_type order = workspace.add_expression(expr, mim, region);
     model::varnamelist vl, dl;
-    workspace.used_variables(vl, dl, 2);
+    workspace.used_variables(vl, dl, order);
     pbrick pbr = new gen_source_term_assembly_brick(expr, (order == 0),
                                                     brickname);
     model::termlist tl; // A unique global vector term