conflicts with master resolved
Description
Description
Details
Details
- Committed
pundir Oct 2 2019, 16:10 - Pushed
gitlab-richart Jan 18 2021, 21:10 - Parents
- rAKA03ae00a232f9: added geometry utils to ease friciton calculation
rAKA0ef5d87d9034: Add 'test/ci/scripts/' from commit 'e20109b241d517abe8e2869216562914ee05aaf3' - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
0ef5d87d9034 | richart | Add 'test/ci/scripts/' from commit 'e20109b241d517abe8e2869216562914ee05aaf3' | Sep 24 2019 | |||
b6a4af4f0f62 | richart | splitting repositories | Sep 24 2019 | |||
e20109b241d5 | richart | arclinting arclint.py | Sep 24 2019 | |||
5d294161d2fc | richart | cleaning usless files | Sep 24 2019 | |||
aaace74d37ac | 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 | |||
f000ed9c0072 | 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 | |||
e28fc6cfa113 | frerot | added parser for junit in harbormaster ci scripts | Sep 23 2019 | |||
c59021d18d8e | richart | bug in the interface | Sep 17 2019 | |||
60e435467a35 | richart | Bug fix in exclusiveScan in sequential | Sep 17 2019 | |||
863d3f407e40 | richart | cleaning the code | Sep 4 2019 | |||
f7fc640b45bc | richart | Do not compute shape derivatives on all type in onElementsAdded | Aug 27 2019 | |||
155d19a093b4 | richart | linting to make jenkins happy again | Aug 27 2019 | |||
8fec248f8b4b | richart | missed the structural shape functions | Aug 27 2019 | |||
5a28b410980b | richart | Limiting the shape functions and integrator to one dimension | Aug 27 2019 | |||
3d0f16c20130 | richart | modernizing the code | Aug 21 2019 | |||
69c31979d23a | richart | adding some debugging | Aug 21 2019 | |||
ed1ff98d1761 | richart | Copying missing file | Aug 21 2019 | |||
0ece01843256 | richart | Material selector test correction | Aug 21 2019 | |||
a58bd8d06aea | richart | bug fix in the profil construction | Aug 20 2019 | |||
912d812b730d | richart | Removing useless function + bug fix | Aug 20 2019 | |||
2efd36a3d807 | richart | trying to compensate google breaking compatibility without change version… | Aug 14 2019 | |||
d5f9aba7e9d9 | richart | Correcting python examples | Aug 14 2019 | |||
534c6752bee0 | richart | adding types capabilities | Aug 14 2019 | |||
a55298ef88a1 | richart | Correcting some stuff in the dumpers | Aug 14 2019 | |||
5f1fc7d7197c | richart | merge ? | Aug 14 2019 | |||
8fb402aea0a1 | richart | Modified pybind11 to work also with 2.3 | Aug 14 2019 | |||
8ec6afee0ae1 | frerot | Merge branch 'master' of ssh://c4science.ch/diffusion/AKAPRIV/akantu-private | Aug 14 2019 | |||
c133939b4175 | frerot | protected pybind tests if python interface is not activated | Aug 13 2019 | |||
7c4625ecd4a8 | richart | made the getNbDataPerElem more generic | Aug 9 2019 | |||
31edf7c58312 | richart | Make tests faster by not running the examples | Jul 23 2019 | |||
2e0de6f355e9 | richart | Adding more options to ci | Jul 19 2019 | |||
66e096390ab1 | richart | backward compatibility for pybind11 interface | Jul 19 2019 | |||
b2a2f97d97ac | richart | Correcting some examples | Jul 19 2019 | |||
cca380adb866 | richart | run parallel examples with mpi | Jul 19 2019 | |||
7863d49f001b | richart | arc lint --everything | Jul 19 2019 | |||
fe2c711063a8 | richart | arc lint --everything | Jul 19 2019 | |||
cb52825d7599 | richart | Making examples testable (just running them nothing fancy) | Jul 19 2019 | |||
1e85232f7ebf | richart | adapt to latest changes | Jul 19 2019 | |||
10c49fba4670 | richart | removed unused variables | Jul 19 2019 | |||
9b6b46814f0d | richart | Trying to figure out the checkout | Jul 19 2019 | |||
d6e9f68dd00a | richart | more synthax errors | Jul 18 2019 | |||
5e4f8ff24796 | richart | Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private | Jul 18 2019 | |||
ebea3132a246 | richart | bug in synthax | Jul 18 2019 | |||
c2fe86fb4370 | richart | Checkout proper commit | Jul 18 2019 | |||
ae029b2fda07 | richart | skip default checkout | Jul 18 2019 | |||
2813b05096af | gallyamov | Merge branch 'master' of ssh://c4science.ch/diffusion/AKAPRIV/akantu-private | Jul 18 2019 | |||
be1354eb1f45 | gallyamov | Remove ghost_type from energy computation | Jul 18 2019 | |||
04e324e17215 | richart | Removing artifacts | Jul 18 2019 |