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
0ef5d87d9034richart
Add 'test/ci/scripts/' from commit 'e20109b241d517abe8e2869216562914ee05aaf3' 
Sep 24 2019
b6a4af4f0f62richart
splitting repositories 
Sep 24 2019
e20109b241d5richart
arclinting arclint.py 
Sep 24 2019
5d294161d2fcrichart
cleaning usless files 
Sep 24 2019
aaace74d37acrichart
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
f000ed9c0072richart
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
e28fc6cfa113frerot
added parser for junit in harbormaster ci scripts 
Sep 23 2019
c59021d18d8erichart
bug in the interface 
Sep 17 2019
60e435467a35richart
Bug fix in exclusiveScan in sequential 
Sep 17 2019
863d3f407e40richart
cleaning the code 
Sep 4 2019
f7fc640b45bcrichart
Do not compute shape derivatives on all type in onElementsAdded 
Aug 27 2019
155d19a093b4richart
linting to make jenkins happy again 
Aug 27 2019
8fec248f8b4brichart
missed the structural shape functions 
Aug 27 2019
5a28b410980brichart
Limiting the shape functions and integrator to one dimension 
Aug 27 2019
3d0f16c20130richart
modernizing the code 
Aug 21 2019
69c31979d23arichart
adding some debugging 
Aug 21 2019
ed1ff98d1761richart
Copying missing file 
Aug 21 2019
0ece01843256richart
Material selector test correction 
Aug 21 2019
a58bd8d06aearichart
bug fix in the profil construction 
Aug 20 2019
912d812b730drichart
Removing useless function + bug fix 
Aug 20 2019
2efd36a3d807richart
trying to compensate google breaking compatibility without change version… 
Aug 14 2019
d5f9aba7e9d9richart
Correcting python examples 
Aug 14 2019
534c6752bee0richart
adding types capabilities 
Aug 14 2019
a55298ef88a1richart
Correcting some stuff in the dumpers 
Aug 14 2019
5f1fc7d7197crichart
merge ? 
Aug 14 2019
8fb402aea0a1richart
Modified pybind11 to work also with 2.3 
Aug 14 2019
8ec6afee0ae1frerot
Merge branch 'master' of ssh://c4science.ch/diffusion/AKAPRIV/akantu-private 
Aug 14 2019
c133939b4175frerot
protected pybind tests if python interface is not activated 
Aug 13 2019
7c4625ecd4a8richart
made the getNbDataPerElem more generic 
Aug 9 2019
31edf7c58312richart
Make tests faster by not running the examples 
Jul 23 2019
2e0de6f355e9richart
Adding more options to ci 
Jul 19 2019
66e096390ab1richart
backward compatibility for pybind11 interface 
Jul 19 2019
b2a2f97d97acrichart
Correcting some examples 
Jul 19 2019
cca380adb866richart
run parallel examples with mpi 
Jul 19 2019
7863d49f001brichart
arc lint --everything 
Jul 19 2019
fe2c711063a8richart
arc lint --everything 
Jul 19 2019
cb52825d7599richart
Making examples testable (just running them nothing fancy) 
Jul 19 2019
1e85232f7ebfrichart
adapt to latest changes 
Jul 19 2019
10c49fba4670richart
removed unused variables 
Jul 19 2019
9b6b46814f0drichart
Trying to figure out the checkout 
Jul 19 2019
d6e9f68dd00arichart
more synthax errors 
Jul 18 2019
5e4f8ff24796richart
Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private 
Jul 18 2019
ebea3132a246richart
bug in synthax 
Jul 18 2019
c2fe86fb4370richart
Checkout proper commit 
Jul 18 2019
ae029b2fda07richart
skip default checkout 
Jul 18 2019
2813b05096afgallyamov
Merge branch 'master' of ssh://c4science.ch/diffusion/AKAPRIV/akantu-private 
Jul 18 2019
be1354eb1f45gallyamov
Remove ghost_type from energy computation 
Jul 18 2019
04e324e17215richart
Removing artifacts 
Jul 18 2019