Merge branch 'master' of gitolite-richart:akantu
f58b7e7a1b1e
Actions

Authored by richart on Oct 26 2015, 18:33.

Description

Merge branch 'master' of gitolite-richart:akantu

Committed

richart

Oct 26 2015, 18:33

Pushed

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
40bd1a75a5fe	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 26 2015
df7b935848b4	Clement Roux	add comment to geometry sphere intersection	Oct 26 2015
f8d33c22597e	richart	Merge commit 'ef3eca4061c280c948785db522167dcc9c3ec5f2'	Oct 26 2015
ef3eca4061c2	richart	Squashed 'cmake/Modules/' changes from fe76bc7..0f6a2d4	Oct 26 2015
d9ed54eafe7f	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 26 2015
c8e1dfb24cc6	richart	ignoring archive files	Oct 26 2015
fb2184550fb1	richart	update submodules metadata	Oct 26 2015
60f4c5d05f97	richart	update submodules metadata	Oct 26 2015
7ee22d3d27da	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 26 2015
2431278eaa7f	Clement Roux	addition of comments in fe_engine folder	Oct 22 2015
65467319f0f0	Aurelia Cuba Ramos	skip the non-local stress computation for empty element filters	Oct 21 2015
daa765529140	Aurelia Cuba Ramos	added tolerance in weight computation	Oct 21 2015
42ff9c6528de	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 21 2015
4e871c6da7fe	Aurelia Cuba Ramos	modifications to make non-local compatible with IGFEM	Oct 21 2015
9ceee6e9cc34	fabarras	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 16 2015
0992fd8db584	fabarras	modification in swig to make camuso working again	Oct 16 2015
3483b09eff1b	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Aug 21 2015
16d6e7aa32ce	richart	Started advanced dumper section for user manual (ticket #59)	Aug 10 2015

		Path
M		.gitignore
M		cmake/Modules/CMakePackagesSystemPrivateFunctions.cmake
M	(sub)	extra_packages/extra-materials
M		python/swig/solid_mechanics_model.i
M		src/common/aka_math_tmpl.hh
M		src/fe_engine/cohesive_element.hh
M		src/fe_engine/element_class.hh
M		src/fe_engine/element_class_structural.hh
M		src/fe_engine/element_class_tmpl.hh
M		src/fe_engine/fe_engine.hh
M		src/fe_engine/fe_engine_template.hh
M		src/fe_engine/integration_point.hh
M		src/fe_engine/integrator.hh
M		src/fe_engine/integrator_gauss.hh
M		src/fe_engine/shape_cohesive.hh
M		src/fe_engine/shape_functions.hh
M		src/fe_engine/shape_lagrange.hh
M		src/fe_engine/shape_linked.hh
M		src/geometry/mesh_abstract_intersector.hh
M		src/geometry/mesh_sphere_intersector.hh
M		src/geometry/mesh_sphere_intersector_tmpl.hh
M		src/model/common/non_local_toolbox/non_local_manager.cc
M		src/model/common/non_local_toolbox/non_local_manager.hh
M		src/model/solid_mechanics/materials/material_damage/material_damage_non_local.hh
M		src/model/solid_mechanics/materials/weight_functions/remove_damaged_weight_function_inline_impl.cc
M		src/synchronizer/dof_synchronizer.cc
M		test/test_model/test_non_local_toolbox/test_build_neighborhood_parallel.cc