Merge branch 'master' muSpectre into feat/repair_intersection_octree
b697b43ec9f0
Actions

Authored by afalsafi on Sep 7 2018, 11:23.

Description

Merge branch 'master' muSpectre into feat/repair_intersection_octree

Committed

afalsafi

Sep 7 2018, 11:23

Pushed

afalsafi

Sep 11 2018, 11:29

Parents

Branches

Unknown

Tags

Unknown

Restricted Application failed to build Restricted Buildable!Sep 11 2018, 11:35

Commit		Author	Details	Committed
e63cff03513f		junge	updated dependencies and tutorial example	Sep 5 2018
f6a48a433ed5	D198	junge	Updated examples for new material names	Sep 5 2018
2fc6050971d8	D190	junge	Statefields integrated with regular fields + python bindings	Jul 24 2018
02acebee7766		junge	Trigger readthedocs through Jenkins	Jun 18 2018
5628cb16c27f	D189	junge	Fixed documentation build on readthedocs.io	Jun 18 2018

				Path
	M			Jenkinsfile
	M			bin/hyper-elasticity.py
	M			bin/small_case.py
	M			bin/tutorial_example.py
	M			doc/dev-docs/requirements.txt
	M			doc/dev-docs/source/CodingConvention.rst
	M			doc/dev-docs/source/Doxyfile
	M			doc/dev-docs/source/GettingStarted.rst
	M			doc/dev-docs/source/conf.py
	M			language_bindings/python/CMakeLists.txt
	M			language_bindings/python/bind_py_cell.cc
	M			language_bindings/python/bind_py_declarations.hh
	A			language_bindings/python/bind_py_field_collection.cc
	M			language_bindings/python/bind_py_material.cc
	M			language_bindings/python/bind_py_module.cc
	M			src/common/field.hh
	M			src/common/field_base.hh
	M			src/common/field_collection_base.hh
	M			src/common/field_map_base.hh
	M			src/common/field_map_matrixlike.hh
	M			src/common/field_typed.hh
	M			src/common/statefield.hh
	M			src/common/utilities.hh
	M			src/materials/material_base.hh
	M			src/materials/material_hyper_elasto_plastic1.cc
	M			src/materials/material_hyper_elasto_plastic1.hh
	M			src/materials/material_linear_elastic1.hh
	M			src/materials/material_linear_elastic2.hh
	M			src/materials/material_linear_elastic3.hh
	M			src/materials/material_linear_elastic4.hh
	M			src/solver/solver_base.cc
	M			src/solver/solver_base.hh
	M			src/solver/solver_cg.cc
	M			src/solver/solver_cg.hh
	M			src/solver/solver_common.cc
	M			src/solver/solver_eigen.cc
	M			src/solver/solver_eigen.hh
	M			src/solver/solvers.cc
	M			src/solver/solvers.hh
	M			tests/python_binding_tests.py
	A			tests/python_field_tests.py
	M			tests/test_field_collections_1.cc
	M			tests/test_field_collections_3.cc
	M			tests/test_material_hyper_elasto_plastic1.cc
	M			tests/test_statefields.cc