Conflict resolved with master
Description
Description
Details
Details
- Committed
pundir Feb 29 2020, 14:39 - Pushed
gitlab-richart Jan 18 2021, 21:10 - Parents
- rAKAb796f5cef85e: example added for contact mechanics
rAKAe55ad43b118d: Bug fix in pythonpath - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| e55ad43b118d | richart | Bug fix in pythonpath | Jan 24 2020 | |||
| 351de5cb04ec | richart | Correcting install directory for old cmake versions | Jan 23 2020 | |||
| 8b12a8c50daf | richart | Installing python binding and akantu-iterators properly | Jan 23 2020 | |||
| 4a17d216cedb | richart | improving the install process | Jan 22 2020 | |||
| f7fc4feca70a | richart | Actually running the examples as tests | Jan 15 2020 | |||
| eb1c624aba2f | richart | make the new_material a bit faster | Jan 15 2020 | |||
| 72bc1b60d6fa | richart | factorizing scatter/gather from dof_synchronizer to synchronizer_impl | Jan 15 2020 | |||
| 658b6fd7fa88 | richart | adding detection of the mpiseq library | Jan 10 2020 | |||
| b72970096de0 | richart | tuple concat trick | Jan 10 2020 | |||
| cdbd6f96b11e | richart | Seting policy for the <package>_ROOT variable in the environment | Dec 20 2019 | |||
| 3741ee66d19a | richart | Wrongly protected compilation | Dec 20 2019 | |||
| 38689942d5bb | richart | Bug fix in the export of the target akantu | Dec 18 2019 | |||
| 668db21aecb0 | richart | mpi skip mpicxx | Dec 13 2019 | |||
| 0ff570ffbf37 | richart | extanding SparseMatrix and DOFManager interface in python | Dec 13 2019 | |||
| ffa47eb473d7 | richart | Make the test work with older version of gtest | Dec 13 2019 | |||
| 093c0a728b0e | richart | Merge commit '77f80db265988ff43dd2ab40ac712b0ab8053711' | Dec 13 2019 | |||
| 77f80db26598 | richart | A bit to aggressive with the clang-tidy | Dec 13 2019 | |||
| 74233cffde18 | richart | Merge commit '7085e4eba3cb6bdc76ba56c87cd3b686039aefaf' | Dec 12 2019 | |||
| 7085e4eba3cb | richart | Added named_zip | Dec 12 2019 | |||
| 507f7dbccbdf | richart | tidied and formated version | Dec 12 2019 | |||
| 3889358d690a | richart | some cleaning to many class in the same file | Dec 12 2019 | |||
| 9af5e8823b34 | richart | Merge branch 'master' of c4science:/diffusion/AKAPRIV/akantu-private | Dec 11 2019 | |||
| 238e081bfa3e | richart | The fix for clang breaks gcc | Dec 11 2019 | |||
| b9311d8ff17e | frerot | fixed warning [-Wempty-body] in Mesh::read | Dec 11 2019 | |||
| ff7c24cea62e | richart | bug fix to compile on clang | Dec 11 2019 | |||
| 586f5f155d7a | richart | Merge branch 'master' of gitlab.com:akantu/akantu | Dec 11 2019 | |||
| 699861af0ea7 | richart | Merge commit '64aba083b7feb682b63ea7aba22d000b30666056' | Dec 11 2019 | |||
| 64aba083b7fe | richart | adding support for non gnu compilers | Dec 10 2019 | |||
| 451e39ec639b | richart | Adding named_tuples and string_literal | Dec 10 2019 | |||
| d19afc22171d | richart | Correcting namespace + warnings | Dec 10 2019 | |||
| c648795f225e | richart | trying to accelerate the ci | Dec 9 2019 | |||
| c80efd72a820 | richart | improving ci | Dec 9 2019 | |||
| 48349fadeece | richart | Add .gitlab-ci.yml | Dec 9 2019 | |||
| 3ad7addae7f2 | richart | small improvements in ci | Dec 9 2019 | |||
| 74def707432e | richart | inceasing timeouts | Dec 9 2019 | |||
| 48535c34dff3 | richart | cleaning a bit the repo | Dec 9 2019 | |||
| fca35ee94278 | richart | Merge branch 'master' of c4science.ch:/diffusion/AKAPRIV/akantu-private | Dec 9 2019 | |||
| ea1f32bc5f12 | richart | Merge commit 'd9766dec5fd1c5eb0b1bbaab9694dc44dcc74f15' | Dec 9 2019 | |||
| d9766dec5fd1 | richart | bug fix in the filter iterator | Dec 9 2019 | |||
| 60ed7290eaa8 | richart | Solving the gtest download failing the second time | Dec 9 2019 | |||
| 5d55d5612076 | richart | linting | Dec 9 2019 | |||
| 221e6ca74e8e | richart | changing the way to do filter adaptor | Dec 9 2019 | |||
| 0c5c265b6584 | richart | correcting the tests | Dec 9 2019 | |||
| 3f594cbb3680 | richart | flags to specify when akantu runs in docker | Dec 9 2019 | |||
| f142b17e9176 | richart | Simplifying the jobs since it fails between caches and makefiles... | Dec 6 2019 | |||
| 09b534cfadc6 | richart | cleaning the readme | Dec 6 2019 | |||
| 2283629c888f | richart | wrong variable | Dec 5 2019 | |||
| 418f0cdcdd93 | richart | separating the caches since the are running in parallel | Dec 5 2019 | |||
| b578a0cb4fe7 | richart | style typos in junit | Dec 5 2019 | |||
| 5d475fc77c44 | richart | typo in reports | Dec 5 2019 |