Merge branch 'master' into feat/documentation
4e46acacb3cc
Actions

Authored by junge on Dec 8 2018, 11:44.

Description

Merge branch 'master' into feat/documentation

Details

Committed

junge

Dec 8 2018, 11:44

Pushed

junge

Dec 8 2018, 11:44

Parents

rMUSPECTRE293be346d221: License switch to LGPL
rMUSPECTRE1dd82467c304: yet another typo

Branches

Unknown

Tags

Unknown

References

feat/documentation

Event Timeline

junge committed rMUSPECTRE4e46acacb3cc: Merge branch 'master' into feat/documentation (authored by junge).Dec 8 2018, 11:44

Restricted Application completed building Restricted Buildable.Dec 8 2018, 12:13

Merged Changes

Commit		Author	Details	Committed
293be346d221	D211	junge	License switch to LGPL	Nov 20 2018
a2e8eb123503	D204	junge/muSpectre-bot	Fixed left-over instances of old, wrong license text	Oct 14 2018
91baed3bdbb9	D203	junge	Fixed License (referred to Emacs rather than µSpectre in places)	Oct 12 2018
40e173511de9	D201	junge	MAINT: Updated pfft engine to new fft engine interface.	Oct 5 2018
c2e4b509a217		junge	ported back relevant parts of muLib integration	Oct 4 2018
46721b412ed9	D199	junge	Enumerable Dynamic Field Maps and Globalisation of Local Fields	Sep 20 2018
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

Changes (180)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	A			"snippets/\302\265Spectre_cmake_header"
	M			"snippets/\302\265Spectre_cpp_header"
	M			"snippets/\302\265Spectre_py_header"
	M			CMakeLists.txt
	P			GLPv3 Copied from LICENSE
	M			Jenkinsfile
	P			LICENSE Copied to GLPv3
	M			bin/demonstrator1.cc
	M			bin/demonstrator2.cc
	M			bin/demonstrator_dynamic_solve.cc
	M			bin/demonstrator_mpi.cc
	M			bin/hyper-elasticity.cc
	M			bin/hyper-elasticity.py
	M			bin/small_case.cc
	M			bin/small_case.py
	M			bin/tutorial_example.py
	M			cmake/muspectreTools.cmake
	M			doc/CMakeLists.txt
	M			doc/dev-docs/source/CodingConvention.rst
	M			doc/dev-docs/source/GettingStarted.rst
	M			doc/dev-docs/source/License.rst
	M			doc/dev-docs/source/conf.py
	M			doc/dev-docs/source/index.rst
	M			language_bindings/CMakeLists.txt
	M			language_bindings/python/CMakeLists.txt
	M			language_bindings/python/bind_py_cell.cc
	M			language_bindings/python/bind_py_common.cc
	M			language_bindings/python/bind_py_declarations.hh
	M			language_bindings/python/bind_py_fftengine.cc
	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			language_bindings/python/bind_py_projections.cc
	M			language_bindings/python/bind_py_solvers.cc
	M			language_bindings/python/muSpectre/__init__.py
	M			language_bindings/python/muSpectre/fft.py
	M			src/CMakeLists.txt
	M			src/cell/CMakeLists.txt
	M			src/cell/cell_base.cc
	M			src/cell/cell_base.hh
	M			src/cell/cell_factory.hh
	M			src/cell/cell_traits.hh
	M			src/common/CMakeLists.txt
	M			src/common/T4_map_proxy.hh
	M			src/common/ccoord_operations.hh
	M			src/common/common.cc
	M			src/common/common.hh
	M			src/common/communicator.hh
	M			src/common/eigen_tools.hh
	M			src/common/field.hh
	M			src/common/field_base.hh
	M			src/common/field_collection.hh
	M			src/common/field_collection_base.hh
	M			src/common/field_collection_global.hh
	M			src/common/field_collection_local.hh
	A			src/common/field_helpers.hh
	M			src/common/field_map.hh
	M			src/common/field_map_base.hh
	A			src/common/field_map_dynamic.hh
	M			src/common/field_map_matrixlike.hh
	M			src/common/field_map_scalar.hh
	M			src/common/field_map_tensor.hh
	M			src/common/field_typed.hh
	M			src/common/statefield.hh
	M			src/common/tensor_algebra.hh
	M			src/common/utilities.hh
	D			src/common/voigt_conversion.cc
	M			src/common/voigt_conversion.hh
	M			src/fft/CMakeLists.txt
	M			src/fft/fft_engine_base.cc
	M			src/fft/fft_engine_base.hh
	M			src/fft/fft_utils.cc
	M			src/fft/fft_utils.hh
	M			src/fft/fftw_engine.cc
	M			src/fft/fftw_engine.hh
	M			src/fft/fftwmpi_engine.cc
	M			src/fft/fftwmpi_engine.hh
	M			src/fft/pfft_engine.cc
	M			src/fft/pfft_engine.hh
	M			src/fft/projection_base.cc
	M			src/fft/projection_base.hh
	M			src/fft/projection_default.cc
	M			src/fft/projection_default.hh
	M			src/fft/projection_finite_strain.cc
	M			src/fft/projection_finite_strain.hh
	M			src/fft/projection_finite_strain_fast.cc
	M			src/fft/projection_finite_strain_fast.hh
	M			src/fft/projection_small_strain.cc
	M			src/fft/projection_small_strain.hh
	M			src/materials/CMakeLists.txt
	M			src/materials/material_base.cc
	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.cc
	M			src/materials/material_linear_elastic1.hh
	M			src/materials/material_linear_elastic2.cc
	M			src/materials/material_linear_elastic2.hh
	M			src/materials/material_linear_elastic3.cc
	M			src/materials/material_linear_elastic3.hh
	M			src/materials/material_linear_elastic4.cc
	M			src/materials/material_linear_elastic4.hh
	A			src/materials/material_linear_elastic_generic.cc
	A			src/materials/material_linear_elastic_generic.hh
	M			src/materials/material_muSpectre_base.hh
	M			src/materials/materials_toolbox.hh
	M			src/solver/CMakeLists.txt
	M			src/solver/deprecated_solver_base.cc
	M			src/solver/deprecated_solver_base.hh
	M			src/solver/deprecated_solver_cg.cc
	M			src/solver/deprecated_solver_cg.hh
	M			src/solver/deprecated_solver_cg_eigen.cc
	M			src/solver/deprecated_solver_cg_eigen.hh
	M			src/solver/deprecated_solvers.cc
	M			src/solver/deprecated_solvers.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_common.hh
	M			src/solver/solver_eigen.cc
	M			src/solver/solver_eigen.hh
	M			src/solver/solvers.cc
	M			src/solver/solvers.hh
	V			tests/{header_test_ccoord_operations.cc ← test_ccoord_operations.cc}
	V			tests/{header_test_eigen_tools.cc ← test_eigen_tools.cc}
	A			tests/header_test_field_collections.cc
	V			tests/{header_test_fields.cc ← test_fields.cc}
	V			tests/{header_test_raw_field_map.cc ← test_raw_field_map.cc}
	V			tests/{header_test_statefields.cc ← test_statefields.cc}
	V			tests/{header_test_t4_map.cc ← test_t4_map.cc}
	V			tests/{header_test_tensor_algebra.cc ← test_tensor_algebra.cc}
	M			tests/main_test_suite.cc
	M			tests/mpi_context.hh
	M			tests/mpi_main_test_suite.cc
	M			tests/mpi_test_fft_engine.cc
	M			tests/mpi_test_projection.hh
	M			tests/mpi_test_projection_finite.cc
	M			tests/mpi_test_projection_small.cc
	M			tests/mpi_test_solver_newton_cg.cc
	M			tests/python_binding_tests.py
	M			tests/python_fft_tests.py
	A			tests/python_field_tests.py
	M			tests/python_goose_ref.py
	M			tests/python_material_linear_elastic3_test.py
	M			tests/python_material_linear_elastic4_test.py
	M			tests/python_mpi_binding_tests.py
	M			tests/python_mpi_material_linear_elastic4_test.py
	M			tests/python_mpi_projection_tests.py
	M			tests/python_projection_tests.py
	M			tests/python_test_imports.py
	M			tests/test_base.cc
	V			tests/{test_ccoord_operations.cc → header_test_ccoord_operations.cc}
	M			tests/test_cell_base.cc
	V			tests/{test_eigen_tools.cc → header_test_eigen_tools.cc}
	M			tests/test_fft_utils.cc
	M			tests/test_fftw_engine.cc
	M			tests/test_field_collections.hh
	D			tests/test_field_collections_1.cc
	D			tests/test_field_collections_2.cc
	D			tests/test_field_collections_3.cc
	V			tests/{test_fields.cc → header_test_fields.cc}
	M			tests/test_goodies.hh
	M			tests/test_material_hyper_elasto_plastic1.cc
	M			tests/test_material_linear_elastic1.cc
	M			tests/test_material_linear_elastic2.cc
	M			tests/test_material_linear_elastic3.cc
	M			tests/test_material_linear_elastic4.cc
	A			tests/test_material_linear_elastic_generic.cc
	M			tests/test_materials_toolbox.cc
	M			tests/test_projection.hh
	M			tests/test_projection_finite.cc
	M			tests/test_projection_small.cc
	V			tests/{test_raw_field_map.cc → header_test_raw_field_map.cc}
	M			tests/test_solver_newton_cg.cc
	V			tests/{test_statefields.cc → header_test_statefields.cc}
	V			tests/{test_t4_map.cc → header_test_t4_map.cc}
	V			tests/{test_tensor_algebra.cc → header_test_tensor_algebra.cc}
	M			tests/tests.hh