branch: master commit 888391bb931bf1bcf56027664a02159356b78954 Author: Konstantinos Poulios <logar...@gmail.com> AuthorDate: Mon Oct 16 14:16:02 2023 +0200
Code readability --- src/getfem_generic_assembly_compile_and_exec.cc | 3 +- src/getfem_generic_assembly_semantic.cc | 3 +- src/getfem_generic_assembly_tree.cc | 38 ++++++++++++++++--------- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/getfem_generic_assembly_compile_and_exec.cc b/src/getfem_generic_assembly_compile_and_exec.cc index e09d46ff..71793f6a 100644 --- a/src/getfem_generic_assembly_compile_and_exec.cc +++ b/src/getfem_generic_assembly_compile_and_exec.cc @@ -5366,7 +5366,8 @@ namespace getfem { // Produce a resize instruction which is stored if no equivalent node is // detected and if the mesh is not uniform. - pnode->t.set_to_original(); pnode->t.set_sparsity(0, 0); + pnode->t.set_to_original(); + pnode->t.set_sparsity(0, 0); bool is_uniform = false; if (pnode->test_function_type == 1) { if (mf1 || mfg1) diff --git a/src/getfem_generic_assembly_semantic.cc b/src/getfem_generic_assembly_semantic.cc index 3504a724..714c4d19 100644 --- a/src/getfem_generic_assembly_semantic.cc +++ b/src/getfem_generic_assembly_semantic.cc @@ -2257,7 +2257,8 @@ namespace getfem { else if (pnode->children.size() == 5) { ind[0] = 2; ind[1] = 4; } else if (pnode->children.size() == 7) { - ind.resize(4); indsize.resize(4); + ind.resize(4); + indsize.resize(4); ind[0] = 2; ind[1] = 3; ind[2] = 5; ind[3] = 6; } diff --git a/src/getfem_generic_assembly_tree.cc b/src/getfem_generic_assembly_tree.cc index 9ba538ea..3dee62a8 100644 --- a/src/getfem_generic_assembly_tree.cc +++ b/src/getfem_generic_assembly_tree.cc @@ -542,12 +542,12 @@ namespace getfem { return false; break; case GA_NODE_C_MATRIX: - if (pnode1->children.size() != pnode2->children.size()) return false; - if (pnode1->nb_test_functions() != pnode2->nb_test_functions()) + if (pnode1->children.size() != pnode2->children.size() || + pnode1->nb_test_functions() != pnode2->nb_test_functions() || + pnode1->t.sizes().size() != pnode2->t.sizes().size()) return false; - if (pnode1->t.sizes().size() != pnode2->t.sizes().size()) return false; for (size_type i=pnode1->nb_test_functions(); - i<pnode1->t.sizes().size(); ++i) + i < pnode1->t.sizes().size(); ++i) if (pnode1->t.sizes()[i] != pnode2->t.sizes()[i]) return false; if (pnode1->nbc1 != pnode2->nbc1) return false; break; @@ -1951,7 +1951,8 @@ namespace getfem { mi.pop_back(); sub_tree.root->tensor().adjust_sizes(mi); } - if (!nb_comp) mii = sub_tree.root->tensor().sizes(); + if (!nb_comp) + mii = sub_tree.root->tensor().sizes(); else { const bgeot::multi_index &mi=sub_tree.root->tensor().sizes(); bool cmp = true; @@ -2034,23 +2035,32 @@ namespace getfem { } while (r_type != GA_RBRACKET); bgeot::multi_index mi; - nbc1 = tree.current_node->nbc1; nbc2 = tree.current_node->nbc2; + nbc1 = tree.current_node->nbc1; + nbc2 = tree.current_node->nbc2; nbc3 = tree.current_node->nbc3; size_type nbl = tree.current_node->children.size() / (nbc2 * nbc1 * nbc3); switch(tensor_order) { case 1: - /* mi.push_back(1); */ mi.push_back(nbc1); break; + // mi.push_back(1); + mi.push_back(nbc1); + break; case 2: - mi.push_back(nbl); if (nbc1 > 1) mi.push_back(nbc1); break; + mi.push_back(nbl); + if (nbc1 > 1) + mi.push_back(nbc1); + break; case 3: - mi.push_back(nbl); mi.push_back(nbc2); + mi.push_back(nbl); + mi.push_back(nbc2); mi.push_back(nbc1); break; case 4: - mi.push_back(nbl); mi.push_back(nbc3); - mi.push_back(nbc2); mi.push_back(nbc1); + mi.push_back(nbl); + mi.push_back(nbc3); + mi.push_back(nbc2); + mi.push_back(nbc1); break; default: GMM_ASSERT1(false, "Internal error"); } @@ -2080,10 +2090,12 @@ namespace getfem { case GA_COLON: case GA_DOT: case GA_DOTMULT: case GA_DOTDIV: case GA_TMULT: tree.add_op(t_type, token_pos, expr); - state = 1; break; + state = 1; + break; case GA_QUOTE: tree.add_op(t_type, token_pos, expr); - state = 2; break; + state = 2; + break; case GA_END: case GA_RPAR: case GA_COMMA: case GA_DCOMMA: case GA_RBRACKET: case GA_SEMICOLON: case GA_DSEMICOLON: return t_type;