[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] r4998 - /trunk/getfem/src/getfem_generic_assembly.cc
From: |
Yves . Renard |
Subject: |
[Getfem-commits] r4998 - /trunk/getfem/src/getfem_generic_assembly.cc |
Date: |
Thu, 21 May 2015 16:20:03 -0000 |
Author: renard
Date: Thu May 21 18:20:03 2015
New Revision: 4998
URL: http://svn.gna.org/viewcvs/getfem?rev=4998&view=rev
Log:
fix on macro treatment
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=4998&r1=4997&r2=4998&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Thu May 21 18:20:03 2015
@@ -4731,7 +4731,7 @@
}
if (tree.root) {
- // cout << "adding tree expression " << endl;
+ // cout << "adding tree expression " << ga_tree_to_string(tree) <<
endl;
max_order = std::max(tree.root->nb_test_functions(), max_order);
add_tree(tree, mim.linked_mesh(), mim, rg, expr,
add_derivative_order);
@@ -6289,10 +6289,11 @@
GMM_ASSERT1(ind_in_parent != size_type(-1), "Internal error");
}
ga_tree &ma_tree = workspace.macro_tree(name, meshdim, ignore_X);
+ pga_tree_node &newnode = (ind_in_parent == size_type(-1))
+ ? tree.root : pnode->parent->children[ind_in_parent];
+ tree.copy_node(ma_tree.root, pnode->parent, newnode);
delete pnode;
- tree.copy_node(ma_tree.root, pnode->parent,
- (ind_in_parent == size_type(-1)) ? tree.root
- : pnode->parent->children[ind_in_parent]);
+ pnode = newnode;
} else {
// Search for a variable name with optional gradient, Hessian,
// divergence or test functions
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] r4998 - /trunk/getfem/src/getfem_generic_assembly.cc,
Yves . Renard <=