[Getfem-commits] (no subject)

[Yves Renard]

branch: master
commit 1539d40e837eb002a9a7a3041abd6951b7be094a
Author: Yves Renard <address@hidden>
Date:   Wed Apr 4 14:58:51 2018 +0200

    Fix a little problem on Mac Os
---
 .gitignore                     | 1 +
 configure.ac                   | 5 +++--
 src/getfem_generic_assembly.cc | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fbb66cf..dadba2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ Makefile
 /getfem-config-notinstalled
 /gmm-config
 /interface/src/python/setup.py
+/interface/src/python/_getfem.*
 /interface/src/scilab/sci_gateway/c/builder_gateway_c.sce
 /libtool
 /src/getfem/getfem_arch_config.h
diff --git a/configure.ac b/configure.ac
index afae287..9ab0ff0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,8 @@ dnl AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 AM_INIT_AUTOMAKE([1.11 parallel-tests]) 
 WARNING_MSG=""
 
+CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+
 dnl --------------------------
 dnl set the optimization level
 dnl --------------------------
@@ -66,8 +68,7 @@ AC_ARG_WITH(optimization,
            AC_HELP_STRING([--with-optimization=FLAG],[Set the optimization 
level (-O3 by default)]),
            [with_optimization=$withval],
            [with_optimization='-O3']
-           )
-
+           )       
 
 dnl ---------------------------PARA LEVEL--------------------------
 paralevel=0
diff --git a/src/getfem_generic_assembly.cc b/src/getfem_generic_assembly.cc
index b7a66ed..e07617a 100644
--- a/src/getfem_generic_assembly.cc
+++ b/src/getfem_generic_assembly.cc
@@ -13345,6 +13345,7 @@ namespace getfem {
               first_ind = pai->ind_first_point_on_face(v.f());
             }
             for (gis.ipt = 0; gis.ipt < gis.nbpt; ++(gis.ipt)) {
+             // cout << "Gauss pt " << gis.ipt << endl;
               if (pgp) gis.ctx.set_ii(first_ind+gis.ipt);
               else gis.ctx.set_xref((*pspt)[first_ind+gis.ipt]);
               if (gis.ipt == 0 || !(pgt->is_linear())) {
@@ -14244,7 +14245,6 @@ namespace getfem {
                   base_small_vector &/*N_y*/,
                   std::map<var_trans_pair, base_tensor> &/*derivatives*/,
                   bool compute_derivatives) const {
-
       int ret_type = 0;
       *m_t = &m_x;
       GMM_ASSERT1(&sm == &m_x, "Bad mesh");
@@ -14265,6 +14265,7 @@ namespace getfem {
         ret_type = 1;
       } else {
         cv = cv_x;
+        face_num = short_type(-1);
         P_ref = ctx_x.xref();
         ret_type = 1;
       }