[Getfem-commits] r4674 - in /trunk/getfem/src: getfem_generic_assembly.cc getfem_models.cc

[Yves . Renard]

Author: renard
Date: Tue Jun  3 08:07:45 2014
New Revision: 4674

URL: http://svn.gna.org/viewcvs/getfem?rev=4674&view=rev
Log:
small fix

Modified:
    trunk/getfem/src/getfem_generic_assembly.cc
    trunk/getfem/src/getfem_models.cc

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4674&r1=4673&r2=4674&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Tue Jun  3 08:07:45 2014
@@ -3192,13 +3192,14 @@
          pnode->node_type == GA_NODE_GRAD ||
          pnode->node_type == GA_NODE_HESS)) {
       bool iscte = workspace.is_constant(pnode->name);
+
       if (!iscte) found_var = true;
       if (!ignore_data || !iscte)
         vars.insert(pnode->name);
     }
     for (size_type i = 0; i < pnode->children.size(); ++i)
-      found_var = ga_extract_variables(pnode->children[i], workspace, vars)
-        || found_var;
+      found_var = ga_extract_variables(pnode->children[i], workspace, vars,
+                                       ignore_data) || found_var;
     return found_var;
   }
 

Modified: trunk/getfem/src/getfem_models.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4674&r1=4673&r2=4674&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc   (original)
+++ trunk/getfem/src/getfem_models.cc   Tue Jun  3 08:07:45 2014
@@ -2041,7 +2041,6 @@
       }
 
       if (recompute_matrix) {
-        cout << "recompute matrix ..." << endl;
         ga_workspace workspace(md);
         mesh_region rg(region);
         mims[0]->linked_mesh().intersect_with_mpi_region(rg);
@@ -2099,8 +2098,6 @@
     model::varnamelist vl, dl;
     bool is_lin = workspace.used_variables(vl, dl, 2);
     GMM_ASSERT1(is_lin, 'Nonlinear term');
-    cout << "linear term vl = " << vl << endl;
-    cout << "linear term dl = " << dl << endl;
     if (order == 0) { is_coercive = is_sym = true; }
     pbrick pbr = new gen_linear_assembly_brick(expr, is_sym, is_coercive,
                                                (order == 0), brickname);
@@ -2222,7 +2219,6 @@
                   "mesh_im");
       GMM_TRACE2("Generic source term assembly");
 
-      cout << "recompute source term ..." << endl;
       ga_workspace workspace(md);
       mesh_region rg(region);
       mims[0]->linked_mesh().intersect_with_mpi_region(rg);
@@ -2279,8 +2275,6 @@
     GMM_ASSERT1(order <= 1, "Wrong order for a source term");
     model::varnamelist vl, dl;
     workspace.used_variables(vl, dl, 1);
-    cout << "source term vl = " << vl << endl;
-    cout << "source term dl = " << dl << endl;
     pbrick pbr = new gen_source_term_assembly_brick(expr, (order == 0),
                                                     brickname);
     model::termlist tl; // A unique global vector term