[Getfem-commits] [getfem-commits] branch master updated: minor fixes

[Yves Renard]

This is an automated email from the git hooks/post-receive script.

renard pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new b602fe5  minor fixes
b602fe5 is described below

commit b602fe5993869f25dc710ef21ee36458ca75f71f
Author: Yves Renard <address@hidden>
AuthorDate: Wed Apr 8 16:23:13 2020 +0200

    minor fixes
---
 .gitignore                                  | 1 +
 interface/tests/matlab/check_mesh_fem.m     | 7 ++++---
 src/getfem_contact_and_friction_integral.cc | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3123daf..f48b68e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -318,6 +318,7 @@ interface/tests/python/results1/
 /tests/test_range_basis.mesh
 /tests/test_rtree
 /tests/test_slice
+/tests/test_condensation
 /tests/test_slice.sl
 /tests/test_slice2.sl
 /tests/test_small_vector
diff --git a/interface/tests/matlab/check_mesh_fem.m 
b/interface/tests/matlab/check_mesh_fem.m
index d3f25b3..f9c5e88 100644
--- a/interface/tests/matlab/check_mesh_fem.m
+++ b/interface/tests/matlab/check_mesh_fem.m
@@ -132,12 +132,13 @@ function check_mesh_fem(iverbose,idebug)
   a=gf_mesh_get(m, 'outer faces');
   b = [5 2 5 3 5 4 5 5 9 1 9 2 9 3 9 5 9 6];
   gfassert('a(:)==b(:)');
-  a=gf_mesh_get(m, 'outer faces',[4 5]);
+  a=gf_mesh_get(m, 'outer faces',3, [4 5]);
   gfassert('a(:)==[5 1 5 2 5 3 5 4 5 5]''');
+  % gf_mesh_get(m, 'outer faces',[4 6 7 8])
   asserterr('gf_mesh_get(m, ''outer faces'',[4 6 7 8])');
-  asserterr('gf_mesh_get(m, ''outer faces'',[0])');
+  asserterr('gf_mesh_get(m, ''outer faces'',3, [0])');
   E=gf_mesh_get(m, 'edges');
-  asserterr('gf_mesh_get(m, ''edges'',[0])');
+  asserterr('gf_mesh_get(m, ''edges'', [0])');
   E=gf_mesh_get(m, 'curved edges',10);
   E=gf_mesh_get(m, 'curved edges',8);
   asserterr('gf_mesh_get(m, ''curved edges'',-1)');
diff --git a/src/getfem_contact_and_friction_integral.cc 
b/src/getfem_contact_and_friction_integral.cc
index 9d838e5..c1a0c8c 100644
--- a/src/getfem_contact_and_friction_integral.cc
+++ b/src/getfem_contact_and_friction_integral.cc
@@ -2605,7 +2605,7 @@ namespace getfem {
    size_type region) {
     
     std::string theta = std::to_string(theta_);
-    ga_workspace workspace(md, true);
+    ga_workspace workspace(md, ga_workspace::inherit::ALL);
     size_type order = workspace.add_expression(Neumannterm, mim, region, 1);
     GMM_ASSERT1(order == 0, "Wrong expression of the Neumann term");