Diffusion akantu 752fa47b5bbc

merge conflicts resolved
752fa47b5bbc
Actions

Authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> on Nov 15 2015, 17:35.

Description

merge conflicts resolved

Details

Committed

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>

Nov 15 2015, 17:35

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

rAKA40f7c5ee2446: python functor working even for external material
rAKAcdefe134a4ae: bug fixes to make Akantu compatible with IGFEM, function added in the SMM to…

Branches

Unknown

Tags

Unknown

Event Timeline

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> committed rAKA752fa47b5bbc: merge conflicts resolved (authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>).Nov 15 2015, 17:35

Merged Changes

Commit	Author	Details	Committed
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
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
6b327e1f666a	richart	Merge branch 'master' of gitolite-richart:akantu	Nov 11 2015
6b6225c5869e	richart	Small correction of the last commit	Nov 11 2015
cb5e7aa126d4	richart	Make the external package iohelper, scotch, mumps, blas compile on windows	Nov 11 2015
72a20029b64d	richart	Modifications to compile on windows	Nov 11 2015
dfbfe549cf81	richart	Split the parser to help with size of file at compile time	Nov 11 2015
ceb81d53fc1f	richart	Bug fix in the detection of functional	Nov 6 2015
484c1dcb5452	Clement Roux	clearer comment with example for Array::extendComponentsInterlaced	Nov 6 2015
1bd0eeb2bfc0	Clement Roux	Add comments and doc for mesh_data and aka_array	Nov 5 2015
685b0a21bea5	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Nov 3 2015
d9048c3b13d6	corrado	code cleaning in material_cohe_linear.cc e solid_mech_model_cohe_inline_impl.cc	Nov 3 2015
c2387764e747	richart	no c++ 11 compile problem solved	Oct 26 2015
f58b7e7a1b1e	richart	Merge branch 'master' of gitolite-richart:akantu	Oct 26 2015
cdf24a08a964	richart	Modification to make the hash pass compilation with c++11 deactivated	Oct 26 2015
40bd1a75a5fe	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 26 2015
df7b935848b4	Clement Roux	add comment to geometry sphere intersection	Oct 26 2015
f8d33c22597e	richart	Merge commit 'ef3eca4061c280c948785db522167dcc9c3ec5f2'	Oct 26 2015
ef3eca4061c2	richart	Squashed 'cmake/Modules/' changes from fe76bc7..0f6a2d4	Oct 26 2015
d9ed54eafe7f	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 26 2015
c8e1dfb24cc6	richart	ignoring archive files	Oct 26 2015
fb2184550fb1	richart	update submodules metadata	Oct 26 2015
60f4c5d05f97	richart	update submodules metadata	Oct 26 2015
7ee22d3d27da	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Oct 26 2015
2431278eaa7f	Clement Roux	addition of comments in fe_engine folder	Oct 22 2015
84a110bdcfb2	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Sep 28 2015
9b096fe6ea59	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Sep 23 2015
a5d41cf14191	corrado	modification to avoid to call computeEnergy inside the Newton-Raphson loop in…	Sep 23 2015
3483b09eff1b	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Aug 21 2015
16d6e7aa32ce	richart	Started advanced dumper section for user manual (ticket #59)	Aug 10 2015

Changes (82)

		Path
M		.gitignore
M		CMakeLists.txt
D		Makefile
M		cmake/AkantuCPack.cmake
M		cmake/AkantuMacros.cmake
M		cmake/AkantuPackagesSystem.cmake
M		cmake/Modules/CMakePackagesSystem.cmake
M		cmake/Modules/CMakePackagesSystemPrivateFunctions.cmake
M		doc/manual/manual-gettingstarted.tex
M	(sub)	extra_packages/traction-at-split-node-contact
P		packages/blas.cmake Copied to multiple locations: packages/python_interface.cmake packages/pythonlibs.cmake
M		packages/core.cmake
P		packages/python_interface.cmake Copied from packages/blas.cmake
P		packages/pythonlibs.cmake Copied from packages/blas.cmake
M		python/CMakeLists.txt
M		python/swig/aka_array.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/cohesive_element.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/fe_engine.hh
M		src/fe_engine/fe_engine_template.hh
M		src/fe_engine/integration_element.cc
M		src/fe_engine/integration_point.hh
M		src/fe_engine/integrator.hh
M		src/fe_engine/integrator_gauss.hh
M		src/fe_engine/shape_cohesive.hh
M		src/fe_engine/shape_functions.hh
M		src/fe_engine/shape_lagrange.hh
M		src/fe_engine/shape_linked.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/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
A		src/io/parser/parser_real.cc
A		src/io/parser/parser_types.cc
M		src/mesh/element_type_map_filter.hh
M		src/mesh/mesh_data.hh
M		src/mesh/mesh_data_tmpl.hh
M		src/mesh_utils/mesh_partition/mesh_partition_mesh_data.cc
A		src/model/boundary_condition_python_functor.cc
A		src/model/boundary_condition_python_functor.hh
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.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.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_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		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