Homec4science

Conflict resolved with master

Authored by pundir on Feb 29 2020, 14:39.

Description

Conflict resolved with master

Details

Committed
pundirFeb 29 2020, 14:39
Pushed
gitlab-richartJul 29 2021, 09:01
Parents
rAKA9929d0a08e7f: Bug fix in pythonpath
rAKA47fd26fc5c36: example added for contact mechanics
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
9929d0a08e7frichart
Bug fix in pythonpath 
Jan 24 2020
b23200851fdcrichart
Correcting install directory for old cmake versions 
Jan 23 2020
667ed59814abrichart
Installing python binding and akantu-iterators properly 
Jan 23 2020
be8e3f9d35f2richart
improving the install process 
Jan 22 2020
84127a482549richart
Actually running the examples as tests 
Jan 15 2020
547777110e55richart
make the new_material a bit faster 
Jan 15 2020
89c853c10096richart
factorizing scatter/gather from dof_synchronizer to synchronizer_impl 
Jan 15 2020
60b28fcdab22richart
adding detection of the mpiseq library 
Jan 10 2020
b6bcc70eec56richart
tuple concat trick 
Jan 10 2020
6d890200f749richart
Seting policy for the <package>_ROOT variable in the environment 
Dec 20 2019
f600d5b63508richart
Wrongly protected compilation 
Dec 20 2019
58bf31d34709richart
Bug fix in the export of the target akantu 
Dec 18 2019
551d547afdddrichart
mpi skip mpicxx 
Dec 13 2019
ac4f37242023richart
extanding SparseMatrix and DOFManager interface in python 
Dec 13 2019
36ba3a35a3dcrichart
Make the test work with older version of gtest 
Dec 13 2019
e64ab77154c7richart
Merge commit '5e1ea8c938d8b63d462d21c8ea8292f3fdeaeebf' 
Dec 13 2019
5e1ea8c938d8richart
A bit to aggressive with the clang-tidy 
Dec 13 2019
14731a9413a1richart
Merge commit 'f8bcabd419ba24966eb8679e9610897dca660db1' 
Dec 12 2019
f8bcabd419barichart
Added named_zip 
Dec 12 2019
bd71d08c3d98richart
tidied and formated version 
Dec 12 2019
596b60c4bdf3richart
some cleaning to many class in the same file 
Dec 12 2019
1e38564b9582richart
Merge branch 'master' of c4science:/diffusion/AKAPRIV/akantu-private 
Dec 11 2019
8eadccc15c0arichart
The fix for clang breaks gcc 
Dec 11 2019
5461568ecf20frerot
fixed warning [-Wempty-body] in Mesh::read 
Dec 11 2019
f553aa3c8bf8richart
bug fix to compile on clang 
Dec 11 2019
c4f89da9ae78richart
Merge branch 'master' of gitlab.com:akantu/akantu 
Dec 11 2019
3a7f4d5d5151richart
Merge commit '0b3ffcd1a0d6eb6b458c72f62f21cd1400f64066' 
Dec 11 2019
0b3ffcd1a0d6richart
adding support for non gnu compilers 
Dec 10 2019
7ca19f1effd2richart
Adding named_tuples and string_literal 
Dec 10 2019
480f4c7eee34richart
Correcting namespace + warnings 
Dec 10 2019
24c0dfa18072richart
trying to accelerate the ci 
Dec 9 2019
14042a61b3adrichart
improving ci 
Dec 9 2019
a07873cdbd98richart
Add .gitlab-ci.yml 
Dec 9 2019
dcda0b809401richart
small improvements in ci 
Dec 9 2019
66e3133c8270richart
inceasing timeouts 
Dec 9 2019
8a2af02b08a5richart
cleaning a bit the repo 
Dec 9 2019
63499ac0083drichart
Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private 
Dec 9 2019
071c9fee244frichart
Merge commit '05b77d3f6ef7d01e805b865ade26ac3acec3d668' 
Dec 9 2019
05b77d3f6ef7richart
bug fix in the filter iterator 
Dec 9 2019
ce29a60dc324richart
Solving the gtest download failing the second time 
Dec 9 2019
e3494c51066drichart
linting 
Dec 9 2019
f9b8db2f4c06richart
changing the way to do filter adaptor 
Dec 9 2019
e4fb2fa229ferichart
correcting the tests 
Dec 9 2019
c70e24267884richart
flags to specify when akantu runs in docker 
Dec 9 2019
ecd4b6b18e86richart
Simplifying the jobs since it fails between caches and makefiles... 
Dec 6 2019
1f0ee966f6cerichart
cleaning the readme 
Dec 6 2019
a9fc7dd91ac1richart
wrong variable 
Dec 5 2019
8ffa4a46e04drichart
separating the caches since the are running in parallel 
Dec 5 2019
f685f876946crichart
style typos in junit 
Dec 5 2019
25386b2b650arichart
typo in reports 
Dec 5 2019