Diffusion akantu 1084411c62c6

conflict fixed with master
1084411c62c6
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

Jan 18 2021, 21:10

Parents

rAKA96b76d05767b: dumper fixed, added area multiplication in contact force
rAKA832d879319a6: some code cleaning

Branches

Unknown

Tags

Unknown

Event Timeline

pundir committed rAKA1084411c62c6: 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
832d879319a6	richart	some code cleaning	Jan 30 2019
5adae7dba462	richart	zip cat iterator	Jan 30 2019
1c60fe620524	richart	removing dead code	Jan 29 2019
4ffeb75ecfda	richart	Bug fix in column iterator and some cleaning	Jan 29 2019
3ceff0e60343	richart	Adding filtered iterator and zip iterator random_access possibility	Jan 29 2019
40783bf8df0e	richart	pipefail illegal option...	Jan 29 2019
8fa1db0f5b25	richart	Proper way to set pipefail shell option	Jan 29 2019
957db5e53127	richart	Factoring the tests	Jan 29 2019
93c5feeceadd	richart	Fighting to really make it fail urly	Jan 29 2019
204794a30ebd	richart	Do not try to continue if compilation error occurs	Jan 29 2019
602986794a95	richart	Missing arcanist dependencies	Jan 29 2019
7e77c430d622	richart	arcanist in the package of Dockerfile	Jan 29 2019
d0b37677147c	richart	Installing arcanist by hand in the dockerfile	Jan 29 2019
f429b1448a8a	richart	Pushing file reports to harbormaster in case of failure	Jan 22 2019
ca4fcfd6ba44	richart	Bug fix in heat transfer	Jan 22 2019
079fccbb5a42	richart	Adding column iterator on Matrix	Jan 22 2019
89dc921702b7	richart	Cleaning a bit the Jenkinsfile	Jan 21 2019
b3edd5d0b34d	richart	Adding linters in the dockerfile	Jan 18 2019
3478848b0145	richart	Ok switch to stupid lint	Jan 17 2019
4619ca8a2117	richart	Escape character	Jan 17 2019
2e32ebcb2e97	richart	Typo in the Jenkinsfile	Jan 17 2019
7dc72e378d3b	richart	A bit more on the linter	Jan 17 2019
1c327375818a	richart	Don't panic this will be linted next commit	Jan 16 2019
a40bfbf82923	richart	Try harder	Jan 16 2019
6f9525737c2e	richart	try not to fail all when only linter failed	Jan 16 2019
51dd90a78f08	richart	Adding linter informations	Jan 16 2019
c9e08c9d3bdb	richart	Copy past error	Jan 16 2019
a57e329353e0	richart	Missing test case	Jan 15 2019
dbfc4e205dda	richart	Trying more fancy tests states	Jan 15 2019
550a9c411591	richart	Cleaning the debug messages	Jan 15 2019
6082dc7d3f05	richart	Still missing some info	Jan 15 2019
0eabd86736a9	richart	This one should be the one	Jan 15 2019
b14a84cff3ab	richart	Adding the hosts informations	Jan 15 2019
f88f74a5f832	richart	PYTHONPATH not set properly still	Jan 15 2019
4db3886fd28e	richart	Typo	Jan 15 2019
ab2aec00e5f4	richart	Could not set the PATH in ci	Jan 15 2019
d90ed65428c7	richart	setting properly the environment variables in ci	Jan 15 2019
5c04545be6c0	richart	Missong python packages for the CI	Jan 15 2019
e84efcd2368d	richart	Cannot move the Jenkinsfile	Jan 15 2019
e6ee3b6c943b	richart	Wrote the ci scripts in python	Jan 15 2019
5bd9a2a05d66	richart	Trying to submit test status to harbormaster	Jan 11 2019
32a55a93b9e3	richart	Cannot archive everything go with just the CTestResults.xml	Jan 10 2019
2bd8e9b02378	richart	Try again	Jan 10 2019
67fb3d3fdeed	richart	Trying to upload file to Phabricator	Jan 10 2019
b657b96f0c08	richart	still not proper synthax	Jan 10 2019
179c11d6390f	richart	I will get the synthax right at a point	Jan 10 2019
f0f686e86b97	richart	Typo correction	Jan 10 2019
c5014494e206	richart	Trying to get jenkins to move a file	Jan 10 2019
2402e0238e70	richart	Quoting properly stages in jenkinsfile	Jan 10 2019
ca61641b304b	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