Diffusion akantu 57fecf92275f

conflict fixed with master
57fecf92275f
Actions

Authored by pundir on Feb 1 2019, 16:39.

Description

conflict fixed with master

Details

Committed

pundir

Feb 1 2019, 16:39

Pushed

gitlab-richart

Jul 29 2021, 09:01

Parents

rAKA01db2b140172: some code cleaning
rAKA8b94894ba0b1: dumper fixed, added area multiplication in contact force

Branches

Unknown

Tags

Unknown

Event Timeline

pundir committed rAKA57fecf92275f: conflict fixed with master (authored by pundir).Feb 1 2019, 16:39

Merged Changes

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

Commit	Author	Details	Committed
01db2b140172	richart	some code cleaning	Jan 30 2019
05ddaf26a7c0	richart	zip cat iterator	Jan 30 2019
e6290e410ed8	richart	removing dead code	Jan 29 2019
dddb508f8340	richart	Bug fix in column iterator and some cleaning	Jan 29 2019
dfaa0e745adb	richart	Adding filtered iterator and zip iterator random_access possibility	Jan 29 2019
c46358f378c7	richart	pipefail illegal option...	Jan 29 2019
46d10f4b360e	richart	Proper way to set pipefail shell option	Jan 29 2019
25232ee996ec	richart	Factoring the tests	Jan 29 2019
402b15f3ac70	richart	Fighting to really make it fail urly	Jan 29 2019
0480e2e007db	richart	Do not try to continue if compilation error occurs	Jan 29 2019
b856484b2e49	richart	Missing arcanist dependencies	Jan 29 2019
b4c1554a7a84	richart	arcanist in the package of Dockerfile	Jan 29 2019
77b260d606a6	richart	Installing arcanist by hand in the dockerfile	Jan 29 2019
a0c78a6f504a	richart	Pushing file reports to harbormaster in case of failure	Jan 22 2019
3d5700f43abf	richart	Bug fix in heat transfer	Jan 22 2019
f959f4fd73d4	richart	Adding column iterator on Matrix	Jan 22 2019
6c6773b48d51	richart	Cleaning a bit the Jenkinsfile	Jan 21 2019
de1fca149331	richart	Adding linters in the dockerfile	Jan 18 2019
8497f13ab5d4	richart	Ok switch to stupid lint	Jan 17 2019
337d7cb4703a	richart	Escape character	Jan 17 2019
52b303457c87	richart	Typo in the Jenkinsfile	Jan 17 2019
216fea71cb16	richart	A bit more on the linter	Jan 17 2019
db395140fe3b	richart	Don't panic this will be linted next commit	Jan 16 2019
ac2cfab6b086	richart	Try harder	Jan 16 2019
862b37272e9c	richart	try not to fail all when only linter failed	Jan 16 2019
03d68138b9d4	richart	Adding linter informations	Jan 16 2019
bd9d307ba13b	richart	Copy past error	Jan 16 2019
34b9ed04e012	richart	Missing test case	Jan 15 2019
e2042f17f028	richart	Trying more fancy tests states	Jan 15 2019
c73a7d91b5d2	richart	Cleaning the debug messages	Jan 15 2019
7e1692a82d1c	richart	Still missing some info	Jan 15 2019
60469529da54	richart	This one should be the one	Jan 15 2019
0a84ba3e1fde	richart	Adding the hosts informations	Jan 15 2019
9348d7ed5ec8	richart	PYTHONPATH not set properly still	Jan 15 2019
cd0a6ed03ae8	richart	Typo	Jan 15 2019
2b0e2cd6be05	richart	Could not set the PATH in ci	Jan 15 2019
d30c58b4021e	richart	setting properly the environment variables in ci	Jan 15 2019
c6d666b494a5	richart	Missong python packages for the CI	Jan 15 2019
8bab54cdfa3c	richart	Cannot move the Jenkinsfile	Jan 15 2019
6d6bbb1d4058	richart	Wrote the ci scripts in python	Jan 15 2019
25a5bfbf725b	richart	Trying to submit test status to harbormaster	Jan 11 2019
7818b69865a3	richart	Cannot archive everything go with just the CTestResults.xml	Jan 10 2019
5a9112cb5d16	richart	Try again	Jan 10 2019
60d8fd947ba6	richart	Trying to upload file to Phabricator	Jan 10 2019
2caef23c150a	richart	still not proper synthax	Jan 10 2019
6064355745cb	richart	I will get the synthax right at a point	Jan 10 2019
0f156db592ee	richart	Typo correction	Jan 10 2019
b3f42f24a88c	richart	Trying to get jenkins to move a file	Jan 10 2019
03e2a74ccdd8	richart	Quoting properly stages in jenkinsfile	Jan 10 2019
5de0bc034157	richart	Updating jenkinsfile	Jan 10 2019

Changes (157)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.arcconfig
M		.arclint
M		CMakeLists.txt
V		{ → test/ci}/Dockerfile
M		Jenkinsfile
M		cmake/AkantuCleaning.cmake
M		cmake/AkantuExtraCompilationProfiles.cmake
M		cmake/akantu_environement.csh.in
M		cmake/akantu_environement.sh.in
P		examples/new_material/CMakeLists.txt Copied to examples/new_material/viscoelastic_maxwell/CMakeLists.txt
A	(dir)	examples/new_material/viscoelastic_maxwell/
P		examples/new_material/viscoelastic_maxwell/CMakeLists.txt Copied from examples/new_material/CMakeLists.txt
A		examples/new_material/viscoelastic_maxwell/material_viscoelastic_maxwell.dat
A		examples/new_material/viscoelastic_maxwell/material_viscoelastic_maxwell_energies.cc
A		examples/new_material/viscoelastic_maxwell/material_viscoelastic_maxwell_mesh.geo
M		extra_packages/traction-at-split-node-contact/src/boundary_conditions/force_based_dirichlet.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_coulomb.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_coulomb_tmpl.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_cohesive.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_cohesive_tmpl.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening_no_healing.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening_no_healing_tmpl.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening_tmpl.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_no_regularisation.cc
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_no_regularisation.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_rubin_ampuero.cc
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_rubin_ampuero.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_simplified_prakash_clifton.cc
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_simplified_prakash_clifton.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/mIIasym_contact.cc
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/mIIasym_contact.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_contact.cc
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_contact.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_friction.cc
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_friction.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/ntn_contact.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_friction.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_friction_tmpl.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_initiation_function.cc
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_initiation_function.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_contact.cc
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_contact.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_friction.hh
M		extra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_friction_tmpl.hh
M		packages/core.cmake
M		packages/solid_mechanics.cmake
M		python/setup.py.in
M		python/swig/aka_array.i
M		python/swig/mesh.i
M		python/swig/solid_mechanics_model_cohesive.i
M		src/CMakeLists.txt
M		src/common/aka_array_tmpl.hh
M		src/common/aka_bbox.hh
M		src/common/aka_common.hh
V		src/{common/aka_element_classes_info_inline_impl.cc ← io/mesh_io/mesh_io_abaqus.hh}
A		src/common/aka_enum_macros.hh
M		src/common/aka_iterators.hh
M		src/common/aka_math.cc
M		src/common/aka_types.hh
M		src/fe_engine/fe_engine_template.hh
M		src/fe_engine/fe_engine_template_tmpl.hh
M		src/fe_engine/shape_cohesive_inline_impl.cc
M		src/fe_engine/shape_functions.cc
M		src/fe_engine/shape_functions.hh
M		src/io/dumper/dumper_compute.hh
M		src/io/dumper/dumper_generic_elemental_field.hh
M		src/io/dumper/dumper_generic_elemental_field_tmpl.hh
M		src/io/dumper/dumper_homogenizing_field.hh
M		src/io/mesh_io.cc
M		src/io/mesh_io.hh
D		src/io/mesh_io/mesh_io_abaqus.cc
V		src/{io/mesh_io/mesh_io_abaqus.hh → common/aka_element_classes_info_inline_impl.cc}
M		src/io/mesh_io/mesh_io_diana.cc
M		src/io/mesh_io/mesh_io_msh.cc
M		src/io/parser/parameter_registry.hh
M		src/io/parser/parameter_registry_tmpl.hh
M		src/io/parser/parser.hh
M		src/mesh/element_group.cc
M		src/mesh/element_group.hh
M		src/mesh/element_group_inline_impl.cc
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/group_manager.cc
M		src/mesh/group_manager.hh
M		src/mesh/mesh.cc
M		src/mesh/mesh.hh
M		src/mesh/mesh_inline_impl.cc
M		src/mesh_utils/cohesive_element_inserter.cc
M		src/mesh_utils/cohesive_element_inserter.hh
M		src/mesh_utils/global_ids_updater.cc
M		src/mesh_utils/global_ids_updater_inline_impl.cc
M		src/mesh_utils/mesh_partition/mesh_partition_scotch.cc
M		src/mesh_utils/mesh_utils.cc
M		src/model/common/neighborhoods_criterion_evaluation/neighborhood_max_criterion.cc
M		src/model/heat_transfer/heat_transfer_model.cc
M		src/model/non_linear_solver_lumped.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/materials/internal_field.hh
M		src/model/solid_mechanics/materials/internal_field_tmpl.hh
M		src/model/solid_mechanics/materials/material_damage/material_damage_tmpl.hh
M		src/model/solid_mechanics/materials/material_plastic/material_linear_isotropic_hardening.cc
M		src/model/solid_mechanics/materials/material_python/material_python.cc
A		src/model/solid_mechanics/materials/material_viscoelastic/material_viscoelastic_maxwell.cc
A		src/model/solid_mechanics/materials/material_viscoelastic/material_viscoelastic_maxwell.hh
M		src/model/solid_mechanics/materials/plane_stress_toolbox_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/fragment_manager.cc
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_cohesive/solid_mechanics_model_cohesive.hh
M		src/synchronizer/communicator.cc
M		src/synchronizer/communicator.hh
M		src/synchronizer/communicator_dummy_inline_impl.cc
M		src/synchronizer/communicator_mpi_inline_impl.cc
M		src/synchronizer/master_element_info_per_processor.cc
M		src/synchronizer/node_info_per_processor.cc
M		src/synchronizer/node_synchronizer.cc
M		src/synchronizer/slave_element_info_per_processor.cc
A	(dir)	test/ci/
V		{test/ci ← }/Dockerfile
A	(dir)	test/ci/scripts/
A		test/ci/scripts/CTestResults.xml
A	(dir)	test/ci/scripts/harbomaster/
A		test/ci/scripts/harbomaster/__init__.py
A		test/ci/scripts/harbomaster/arclint.py
A		test/ci/scripts/harbomaster/ctestresults.py
A		test/ci/scripts/harbomaster/hbm.py
A		test/ci/scripts/harbomaster/results.py
A		test/ci/scripts/hbm
M		test/test_common/test_grid.cc
M		test/test_common/test_iterators.cc
M		test/test_common/test_tensors.cc
M		test/test_fe_engine/test_facet_element_mapping.cc
M		test/test_mesh/CMakeLists.txt
M		test/test_mesh_utils/test_mesh_io/test_mesh_io_msh_physical_names.cc
M		test/test_mesh_utils/test_mesh_partitionate/test_mesh_partitionate_mesh_data.cc
M		test/test_mesh_utils/test_mesh_partitionate/test_mesh_partitionate_scotch.cc
M		test/test_model/test_model_solver/test_model_solver_dynamic.cc
M		test/test_model/test_solid_mechanics_model/test_cohesive/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_cohesive/material_0_finite_def.dat
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive.cc
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_fixture.hh
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_insertion/test_cohesive_insertion_along_physical_surfaces.cc
M		test/test_model/test_solid_mechanics_model/test_materials/CMakeLists.txt
A	(dir)	test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic_maxwell/
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic_maxwell/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic_maxwell/material_viscoelastic_maxwell.dat
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic_maxwell/test_material_viscoelastic_maxwell.geo
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic_maxwell/test_material_viscoelastic_maxwell_relaxation.cc
M		test/test_model/test_solid_mechanics_model/test_materials/test_multi_material_elastic.cc
M		test/test_model/test_solid_mechanics_model/test_solid_mechanics_model_reassign_material.cc