Diffusion akantu 3415d2204cd2

Merge branch 'master' of lsmssrv1.epfl.ch:akantu
3415d2204cd2
Actions

Authored by richart on Nov 19 2015, 14:44.

Description

Merge branch 'master' of lsmssrv1.epfl.ch:akantu

Details

Committed

richart

Nov 19 2015, 14:44

Pushed

richart	Dec 6 2019, 13:35
richart	Dec 6 2019, 13:16
richart	Dec 6 2019, 12:16
richart	Dec 6 2019, 11:45
richart	Dec 5 2019, 22:54
richart	Dec 5 2019, 18:45

Parents

rAKA5462986a7ed5: Bug fixes + little improvements
rAKA7f9872a216df: Merge branch 'master' of lsmssrv1.epfl.ch:akantu

Branches

Unknown

Tags

Unknown

Event Timeline

richart committed rAKA3415d2204cd2: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by richart).Nov 19 2015, 14:44

Merged Changes

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

Commit	Author	Details	Committed
7f9872a216df	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
0caf6bbc28fd	Aurelia Cuba Ramos	corrected element kind error	Nov 18 2015
983f668d7076	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
0d9183b269ba	Clement Roux	proper computation of external work in statics	Nov 18 2015
180e51641dc5	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
6f79f8185b2b	Aurelia Cuba Ramos	bug fixes in material cohesive to make it compatible with the changes in the…	Nov 18 2015
2e3fbd5b8ea4	anciaux	remove a warning	Nov 18 2015
b894062ef5c3	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
f99ec6f3a21e	richart	extra package phase field	Nov 18 2015
1aa749cbda83	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
d3c037e5c1cc	richart	adding phase field submodule	Nov 18 2015
4af6b43d250f	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 18 2015
3fba4c153a26	Clement Roux	remove unused event in material	Nov 18 2015
731f0215d81a	richart	update meta data of submodules	Nov 18 2015
c51065c4b102	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 17 2015
46bb55aa2e82	Aurelia Cuba Ramos	bug fix in flattenInternal() to make it work, even if non of the materials on…	Nov 17 2015
f6e83356c2f8	fabarras	cleaning dead code	Nov 17 2015
53fc0c18aa45	fabarras	update pointers to submodules	Nov 17 2015
c391c592eef8	fabarras	ticket #71 trial of removing dead contact code	Nov 17 2015
1bd87fa434b2	richart	Missing files + small improvements	Nov 16 2015
ad4305075b56	richart	Merge branch 'master' of gitolite-richart:akantu	Nov 16 2015
cabbb9b7fa37	richart	Moving code python code out of akantu API + minor cleaning	Nov 16 2015
07b1707279be	richart	Improvement of the package system: callback + potential bug correction +…	Nov 16 2015
3c634b2239b4	kammer	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 16 2015
f1a305bc15d8	kammer	save matrix M and K for parallel	Nov 16 2015
0f184b143f5d	kammer	correct profile creation with pbc in parallel	Nov 16 2015
830830836c82	richart	Merge branch 'master' of gitolite-richart:akantu	Nov 16 2015
4f1173ed1724	richart	Correction of the cmake instlude for user examples	Nov 16 2015
bb98fd1fc8eb	Aurelia Cuba Ramos	merging of mesh-sphere intersector	Nov 15 2015
752fa47b5bbc	Aurelia Cuba Ramos	merge conflicts resolved	Nov 15 2015
cdefe134a4ae	Aurelia Cuba Ramos	bug fixes to make Akantu compatible with IGFEM, function added in the SMM to…	Nov 15 2015
40f7c5ee2446	anciaux	python functor working even for external material	Nov 15 2015
78fc2376708c	anciaux	example of a material entirely in python	Nov 13 2015
82f5d11da20a	anciaux	factor the python wrapper code to reuse for the material or others: C++11…	Nov 13 2015
6d4e9182b691	anciaux	modifying the package for python materials	Nov 12 2015
a09aa4f1eec4	anciaux	Merge branch 'master' of gitolite:akantu	Nov 12 2015
f6e87d206662	richart	bug fix in python cmake	Nov 12 2015
75c9b3cb5d60	richart	Compilation correction + bug fix in python cmake	Nov 11 2015
7f95a9a09872	richart	binary packages corrected, python almost compiling on windows	Nov 11 2015
d0fa3fc75064	anciaux	adding the working version for the dirichlet functors with python	Nov 11 2015
a3a96ce12c4b	richart	begining of reabilitating make install and cpack	Nov 11 2015
ed8d6aead3cc	richart	creating proper python packages	Nov 11 2015
08d9b45ab329	kammer	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 11 2015
f9b7627b2be0	kammer	correct of global equation number used for parallel computations... does still…	Nov 11 2015
85cb1a83da47	kammer	small improvements about what is printed in various dbl levels	Nov 11 2015
4e5e64db9477	anciaux	Merge branch 'master' of gitolite:akantu	Nov 11 2015
d5f88fe07615	anciaux	adding the python BC feature	Nov 11 2015
73975c226f7a	anciaux	adding the python BC feature	Nov 11 2015
7558dd5511a8	richart	bug fix due to parser.cc separation	Nov 11 2015
2f789573de72	richart	new commits in submodule	Nov 11 2015

Changes (110)

		Path
M		.gitignore
M		.gitmodules
M		CMakeLists.txt
D		Makefile
M		cmake/AkantuCPack.cmake
M		cmake/AkantuConfig.cmake.in
M		cmake/AkantuMacros.cmake
M		cmake/AkantuPackagesSystem.cmake
M		cmake/Modules/CMakePackagesSystem.cmake
M		cmake/Modules/CMakePackagesSystemGlobalFunctions.cmake
M		cmake/Modules/CMakePackagesSystemPrivateFunctions.cmake
M		cmake/Modules/FindMumps.cmake
A		cmake/Modules/FindNumpy.cmake
M		cmake/Modules/FindScotch.cmake
M		doc/manual/manual-gettingstarted.tex
M	(sub)	extra_packages/extra-materials
A	(sub)	extra_packages/phase-field
M		packages/blas.cmake
M		packages/contact.cmake
M		packages/core.cmake
P		packages/mpi.cmake Copied to multiple locations: packages/python_interface.cmake packages/pythonlibs.cmake
A		packages/numpy.cmake
P		packages/python_interface.cmake Copied from packages/mpi.cmake
P		packages/pythonlibs.cmake Copied from packages/mpi.cmake
M		packages/scotch.cmake
M		python/CMakeLists.txt
M		python/swig/aka_array.i
M		python/swig/aka_common.i
M		python/swig/aka_csr.i
M		python/swig/akantu.i
M		python/swig/model.i
M		python/swig/solid_mechanics_model.i
M		src/CMakeLists.txt
M		src/common/aka_array.hh
M		src/common/aka_array_tmpl.hh
M		src/common/aka_common.cc
M		src/common/aka_common.hh
M		src/common/aka_config.hh.in
M		src/common/aka_error.cc
M		src/common/aka_extern.cc
M		src/common/aka_random_generator.hh
M		src/fe_engine/fe_engine_template_tmpl.hh
M		src/fe_engine/integration_element.cc
M		src/fe_engine/integration_point.hh
M		src/fe_engine/shape_lagrange.hh
M		src/geometry/mesh_abstract_intersector.hh
M		src/geometry/mesh_sphere_intersector.hh
M		src/geometry/mesh_sphere_intersector_tmpl.hh
M		src/io/dumper/dumpable.cc
M		src/io/dumper/dumpable_inline_impl.hh
M		src/io/dumper/dumper_compute.hh
M		src/io/parser/algebraic_parser.hh
M		src/io/parser/cppargparse/cppargparse.cc
M		src/io/parser/parser.cc
A		src/io/parser/parser_grammar_tmpl.hh
A		src/io/parser/parser_input_files.cc
A		src/io/parser/parser_random.cc
P		src/io/parser/parser_real.cc Copied from src/model/solid_mechanics/materials/material_non_local_includes.hh
A		src/io/parser/parser_types.cc
M		src/mesh/element_type_map_filter.hh
M		src/mesh/group_manager.hh
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_partition/mesh_partition_mesh_data.cc
M		src/mesh_utils/mesh_utils.cc
P		src/model/boundary_condition_python_functor.cc Copied from src/model/solid_mechanics/materials/material_non_local_includes.hh
A		src/model/boundary_condition_python_functor.hh
M		src/model/common/non_local_toolbox/non_local_manager.cc
D		src/model/contact_manager0.hh
M		src/model/model.cc
M		src/model/model_inline_impl.cc
D		src/model/model_manager.cc
D		src/model/model_manager.hh
M		src/model/solid_mechanics/material.cc
M		src/model/solid_mechanics/material.hh
M		src/model/solid_mechanics/material_selector.hh
M		src/model/solid_mechanics/materials/internal_field_tmpl.hh
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.cc
M		src/model/solid_mechanics/materials/material_cohesive/material_cohesive.cc
M		src/model/solid_mechanics/materials/material_elastic.hh
M		src/model/solid_mechanics/materials/material_non_local.cc
P		src/model/solid_mechanics/materials/material_non_local_includes.hh Copied to multiple locations: src/io/parser/parser_real.cc src/model/boundary_condition_python_functor.cc
A	(dir)	src/model/solid_mechanics/materials/material_python/
A		src/model/solid_mechanics/materials/material_python/material_python.cc
A		src/model/solid_mechanics/materials/material_python/material_python.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.cc
M		src/model/solid_mechanics/solid_mechanics_model_cohesive_inline_impl.cc
M		src/model/solid_mechanics/solid_mechanics_model_inline_impl.cc
M		src/model/solid_mechanics/solid_mechanics_model_material.cc
M		src/model/solid_mechanics/solid_mechanics_model_tmpl.hh
A	(dir)	src/python/
A		src/python/python_functor.cc
A		src/python/python_functor.hh
A		src/python/python_functor_inline_impl.cc
M		src/solver/sparse_matrix.cc
M		test/test_solver/test_petsc_matrix_apply_boundary.cc
M		test/test_solver/test_petsc_matrix_diagonal.cc
M		test/test_solver/test_solver_petsc.cc
M		third-party/MUMPS_4.10.0_make.inc.cmake
M		third-party/MUMPS_4.9.2_make.inc.cmake
A		third-party/blas_3.5.0_make.inc.cmake
A		third-party/cmake/blas.cmake
M		third-party/cmake/iohelper.cmake
M		third-party/cmake/mumps.cmake
M		third-party/cmake/scotch.cmake
M		third-party/scotch_5.1.12b.patch
M		third-party/scotch_5.1.12b_make.inc.cmake