:Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

OPM · May 28, 2023 · f574140 · f574140
2 parents 2989e89 + 5840535
commit f574140
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/models/BGKModel.cpp b/models/BGKModel.cpp
@@ -215,8 +215,8 @@ void ScaLBL_BGKModel::Create() {
     if (rank == 0)
         printf("Allocating distributions \n");
     //......................device distributions.................................
-    int dist_mem_size = Np * sizeof(double);
-    int neighborSize = 18 * (Np * sizeof(int));
+    size_t dist_mem_size = Np * sizeof(double);
+    size_t neighborSize = 18 * (Np * sizeof(int));
     //...........................................................................
     ScaLBL_AllocateDeviceMemory((void **)&NeighborList, neighborSize);
     ScaLBL_AllocateDeviceMemory((void **)&fq, 19 * dist_mem_size);

diff --git a/models/ColorModel.h b/models/ColorModel.h
@@ -154,8 +154,8 @@ class ScaLBL_ColorModel {
 private:
     Utilities::MPI comm;
 
-    int dist_mem_size;
-    int neighborSize;
+    size_t dist_mem_size;
+    size_t neighborSize;
     // filenames
     char LocalRankString[8];
     char LocalRankFilename[40];

diff --git a/models/DFHModel.h b/models/DFHModel.h
@@ -68,8 +68,8 @@ class ScaLBL_DFHModel {
 private:
     Utilities::MPI comm;
 
-    int dist_mem_size;
-    int neighborSize;
+    size_t dist_mem_size;
+    size_t neighborSize;
     // filenames
     char LocalRankString[8];
     char LocalRankFilename[40];

diff --git a/models/FreeLeeModel.h b/models/FreeLeeModel.h
@@ -91,8 +91,8 @@ class ScaLBL_FreeLeeModel {
 private:
     Utilities::MPI comm;
 
-    int dist_mem_size;
-    int neighborSize;
+    size_t dist_mem_size;
+    size_t neighborSize;
     // filenames
     char LocalRankString[8];
     char LocalRankFilename[40];

diff --git a/models/GreyscaleColorModel.h b/models/GreyscaleColorModel.h
@@ -133,8 +133,8 @@ class ScaLBL_GreyscaleColorModel {
 private:
     Utilities::MPI comm;
 
-    int dist_mem_size;
-    int neighborSize;
+    size_t dist_mem_size;
+    size_t neighborSize;
     // filenames
     char LocalRankString[8];
     char LocalRankFilename[40];

diff --git a/models/GreyscaleModel.h b/models/GreyscaleModel.h
@@ -93,8 +93,8 @@ class ScaLBL_GreyscaleModel {
 private:
     Utilities::MPI comm;
 
-    int dist_mem_size;
-    int neighborSize;
+    size_t dist_mem_size;
+    size_t neighborSize;
     // filenames
     char LocalRankString[8];
     char LocalRankFilename[40];

diff --git a/models/MRTModel.cpp b/models/MRTModel.cpp
@@ -220,8 +220,8 @@ void ScaLBL_MRTModel::Create() {
     if (rank == 0)
         printf("Allocating distributions \n");
     //......................device distributions.................................
-    int dist_mem_size = Np * sizeof(double);
-    int neighborSize = 18 * (Np * sizeof(int));
+    size_t dist_mem_size = Np * sizeof(double);
+    size_t neighborSize = 18 * (Np * sizeof(int));
     //...........................................................................
     ScaLBL_AllocateDeviceMemory((void **)&NeighborList, neighborSize);
     ScaLBL_AllocateDeviceMemory((void **)&fq, 19 * dist_mem_size);

diff --git a/models/StokesModel.cpp b/models/StokesModel.cpp
@@ -516,8 +516,8 @@ void ScaLBL_StokesModel::Create() {
     if (rank == 0)
         printf("LB Single-Fluid Solver: Allocating distributions \n");
     //......................device distributions.................................
-    int dist_mem_size = Np * sizeof(double);
-    int neighborSize = 18 * (Np * sizeof(int));
+    size_t dist_mem_size = Np * sizeof(double);
+    size_t neighborSize = 18 * (Np * sizeof(int));
     //...........................................................................
     ScaLBL_AllocateDeviceMemory((void **)&NeighborList, neighborSize);
     ScaLBL_AllocateDeviceMemory((void **)&fq, 19 * dist_mem_size);