branch: devel-logari81 commit 5f31268e4c758d4a4bf3903b24c911dd6bb6a8bc Merge: 537a96f b9775b9 Author: Konstantinos Poulios <logar...@gmail.com> Date: Fri Jul 13 20:32:14 2018 +0200
Merge branch 'master' into devel-logari81 doc/sphinx/source/glossary.rst | 4 +- doc/sphinx/source/project/contribute.rst | 10 +- .../source/project/images/getfem_structure.svg | 2 +- .../source/project/libdesc_high_gen_assemb.rst | 2 +- doc/sphinx/source/userdoc/gasm_high.rst | 86 +- doc/sphinx/source/userdoc/interMM.rst | 6 +- doc/sphinx/source/userdoc/model_Nitsche.rst | 2 +- .../source/userdoc/model_generic_assembly.rst | 2 +- .../userdoc/model_plasticity_small_strain.rst | 2 +- doc/sphinx/source/userdoc/parallel.rst | 8 +- doc/sphinx/source/whatsnew/4.3.rst | 3 +- doc/sphinx/source/whatsnew/5.3.rst | 7 +- interface/src/gf_asm.cc | 89 +- interface/src/gf_model_set.cc | 88 +- interface/src/python/getfem_python.c | 2 +- interface/tests/meshes/Makefile.am | 3 +- interface/tests/meshes/mixed_mesh.gmf | 2442 ++++++++++++++++++++ interface/tests/python/Makefile.am | 9 +- interface/tests/python/check_asm.py | 3 + interface/tests/python/check_mixed_mesh.py | 193 ++ interface/tests/python/check_secondary_domain.py | 91 + interface/tests/python/demo_phase_field.py | 234 ++ src/getfem/bgeot_ftool.h | 4 +- src/getfem/getfem_generic_assembly.h | 52 +- .../getfem_generic_assembly_compile_and_exec.h | 29 +- src/getfem/getfem_generic_assembly_tree.h | 31 +- src/getfem/getfem_models.h | 98 +- src/getfem_contact_and_friction_common.cc | 4 +- src/getfem_generic_assembly_compile_and_exec.cc | 699 +++++- ...fem_generic_assembly_functions_and_operators.cc | 3 + src/getfem_generic_assembly_interpolation.cc | 35 + src/getfem_generic_assembly_semantic.cc | 311 ++- src/getfem_generic_assembly_tree.cc | 80 +- src/getfem_generic_assembly_workspace.cc | 52 +- src/getfem_mesh_level_set.cc | 2 +- src/getfem_models.cc | 124 +- tests/test_assembly.cc | 10 +- 37 files changed, 4455 insertions(+), 367 deletions(-)