MAINT:Merge branch 'master' into feat/crystal_plasticity_finite
a476d861d2e3
Actions

Authored by junge on Dec 12 2018, 13:31.

Description

MAINT:Merge branch 'master' into feat/crystal_plasticity_finite

Details

Committed

junge

Dec 12 2018, 15:18

Pushed

junge

Dec 12 2018, 15:18

Parents

rMUSPECTRE3d364d237a5f: MAINT: pre-merge clang format
rMUSPECTREbdcd2d2db5b4: linted entire c++ code base, added clang-format config and cpplint

Branches

Unknown

Tags

Unknown

Event Timeline

junge committed rMUSPECTREa476d861d2e3: MAINT:Merge branch 'master' into feat/crystal_plasticity_finite (authored by junge).Dec 12 2018, 15:18

Restricted Application completed building Restricted Buildable.Dec 12 2018, 16:36

Merged Changes

Commit		Author	Details	Committed
bdcd2d2db5b4	D226	junge/muSpectre-bot	linted entire c++ code base, added clang-format config and cpplint	Dec 12 2018
efec0cbbf093	D227	pastewka	MAINT: Fixes on OS X - exclude deprecation warnings in pybind11 and add library…	Dec 11 2018
46632033a7cc		junge	minor comment change	Dec 9 2018

Changes (155)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	A			.clang-format
	M			CMakeLists.txt
	A			CPPLINT.cfg
	M			bin/demonstrator1.cc
	M			bin/demonstrator2.cc
	M			bin/demonstrator_dynamic_solve.cc
	M			bin/demonstrator_mpi.cc
	A			bin/elasto_plastic_comparison.py
	M			bin/hyper-elasticity.cc
	M			bin/small_case.cc
	A			cmake/cpplint.cmake
	M			dockerfiles/docker_debian_stable
	M			dockerfiles/docker_debian_testing
	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
	M			language_bindings/python/bind_py_field_collection.cc
	M			language_bindings/python/bind_py_material.cc
	M			language_bindings/python/bind_py_material_crystal_plasticity_finite.cc
	M			language_bindings/python/bind_py_material_hyper_elasto_plastic1.cc
	M			language_bindings/python/bind_py_material_linear_elastic1.cc
	M			language_bindings/python/bind_py_material_linear_elastic2.cc
	M			language_bindings/python/bind_py_material_linear_elastic3.cc
	M			language_bindings/python/bind_py_material_linear_elastic4.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			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/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
	M			src/common/field_helpers.hh
	M			src/common/field_map.hh
	M			src/common/field_map_base.hh
	M			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/geometry.hh
	M			src/common/iterators.hh
	M			src/common/ref_array.hh
	M			src/common/statefield.hh
	M			src/common/tensor_algebra.hh
	M			src/common/utilities.hh
	M			src/common/voigt_conversion.hh
	M			src/fft/fft_engine_base.hh
	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.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/material_base.cc
	M			src/materials/material_base.hh
	M			src/materials/material_crystal_plasticity_finite.cc
	M			src/materials/material_crystal_plasticity_finite.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.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
	M			src/materials/material_linear_elastic_generic.cc
	M			src/materials/material_linear_elastic_generic.hh
	M			src/materials/material_muSpectre_base.hh
	M			src/materials/materials_toolbox.hh
	M			src/materials/stress_transformations.hh
	M			src/materials/stress_transformations_Kirchhoff.hh
	M			src/materials/stress_transformations_Kirchhoff_impl.hh
	M			src/materials/stress_transformations_PK1.hh
	M			src/materials/stress_transformations_PK1_impl.hh
	M			src/materials/stress_transformations_PK2.hh
	M			src/materials/stress_transformations_PK2_impl.hh
	M			src/materials/stress_transformations_default_case.hh
	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
	M			tests/header_test_field_collections.cc
	M			tests/header_test_fields.cc
	M			tests/header_test_raw_field_map.cc
	M			tests/header_test_statefields.cc
	M			tests/header_test_t4_map.cc
	M			tests/header_test_tensor_algebra.cc
	M			tests/mpi_context.hh
	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/py_comparison_test_material_hyper_elasto_plastic1.cc
	M			tests/py_comparison_test_material_linear_elastic1.cc
	M			tests/python_test_imports.py
	M			tests/test_cell_base.cc
	M			tests/test_fftw_engine.cc
	M			tests/test_field_collections.hh
	M			tests/test_field_collections_1.cc
	M			tests/test_field_collections_2.cc
	M			tests/test_field_collections_3.cc
	M			tests/test_geometry.cc
	M			tests/test_goodies.hh
	M			tests/test_material_crystal_plasticity_finite.cc
	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
	M			tests/test_materials_toolbox.cc
	M			tests/test_projection.hh
	M			tests/test_projection_finite.cc
	M			tests/test_projection_small.cc
	M			tests/test_solver_newton_cg.cc
	M			tests/tests.hh