conflicts with master resolved
Description
Description
Details
Details
- Committed
pundir Oct 2 2019, 16:10 - Pushed
gitlab-richart Jul 29 2021, 09:01 - Parents
- rAKAdec47ae94661: Add 'test/ci/scripts/' from commit 'df23807ae10b118336f2e819c6a205b0704401e5'
rAKA2f449dcda0b1: added geometry utils to ease friciton calculation - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
dec47ae94661 | richart | Add 'test/ci/scripts/' from commit 'df23807ae10b118336f2e819c6a205b0704401e5' | Sep 24 2019 | |||
342ac7beecee | richart | splitting repositories | Sep 24 2019 | |||
df23807ae10b | richart | arclinting arclint.py | Sep 24 2019 | |||
1f8ceb41cdb1 | richart | cleaning usless files | Sep 24 2019 | |||
41e7f928e7f3 | richart | preparation to split hbm scripts in a different project | Sep 24 2019 | |||
9b0b8a6b22b2 | richart | preparation to split hbm scripts in a different project | Sep 24 2019 | |||
d16bb4b1e67d | richart | Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private | Sep 24 2019 | |||
07f320d9a304 | frerot | added parser for junit in harbormaster ci scripts | Sep 23 2019 | |||
41d91ae41651 | frerot | added parser for junit in harbormaster ci scripts | Sep 23 2019 | |||
4b00ed89f550 | richart | bug in the interface | Sep 17 2019 | |||
3fdc4ee052a4 | richart | Bug fix in exclusiveScan in sequential | Sep 17 2019 | |||
8d4effaa2144 | richart | cleaning the code | Sep 4 2019 | |||
dc616972a49a | richart | Do not compute shape derivatives on all type in onElementsAdded | Aug 27 2019 | |||
b3f8b6dd7ebb | richart | linting to make jenkins happy again | Aug 27 2019 | |||
2f6c39dd1049 | richart | missed the structural shape functions | Aug 27 2019 | |||
00ddecef1c66 | richart | Limiting the shape functions and integrator to one dimension | Aug 27 2019 | |||
aceea939d413 | richart | modernizing the code | Aug 21 2019 | |||
273de36873a2 | richart | adding some debugging | Aug 21 2019 | |||
fb1c462a64eb | richart | Copying missing file | Aug 21 2019 | |||
de5aab8dbcc3 | richart | Material selector test correction | Aug 21 2019 | |||
d9813e44eab2 | richart | bug fix in the profil construction | Aug 20 2019 | |||
4cc5593bbcc3 | richart | Removing useless function + bug fix | Aug 20 2019 | |||
173ad494e739 | richart | trying to compensate google breaking compatibility without change version… | Aug 14 2019 | |||
1b4cc34760d6 | richart | Correcting python examples | Aug 14 2019 | |||
506facc40360 | richart | adding types capabilities | Aug 14 2019 | |||
25ce746b01c9 | richart | Correcting some stuff in the dumpers | Aug 14 2019 | |||
1df7f98dd040 | richart | merge ? | Aug 14 2019 | |||
1b5c0762adf5 | richart | Modified pybind11 to work also with 2.3 | Aug 14 2019 | |||
bba624502e8f | frerot | Merge branch 'master' of ssh://c4science.ch/diffusion/AKAPRIV/akantu-private | Aug 14 2019 | |||
8f67ae44aaa2 | frerot | protected pybind tests if python interface is not activated | Aug 13 2019 | |||
68b36dbdab07 | richart | made the getNbDataPerElem more generic | Aug 9 2019 | |||
85bbe0855508 | richart | Make tests faster by not running the examples | Jul 23 2019 | |||
9d98a08af0ca | richart | Adding more options to ci | Jul 19 2019 | |||
d0573c64ba77 | richart | backward compatibility for pybind11 interface | Jul 19 2019 | |||
d813e3429b63 | richart | Correcting some examples | Jul 19 2019 | |||
10b7ce394580 | richart | run parallel examples with mpi | Jul 19 2019 | |||
7863d49f001b | richart | arc lint --everything | Jul 19 2019 | |||
5cf490a6c1b7 | richart | arc lint --everything | Jul 19 2019 | |||
dd7a93e3d228 | richart | Making examples testable (just running them nothing fancy) | Jul 19 2019 | |||
a88fe88b52f9 | richart | adapt to latest changes | Jul 19 2019 | |||
5af31d108e6b | richart | removed unused variables | Jul 19 2019 | |||
1fe95d9275e3 | richart | Trying to figure out the checkout | Jul 19 2019 | |||
3e2ce1b3f4ec | richart | more synthax errors | Jul 18 2019 | |||
36a1cff1722f | richart | Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private | Jul 18 2019 | |||
77d5e25c4217 | richart | bug in synthax | Jul 18 2019 | |||
5f91ae6dd213 | richart | Checkout proper commit | Jul 18 2019 | |||
56500b9499ee | richart | skip default checkout | Jul 18 2019 | |||
6cc99d648484 | gallyamov | Merge branch 'master' of ssh://c4science.ch/diffusion/AKAPRIV/akantu-private | Jul 18 2019 | |||
83daca0d40ff | gallyamov | Remove ghost_type from energy computation | Jul 18 2019 | |||
9a7dc4b02c38 | richart | Removing artifacts | Jul 18 2019 |