Merge branch 'master' into feat/documentation
c18a1858c312
Actions

Authored by junge on Feb 26 2018, 17:22.

Description

Merge branch 'master' into feat/documentation

Committed

junge

Feb 26 2018, 17:22

Pushed

junge

Feb 26 2018, 17:40

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	4a33d5ec6b0a		D163	pastewka	- Updated documentation of Field, FieldCollection and FieldMap. - Updated CMake…	Feb 26 2018
	1fe880c12733		D162	junge	Removed the FieldCollection alias	Feb 24 2018

				Path
	M			src/common/field.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_map_base.hh
	M			src/common/field_map_matrixlike.hh
	M			src/common/field_map_scalar.hh
	M			src/common/field_map_tensor.hh
	M			src/fft/fft_engine_base.hh
	M			src/fft/projection_default.hh
	M			src/fft/projection_finite_strain.hh
	M			src/fft/projection_finite_strain_fast.hh
	M			src/fft/projection_small_strain.hh
	M			src/materials/material_base.hh
	M			src/system/system_base.hh
	M			tests/test_fftw_engine.cc
	M			tests/test_field_collections.cc
	M			tests/test_field_collections_header.hh
	M			tests/test_fields.cc
	M			tests/test_material_linear_elastic1.cc
	M			tests/test_material_linear_elastic2.cc
	M			tests/test_projection_finite.cc
	M			tests/test_projection_small.cc