Merge branch 'master' into release
b8b09e8adf0c
Actions

Authored by richart on Oct 19 2014, 18:31.

Description

Merge branch 'master' into release

Details

Committed

Oct 19 2014, 18:31

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

rAKAbde417c93258: Merge commit '947520befe236c3252c11c5474b89c3b8bb8e98f' as 'examples'
rAKA1a2d9c66bba6: setup version for the release 2.2

Branches

Unknown

Tags

Unknown

Event Timeline

richart committed rAKAb8b09e8adf0c: Merge branch 'master' into release (authored by richart).Oct 19 2014, 18:31

Merged Changes

Commit	Author	Details	Committed
bde417c93258	richart	Merge commit '947520befe236c3252c11c5474b89c3b8bb8e98f' as 'examples'	Oct 19 2014
947520befe23	richart	Squashed 'examples/' content from commit 7f536c5	Oct 19 2014
f1f15007caf5	richart	Merge commit 'e110fde51edef4f5dc67b9bca33944c444cef94f' as 'cmake/Modules'	Oct 19 2014
e110fde51ede	richart	Squashed 'cmake/Modules/' content from commit 5478da4	Oct 19 2014
35f4370b6b98	richart	Merge branch 'release'	Oct 19 2014

Changes (186)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A	(dir)	cmake/Modules/
A		cmake/Modules/CMakeDebugMessages.cmake
A		cmake/Modules/CMakeDetermineCCompiler.cmake
A		cmake/Modules/CMakeDetermineCompiler.cmake
A		cmake/Modules/CMakeFlagsHandling.cmake
A		cmake/Modules/CMakePackagesSystem.cmake
A		cmake/Modules/CMakeVersionGenerator.cmake
A		cmake/Modules/CorrectWindowsPaths.cmake
A		cmake/Modules/FindCppArray.cmake
A		cmake/Modules/FindEPSN.cmake
A		cmake/Modules/FindFFTW.cmake
A		cmake/Modules/FindGMSH.cmake
A		cmake/Modules/FindGSL.cmake
A		cmake/Modules/FindIOHelper.cmake
A		cmake/Modules/FindInkscape.cmake
A		cmake/Modules/FindLAMMPS.cmake
A		cmake/Modules/FindMumps.cmake
A		cmake/Modules/FindNLopt.cmake
A		cmake/Modules/FindPETSc.cmake
A		cmake/Modules/FindPQXX.cmake
A		cmake/Modules/FindPTScotch.cmake
A		cmake/Modules/FindPackageMultipass.cmake
A		cmake/Modules/FindParaDiS.cmake
A		cmake/Modules/FindPostgreSQL.cmake
A		cmake/Modules/FindQVIEW.cmake
A		cmake/Modules/FindSIMULPACK.cmake
A		cmake/Modules/FindScotch.cmake
A		cmake/Modules/FindSubversion.cmake
A		cmake/Modules/PCHgcc.cmake
A		cmake/Modules/ResolveCompilerPaths.cmake
A		doc/manual/figures/problemDomain.svg
A		doc/manual/figures/stress_strain_neo.svg
A		doc/manual/manual-planning.tex
A	(dir)	examples/
A		examples/CMakeLists.txt
A	(dir)	examples/boundary_conditions/
A		examples/boundary_conditions/CMakeLists.txt
A		examples/boundary_conditions/material.dat
A		examples/boundary_conditions/plate.cc
A		examples/boundary_conditions/square.geo
A	(dir)	examples/cohesive_element/
A		examples/cohesive_element/CMakeLists.txt
A	(dir)	examples/cohesive_element/cohesive_extrinsic/
A		examples/cohesive_element/cohesive_extrinsic/CMakeLists.txt
A		examples/cohesive_element/cohesive_extrinsic/cohesive_extrinsic.cc
A		examples/cohesive_element/cohesive_extrinsic/material.dat
A		examples/cohesive_element/cohesive_extrinsic/triangle.geo
A	(dir)	examples/cohesive_element/cohesive_extrinsic_IG_TG/
A		examples/cohesive_element/cohesive_extrinsic_IG_TG/CMakeLists.txt
A		examples/cohesive_element/cohesive_extrinsic_IG_TG/cohesive_extrinsic_IG_TG.cc
A		examples/cohesive_element/cohesive_extrinsic_IG_TG/material.dat
A		examples/cohesive_element/cohesive_extrinsic_IG_TG/square.msh
A	(dir)	examples/cohesive_element/cohesive_intrinsic/
A		examples/cohesive_element/cohesive_intrinsic/CMakeLists.txt
A		examples/cohesive_element/cohesive_intrinsic/cohesive_intrinsic.cc
A		examples/cohesive_element/cohesive_intrinsic/material.dat
A		examples/cohesive_element/cohesive_intrinsic/triangle.geo
A	(dir)	examples/contact/
A		examples/contact/CMakeLists.txt
A		examples/contact/blocks.cc
A		examples/contact/blocks.geo
A		examples/contact/hertz_2D.cc
A		examples/contact/hertz_2D.geo
A		examples/contact/hertz_3D.cc
A		examples/contact/hertz_3D.geo
A		examples/contact/steel.dat
A		examples/contact/tetrahedra.cc
A		examples/contact/tetrahedra.geo
A	(dir)	examples/explicit/
A		examples/explicit/CMakeLists.txt
A		examples/explicit/bar.geo
A		examples/explicit/explicit_dynamic.cc
A		examples/explicit/material.dat
A	(dir)	examples/heat_transfer/
A		examples/heat_transfer/CMakeLists.txt
A		examples/heat_transfer/explicit_heat_transfer.cc
A		examples/heat_transfer/material.dat
A		examples/heat_transfer/square.geo
A	(dir)	examples/implicit/
A		examples/implicit/CMakeLists.txt
A		examples/implicit/beam.geo
A		examples/implicit/implicit_dynamic.cc
A		examples/implicit/material_dynamic.dat
A	(dir)	examples/new_material/
A		examples/new_material/CMakeLists.txt
A		examples/new_material/barre_trou.geo
A		examples/new_material/local_material_damage.cc
A		examples/new_material/local_material_damage.hh
A		examples/new_material/local_material_damage_inline_impl.cc
A		examples/new_material/material.dat
A		examples/new_material/new_local_material.cc
A	(dir)	examples/optimization/
A		examples/optimization/CMakeLists.txt
A		examples/optimization/fn_optimize.cc
A	(dir)	examples/parallel_2d/
A		examples/parallel_2d/CMakeLists.txt
A		examples/parallel_2d/material.dat
A		examples/parallel_2d/parallel_2d.cc
A		examples/parallel_2d/square_2d.geo
A	(dir)	examples/static/
A		examples/static/CMakeLists.txt
A		examples/static/material.dat
A		examples/static/square.geo
A		examples/static/static.cc
A	(dir)	examples/structural_mechanics/
A		examples/structural_mechanics/CMakeLists.txt
A		examples/structural_mechanics/bernoulli_beam_2_exemple.cc
A		packages/84_petsc.cmake
A		packages/90_blackdynamite.cmake
A		packages/90_cblas.cmake
A		packages/90_qview.cmake
A		packages/debug_tools.cmake
A		src/common/aka_debug_tools.hh
A		src/solver/petsc_matrix.cc
A		src/solver/petsc_matrix.hh
A		src/solver/petsc_matrix_inline_impl.cc
A		src/solver/solver_petsc.cc
A		src/solver/solver_petsc.hh
A		src/solver/static_solver.cc
A		src/solver/static_solver.hh
A		test/test_contact/acurnier_2D_3.verified
A		test/test_contact/hertz_3D.geo
A		test/test_fem/_b_beam_2.msh
A		test/test_fem/circle.geo
A		test/test_fem/hexa_structured.geo
A		test/test_fem/line.geo
A		test/test_fem/square.geo
A		test/test_fem/square_structured.geo
A		test/test_fem/test_igfem_integrate.cc
A		test/test_fem/test_interpolate_bernoulli_beam_2.cc
A		test/test_fem/test_interpolate_bernoulli_beam_2.verified
A		test/test_mesh_utils/test_mesh_io/test_mesh_io_diana.cc
A		test/test_mesh_utils/test_mesh_partitionate/squares.geo
A		test/test_mesh_utils/test_mesh_partitionate/squares_H.msh
A		test/test_mesh_utils/test_mesh_partitionate/squares_L.msh
A		test/test_model/test_heat_transfer_model/test_heat_transfer_model_bar2d_coarse_square_mesh.cc
A		test/test_model/test_heat_transfer_model/test_heat_transfer_model_bar2d_coarse_triangle_mesh.cc
A		test/test_model/test_heat_transfer_model/test_heat_transfer_model_bar2d_fine_square_mesh.cc
A		test/test_model/test_heat_transfer_model/test_heat_transfer_model_cube3d_anisotropy_conductivity.cc
A		test/test_model/test_solid_mechanics_model/cube_physical_names.geo
A		test/test_model/test_solid_mechanics_model/patch_tests/data/_pentahedron_6.msh
A		test/test_model/test_solid_mechanics_model/patch_tests/data/material_anisotropic.dat
A		test/test_model/test_solid_mechanics_model/patch_tests/data/material_check_stress.dat
A		test/test_model/test_solid_mechanics_model/patch_tests/explicit/patch_test_explicit_anisotropic.cc
A		test/test_model/test_solid_mechanics_model/square_structured.geo
A	(dir)	test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/hexahedron.msh
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/test_cohesive_buildfacets_hexahedron.cc
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/test_cohesive_buildfacets_tetrahedron.cc
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/tetrahedron.msh
A	(dir)	test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfragments/
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfragments/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfragments/material.dat
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfragments/mesh.geo
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfragments/test_cohesive_buildfragments.cc
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/tetrahedron.msh
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_intrinsic_impl/stiffness_matrix.verified
A	(dir)	test/test_model/test_solid_mechanics_model/test_materials/data/
A		test/test_model/test_solid_mechanics_model/test_materials/data/single_quadrangle_4.msh
A		test/test_model/test_solid_mechanics_model/test_materials/data/single_triangle_3.msh
A		test/test_model/test_solid_mechanics_model/test_materials/data/test_material_elastic_caughey_quadrangle_4.msh
A		test/test_model/test_solid_mechanics_model/test_materials/data/test_material_elastic_caughey_triangle_3.msh
A	(dir)	test/test_model/test_solid_mechanics_model/test_materials/ref_files/
A		test/test_model/test_solid_mechanics_model/test_materials/ref_files/test_material_elastic_caughey_quadrangle_4.ref
A		test/test_model/test_solid_mechanics_model/test_materials/ref_files/test_material_elastic_caughey_triangle_3.ref
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/material_non_local.dat
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/test_material_non_local.cc
A	(dir)	test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/material_standard_linear_solid_deviatoric_relaxation.dat
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/material_stiffness_proportional.dat
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/material_stiffness_proportional_damping.dat
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/test_material_standard_linear_solid_deviatoric_relaxation.cc
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/test_material_standard_linear_solid_deviatoric_relaxation.geo
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/test_material_standard_linear_solid_deviatoric_relaxation_tension.cc
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/test_material_stiffness_proportional.cc
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_viscoelastic/test_material_stiffness_proportional_damping.cc
A		test/test_model/test_solid_mechanics_model/test_materials/triangle.geo
A		test/test_model/test_solid_mechanics_model/test_solid_mechanics_model.cc
A		test/test_model/test_solid_mechanics_model/test_solid_mechanics_model_bar_traction2d_mass_not_lumped.cc
A		test/test_model/test_solid_mechanics_model/test_solid_mechanics_model_pbc_parallel.cc
A		test/test_model/test_structural_mechanics_model/test_structural_mechanics_model_bernoulli_beam_12_10_13.cc
A		test/test_solver/test_petsc_matrix_profile.cc
A		test/test_solver/test_sparse_matrix_profile_parallel.cc
A		test/test_synchronizer/data_split.geo