branch: devel-tetsuo-VersionUp-sphinx
commit 4e28f1bc27a73d1b552512fe33445fbee04099e3
Merge: 59f6a91 86a54a3
Author: Tetsuo Koyama <tkoyama...@gmail.com>
Date: Tue Feb 5 23:35:51 2019 +0900
Merge branch 'master' of https://git.savannah.nongnu.org/git/getfem into
devel-tetsuo-VersionUp-sphinx
src/getfem/getfem_accumulated_distro.h | 7 +-
.../getfem_generic_assembly_compile_and_exec.h | 16 ++-
src/getfem/getfem_im_list.h | 2 +-
src/getfem_contact_and_friction_common.cc | 66 +++++-------
src/getfem_generic_assembly_compile_and_exec.cc | 115 ++++++++++++++-------
src/getfem_generic_assembly_semantic.cc | 9 +-
src/getfem_generic_assembly_tree.cc | 66 ++++++++++--
src/getfem_generic_assembly_workspace.cc | 2 +-
src/getfem_mesh_im_level_set.cc | 1 +
src/gmm/gmm_opt.h | 101 +++++++++---------
10 files changed, 229 insertions(+), 156 deletions(-)
