Diffusion akantu 179c23d61404

Merge branch 'master' of lsmssrv1.epfl.ch:akantu
179c23d61404
Actions

Authored by corrado on Mar 3 2015, 15:16.

Description

Merge branch 'master' of lsmssrv1.epfl.ch:akantu

Details

Committed

corrado

Mar 3 2015, 15:16

Pushed

richart	Dec 6 2019, 13:35
richart	Dec 6 2019, 13:16
richart	Dec 6 2019, 12:16
richart	Dec 6 2019, 11:45
richart	Dec 5 2019, 22:54
richart	Dec 5 2019, 18:45

Parents

rAKAb90dc8080730: Merge branch 'master' of lsmssrv1.epfl.ch:akantu
rAKA37ee2b02c7e3: Reverting a small modification added for debugging

Branches

Unknown

Tags

Unknown

Event Timeline

corrado committed rAKA179c23d61404: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by corrado).Mar 3 2015, 15:16

Restricted Application failed to build Restricted Buildable!Dec 6 2019, 13:43

Merged Changes

Commit	Author	Details	Committed
37ee2b02c7e3	Marco Vocialta	Reverting a small modification added for debugging	Mar 2 2015
3e6ad2544594	Marco Vocialta	Minor update to the manual concerning the fatigue cohesive law	Mar 2 2015
951b45d63668	Marco Vocialta	Bug fixes to the material cohesive linear fatigue law	Mar 2 2015
6f5a917d023b	Lucas Frérot	Renamed classes in geometry. Partial impl of MeshGeomContainer	Mar 2 2015
e390ecd361e0	richart	non-local bug fix in quadrature points numbering	Mar 1 2015
33bb3a63e254	Aurelia Cuba Ramos	correction of weight computation and averaging in the material non-local	Mar 1 2015
98de6dbb9288	Aurelia Cuba Ramos	bug fix: make sure computeNonLocalStresses() is called	Feb 27 2015
9383acb32be0	Lucas Frérot	Completed test_geometry_intersection test	Feb 27 2015
945f3c40b4b3	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Feb 27 2015
5de79ae701d5	richart	bug fix in non local	Feb 27 2015
f9e32ccbcdc7	Lucas Frérot	Added vim temporary files to .gitignore	Feb 27 2015
face17120e14	Lucas Frérot	Changed structure of geometry module	Feb 27 2015
d2a0f22a054a	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Feb 27 2015
72afa32339fa	Aurelia Cuba Ramos	bug fix in material non local	Feb 26 2015
b34f775008d5	Lucas Frérot	Modified generation of package libraries to correct problem with CGAL (cf…	Feb 26 2015
68266dbc9847	richart	change in material non local for the communications of material ids	Feb 26 2015
9ef0049ab1a1	richart	Merge branch 'master' of lsmssrv.epfl.ch:akantu	Feb 23 2015
d6d332fadd4c	richart	blackdynamite correction	Feb 23 2015
7f266593a9d8	richart	Boost handled correctly	Feb 23 2015

Changes (55)

		Path
M		.gitignore
M		CMakeLists.txt
M		cmake/AkantuMacros.cmake
M		cmake/Modules/CMakePackagesSystem.cmake
M		doc/manual/manual-cohesive_laws.tex
M		doc/manual/manual-constitutive-laws.tex
M		packages/00_core.cmake
V		packages/{80_cgal.cmake → cgal.cmake}
P		packages/90_blackdynamite.cmake Copied from packages/80_cpparray.cmake
P		packages/boost.cmake Copied from test/test_static_memory/CMakeLists.txt
V		packages/{cgal.cmake ← 80_cgal.cmake}
M		src/common/aka_config.hh.in
M		src/fe_engine/fe_engine.hh
D		src/geometry/cgal_point.cc
D		src/geometry/cgal_point.hh
D		src/geometry/cgal_segment.cc
D		src/geometry/cgal_segment.hh
D		src/geometry/cgal_triangle.cc
D		src/geometry/cgal_triangle.hh
V		src/geometry/{geometrical_primitive.hh → mesh_geom_abstract.cc}
V		src/geometry/{mesh_geom_abstract.cc ← geometrical_primitive.hh}
P		src/geometry/mesh_geom_abstract.hh Copied from src/geometry/point.hh
A		src/geometry/mesh_geom_container.cc
V		src/geometry/{mesh_geom_container.hh ← point.cc}
V		src/geometry/{mesh_geom_factory.hh ← segment.hh}
A		src/geometry/mesh_geom_factory_tmpl.hh
V		src/geometry/{point.cc → mesh_geom_container.hh}
P		src/geometry/point.hh Deleted after being copied to multiple locations: src/geometry/mesh_geom_abstract.hh src/geometry/tree_type_helper.hh
D		src/geometry/segment.cc
V		src/geometry/{segment.hh → mesh_geom_factory.hh}
V		src/geometry/{tree_type_helper.hh ← point.hh}
D		src/geometry/triangle.cc
D		src/geometry/triangle.hh
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.cc
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.hh
M		src/model/solid_mechanics/materials/material_cohesive/material_cohesive.cc
M		src/model/solid_mechanics/materials/material_non_local_inline_impl.cc
M		src/model/solid_mechanics/solid_mechanics_model.cc
M		src/synchronizer/grid_synchronizer.cc
M		src/synchronizer/grid_synchronizer.hh
M		test/CMakeLists.txt
A	(dir)	test/test_geometry/
P		test/test_geometry/CMakeLists.txt Copied from test/test_io/test_dumper/CMakeLists.txt
A		test/test_geometry/mesh.geo
A		test/test_geometry/test_geometry_intersection.cc
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/material_fatigue.dat
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/test_cohesive_extrinsic_fatigue.cc
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/custom_non_local_test_material.cc
P		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/custom_non_local_test_material.hh Copied from src/model/solid_mechanics/materials/material_damage/material_damage_non_local.hh
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/material.dat
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/mesh.geo
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/test_material_non_local.cc
M		test/test_synchronizer/test_grid_synchronizer.cc
M		test/test_synchronizer/test_grid_synchronizer_check_neighbors.cc