portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-03 18:55:56 +01:00
Code Releases Activity

Fixing the remaining merge conflicts

Browse Source
This commit is contained in:
Guido Cossu 2017-04-05 16:17:46 +01:00
parent 4b759b8f2a
commit 7b03d8d087
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/qcd/action/scalar/Scalar.h
View File

@ -31,6 +31,7 @@ directory
#include <Grid/qcd/action/scalar/ScalarImpl.h>
#include <Grid/qcd/action/scalar/ScalarAction.h>
#include <Grid/qcd/action/scalar/ScalarInteractionAction.h>
namespace Grid {
namespace QCD {
@ -39,6 +40,10 @@ namespace QCD {
typedef ScalarAction<ScalarImplF> ScalarActionF;
typedef ScalarAction<ScalarImplD> ScalarActionD;
typedef ScalarInteractionAction<ScalarAdjImplR> ScalarAdjActionR;
typedef ScalarInteractionAction<ScalarAdjImplF> ScalarAdjActionF;
typedef ScalarInteractionAction<ScalarAdjImplD> ScalarAdjActionD;
}
}

7
tests/Test_stencil.cc
View File

@ -189,13 +189,6 @@ int main(int argc, char ** argv) {
SimpleCompressor<vobj> compress;
<<<<<<< HEAD
EStencil.HaloExchange(EFoo,compress);
OStencil.HaloExchange(OFoo,compress);
=======
>>>>>>> feature/hmc_generalise
Bar = Cshift(Foo,dir,disp);
if ( disp & 0x1 ) {