Diffusion akantu 685b0a21bea5

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

Authored by corrado on Nov 3 2015, 13:59.

Description

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

Details

Committed

corrado

Nov 3 2015, 13:59

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

rAKAc2387764e747: no c++ 11 compile problem solved
rAKAd9048c3b13d6: code cleaning in material_cohe_linear.cc e solid_mech_model_cohe_inline_impl.cc

Branches

Unknown

Tags

Unknown

Event Timeline

corrado committed rAKA685b0a21bea5: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by corrado).Nov 3 2015, 13:59

Merged Changes

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

Commit	Author	Details	Committed
c2387764e747	richart	no c++ 11 compile problem solved	Oct 26 2015
f58b7e7a1b1e	richart	Merge branch 'master' of gitolite-richart:akantu	Oct 26 2015
cdf24a08a964	richart	Modification to make the hash pass compilation with c++11 deactivated	Oct 26 2015
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
ff3a62a20cdb	richart	Merge branch 'master' of gitolite-richart:akantu	Oct 16 2015
4cd8f6df144d	richart	Adding aiterable type on element kinds	Oct 16 2015
86199295e713	richart	Moving some files in the good package	Oct 16 2015
154ab8ac06e4	Aurelia Cuba Ramos	fixing the python interface due to renaming of QuadraturePoint	Oct 15 2015
6f67b4f45472	Aurelia Cuba Ramos	resolved linking problem when compiling without non-local	Oct 15 2015
2e3270d32fc9	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 15 2015
54e599859086	Aurelia Cuba Ramos	Non-local development completed in parallel, neighborhood for iterative damage…	Oct 15 2015
4e159fe4fd78	fabarras	oupssss this is not supposed to be here, DO NOT READ	Oct 15 2015
3e12823ecb4b	fabarras	removing hydropressure function	Oct 15 2015
8ed5d3d605fa	fabarras	last year devs on swig for solidmechanics model	Oct 15 2015
26d42f99761f	fabarras	python examples	Oct 9 2015
74d30912a414	fabarras	Merge branch 'master' of lsmssrv1.epfl.ch:users/fabarras/dev/akantu_students	Oct 9 2015
97501d7a13f3	Marco Vocialta	Updating submodules link	Oct 9 2015
b056556fd224	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 8 2015
8e29c7fb9311	Clement Roux	addition of test material mazrars	Oct 8 2015
14a63c1b7ec2	yilmaz	doxygen comments for material class (ticket 47) - to close	Oct 8 2015
2d08200f3ffd	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 8 2015
b05e145d997e	Aurelia Cuba Ramos	modifications to make non-local averaging work in parallel: unique tag	Oct 8 2015
a0b28f5877ff	Aurelia Cuba Ramos	generic neighborhood class added	Oct 8 2015
31bc1f38dee0	Aurelia Cuba Ramos	Non-local modifications completed	Oct 8 2015
2489c7e7c17f	Aurelia Cuba Ramos	WeightFunction removed from MaterialNonLocal	Oct 7 2015
6971d6cdb6f8	Aurelia Cuba Ramos	bug fix in parser, non-local modifications continued	Oct 6 2015
072d5639001c	Marco Vocialta	Fixing a memory leak	Oct 5 2015
e23a7bad59ca	Marco Vocialta	Another compilation fix	Oct 5 2015
b0c536d0a064	Marco Vocialta	Compilation bug fix	Oct 5 2015
e277f6c7cbb8	Marco Vocialta	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 4 2015
db26bbacce3f	Marco Vocialta	Bug fix to prevent the cohesive element inserter from increasing the global…	Oct 4 2015
733b401f9a72	Marco Vocialta	Creation of a class to update the global connectivity in parallel, important…	Oct 2 2015
f53070fb66ff	Aurelia Cuba Ramos	Operators in quadrature point class corrected, non-local modifications…	Oct 2 2015
37f4feb6a88f	yilmaz	some doxygen additions (ticket 47)	Oct 1 2015
bab5fcb0a2b9	fabarras	double cantilever beam simulations	Oct 1 2015

Changes (215)

		Path
M		.gitignore
M		CMakeLists.txt
M		cmake/AkantuMacros.cmake
M		cmake/AkantuPackagesSystem.cmake
M		cmake/Modules/CMakePackagesSystemPrivateFunctions.cmake
M		doc/manual/manual-cohesive_elements_insertion.tex
M	(sub)	extra_packages/extra-materials
M	(sub)	extra_packages/igfem
M	(sub)	extra_packages/parallel-cohesive-element
M	(sub)	extra_packages/students-extra-package
M	(sub)	extra_packages/traction-at-split-node-contact
M		packages/blackdynamite.cmake
M		packages/cgal.cmake
M		packages/cohesive_element.cmake
M		packages/core.cmake
M		packages/damage_non_local.cmake
M		packages/mpi.cmake
M		python/swig/mesh.i
M		python/swig/model.i
M		python/swig/solid_mechanics_model.i
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_element_classes_info.hh.in
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.cc
M		src/fe_engine/fe_engine.hh
M		src/fe_engine/fe_engine_template.hh
M		src/fe_engine/fe_engine_template_cohesive.cc
M		src/fe_engine/fe_engine_template_tmpl.hh
M		src/fe_engine/fe_engine_template_tmpl_struct.hh
V		src/fe_engine/{integration_point.hh ← quadrature_point.hh}
M		src/fe_engine/integrator.hh
M		src/fe_engine/integrator_gauss.hh
V		src/fe_engine/{quadrature_point.hh → integration_point.hh}
M		src/fe_engine/shape_cohesive.hh
M		src/fe_engine/shape_cohesive_inline_impl.cc
M		src/fe_engine/shape_functions.hh
M		src/fe_engine/shape_functions_inline_impl.cc
M		src/fe_engine/shape_lagrange.hh
M		src/fe_engine/shape_lagrange_inline_impl.cc
M		src/fe_engine/shape_linked.hh
M		src/fe_engine/shape_linked_inline_impl.cc
M		src/geometry/mesh_abstract_intersector.hh
M		src/geometry/mesh_abstract_intersector_tmpl.hh
V		src/{geometry/mesh_geom_abstract.cc → model/solid_mechanics/materials/material_non_local_inline_impl.cc}
M		src/geometry/mesh_geom_abstract.hh
M		src/geometry/mesh_geom_factory.hh
M		src/geometry/mesh_geom_factory_tmpl.hh
M		src/geometry/mesh_geom_intersector.hh
M		src/geometry/mesh_geom_intersector_tmpl.hh
M		src/geometry/mesh_segment_intersector.hh
M		src/geometry/mesh_segment_intersector_tmpl.hh
M		src/geometry/mesh_sphere_intersector.hh
M		src/geometry/mesh_sphere_intersector_tmpl.hh
M		src/io/parser/parsable.cc
M		src/io/parser/parser.hh
M		src/mesh/element_type_map.hh
M		src/mesh/element_type_map_filter.hh
M		src/mesh/element_type_map_tmpl.hh
M		src/mesh/mesh.cc
M		src/mesh/mesh.hh
M		src/mesh/mesh_events.hh
M		src/mesh/mesh_inline_impl.cc
M		src/mesh_utils/cohesive_element_inserter.cc
M		src/mesh_utils/cohesive_element_inserter.hh
P		src/mesh_utils/global_ids_updater.cc Copied from src/model/common/non_local_toolbox/non_local_manager.cc
A		src/mesh_utils/global_ids_updater.hh
A		src/mesh_utils/global_ids_updater_inline_impl.cc
M		src/mesh_utils/mesh_utils.cc
M		src/mesh_utils/mesh_utils.hh
M		src/model/boundary_condition_functor.hh
M		src/model/boundary_condition_functor_inline_impl.cc
M		src/model/boundary_condition_tmpl.hh
A		src/model/common/neighborhood_base.cc
P		src/model/common/neighborhood_base.hh Copied from src/model/common/non_local_toolbox/non_local_neighborhood_base.hh
P		src/model/common/neighborhood_base_inline_impl.cc Copied from src/model/common/non_local_toolbox/non_local_neighborhood_base_inline_impl.cc
A	(dir)	src/model/common/neighborhoods_criterion_evaluation/
A		src/model/common/neighborhoods_criterion_evaluation/neighborhood_max_criterion.cc
A		src/model/common/neighborhoods_criterion_evaluation/neighborhood_max_criterion.hh
V		src/model/common/{neighborhoods_criterion_evaluation/neighborhood_max_criterion_inline_impl.cc ← non_local_toolbox/non_local_neighborhood_base_inline_impl.cc}
P		src/model/common/non_local_toolbox/non_local_manager.cc Copied to src/mesh_utils/global_ids_updater.cc
M		src/model/common/non_local_toolbox/non_local_manager.hh
M		src/model/common/non_local_toolbox/non_local_manager_inline_impl.cc
D		src/model/common/non_local_toolbox/non_local_neighborhood.cc
M		src/model/common/non_local_toolbox/non_local_neighborhood.hh
M		src/model/common/non_local_toolbox/non_local_neighborhood_base.cc
P		src/model/common/non_local_toolbox/non_local_neighborhood_base.hh Copied to src/model/common/neighborhood_base.hh
P		src/model/common/non_local_toolbox/non_local_neighborhood_base_inline_impl.cc Deleted after being copied to multiple locations: src/model/common/neighborhood_base_inline_impl.cc src/model/common/neighborhoods_criterion_evaluation/neighborhood_max_criterion_inline_impl.cc
A		src/model/common/non_local_toolbox/non_local_neighborhood_inline_impl.cc
A		src/model/common/non_local_toolbox/non_local_neighborhood_tmpl.hh
M		src/model/heat_transfer/heat_transfer_model.cc
M		src/model/heat_transfer/heat_transfer_model_inline_impl.cc
M		src/model/model.hh
M		src/model/model_inline_impl.cc
M		src/model/solid_mechanics/embedded_interface_intersector.cc
M		src/model/solid_mechanics/embedded_interface_intersector.hh
M		src/model/solid_mechanics/fragment_manager.cc
M		src/model/solid_mechanics/fragment_manager.hh
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_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/cohesive_internal_field.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_linear.cc
M		src/model/solid_mechanics/materials/material_cohesive/material_cohesive.cc
M		src/model/solid_mechanics/materials/material_cohesive/material_cohesive.hh
M		src/model/solid_mechanics/materials/material_cohesive/material_cohesive_inline_impl.cc
M		src/model/solid_mechanics/materials/material_damage/material_damage_non_local.hh
M		src/model/solid_mechanics/materials/material_damage/material_marigo.cc
M		src/model/solid_mechanics/materials/material_damage/material_marigo_inline_impl.cc
P		src/model/solid_mechanics/materials/material_damage/material_marigo_non_local.hh Copied to src/model/solid_mechanics/materials/material_non_local.hh
M		src/model/solid_mechanics/materials/material_damage/material_marigo_non_local_inline_impl.cc
M		src/model/solid_mechanics/materials/material_damage/material_mazars_non_local.cc
M		src/model/solid_mechanics/materials/material_damage/material_mazars_non_local.hh
M		src/model/solid_mechanics/materials/material_elastic.cc
M		src/model/solid_mechanics/materials/material_elastic_linear_anisotropic.cc
M		src/model/solid_mechanics/materials/material_elastic_orthotropic.cc
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement.cc
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template_tmpl.hh
M		src/model/solid_mechanics/materials/material_finite_deformation/material_neohookean.hh
A		src/model/solid_mechanics/materials/material_non_local.cc
P		src/model/solid_mechanics/materials/material_non_local.hh Copied from src/model/solid_mechanics/materials/material_damage/material_marigo_non_local.hh
M		src/model/solid_mechanics/materials/material_non_local_includes.hh
V		src/{model/solid_mechanics/materials/material_non_local_inline_impl.cc ← geometry/mesh_geom_abstract.cc}
M		src/model/solid_mechanics/materials/material_plastic/material_plastic.hh
M		src/model/solid_mechanics/materials/material_viscoelastic/material_standard_linear_solid_deviatoric.cc
M		src/model/solid_mechanics/materials/material_viscoelastic/material_standard_linear_solid_deviatoric.hh
M		src/model/solid_mechanics/materials/random_internal_field.hh
M		src/model/solid_mechanics/materials/weight_functions/base_weight_function.hh
M		src/model/solid_mechanics/materials/weight_functions/base_weight_function_inline_impl.cc
M		src/model/solid_mechanics/materials/weight_functions/damaged_weight_function.hh
M		src/model/solid_mechanics/materials/weight_functions/damaged_weight_function_inline_impl.cc
M		src/model/solid_mechanics/materials/weight_functions/remove_damaged_weight_function.hh
M		src/model/solid_mechanics/materials/weight_functions/remove_damaged_weight_function_inline_impl.cc
M		src/model/solid_mechanics/materials/weight_functions/remove_damaged_with_damage_rate_weight_function.hh
M		src/model/solid_mechanics/materials/weight_functions/remove_damaged_with_damage_rate_weight_function_inline_impl.cc
M		src/model/solid_mechanics/materials/weight_functions/stress_based_weight_function.cc
M		src/model/solid_mechanics/materials/weight_functions/stress_based_weight_function.hh
M		src/model/solid_mechanics/materials/weight_functions/stress_based_weight_function_inline_impl.cc
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
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_inline_impl.cc
M		src/model/structural_mechanics/structural_mechanics_model_mass.cc
M		src/solver/solver_petsc.cc
M		src/synchronizer/data_accessor.hh
M		src/synchronizer/data_accessor_inline_impl.cc
M		src/synchronizer/distributed_synchronizer.cc
M		src/synchronizer/distributed_synchronizer.hh
M		src/synchronizer/dof_synchronizer.cc
M		src/synchronizer/grid_synchronizer.cc
M		src/synchronizer/grid_synchronizer.hh
M		src/synchronizer/synchronizer.hh
M		src/synchronizer/synchronizer_registry.cc
M		test/test_fe_engine/test_gradient.cc
M		test/test_fe_engine/test_integrate.cc
M		test/test_fe_engine/test_interpolate.cc
M		test/test_fe_engine/test_inverse_map.cc
M		test/test_model/test_non_local_toolbox/CMakeLists.txt
A		test/test_model/test_non_local_toolbox/fine_mesh.msh
M		test/test_model/test_non_local_toolbox/material.dat
A		test/test_model/test_non_local_toolbox/material_parallel_test.dat
A		test/test_model/test_non_local_toolbox/material_remove_damage.dat
A		test/test_model/test_non_local_toolbox/material_weight_computation.dat
A		test/test_model/test_non_local_toolbox/plate.msh
A		test/test_model/test_non_local_toolbox/test_build_neighborhood_parallel.cc
M		test/test_model/test_non_local_toolbox/test_material.cc
P		test/test_model/test_non_local_toolbox/test_material.hh Copied to test/test_model/test_non_local_toolbox/test_material_damage.hh
A		test/test_model/test_non_local_toolbox/test_material_damage.cc
P		test/test_model/test_non_local_toolbox/test_material_damage.hh Copied from test/test_model/test_non_local_toolbox/test_material.hh
P		test/test_model/test_non_local_toolbox/test_non_local_averaging.cc Copied from test/test_model/test_non_local_toolbox/test_non_local_neighborhood_base.cc
P		test/test_model/test_non_local_toolbox/test_non_local_neighborhood_base.cc Copied to multiple locations: test/test_model/test_non_local_toolbox/test_non_local_averaging.cc test/test_model/test_non_local_toolbox/test_weight_computation.cc
M		test/test_model/test_non_local_toolbox/test_non_local_neighborhood_base.verified
A		test/test_model/test_non_local_toolbox/test_remove_damage_weight_function.cc
A		test/test_model/test_non_local_toolbox/test_remove_damage_weight_function.verified
P		test/test_model/test_non_local_toolbox/test_weight_computation.cc Copied from test/test_model/test_non_local_toolbox/test_non_local_neighborhood_base.cc
A		test/test_model/test_non_local_toolbox/test_weight_computation.verified
M		test/test_model/test_solid_mechanics_model/patch_tests/explicit/patch_test_explicit.cc
M		test/test_model/test_solid_mechanics_model/patch_tests/explicit/patch_test_explicit_anisotropic.cc
M		test/test_model/test_solid_mechanics_model/patch_tests/implicit/patch_test_implicit.cc
M		test/test_model/test_solid_mechanics_model/patch_tests/lumped_mass/test_lumped_mass.cc
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfragments/test_cohesive_buildfragments.cc
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/test_cohesive_extrinsic_tetrahedron.cc
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_intrinsic/test_cohesive_intrinsic_tetrahedron.cc
M		test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model_prestress.cc
M		test/test_model/test_solid_mechanics_model/test_materials/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_materials/material_mazars.dat
M		test/test_model/test_solid_mechanics_model/test_materials/test_interpolate_stress.cc
M		test/test_model/test_solid_mechanics_model/test_materials/test_local_material.cc
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_mazars.cc
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/CMakeLists.txt
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/custom_non_local_test_material.cc
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/custom_non_local_test_material.hh
M		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/material_damage_non_local.dat
D		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/material_non_local.dat
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/test_material_damage_non_local.cc
D		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
D		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/two_materials.geo
D		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/two_materials_non_local.dat
M		third-party/cmake/blackdynamite.cmake