[Getfem-commits] (no subject)

[Konstantinos Poulios]

branch: integration-point-variables
commit 7f3e16af9175c3685d2facd322f88f64180fb6f8
Author: Konstantinos Poulios <address@hidden>
Date:   Thu Dec 20 01:46:38 2018 +0100

    Code cleanup
---
 interface/src/gf_asm.cc                         |  4 ++--
 src/getfem/getfem_generic_assembly.h            | 10 ++++++----
 src/getfem_generic_assembly_compile_and_exec.cc | 16 ++++++++--------
 src/getfem_mesh.cc                              |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/interface/src/gf_asm.cc b/interface/src/gf_asm.cc
index 42416af..2bf431a 100644
--- a/interface/src/gf_asm.cc
+++ b/interface/src/gf_asm.cc
@@ -799,9 +799,9 @@ void gf_asm(getfemint::mexargs_in& m_in, 
getfemint::mexargs_out& m_out) {
       functions are only available for variables, not for constants.
 
       `select_output` is an optional parameter which allows to reduce the
-      output vecotr (for `order` equal to 1) or the matrix (for `order`
+      output vector (for `order` equal to 1) or the matrix (for `order`
       equal to 2) to the degrees of freedom of the specified variables.
-      One variable has to be specified for a vector ouptut and two for a
+      One variable has to be specified for a vector output and two for a
       matrix output.
 
       Note that if several variables are given, the assembly of the
diff --git a/src/getfem/getfem_generic_assembly.h 
b/src/getfem/getfem_generic_assembly.h
index 5dd045c..b8b76bf 100644
--- a/src/getfem/getfem_generic_assembly.h
+++ b/src/getfem/getfem_generic_assembly.h
@@ -287,16 +287,18 @@ namespace getfem {
       }
 
       var_description(bool is_var, bool is_fem,
-                      const mesh_fem *mmf, gmm::sub_interval I_,
+                      const mesh_fem *mf_, gmm::sub_interval I_,
                       const model_real_plain_vector *v, const im_data *imd_,
                       size_type Q)
-        : is_variable(is_var), is_fem_dofs(is_fem), mf(mmf), I(I_), V(v),
-          imd(imd_), qdims(1) {
+        : is_variable(is_var), is_fem_dofs(is_fem), mf(mf_), I(I_), V(v),
+          imd(imd_), qdims(1)
+      {
         GMM_ASSERT1(Q > 0, "Bad dimension");
         qdims[0] = Q;
       }
       var_description() : is_variable(false), is_fem_dofs(false),
-                          mf(0), V(0), imd(0), qdims(1) { qdims[0] = 1; }
+                          mf(0), V(0), imd(0), qdims(1)
+      { qdims[0] = 1; }
     };
 
   public:
diff --git a/src/getfem_generic_assembly_compile_and_exec.cc 
b/src/getfem_generic_assembly_compile_and_exec.cc
index 12b4ecc..f35241f 100644
--- a/src/getfem_generic_assembly_compile_and_exec.cc
+++ b/src/getfem_generic_assembly_compile_and_exec.cc
@@ -6702,7 +6702,7 @@ namespace getfem {
         if ((version == td.interpolation) &&
             ((version == 0 && td.order == order) || // Assembly
              ((version > 0 && (td.order == size_type(-1) || // Assignment
-                                td.order == size_type(-2) - order))))) {
+                               td.order == size_type(-2) - order))))) {
           ga_tree *added_tree = 0;
           if (td.interpolation) {
             gis.interpolation_trees.push_back(*(td.ptree));
@@ -6870,23 +6870,23 @@ namespace getfem {
                     In2 = &(workspace.interval_of_variable(root->name_test2));
                   }
 
-                  if (!interpolate && mfg1 == 0 && mfg2 == 0 && mf1 && mf2
-                      && mf1->get_qdim() == 1 && mf2->get_qdim() == 1
-                      && !(mf1->is_reduced()) && !(mf2->is_reduced())) {
+                  bool simple = !interpolate &&
+                                mfg1 == 0 && mfg2 == 0 && mf1 && mf2 &&
+                                !(mf1->is_reduced()) && !(mf2->is_reduced());
+                  if (simple && mf1->get_qdim() == 1 && mf2->get_qdim() == 1) {
                     pgai = std::make_shared
                       <ga_instruction_matrix_assembly_standard_scalar<>>
                       (root->tensor(), workspace.assembled_matrix(), ctx1, 
ctx2,
                        *In1, *In2, mf1, mf2,
                        gis.coeff, *alpha1, *alpha2, gis.nbpt, gis.ipt);
-                  } else if (!interpolate && mfg1 == 0 && mfg2==0 && mf1 && mf2
-                             && !(mf1->is_reduced()) && !(mf2->is_reduced())) {
-                    if (root->sparsity() == 10 && root->t.qdim()==2)
+                  } else if (simple) {
+                    if (root->sparsity() == 10 && root->t.qdim() == 2)
                       pgai = std::make_shared
                         
<ga_instruction_matrix_assembly_standard_vector_opt10_2>
                         (root->tensor(), 
workspace.assembled_matrix(),ctx1,ctx2,
                          *In1, *In2, mf1, mf2,
                          gis.coeff, *alpha1, *alpha2, gis.nbpt, gis.ipt);
-                    else if (root->sparsity() == 10 && root->t.qdim()==3)
+                    else if (root->sparsity() == 10 && root->t.qdim() == 3)
                       pgai = std::make_shared
                         
<ga_instruction_matrix_assembly_standard_vector_opt10_3>
                         (root->tensor(), 
workspace.assembled_matrix(),ctx1,ctx2,
diff --git a/src/getfem_mesh.cc b/src/getfem_mesh.cc
index edf8d96..e189e6e 100644
--- a/src/getfem_mesh.cc
+++ b/src/getfem_mesh.cc
@@ -363,7 +363,7 @@ namespace getfem {
     }
     bgeot::mesh_structure::sup_convex(ic);
     if (sup_points)
-      for (size_type ip = 0; ip < ipt.size(); ++ip) sup_point(ipt[ip]);
+      for (const size_type &ip : ipt) sup_point(ip);
     trans_exists.sup(ic);
     sup_convex_from_regions(ic);
     if (Bank_info.get()) Bank_sup_convex_from_green(ic);