Diffusion akantu 6f4884139d6c

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

Authored by Clement Roux <clement.roux@epfl.ch> on Apr 23 2015, 18:41.

Description

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

Details

Committed

Clement Roux <clement.roux@epfl.ch>

Apr 23 2015, 18:41

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

rAKAb0541e3ca125: addition of n_iter in solid_mechanics_model
rAKA0221a6364c7b: minor bug fixes

Branches

Unknown

Tags

Unknown

Event Timeline

Clement Roux <clement.roux@epfl.ch> committed rAKA6f4884139d6c: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by Clement Roux <clement.roux@epfl.ch>).Apr 23 2015, 18:41

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

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
0221a6364c7b	richart	minor bug fixes	Apr 22 2015
3d3adfde73fe	richart	minor bug fixes	Apr 22 2015
089ea78fe293	Marco Vocialta	Fixing a bug in the operator= of VectorProxy	Apr 22 2015
e9a8caee536f	Marco Vocialta	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 22 2015
9be3d58a8aa0	Marco Vocialta	Bug fixes	Apr 22 2015
97bcaf7d35ad	anciaux	correct interface in the case IOHelper is not used	Apr 20 2015
47a06e11f4f6	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 17 2015
3879670d5cf8	richart	Bug fix for iohelper	Apr 17 2015
eac5ce370cf5	Marco Vocialta	Splitting one function in SolidMechanicsModelCohesive	Apr 17 2015
f8aed23b4396	Marco Vocialta	Splitting one function in SolidMechanicsModelCohesive	Apr 17 2015
86a8f46cc420	Marco Vocialta	Compilation fix for the manual	Apr 16 2015
abb8cda3c3be	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 13 2015
cee9304c42a5	richart	Change in operator[] of array iterator return a proxy instead of a reference	Apr 13 2015
0d826477d0dd	richart	Change to no get errors for MUMPS warnings	Apr 13 2015
e9aae244aa16	Lucas Frérot	Merge branch 'master' of lsmssrv1.epfl.ch:akantu-students	Apr 13 2015
af25522d7bfc	Lucas Frérot	Added fe_engine_id as parameter for dumper functions in SolidMechanicsModel and…	Apr 13 2015
d92232b01445	Lucas Frérot	Added computation of reinforcement potential energy	Apr 13 2015
221818ed5569	richart	Change to no get errors for MUMPS warnings	Apr 13 2015
04706ee752fd	richart	mumps 5.0.0 patch	Apr 13 2015
63a5b31828e0	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 12 2015
d39799d82ebd	richart	aligning submodules	Apr 12 2015
f636bb36f91f	richart	refactoring	Apr 11 2015
0a6229dad4a7	richart	modification on reorder connectivities in IOHelper for paraview	Apr 11 2015
c08cb640aa1b	molyneau	modified aka_config.hh.in for students-extra-package	Apr 11 2015
6bcae4a3d87b	corrado	renamed variables in solid_mechanics_model_cohesive_inline_impl.cc	Apr 10 2015
f9f10dc8ed67	corrado	tests for hexahedron 20	Apr 10 2015
fbcc33484b3a	corrado	conflicts solved	Apr 10 2015
dee5ba7b2bfb	corrado	implementing function to check delta_max in case of no convergence	Apr 10 2015
81c45463b261	richart	Communications to reduce the criteria on insertion in implicit/static scheme…	Apr 10 2015
e9660d462694	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 9 2015
1d3da3dfa0ad	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 7 2015
9b64fc7eae71	corrado	fixed bugs with hexahedron_20	Apr 7 2015
fd6043c11f48	fabarras	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 1 2015
e4b2e5ccde02	fabarras	python infc for structural mech + bug in testConvergence<res> bis	Apr 1 2015
6553f3f8a9c7	fabarras	python infc for structural mech + bug in testConvergence<res>	Apr 1 2015
2eb87f8351ac	corrado	conflicts solved	Mar 31 2015
1f39ca97a8bd	corrado	correcting indentation	Mar 31 2015
58c643481d74	corrado	correcting facet numbering for hexa20	Mar 31 2015
edab3a8977ab	Marco Vocialta	Bugfix after recent modifications to the cohesive elements' insertion	Mar 31 2015
4d57c9fb721c	Lucas Frérot	Added uniform prestressing to reinforcements	Mar 31 2015
d126c327f2a1	richart	small optimization	Mar 31 2015
a18be6ce0821	richart	find package for scalapack extracted from mumps	Mar 31 2015
dffd939f2b67	richart	Cleaning some leftovers in cmake	Mar 30 2015
e3be31c62362	richart	Minor modifs to make akantu compile again with icc... + some styling	Mar 30 2015
0565c65edcae	richart	update of submodule ref	Mar 30 2015
850e169d52c0	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Mar 30 2015
d130997e6472	richart	Modification sof the package system for third-party + making functions more…	Mar 30 2015
b6583ee9cc52	Lucas Frérot	Corrected bugs with embedded model	Mar 30 2015
a3a7aba9a7ea	molyneau	added rgib in students-extra-package	Mar 30 2015
68e28d10eb2c	molyneau	extra package	Mar 27 2015

Changes (264)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
M		.gitmodules
M		CMakeLists.txt
M		cmake/AkantuInstall.cmake
M		cmake/AkantuMacros.cmake
M		cmake/AkantuTestAndExamples.cmake
M		cmake/Modules/CMakePackagesSystem.cmake
M		cmake/Modules/FindMumps.cmake
A		cmake/Modules/FindScaLAPACK.cmake
M		doc/CMakeLists.txt
M		doc/manual/CMakeLists.txt
M		doc/manual/manual-appendix-elements.tex
M		doc/manual/manual-appendix-materials-cohesive.tex
M		doc/manual/manual-bibliography.bib
M		doc/manual/manual-cohesive_laws.tex
M		doc/manual/manual-constitutive-laws.tex
M		doc/manual/manual-io.tex
M		doc/manual/manual-solidmechanicsmodel.tex
M	(sub)	extra_packages/extra-materials
M	(sub)	extra_packages/igfem
M	(sub)	extra_packages/parallel-cohesive-element
A	(sub)	extra_packages/students-extra-package
M	(sub)	extra_packages/traction-at-split-node-contact
V		packages/{00_core.cmake → core.cmake}
V		packages/{00_core_cxx11.cmake → core_cxx11.cmake}
V		packages/{00_documentation_doxygen.cmake → documentation_doxygen.cmake}
V		packages/{00_documentation_manual.cmake → documentation_manual.cmake}
V		packages/{10_heat_transfer.cmake → heat_transfer.cmake}
V		packages/{10_structural_mechanics.cmake → structural_mechanics.cmake}
V		packages/{20_cohesive_element.cmake → cohesive_element.cmake}
V		packages/{20_contact.cmake → contact.cmake}
V		packages/{25_damage_non_local.cmake → damage_non_local.cmake}
V		packages/{40_optimization.cmake → optimization.cmake}
P		packages/50_implicit.cmake Deleted after being copied to multiple locations: packages/embedded.cmake packages/implicit.cmake packages/scalapack.cmake
V		packages/{50_parallel.cmake → parallel.cmake}
D		packages/80_cpparray.cmake
V		packages/{80_mpi.cmake → mpi.cmake}
D		packages/80_nlopt.cmake
V		packages/{84_petsc.cmake → petsc.cmake}
D		packages/85_mumps.cmake
V		packages/{89_lapack.cmake → lapack.cmake}
D		packages/90_blackdynamite.cmake
V		packages/{90_blas.cmake → blas.cmake}
V		packages/{90_iohelper.cmake → iohelper.cmake}
P		packages/90_qview.cmake Deleted after being copied to multiple locations: packages/boost.cmake packages/qview.cmake
D		packages/90_scotch.cmake
A		packages/blackdynamite.cmake
V		packages/{blas.cmake ← 90_blas.cmake}
P		packages/boost.cmake Copied from packages/90_qview.cmake
A		packages/cgal.cmake
V		packages/{cohesive_element.cmake ← 20_cohesive_element.cmake}
V		packages/{contact.cmake ← 20_contact.cmake}
V		packages/{core.cmake ← 00_core.cmake}
V		packages/{core_cxx11.cmake ← 00_core_cxx11.cmake}
A		packages/cpparray.cmake
V		packages/{damage_non_local.cmake ← 25_damage_non_local.cmake}
V		packages/{documentation_doxygen.cmake ← 00_documentation_doxygen.cmake}
V		packages/{documentation_manual.cmake ← 00_documentation_manual.cmake}
P		packages/embedded.cmake Copied from packages/50_implicit.cmake
V		packages/{heat_transfer.cmake ← 10_heat_transfer.cmake}
P		packages/implicit.cmake Copied from packages/50_implicit.cmake
V		packages/{iohelper.cmake ← 90_iohelper.cmake}
V		packages/{lapack.cmake ← 89_lapack.cmake}
V		packages/{mpi.cmake ← 80_mpi.cmake}
A		packages/mumps.cmake
A		packages/nlopt.cmake
V		packages/{optimization.cmake ← 40_optimization.cmake}
V		packages/{parallel.cmake ← 50_parallel.cmake}
V		packages/{petsc.cmake ← 84_petsc.cmake}
V		packages/{qview.cmake ← 90_qview.cmake}
V		packages/{scalapack.cmake ← 50_implicit.cmake}
A		packages/scotch.cmake
V		packages/{structural_mechanics.cmake ← 10_structural_mechanics.cmake}
M		python/swig/aka_common.i
M		python/swig/akantu.i
A		python/swig/load_functions.i
M		python/swig/mesh.i
A		python/swig/structural_mechanics_model.i
M		src/CMakeLists.txt
M		src/common/aka_array_tmpl.hh
M		src/common/aka_common.cc
M		src/common/aka_common.hh
M		src/common/aka_common_inline_impl.cc
M		src/common/aka_config.hh.in
M		src/common/aka_fwd.hh
M		src/common/aka_grid_dynamic.hh
M		src/common/aka_types.hh
M		src/fe_engine/element_class.cc
M		src/fe_engine/element_class.hh
M		src/fe_engine/element_class_structural.hh
A		src/fe_engine/element_classes/element_class_hexahedron_20_inline_impl.cc
A		src/fe_engine/element_classes/element_class_pentahedron_15_inline_impl.cc
M		src/fe_engine/element_classes/element_class_quadrangle_8_inline_impl.cc
M		src/fe_engine/fe_engine.hh
M		src/fe_engine/fe_engine_template.hh
M		src/fe_engine/fe_engine_template_tmpl.hh
M		src/fe_engine/geometrical_element.cc
M		src/fe_engine/integration_element.cc
M		src/fe_engine/interpolation_element_tmpl.hh
A	(dir)	src/geometry/
A	(dir)	src/geometry/aabb_primitives/
A		src/geometry/aabb_primitives/aabb_primitive.hh
A		src/geometry/aabb_primitives/tetrahedron.hh
A		src/geometry/aabb_primitives/tetrahedron_tmpl.hh
A		src/geometry/aabb_primitives/triangle.hh
A		src/geometry/aabb_primitives/triangle_tmpl.hh
A		src/geometry/geom_helper_functions.hh
P		src/geometry/mesh_geom_abstract.cc Copied from src/model/solid_mechanics/materials/material_cohesive_includes.hh
A		src/geometry/mesh_geom_abstract.hh
A		src/geometry/mesh_geom_container.cc
A		src/geometry/mesh_geom_container.hh
A		src/geometry/mesh_geom_factory.hh
A		src/geometry/mesh_geom_factory_tmpl.hh
A		src/geometry/tree_type_helper.hh
M		src/io/dumper/dumpable_inline_impl.hh
M		src/io/dumper/dumper_compute.hh
M		src/io/dumper/dumper_connectivity_field.hh
M		src/io/dumper/dumper_element_iterator.hh
M		src/io/dumper/dumper_element_partition.hh
M		src/io/dumper/dumper_element_type.hh
M		src/io/dumper/dumper_iohelper.cc
M		src/io/dumper/dumper_iohelper.hh
M		src/io/dumper/dumper_material_padders.hh
M		src/io/dumper/dumper_quadrature_points_field.hh
M		src/io/mesh_io/mesh_io_msh.cc
M		src/io/mesh_io/mesh_io_msh.hh
M		src/io/parser/parsable_tmpl.hh
M		src/io/parser/parser.hh
M		src/mesh/element_type_map.hh
M		src/mesh/element_type_map_tmpl.hh
M		src/mesh/group_manager.cc
M		src/mesh/group_manager_inline_impl.cc
M		src/mesh/mesh.cc
M		src/mesh/mesh.hh
A		src/mesh/mesh_events.hh
M		src/mesh_utils/cohesive_element_inserter.cc
M		src/mesh_utils/cohesive_element_inserter.hh
M		src/mesh_utils/mesh_utils.cc
M		src/mesh_utils/mesh_utils.hh
M		src/mesh_utils/mesh_utils_inline_impl.cc
M		src/model/boundary_condition_tmpl.hh
M		src/model/model.hh
A		src/model/solid_mechanics/embedded_interface.cc
P		src/model/solid_mechanics/embedded_interface.hh Copied from src/synchronizer/grid_synchronizer.hh
A		src/model/solid_mechanics/embedded_interface_model.cc
A		src/model/solid_mechanics/embedded_interface_model.hh
M		src/model/solid_mechanics/fragment_manager.cc
M		src/model/solid_mechanics/material.cc
M		src/model/solid_mechanics/material.hh
M		src/model/solid_mechanics/material_inline_impl.cc
M		src/model/solid_mechanics/material_list.hh
M		src/model/solid_mechanics/material_selector.hh
M		src/model/solid_mechanics/materials/internal_field.hh
M		src/model/solid_mechanics/materials/internal_field_tmpl.hh
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_bilinear.cc
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_exponential.cc
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_exponential.hh
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.cc
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.hh
A		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.cc
A		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.hh
A		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_inline_impl.cc
M		src/model/solid_mechanics/materials/material_cohesive/material_cohesive.cc
M		src/model/solid_mechanics/materials/material_cohesive/material_cohesive.hh
P		src/model/solid_mechanics/materials/material_cohesive_includes.hh Copied to multiple locations: src/geometry/mesh_geom_abstract.cc src/model/solid_mechanics/materials/material_embedded/material_embedded_includes.hh test/test_geometry/test_geometry_predicates.cc
M		src/model/solid_mechanics/materials/material_damage/material_mazars_inline_impl.cc
M		src/model/solid_mechanics/materials/material_elastic_linear_anisotropic.cc
M		src/model/solid_mechanics/materials/material_elastic_orthotropic.cc
A	(dir)	src/model/solid_mechanics/materials/material_embedded/
A		src/model/solid_mechanics/materials/material_embedded/embedded_internal_field.hh
P		src/model/solid_mechanics/materials/material_embedded/material_embedded_includes.hh Copied from src/model/solid_mechanics/materials/material_cohesive_includes.hh
A		src/model/solid_mechanics/materials/material_embedded/material_reinforcement.cc
A		src/model/solid_mechanics/materials/material_embedded/material_reinforcement.hh
A		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_inline_impl.cc
A		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template.hh
A		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template_inline_impl.cc
M		src/model/solid_mechanics/materials/material_non_local.hh
M		src/model/solid_mechanics/materials/material_non_local_inline_impl.cc
M		src/model/solid_mechanics/materials/material_plastic/material_linear_isotropic_hardening.cc
M		src/model/solid_mechanics/materials/material_plastic/material_linear_isotropic_hardening.hh
M		src/model/solid_mechanics/materials/material_plastic/material_linear_isotropic_hardening_inline_impl.cc
M		src/model/solid_mechanics/materials/material_plastic/material_plastic.cc
M		src/model/solid_mechanics/materials/weight_function.hh
M		src/model/solid_mechanics/materials/weight_function_tmpl.hh
M		src/model/solid_mechanics/solid_mechanics_model.cc
M		src/model/solid_mechanics/solid_mechanics_model.hh
M		src/model/solid_mechanics/solid_mechanics_model_cohesive.cc
M		src/model/solid_mechanics/solid_mechanics_model_cohesive.hh
A		src/model/solid_mechanics/solid_mechanics_model_cohesive_inline_impl.cc
M		src/model/solid_mechanics/solid_mechanics_model_inline_impl.cc
M		src/model/solid_mechanics/solid_mechanics_model_mass.cc
M		src/model/solid_mechanics/solid_mechanics_model_material.cc
M		src/model/structural_mechanics/structural_mechanics_model.cc
M		src/model/structural_mechanics/structural_mechanics_model.hh
M		src/solver/petsc_matrix.cc
M		src/solver/solver_mumps.cc
M		src/solver/static_solver.hh
M		src/synchronizer/distributed_synchronizer.cc
M		src/synchronizer/distributed_synchronizer.hh
M		src/synchronizer/grid_synchronizer.cc
P		src/synchronizer/grid_synchronizer.hh Copied to src/model/solid_mechanics/embedded_interface.hh
M		test/CMakeLists.txt
M		test/test_common/test_grid.cc
M		test/test_fem/CMakeLists.txt
A		test/test_fem/_hexahedron_20.msh
M		test/test_fem/cube.geo
M		test/test_fem/square.geo
M		test/test_fem/test_gradient.cc
A		test/test_fem/test_gradient_hexahedron_20.verified
A		test/test_fem/test_integrate_hexahedron_20.verified
A		test/test_fem/test_interpolate_hexahedron_20.verified
A		test/test_fem/test_inverse_map_hexahedron_20.verified
A	(dir)	test/test_geometry/
P		test/test_geometry/CMakeLists.txt Copied from test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/CMakeLists.txt
A		test/test_geometry/test_geometry_intersection.cc
A		test/test_geometry/test_geometry_intersection_tetrahedron_4.cc
A		test/test_geometry/test_geometry_intersection_triangle_3.cc
P		test/test_geometry/test_geometry_predicates.cc Copied from src/model/solid_mechanics/materials/material_cohesive_includes.hh
A		test/test_geometry/tetrahedron_4.geo
A		test/test_geometry/triangle_3.geo
M		test/test_model/test_solid_mechanics_model/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/orthotropic.dat
M		test/test_model/test_solid_mechanics_model/patch_tests/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/patch_tests/data/_hexahedron_20.msh
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_1d_element/material.dat
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfragments/material.dat
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/fatigue.geo
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/material.dat
A		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.cc
A		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_cohesive/test_cohesive_intrinsic/material.dat
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_intrinsic/material_tetrahedron.dat
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_intrinsic/test_cohesive_intrinsic_tetrahedron.cc
A	(dir)	test/test_model/test_solid_mechanics_model/test_embedded_interface/
P		test/test_model/test_solid_mechanics_model/test_embedded_interface/CMakeLists.txt Copied from test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/embedded_element.dat
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/embedded_mesh.msh
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/material.dat
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/matrix
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_element_matrix.cc
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model.cc
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model.sh
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/triangle.msh
P		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/CMakeLists.txt Copied to multiple locations: test/test_geometry/CMakeLists.txt test/test_model/test_solid_mechanics_model/test_embedded_interface/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/custom_non_local_test_material.cc
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/custom_non_local_test_material.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
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/test_material_damage_non_local_two_materials.cc
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/test_material_non_local.cc
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/two_materials.geo
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/two_materials_non_local.dat
A		test/test_model/test_solid_mechanics_model/test_solid_mechanics_model_orthotropic.cc
M		test/test_model/test_solid_mechanics_model/test_solid_mechanics_model_reassign_material.cc
M		test/test_synchronizer/test_grid_synchronizer.cc
M		test/test_synchronizer/test_grid_synchronizer_check_neighbors.cc
A		third-party/MUMPS_5.0.0.patch
A	(dir)	third-party/cmake/
A		third-party/cmake/iohelper.cmake
A		third-party/cmake/mumps.cmake
A		third-party/cmake/scalapack.cmake
A		third-party/cmake/scotch.cmake