Guido Cossu 7b03d8d087 Fixing the remaining merge conflicts

2017-04-05 16:17:46 +01:00

..

algorithms

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

allocator

Refactoring header layout

2017-02-22 18:09:33 +00:00

cartesian

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

communicator

Creation mode better implementation

2017-04-05 02:35:34 +09:00

cshift

Refactoring header layout

2017-02-22 18:09:33 +00:00

json

Fixed seg fault for observable modules

2017-03-17 13:59:31 +09:00

lattice

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

log

Header fix

2017-02-24 19:12:11 -05:00

parallelIO

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

perfmon

Merge branch 'develop' into feature/bgq-asm

2017-02-23 00:25:29 +00:00

pugixml

Build system sanity check: corrected several headers not in the <Grid/*> format

2017-01-26 17:00:41 -08:00

qcd

Fixing the remaining merge conflicts

2017-04-05 16:17:46 +01:00

serialisation

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

simd

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

sitmo_rng

Updating the engine to the last version

2017-01-25 18:10:41 +00:00

stencil

Average over whole cluster the comm time.

2017-03-21 22:29:51 -04:00

tensors

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

threads

Refactoring header layout

2017-02-22 18:09:33 +00:00

util

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

.dirstamp

Changed the colouring classes

2016-06-30 16:51:03 +01:00

DisableWarnings.h

All tests compile.

2017-02-10 10:27:51 +00:00

Grid.h

Merge branch 'develop' into feature/bgq-asm

2017-02-23 00:25:29 +00:00

GridCore.h

Merge branch 'develop' into feature/bgq-asm

2017-02-23 00:25:29 +00:00

GridQCDcore.h

Merge branch 'develop' into feature/bgq-asm

2017-02-23 00:25:29 +00:00

Hadrons

Hadrons is now a library, the previous XML driven program is now a test

2016-12-01 21:36:29 +09:00

Makefile.am

HDF5 types static initialisation is mysteriously buggy on BG/Q, changing strategy

2017-01-19 18:02:53 -08:00