Diffusion akantu b3344dd1b9d6

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

Authored by corrado on Dec 21 2015, 11:11.

Description

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

Conflicts:
src/model/solid_mechanics/solid_mechanics_model_event_handler.hh

Details

Committed

corrado

Dec 21 2015, 11:11

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

rAKAdfec593efad7: adding explanations about non-local damage models
rAKA355bb2eb5356: modifications to the user manual related to ticket #98

Branches

Unknown

Tags

Unknown

Event Timeline

corrado committed rAKAb3344dd1b9d6: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by corrado).Dec 21 2015, 11:11

Merged Changes

Commit	Author	Details	Committed
dfec593efad7	jcho	adding explanations about non-local damage models	Dec 18 2015
3bfc4b872942	Valentine	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Dec 18 2015
200e9204e52f	Valentine	pour pouvoir pusher	Dec 18 2015
b34da39d8272	fabarras	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Dec 18 2015
591c9001eda2	fabarras	[closes #111]	Dec 18 2015
fa1ab379485d	Valentine	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Dec 18 2015
8525404f6626	Valentine	comments for tickets 79	Dec 18 2015
bc158cdfbd51	yilmaz	some doxygen comments (ticket 96)	Dec 18 2015
facbca4a1976	Lucas Frérot	added doc for parser + aka_blas_lapack.hh	Dec 17 2015
5c2dd6f3479e	Aurelia Cuba Ramos	resolution of tickets 118, 115, 122, 102, 80, bug fixes in non-local	Dec 16 2015
fd65bfe537f1	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Dec 16 2015
a339de614273	Aurelia Cuba Ramos	testing of non-local damage completed	Dec 16 2015
f87b8f54ee65	fabarras	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Dec 14 2015
01bfa944af30	fabarras	ticket #129 add cheesy parser example	Dec 14 2015
4447e9a351cd	richart	Merge branch 'master' of gitolite-richart:akantu	Dec 14 2015
d27754922c2f	fabarras	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Dec 14 2015
50e2f77d9be9	fabarras	ticket #128 section dedicated to input file in user manual	Dec 14 2015
c7fa99546210	richart	removing generated files in the sources	Dec 14 2015
7899d2267cfd	richart	Remade the changes of with a git mv instead of mv [closes #76]	Dec 14 2015
4bbe42d036d2	richart	Merge branch 'master' of gitolite-richart:akantu	Dec 14 2015
3c8d3d807f9c	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Dec 14 2015
f453f86b1941	richart	Revert "add sub directories for cohesive and embedded in smm"	Dec 14 2015
4d67516af78c	richart	Revert "add sub directories in package file"	Dec 14 2015
53d557c7b79f	richart	Revert "add sub directories in package file"	Dec 14 2015
c52be25b2a3a	richart	Revert "add sub directories in package file"	Dec 14 2015
dda027523015	jcho	add sub directories in package file	Dec 13 2015
0e4c954167a2	jcho	add sub directories in package file	Dec 13 2015
7e3ac8438716	jcho	add sub directories in package file	Dec 13 2015
0d89ae1093cf	jcho	add sub directories for cohesive and embedded in smm	Dec 13 2015
6fffeec69af2	richart	Modifications for boost	Dec 11 2015
17b892f21081	anciaux	remove the debug tools as required by a ticket	Dec 10 2015
baa5c7c9b92e	yilmaz	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Dec 10 2015
74787b564376	yilmaz	changes in manual for ticket 92 (addition of bc example with element group)	Dec 10 2015
b71b9c44c3fc	Lucas Frérot	fixed doxygen for Vector, Matrix and Tensor3	Dec 10 2015
44bf128800e2	richart	OpenMPI seems to not define the max tag	Dec 10 2015
4ddead2f89f4	richart	conflit not correctly corrected	Dec 10 2015
2be8a88b8197	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Dec 10 2015
3970dec2a337	richart	extending to full support of the MPI reduce operations	Dec 10 2015

Changes (101)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		cmake/AkantuMacros.cmake
M		cmake/Modules/FindScotch.cmake
M		doc/doxygen/akantu.dox.in
M		doc/manual/manual-bibliography.bib
M		doc/manual/manual-cohesive_elements_insertion.tex
M		doc/manual/manual-constitutive-laws-non_local.tex
M		doc/manual/manual-constitutive-laws.tex
M		doc/manual/manual-gettingstarted.tex
M		doc/manual/manual-io.tex
M		doc/manual/manual-solidmechanicsmodel.tex
D		doc/manual/manual.aux
D		doc/manual/manual.idx
D		doc/manual/manual.log
D		doc/manual/manual.toc
M		examples/CMakeLists.txt
P	(dir)	examples/boundary_conditions/ Copied to examples/boundary_conditions/predefined_BC
P		examples/boundary_conditions/CMakeLists.txt Copied to multiple locations: examples/boundary_conditions/predefined_BC/CMakeLists.txt examples/boundary_conditions/user_defined_BC/CMakeLists.txt
P		examples/boundary_conditions/material.dat Deleted after being copied to multiple locations: examples/boundary_conditions/predefined_BC/material.dat examples/boundary_conditions/user_defined_BC/material.dat
P		examples/boundary_conditions/plate.cc Deleted after being copied to multiple locations: examples/boundary_conditions/predefined_BC/plate.cc examples/boundary_conditions/user_defined_BC/complex_boundary_condition.cc
P	(dir)	examples/boundary_conditions/predefined_BC/ Copied from examples/boundary_conditions
P		examples/boundary_conditions/predefined_BC/CMakeLists.txt Copied from examples/boundary_conditions/CMakeLists.txt
P		examples/boundary_conditions/predefined_BC/material.dat Copied from examples/boundary_conditions/material.dat
P		examples/boundary_conditions/predefined_BC/plate.cc Copied from examples/boundary_conditions/plate.cc
P		examples/boundary_conditions/predefined_BC/square.geo Copied from examples/boundary_conditions/square.geo
P		examples/boundary_conditions/square.geo Deleted after being copied to multiple locations: examples/boundary_conditions/predefined_BC/square.geo examples/boundary_conditions/user_defined_BC/fine_mesh.geo
A	(dir)	examples/boundary_conditions/user_defined_BC/
P		examples/boundary_conditions/user_defined_BC/CMakeLists.txt Copied from examples/boundary_conditions/CMakeLists.txt
V		examples/boundary_conditions/{user_defined_BC/complex_boundary_condition.cc ← plate.cc}
V		examples/boundary_conditions/{user_defined_BC/fine_mesh.geo ← square.geo}
V		examples/boundary_conditions/{user_defined_BC ← }/material.dat
P		examples/io/CMakeLists.txt Copied to examples/io/parser/CMakeLists.txt
A	(dir)	examples/io/parser/
P		examples/io/parser/CMakeLists.txt Copied from examples/io/CMakeLists.txt
A		examples/io/parser/example_parser.cc
A		examples/io/parser/input_file.dat
A		examples/io/parser/swiss_cheese.geo
M	(sub)	extra_packages/extra-materials
M	(sub)	extra_packages/igfem
M	(sub)	extra_packages/parallel-cohesive-element
M	(sub)	extra_packages/traction-at-split-node-contact
M		packages/blas.cmake
M		packages/boost.cmake
M		packages/cohesive_element.cmake
M		packages/core_cxx11.cmake
V		packages/debug_tools.cmake
M		packages/embedded.cmake
M		src/common/aka_blas_lapack.hh
D		src/common/aka_ci_string.hh
M		src/common/aka_common.hh
M		src/common/aka_config.hh.in
D		src/common/aka_debug_tools.hh
M		src/common/aka_event_handler_manager.hh
M		src/common/aka_geometry.hh
M		src/io/mesh_io/mesh_io_abaqus.cc
M		src/io/parser/parsable.hh
M		src/io/parser/parser.hh
M		src/mesh/element_type_map_filter.hh
M		src/mesh/mesh_filter.hh
M		src/model/boundary_condition.hh
M		src/model/common/non_local_toolbox/non_local_manager.cc
V		src/model/solid_mechanics/{ → solid_mechanics_model_embedded_interface}/embedded_interface_intersector.cc
V		src/model/solid_mechanics/{ → solid_mechanics_model_embedded_interface}/embedded_interface_intersector.hh
V		src/model/solid_mechanics/{ → solid_mechanics_model_embedded_interface}/embedded_interface_model.cc
V		src/model/solid_mechanics/{ → solid_mechanics_model_embedded_interface}/embedded_interface_model.hh
V		src/model/solid_mechanics/{ → solid_mechanics_model_cohesive}/fragment_manager.cc
V		src/model/solid_mechanics/{ → solid_mechanics_model_cohesive}/fragment_manager.hh
M		src/model/solid_mechanics/material_selector.hh
M		src/model/solid_mechanics/solid_mechanics_model.cc
M		src/model/solid_mechanics/solid_mechanics_model.hh
A	(dir)	src/model/solid_mechanics/solid_mechanics_model_cohesive/
V		src/model/solid_mechanics/{ → solid_mechanics_model_cohesive}/solid_mechanics_model_cohesive.cc
V		src/model/solid_mechanics/{ → solid_mechanics_model_cohesive}/solid_mechanics_model_cohesive.hh
V		src/model/solid_mechanics/{solid_mechanics_model_cohesive ← }/fragment_manager.cc
V		src/model/solid_mechanics/{solid_mechanics_model_cohesive ← }/fragment_manager.hh
A		src/model/solid_mechanics/solid_mechanics_model_cohesive/material_selector_cohesive.cc
A		src/model/solid_mechanics/solid_mechanics_model_cohesive/material_selector_cohesive.hh
V		src/model/solid_mechanics/{solid_mechanics_model_cohesive ← }/solid_mechanics_model_cohesive.cc
V		src/model/solid_mechanics/{solid_mechanics_model_cohesive ← }/solid_mechanics_model_cohesive.hh
V		src/model/solid_mechanics/{solid_mechanics_model_cohesive ← }/solid_mechanics_model_cohesive_inline_impl.cc
V		src/model/solid_mechanics/{ → solid_mechanics_model_cohesive}/solid_mechanics_model_cohesive_inline_impl.cc
A	(dir)	src/model/solid_mechanics/solid_mechanics_model_embedded_interface/
V		src/model/solid_mechanics/{solid_mechanics_model_embedded_interface ← }/embedded_interface_intersector.cc
V		src/model/solid_mechanics/{solid_mechanics_model_embedded_interface ← }/embedded_interface_intersector.hh
V		src/model/solid_mechanics/{solid_mechanics_model_embedded_interface ← }/embedded_interface_model.cc
V		src/model/solid_mechanics/{solid_mechanics_model_embedded_interface ← }/embedded_interface_model.hh
M		src/model/solid_mechanics/solid_mechanics_model_event_handler.hh
M		src/synchronizer/real_static_communicator.hh
M		src/synchronizer/static_communicator.hh
M		src/synchronizer/static_communicator_dummy.hh
M		src/synchronizer/static_communicator_inline_impl.hh
M		src/synchronizer/static_communicator_mpi.cc
M		src/synchronizer/static_communicator_mpi.hh
M		src/synchronizer/synchronizer.hh
M		test/test_model/test_non_local_toolbox/CMakeLists.txt
M		test/test_model/test_non_local_toolbox/test_build_neighborhood_parallel.sh
P		test/test_model/test_non_local_toolbox/test_pair_computation.sh Copied to test/test_model/test_non_local_toolbox/test_pair_computation_parallel.sh
P		test/test_model/test_non_local_toolbox/test_pair_computation_parallel.sh Copied from test/test_model/test_non_local_toolbox/test_pair_computation.sh
A		test/test_solver/CMakeCache.txt
M		test/test_solver/CMakeLists.txt
M		test/test_solver/test_solver_petsc.sh
A		test/test_solver/test_solver_petsc_parallel.sh