fixed conflicts
Former-commit-id: 2e8feea7310024c153cca4838e55efcd649e5512
Description
Description
Details
Details
- Committed
Christoph Schaefer <cerschae@greina6.cm.cluster> Feb 13 2018, 16:31 - Pushed
schaefer Jul 8 2019, 16:11 - Parents
- R1448:d46d52721576: Merge branch 'master' of ssh://c4science.ch/diffusion/1448/lenstool-hpc
R1448:9547ad0842b0: Merge branch 'master' into readPara - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| d46d52721576 | fourestey | Merge branch 'master' of ssh://c4science.ch/diffusion/1448/lenstool-hpc | Dec 13 2017 | |||
| 756662dcd1a4 | fourestey | update | Dec 13 2017 | |||
| 280648503814 | fourestey | updated version of the scripts | Dec 13 2017 | |||
| 19917d488399 | fourestey | adding fast sqrt reciprocal for SIS | Dec 13 2017 | |||
| 543d025396da | fourestey | adding Ofast | Dec 13 2017 | |||
| 6dfa0470e8a8 | fourestey | adding message when exiting | Dec 13 2017 | |||
| 3f9b5bf04694 | fourestey | update | Dec 13 2017 | |||
| c089a2e48757 | fourestey | Mixed precision Grid Gradient Benchmark | Dec 13 2017 | |||
| 4b4f4f8a3d35 | fourestey | update | Dec 8 2017 | |||
| 5b806f795edc | fourestey | update | Dec 8 2017 | |||
| 8adb9222081c | fourestey | mpi check functions | Dec 8 2017 | |||
| 0b1ec2126ec1 | fourestey | update | Dec 8 2017 | |||
| 6944b7d77c0e | fourestey | update | Dec 8 2017 | |||
| 4490eea72157 | fourestey | improved makefiles | Dec 8 2017 | |||
| 237207bb09c0 | fourestey | bug correction | Dec 8 2017 | |||
| 46a44038cba2 | fourestey | bug correction | Dec 8 2017 | |||
| 2516410a2d5f | fourestey | casting literals explicitely to prevent compilers to do it for us (badly) | Dec 8 2017 |