OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing build

Browse Source
This commit is contained in:
JamesEMcclure 2020-10-05 14:36:50 -04:00
parent c232f076dc
commit af07ddb099
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ScaLBL.h
View File

@ -10,7 +10,6 @@
#ifndef ScalLBL_H #ifndef ScalLBL_H
#define ScalLBL_H #define ScalLBL_H
#include "common/Domain.h" #include "common/Domain.h"
#include "common/WideHalo.h"
extern "C" int ScaLBL_SetDevice(int rank); extern "C" int ScaLBL_SetDevice(int rank);

5
common/WideHalo.h
View File

@ -106,8 +106,9 @@ private:
} }
} }
} }
ScaLBL_AllocateZeroCopy((void **) &dvcList, count*sizeof(int)); // Allocate device memory size_t numbytes=count*sizeof(int);
ScaLBL_CopyToZeroCopy(dvcList,List,count*sizeof(int)); ScaLBL_AllocateZeroCopy((void **) &dvcList, numbytes); // Allocate device memory
ScaLBL_CopyToZeroCopy(dvcList,List,numbytes);
return count; return count;
} }

3
tests/TestWideHalo.cpp
View File

@ -7,6 +7,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include "common/ScaLBL.h" #include "common/ScaLBL.h"
#include "common/WideHalo.h"
#include "common/MPI_Helpers.h" #include "common/MPI_Helpers.h"
using namespace std; using namespace std;
@ -168,7 +169,7 @@ int main(int argc, char **argv)
//Create a second communicator based on the regular data layout //Create a second communicator based on the regular data layout
ScaLBL_Communicator ScaLBL_Comm_Regular(Dm); ScaLBL_Communicator ScaLBL_Comm_Regular(Dm);
ScaLBL_Communicator ScaLBL_Comm(Dm); ScaLBL_Communicator ScaLBL_Comm(Dm);
ScaLBLWideHalo_Communicator WideHalo(Dm); ScaLBLWideHalo_Communicator WideHalo(Dm,2);
// LBM variables // LBM variables
if (rank==0) printf ("Set up the neighborlist \n"); if (rank==0) printf ("Set up the neighborlist \n");