Homec4science

fixed conflicts

Authored by Christoph Schaefer <cerschae@greina6.cm.cluster> on Feb 13 2018, 16:31.

Description

fixed conflicts

Event Timeline

Christoph Schaefer <cerschae@greina6.cm.cluster> committed R1448:2e8feea73100: fixed conflicts (authored by Christoph Schaefer <cerschae@greina6.cm.cluster>).Feb 13 2018, 16:31

Merged Changes

CommitAuthorDetailsCommitted
baaf7ff134d9fourestey
Merge branch 'master' of ssh://c4science.ch/diffusion/1448/lenstool-hpc 
Dec 13 2017
dc43260b4ab1fourestey
update 
Dec 13 2017
2357708da7e1fourestey
updated version of the scripts 
Dec 13 2017
c9055b6bd7ebfourestey
adding fast sqrt reciprocal for SIS 
Dec 13 2017
8ae0fc9ab5d2fourestey
adding Ofast 
Dec 13 2017
3ce49592645cfourestey
adding message when exiting 
Dec 13 2017
38a096b027a0fourestey
update 
Dec 13 2017
13bc4a5c42befourestey
Mixed precision Grid Gradient Benchmark 
Dec 13 2017
433d29389004fourestey
update 
Dec 8 2017
a2db90eb314dfourestey
update 
Dec 8 2017
aadf52da52ccfourestey
mpi check functions 
Dec 8 2017
831158ed29e2fourestey
update 
Dec 8 2017
d37a05808347fourestey
update 
Dec 8 2017
74c36423b38dfourestey
improved makefiles 
Dec 8 2017
37cd0c654860fourestey
bug correction 
Dec 8 2017
42ed32d4273bfourestey
bug correction 
Dec 8 2017
8812ace8a01efourestey
casting literals explicitely to prevent compilers to do it for us (badly) 
Dec 8 2017