conflict resolved in aka_common
5d33ff19c8e5
Actions

Authored by pundir on Sep 26 2018, 09:05.

Description

conflict resolved in aka_common

Committed

pundir

Sep 26 2018, 09:05

Pushed

gitlab-richart

Jul 29 2021, 09:01

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
33710fe43077	richart	Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private	Sep 25 2018
caa62dff9737	richart	Adding the mesh nodal data to the python interface	Sep 25 2018
ee46ef34e455	richart	Adding transform adaptor and nodedata in mesh data	Sep 12 2018

				Path
	M			CMakeLists.txt
	M			python/swig/akantu.i
	M			python/swig/mesh.i
	M			src/common/aka_common.hh
	M			src/common/aka_iterators.hh
	M			src/io/mesh_io/mesh_io_msh.cc
	M			src/mesh/group_manager.hh
	M			src/mesh/mesh.cc
	M			src/mesh/mesh.hh
	M			src/mesh/mesh_accessor.hh
	M			src/mesh/mesh_data.cc
	M			src/mesh/mesh_data.hh
	M			src/mesh/mesh_data_tmpl.hh
	M			src/mesh/mesh_inline_impl.cc
	M			src/mesh_utils/mesh_utils_distribution.cc
	M			src/model/solid_mechanics/solid_mechanics_model_embedded_interface/embedded_interface_intersector.cc
	M			src/synchronizer/communication_buffer.hh
	M			src/synchronizer/communication_buffer_inline_impl.cc
	M			src/synchronizer/communicator.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			src/synchronizer/node_info_per_processor.hh
	M			test/test_common/CMakeLists.txt
	D			test/test_common/test_arange_iterator.cc
	V			test/test_common/{test_iterators.cc ← test_zip_iterator.cc}
	V			test/test_common/{test_zip_iterator.cc → test_iterators.cc}
	M			test/test_fe_engine/test_fe_engine_precomputation_bernoulli_3.cc
	M			test/test_fe_engine/test_fe_engine_precomputation_structural.cc
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_element_matrix.cc
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model.cc
	M			test/test_model/test_structural_mechanics_model/test_structural_mechanics_model_bernoulli_beam_3.cc
	M			test/test_synchronizer/test_data_distribution.cc