Diffusion akantu 8e76908f420b

[wip] slowly correcting the merge and rebase errors
8e76908f420b
Actions

Authored by Nicolas Richart <networms@gmail.ch> on Oct 30 2021, 18:38.

Description

[wip] slowly correcting the merge and rebase errors

Details

Committed

Nicolas Richart <networms@gmail.ch>

Oct 31 2021, 21:06

Pushed

gitlab-richart

Mar 10 2023, 15:35

Parents

rAKA01141098e462: Merge remote-tracking branch 'origin/master' into features/eigen

Branches

Unknown

Tags

Unknown

Event Timeline

Nicolas Richart <networms@gmail.ch> committed rAKA8e76908f420b: [wip] slowly correcting the merge and rebase errors (authored by Nicolas Richart <networms@gmail.ch>).Oct 31 2021, 21:06

Changes (73)

				Path
	M			.gitignore
	M			python/akantu/__init__.py
	M			src/common/aka_array.hh
	M			src/common/aka_array_tmpl.hh
	M			src/common/aka_bbox.hh
	M			src/common/aka_common.hh
	M			src/common/aka_element_classes_info_inline_impl.hh
	M			src/common/aka_fwd.hh
	M			src/common/aka_math.hh
	M			src/common/aka_math_tmpl.hh
	M			src/common/aka_types.hh
	M			src/common/aka_types_eigen_matrix_base_plugin.hh
	M			src/common/aka_types_eigen_matrix_plugin.hh
	M			src/common/aka_view_iterators.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/element_classes/element_class_bernoulli_beam_inline_impl.hh
	M			src/fe_engine/element_classes/element_class_hermite_inline_impl.hh
	M			src/fe_engine/element_classes/element_class_kirchhoff_shell_inline_impl.hh
	M			src/fe_engine/element_classes/element_class_pentahedron_6_inline_impl.hh
	M			src/fe_engine/element_classes/element_class_quadrangle_8_inline_impl.hh
	M			src/fe_engine/element_classes/element_class_segment_3_inline_impl.hh
	M			src/fe_engine/element_classes/element_class_tetrahedron_10_inline_impl.hh
	M			src/fe_engine/element_classes/element_class_tetrahedron_4_inline_impl.hh
	M			src/fe_engine/element_classes/element_class_triangle_3_inline_impl.hh
	M			src/fe_engine/element_type_conversion.hh
	M			src/fe_engine/fe_engine.hh
	M			src/fe_engine/fe_engine_inline_impl.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_field.hh
	M			src/fe_engine/gauss_integration_tmpl.hh
	M			src/fe_engine/shape_functions.hh
	M			src/fe_engine/shape_functions_inline_impl.hh
	M			src/fe_engine/shape_lagrange.hh
	M			src/fe_engine/shape_lagrange_inline_impl.hh
	M			src/fe_engine/shape_structural.hh
	M			src/fe_engine/shape_structural_inline_impl.hh
	M			src/io/parser/parameter_registry_tmpl.hh
	M			src/mesh/element_group.hh
	M			src/mesh/element_group_inline_impl.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.hh
	M			src/mesh/mesh_accessor.hh
	M			src/mesh/mesh_inline_impl.hh
	M			src/mesh/node_group_inline_impl.hh
	M			src/mesh_utils/cohesive_element_inserter_helper.cc
	M			src/mesh_utils/cohesive_element_inserter_helper.hh
	M			src/model/common/boundary_condition/boundary_condition.hh
	M			src/model/common/boundary_condition/boundary_condition_functor.hh
	M			src/model/common/boundary_condition/boundary_condition_functor_inline_impl.hh
	M			src/model/common/dof_manager/dof_manager_inline_impl.hh
	M			src/model/model.hh
	M			src/model/solid_mechanics/material_selector_tmpl.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/solid_mechanics_model.hh
	M			src/model/solid_mechanics/solid_mechanics_model_cohesive/fragment_manager.cc
	M			src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_bilinear.cc
	M			src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_exponential.cc
	M			src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive.cc
	M			src/synchronizer/data_accessor.hh
	M			src/synchronizer/synchronizer_impl_tmpl.hh
	M			third-party/akantu_iterators/include/aka_tuple_tools.hh
	M			third-party/iohelper/src/dumper_lammps.hh
	M			third-party/iohelper/src/dumper_text.hh
	M			third-party/iohelper/src/field.hh
	M			third-party/iohelper/src/paraview_helper.hh
	M			third-party/iohelper/src/paraview_helper.tcc