Homec4science

conflicts with master resolved

Authored by pundir on Oct 2 2019, 16:10.

Description

conflicts with master resolved

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
dec47ae94661richart
Add 'test/ci/scripts/' from commit 'df23807ae10b118336f2e819c6a205b0704401e5' 
Sep 24 2019
342ac7beeceerichart
splitting repositories 
Sep 24 2019
df23807ae10brichart
arclinting arclint.py 
Sep 24 2019
1f8ceb41cdb1richart
cleaning usless files 
Sep 24 2019
41e7f928e7f3richart
preparation to split hbm scripts in a different project 
Sep 24 2019
9b0b8a6b22b2richart
preparation to split hbm scripts in a different project 
Sep 24 2019
d16bb4b1e67drichart
Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private 
Sep 24 2019
07f320d9a304frerot
added parser for junit in harbormaster ci scripts 
Sep 23 2019
41d91ae41651frerot
added parser for junit in harbormaster ci scripts 
Sep 23 2019
4b00ed89f550richart
bug in the interface 
Sep 17 2019
3fdc4ee052a4richart
Bug fix in exclusiveScan in sequential 
Sep 17 2019
8d4effaa2144richart
cleaning the code 
Sep 4 2019
dc616972a49arichart
Do not compute shape derivatives on all type in onElementsAdded 
Aug 27 2019
b3f8b6dd7ebbrichart
linting to make jenkins happy again 
Aug 27 2019
2f6c39dd1049richart
missed the structural shape functions 
Aug 27 2019
00ddecef1c66richart
Limiting the shape functions and integrator to one dimension 
Aug 27 2019
aceea939d413richart
modernizing the code 
Aug 21 2019
273de36873a2richart
adding some debugging 
Aug 21 2019
fb1c462a64ebrichart
Copying missing file 
Aug 21 2019
de5aab8dbcc3richart
Material selector test correction 
Aug 21 2019
d9813e44eab2richart
bug fix in the profil construction 
Aug 20 2019
4cc5593bbcc3richart
Removing useless function + bug fix 
Aug 20 2019
173ad494e739richart
trying to compensate google breaking compatibility without change version… 
Aug 14 2019
1b4cc34760d6richart
Correcting python examples 
Aug 14 2019
506facc40360richart
adding types capabilities 
Aug 14 2019
25ce746b01c9richart
Correcting some stuff in the dumpers 
Aug 14 2019
1df7f98dd040richart
merge ? 
Aug 14 2019
1b5c0762adf5richart
Modified pybind11 to work also with 2.3 
Aug 14 2019
bba624502e8ffrerot
Merge branch 'master' of ssh://c4science.ch/diffusion/AKAPRIV/akantu-private 
Aug 14 2019
8f67ae44aaa2frerot
protected pybind tests if python interface is not activated 
Aug 13 2019
68b36dbdab07richart
made the getNbDataPerElem more generic 
Aug 9 2019
85bbe0855508richart
Make tests faster by not running the examples 
Jul 23 2019
9d98a08af0carichart
Adding more options to ci 
Jul 19 2019
d0573c64ba77richart
backward compatibility for pybind11 interface 
Jul 19 2019
d813e3429b63richart
Correcting some examples 
Jul 19 2019
10b7ce394580richart
run parallel examples with mpi 
Jul 19 2019
7863d49f001brichart
arc lint --everything 
Jul 19 2019
5cf490a6c1b7richart
arc lint --everything 
Jul 19 2019
dd7a93e3d228richart
Making examples testable (just running them nothing fancy) 
Jul 19 2019
a88fe88b52f9richart
adapt to latest changes 
Jul 19 2019
5af31d108e6brichart
removed unused variables 
Jul 19 2019
1fe95d9275e3richart
Trying to figure out the checkout 
Jul 19 2019
3e2ce1b3f4ecrichart
more synthax errors 
Jul 18 2019
36a1cff1722frichart
Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private 
Jul 18 2019
77d5e25c4217richart
bug in synthax 
Jul 18 2019
5f91ae6dd213richart
Checkout proper commit 
Jul 18 2019
56500b9499eerichart
skip default checkout 
Jul 18 2019
6cc99d648484gallyamov
Merge branch 'master' of ssh://c4science.ch/diffusion/AKAPRIV/akantu-private 
Jul 18 2019
83daca0d40ffgallyamov
Remove ghost_type from energy computation 
Jul 18 2019
9a7dc4b02c38richart
Removing artifacts 
Jul 18 2019