Diffusion akantu 2eb87f8351ac

conflicts solved
2eb87f8351ac
Actions

Authored by corrado on Mar 31 2015, 18:30.

Description

conflicts solved

Details

Committed

corrado

Mar 31 2015, 18:30

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

rAKA1f39ca97a8bd: correcting indentation
rAKAedab3a8977ab: Bugfix after recent modifications to the cohesive elements' insertion

Branches

Unknown

Tags

Unknown

Event Timeline

corrado committed rAKA2eb87f8351ac: conflicts solved (authored by corrado).Mar 31 2015, 18:30

Restricted Application failed to build Restricted Buildable!Dec 6 2019, 13:43

Merged Changes

Commit	Author	Details	Committed
edab3a8977ab	Marco Vocialta	Bugfix after recent modifications to the cohesive elements' insertion	Mar 31 2015
4d57c9fb721c	Lucas Frérot	Added uniform prestressing to reinforcements	Mar 31 2015
a18be6ce0821	richart	find package for scalapack extracted from mumps	Mar 31 2015
dffd939f2b67	richart	Cleaning some leftovers in cmake	Mar 30 2015
e3be31c62362	richart	Minor modifs to make akantu compile again with icc... + some styling	Mar 30 2015
0565c65edcae	richart	update of submodule ref	Mar 30 2015
850e169d52c0	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Mar 30 2015
d130997e6472	richart	Modification sof the package system for third-party + making functions more…	Mar 30 2015
b6583ee9cc52	Lucas Frérot	Corrected bugs with embedded model	Mar 30 2015
a3a7aba9a7ea	molyneau	added rgib in students-extra-package	Mar 30 2015
68e28d10eb2c	molyneau	extra package	Mar 27 2015
28c38a2f2414	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Mar 23 2015
a4dbc90c2b1a	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Mar 19 2015
35fa19c85c8a	richart	small clarification	Mar 19 2015

Changes (83)

		Path
M		.gitignore
M		CMakeLists.txt
M		cmake/AkantuInstall.cmake
M		cmake/AkantuTestAndExamples.cmake
M		cmake/Modules/CMakePackagesSystem.cmake
M		cmake/Modules/FindMumps.cmake
A		cmake/Modules/FindScaLAPACK.cmake
M		doc/manual/CMakeLists.txt
A	(sub)	extra_packages/students-extra-package
V		packages/{00_core.cmake → core.cmake}
V		packages/{00_core_cxx11.cmake → core_cxx11.cmake}
V		packages/{00_documentation_doxygen.cmake → documentation_doxygen.cmake}
V		packages/{00_documentation_manual.cmake → documentation_manual.cmake}
V		packages/{10_heat_transfer.cmake → heat_transfer.cmake}
V		packages/{10_structural_mechanics.cmake → structural_mechanics.cmake}
V		packages/{20_cohesive_element.cmake → cohesive_element.cmake}
V		packages/{20_contact.cmake → contact.cmake}
V		packages/{25_damage_non_local.cmake → damage_non_local.cmake}
V		packages/{40_optimization.cmake → optimization.cmake}
V		packages/{50_implicit.cmake → implicit.cmake}
V		packages/{50_parallel.cmake → parallel.cmake}
V		packages/{80_cpparray.cmake → cpparray.cmake}
V		packages/{80_mpi.cmake → mpi.cmake}
V		packages/{80_nlopt.cmake → nlopt.cmake}
V		packages/{84_petsc.cmake → petsc.cmake}
D		packages/85_mumps.cmake
P		packages/89_lapack.cmake Deleted after being copied to multiple locations: packages/lapack.cmake packages/scalapack.cmake
V		packages/{90_blackdynamite.cmake → blackdynamite.cmake}
V		packages/{90_blas.cmake → blas.cmake}
V		packages/{90_iohelper.cmake → iohelper.cmake}
V		packages/{90_qview.cmake → qview.cmake}
D		packages/90_scotch.cmake
V		packages/{blackdynamite.cmake ← 90_blackdynamite.cmake}
V		packages/{blas.cmake ← 90_blas.cmake}
M		packages/boost.cmake
M		packages/cgal.cmake
V		packages/{cohesive_element.cmake ← 20_cohesive_element.cmake}
V		packages/{contact.cmake ← 20_contact.cmake}
V		packages/{core.cmake ← 00_core.cmake}
V		packages/{core_cxx11.cmake ← 00_core_cxx11.cmake}
V		packages/{cpparray.cmake ← 80_cpparray.cmake}
V		packages/{damage_non_local.cmake ← 25_damage_non_local.cmake}
V		packages/{documentation_doxygen.cmake ← 00_documentation_doxygen.cmake}
V		packages/{documentation_manual.cmake ← 00_documentation_manual.cmake}
V		packages/{heat_transfer.cmake ← 10_heat_transfer.cmake}
V		packages/{implicit.cmake ← 50_implicit.cmake}
V		packages/{iohelper.cmake ← 90_iohelper.cmake}
P		packages/lapack.cmake Copied from packages/89_lapack.cmake
V		packages/{mpi.cmake ← 80_mpi.cmake}
A		packages/mumps.cmake
V		packages/{nlopt.cmake ← 80_nlopt.cmake}
V		packages/{optimization.cmake ← 40_optimization.cmake}
V		packages/{parallel.cmake ← 50_parallel.cmake}
V		packages/{petsc.cmake ← 84_petsc.cmake}
V		packages/{qview.cmake ← 90_qview.cmake}
V		packages/{scalapack.cmake ← 89_lapack.cmake}
A		packages/scotch.cmake
V		packages/{structural_mechanics.cmake ← 10_structural_mechanics.cmake}
M		src/CMakeLists.txt
M		src/common/aka_common.cc
M		src/fe_engine/element_class_structural.hh
M		src/fe_engine/geometrical_element.cc
M		src/geometry/geom_helper_functions.hh
M		src/geometry/mesh_geom_factory.hh
M		src/geometry/mesh_geom_factory_tmpl.hh
M		src/model/solid_mechanics/embedded_interface.cc
M		src/model/solid_mechanics/embedded_interface_model.cc
M		src/model/solid_mechanics/embedded_interface_model.hh
M		src/model/solid_mechanics/material_list.hh
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.cc
M		src/model/solid_mechanics/materials/material_embedded/embedded_internal_field.hh
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement.cc
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement.hh
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template.hh
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template_inline_impl.cc
M		src/model/solid_mechanics/materials/material_plastic/material_plastic.cc
M		src/model/solid_mechanics/solid_mechanics_model.cc
M		src/model/solid_mechanics/solid_mechanics_model.hh
A	(dir)	third-party/cmake/
A		third-party/cmake/iohelper.cmake
A		third-party/cmake/mumps.cmake
A		third-party/cmake/scalapack.cmake
A		third-party/cmake/scotch.cmake