Diffusion akantu f45c6557b01d

conflicts resolved
f45c6557b01d
Actions

Authored by pundir on Jun 10 2019, 23:42.

Description

conflicts resolved

Details

Committed

pundir

Jun 10 2019, 23:42

Pushed

gitlab-richart

Jan 18 2021, 21:10

Parents

rAKA300b2c16422b: chmaged contact detector and element class for friciton traction
rAKAaa8c5c4077ce: Minor bug fixes

Branches

Unknown

Tags

Unknown

Event Timeline

pundir committed rAKAf45c6557b01d: conflicts resolved (authored by pundir).Jun 10 2019, 23:42

Merged Changes

Commit		Author	Details	Committed
aa8c5c4077ce		richart	Minor bug fixes	Jun 5 2019
d77e9ccf0452		richart	Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private	Jun 4 2019
7a04471d3e4d		richart	Bug fix in the MSH reader version 4	Jun 2 2019
b1971f0dd3a7		richart	Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private	May 31 2019
e8875aefc8da		anciaux/richart	correct the construction of the element filter with ek_regular	May 31 2019
e6acdd6c5042		gallyamov/richart	Correction of the default element types within element_type_map:	May 31 2019
df7dd4dc2abc		richart	Update on mesh_io_msh read and write	May 29 2019
fddfb5094d24		richart	Update for latest findcgal.cmake	May 21 2019
84880d975de9		richart	Modified MSH reader for version 4.1 of the files	May 21 2019
c992924e0405		richart	Reactivating anisotropic patch tests	May 14 2019
c42b7b3e4d52		richart	Bug fix in material anisotropic	May 14 2019
f472fed08c4c		anciaux	change a path	May 9 2019
0a930296a24d		anciaux	adding an example extracting the stiffness amtrix	Mar 26 2019
b879bd479ec6		anciaux	modifying the swig temporarily to have access to aij sparse matrices	Mar 26 2019
9eaed4318be9		anciaux	adding an example extracting the stiffness amtrix	Mar 26 2019
ad8da63e2e3d		frerot	setting rpath for python extension	Mar 20 2019
76e9be0a5b66		richart	exposing partitionate parameters in distribute	Feb 26 2019
431ad889f5c5		richart	Adding traction test for Mazars	Feb 13 2019
5424eed87428		richart	Correction in the ci handling	Feb 8 2019
cbdb1e7d0583		richart	Create matrices at the earliest moment	Feb 8 2019
f8a03d4d85b9		richart	Bug fixing some tests + sanitizing them	Feb 8 2019
87e540f9faa7		richart	Swig protection	Feb 8 2019
c263b07d61fc	D197	fouad/richart	Correcting examples and tests	Feb 6 2019
7237f444b33e		richart	adding bool as a mesh_data	Dec 28 2018

Changes (121)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		cmake/akantu_environement.csh.in
M		cmake/akantu_environement.sh.in
M		cmake/akantu_test_driver.sh
M		examples/boundary_conditions/predefined_bc/predefined_bc.cc
M		examples/boundary_conditions/predefined_bc/square.geo
M		examples/boundary_conditions/user_defined_bc/fine_mesh.geo
M		examples/boundary_conditions/user_defined_bc/user_defined_bc.cc
M		examples/cohesive_element/cohesive_extrinsic/cohesive_extrinsic.cc
M		examples/cohesive_element/cohesive_extrinsic/material.dat
M		examples/cohesive_element/cohesive_extrinsic_ig_tg/material.dat
M		examples/embedded/embedded.cc
M		examples/implicit/implicit_dynamic.cc
M		examples/io/dumper/dumpable_interface.cc
M		examples/io/dumper/dumper_low_level.cc
M		examples/io/parser/example_parser.cc
M		examples/new_material/local_material_damage.cc
M		examples/new_material/new_local_material.cc
M		examples/python/CMakeLists.txt
A	(dir)	examples/python/stiffness_matrix/
A		examples/python/stiffness_matrix/CMakeLists.txt
A		examples/python/stiffness_matrix/material.dat
A		examples/python/stiffness_matrix/plate.geo
A		examples/python/stiffness_matrix/plate.msh
A		examples/python/stiffness_matrix/stiffness_matrix.py
M		extra_packages/traction-at-split-node-contact/src/functions/boundary_functions.cc
M		extra_packages/traction-at-split-node-contact/src/functions/boundary_functions.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_contact.cc
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_contact.cc
M		packages/cgal.cmake
M		packages/solid_mechanics.cmake
M		python/setup.py.in
M		python/swig/mesh.i
M		python/swig/model.i
M		python/swig/sparse_matrix.i
M		src/common/aka_array_tmpl.hh
M		src/common/aka_types.hh
M		src/common/aka_voigthelper_tmpl.hh
M		src/io/mesh_io.cc
M		src/io/mesh_io.hh
M		src/io/mesh_io/mesh_io_msh.cc
M		src/io/mesh_io/mesh_io_msh.hh
M		src/mesh/element_group.cc
M		src/mesh/element_group.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.hh
M		src/mesh/group_manager_inline_impl.cc
M		src/mesh/mesh.cc
M		src/mesh/mesh.hh
M		src/mesh/mesh_data.hh
M		src/mesh/mesh_data_tmpl.hh
M		src/mesh/node_group.hh
M		src/mesh_utils/mesh_partition.cc
M		src/mesh_utils/mesh_partition.hh
M		src/mesh_utils/mesh_partition/mesh_partition_mesh_data.cc
M		src/mesh_utils/mesh_partition/mesh_partition_mesh_data.hh
M		src/mesh_utils/mesh_partition/mesh_partition_scotch.cc
M		src/mesh_utils/mesh_partition/mesh_partition_scotch.hh
M		src/model/dof_manager.cc
M		src/model/dof_manager.hh
M		src/model/dof_manager_default.cc
M		src/model/dof_manager_default.hh
M		src/model/heat_transfer/heat_transfer_model.cc
M		src/model/model_solver.cc
M		src/model/solid_mechanics/material.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
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_tmpl.hh
M		src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive.cc
M		src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive.cc
M		src/model/solid_mechanics/solid_mechanics_model_embedded_interface/embedded_interface_intersector.cc
M		src/model/solid_mechanics/solid_mechanics_model_mass.cc
M		src/model/time_step_solver.hh
M		src/model/time_step_solvers/time_step_solver.cc
M		src/model/time_step_solvers/time_step_solver_default.cc
M		src/model/time_step_solvers/time_step_solver_default.hh
M		src/synchronizer/element_info_per_processor_tmpl.hh
M		src/synchronizer/master_element_info_per_processor.cc
M		src/synchronizer/node_info_per_processor.cc
M		test/CMakeLists.txt
M		test/ci/scripts/harbomaster/hbm.py
V		test/{ ← test_fe_engine}/pybind11_akantu.cc
V		test/{ ← test_fe_engine}/pybind11_akantu.hh
M		test/test_fe_engine/CMakeLists.txt
V		test/{test_fe_engine → }/pybind11_akantu.cc
V		test/{test_fe_engine → }/pybind11_akantu.hh
M		test/test_io/test_dumper/test_dumper.cc
M		test/test_io/test_parser/test_parser.verified
M		test/test_mesh_utils/test_mesh_iterators.cc
M		test/test_model/patch_tests/CMakeLists.txt
V		test/test_model/patch_tests/data/{material_anisotropic.dat → material_anisotropic_3.dat}
A		test/test_model/patch_tests/data/material_anisotropic_1.dat
A		test/test_model/patch_tests/data/material_anisotropic_2.dat
V		test/test_model/patch_tests/data/{material_anisotropic_3.dat ← material_anisotropic.dat}
A		test/test_model/patch_tests/patch_test_linear_anisotropic.cc
D		test/test_model/patch_tests/patch_test_linear_anisotropic_explicit.cc
M		test/test_model/patch_tests/patch_test_linear_fixture.hh
M		test/test_model/test_model_solver/test_dof_manager_default.cc
M		test/test_model/test_model_solver/test_model_solver_dynamic.cc
M		test/test_model/test_model_solver/test_model_solver_dynamic_explicit.verified
M		test/test_model/test_model_solver/test_model_solver_dynamic_implicit.verified
M		test/test_model/test_model_solver/test_model_solver_my_model.hh
M		test/test_model/test_non_local_toolbox/test_build_neighborhood_parallel.cc
M		test/test_model/test_non_local_toolbox/test_pair_computation.cc
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive.cc
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_materials/test_material_cohesive_fixture.hh
M		test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model.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_energies/test_solid_mechanics_model_work_dynamics.cc
M		test/test_model/test_solid_mechanics_model/test_energies/test_solid_mechanics_model_work_quasistatic.cc
M		test/test_model/test_solid_mechanics_model/test_materials/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_materials/py_mazars.py
M		test/test_model/test_solid_mechanics_model/test_materials/test_damage_materials.cc
M		test/test_model/test_solid_mechanics_model/test_materials/test_local_material.cc
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_elasto_plastic_linear_isotropic_hardening/test_material_elasto_plastic_linear_isotropic_hardening.cc
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_mazars.cc
M		test/test_model/test_structural_mechanics_model/test_structural_mechanics_model_bernoulli_beam_dynamics.cc
M		test/test_solver/test_sparse_matrix_product.verified
M		test/test_synchronizer/test_data_distribution.cc