:Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
This commit is contained in:
commit
f574140a16
|
@ -215,8 +215,8 @@ void ScaLBL_BGKModel::Create() {
|
||||||
if (rank == 0)
|
if (rank == 0)
|
||||||
printf("Allocating distributions \n");
|
printf("Allocating distributions \n");
|
||||||
//......................device distributions.................................
|
//......................device distributions.................................
|
||||||
int dist_mem_size = Np * sizeof(double);
|
size_t dist_mem_size = Np * sizeof(double);
|
||||||
int neighborSize = 18 * (Np * sizeof(int));
|
size_t neighborSize = 18 * (Np * sizeof(int));
|
||||||
//...........................................................................
|
//...........................................................................
|
||||||
ScaLBL_AllocateDeviceMemory((void **)&NeighborList, neighborSize);
|
ScaLBL_AllocateDeviceMemory((void **)&NeighborList, neighborSize);
|
||||||
ScaLBL_AllocateDeviceMemory((void **)&fq, 19 * dist_mem_size);
|
ScaLBL_AllocateDeviceMemory((void **)&fq, 19 * dist_mem_size);
|
||||||
|
|
|
@ -154,8 +154,8 @@ public:
|
||||||
private:
|
private:
|
||||||
Utilities::MPI comm;
|
Utilities::MPI comm;
|
||||||
|
|
||||||
int dist_mem_size;
|
size_t dist_mem_size;
|
||||||
int neighborSize;
|
size_t neighborSize;
|
||||||
// filenames
|
// filenames
|
||||||
char LocalRankString[8];
|
char LocalRankString[8];
|
||||||
char LocalRankFilename[40];
|
char LocalRankFilename[40];
|
||||||
|
|
|
@ -68,8 +68,8 @@ public:
|
||||||
private:
|
private:
|
||||||
Utilities::MPI comm;
|
Utilities::MPI comm;
|
||||||
|
|
||||||
int dist_mem_size;
|
size_t dist_mem_size;
|
||||||
int neighborSize;
|
size_t neighborSize;
|
||||||
// filenames
|
// filenames
|
||||||
char LocalRankString[8];
|
char LocalRankString[8];
|
||||||
char LocalRankFilename[40];
|
char LocalRankFilename[40];
|
||||||
|
|
|
@ -91,8 +91,8 @@ public:
|
||||||
private:
|
private:
|
||||||
Utilities::MPI comm;
|
Utilities::MPI comm;
|
||||||
|
|
||||||
int dist_mem_size;
|
size_t dist_mem_size;
|
||||||
int neighborSize;
|
size_t neighborSize;
|
||||||
// filenames
|
// filenames
|
||||||
char LocalRankString[8];
|
char LocalRankString[8];
|
||||||
char LocalRankFilename[40];
|
char LocalRankFilename[40];
|
||||||
|
|
|
@ -133,8 +133,8 @@ public:
|
||||||
private:
|
private:
|
||||||
Utilities::MPI comm;
|
Utilities::MPI comm;
|
||||||
|
|
||||||
int dist_mem_size;
|
size_t dist_mem_size;
|
||||||
int neighborSize;
|
size_t neighborSize;
|
||||||
// filenames
|
// filenames
|
||||||
char LocalRankString[8];
|
char LocalRankString[8];
|
||||||
char LocalRankFilename[40];
|
char LocalRankFilename[40];
|
||||||
|
|
|
@ -93,8 +93,8 @@ public:
|
||||||
private:
|
private:
|
||||||
Utilities::MPI comm;
|
Utilities::MPI comm;
|
||||||
|
|
||||||
int dist_mem_size;
|
size_t dist_mem_size;
|
||||||
int neighborSize;
|
size_t neighborSize;
|
||||||
// filenames
|
// filenames
|
||||||
char LocalRankString[8];
|
char LocalRankString[8];
|
||||||
char LocalRankFilename[40];
|
char LocalRankFilename[40];
|
||||||
|
|
|
@ -220,8 +220,8 @@ void ScaLBL_MRTModel::Create() {
|
||||||
if (rank == 0)
|
if (rank == 0)
|
||||||
printf("Allocating distributions \n");
|
printf("Allocating distributions \n");
|
||||||
//......................device distributions.................................
|
//......................device distributions.................................
|
||||||
int dist_mem_size = Np * sizeof(double);
|
size_t dist_mem_size = Np * sizeof(double);
|
||||||
int neighborSize = 18 * (Np * sizeof(int));
|
size_t neighborSize = 18 * (Np * sizeof(int));
|
||||||
//...........................................................................
|
//...........................................................................
|
||||||
ScaLBL_AllocateDeviceMemory((void **)&NeighborList, neighborSize);
|
ScaLBL_AllocateDeviceMemory((void **)&NeighborList, neighborSize);
|
||||||
ScaLBL_AllocateDeviceMemory((void **)&fq, 19 * dist_mem_size);
|
ScaLBL_AllocateDeviceMemory((void **)&fq, 19 * dist_mem_size);
|
||||||
|
|
|
@ -516,8 +516,8 @@ void ScaLBL_StokesModel::Create() {
|
||||||
if (rank == 0)
|
if (rank == 0)
|
||||||
printf("LB Single-Fluid Solver: Allocating distributions \n");
|
printf("LB Single-Fluid Solver: Allocating distributions \n");
|
||||||
//......................device distributions.................................
|
//......................device distributions.................................
|
||||||
int dist_mem_size = Np * sizeof(double);
|
size_t dist_mem_size = Np * sizeof(double);
|
||||||
int neighborSize = 18 * (Np * sizeof(int));
|
size_t neighborSize = 18 * (Np * sizeof(int));
|
||||||
//...........................................................................
|
//...........................................................................
|
||||||
ScaLBL_AllocateDeviceMemory((void **)&NeighborList, neighborSize);
|
ScaLBL_AllocateDeviceMemory((void **)&NeighborList, neighborSize);
|
||||||
ScaLBL_AllocateDeviceMemory((void **)&fq, 19 * dist_mem_size);
|
ScaLBL_AllocateDeviceMemory((void **)&fq, 19 * dist_mem_size);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user