From a0fabd4b32ed795ab1a5049197f6005097f301d5 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Fri, 29 Mar 2019 06:46:48 -0400 Subject: [PATCH] make signed char explicit --- common/Domain.cpp | 2 +- common/Domain.h | 6 +++--- common/ScaLBL.cpp | 2 +- common/ScaLBL.h | 2 +- models/ColorModel.h | 2 +- tests/lbpm_serial_decomp.cpp | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/Domain.cpp b/common/Domain.cpp index e88a6b25..931ac5dd 100644 --- a/common/Domain.cpp +++ b/common/Domain.cpp @@ -161,7 +161,7 @@ void Domain::initialize( std::shared_ptr db ) // Fill remaining variables N = Nx*Ny*Nz; Volume = nx*ny*nx*nproc[0]*nproc[1]*nproc[2]*1.0; - id = new char[N]; + id = new signed char[N]; memset(id,0,N); BoundaryCondition = d_db->getScalar("BC"); int nprocs; diff --git a/common/Domain.h b/common/Domain.h index 764ec957..038627c2 100755 --- a/common/Domain.h +++ b/common/Domain.h @@ -170,7 +170,7 @@ public: // Public variables (need to create accessors instead) int *recvList_xY, *recvList_yZ, *recvList_Xz, *recvList_XY, *recvList_YZ, *recvList_XZ; //...................................................................................... // Solid indicator function - char *id; + signed char *id; void ReadIDs(); void CommunicateMeshHalo(DoubleArray &Mesh); @@ -179,8 +179,8 @@ public: // Public variables (need to create accessors instead) private: - void PackID(int *list, int count, char *sendbuf, char *ID); - void UnpackID(int *list, int count, char *recvbuf, char *ID); + void PackID(int *list, int count, signed char *sendbuf, signed char *ID); + void UnpackID(int *list, int count, signed char *recvbuf, signed char *ID); void CommHaloIDs(); //...................................................................................... diff --git a/common/ScaLBL.cpp b/common/ScaLBL.cpp index 0c4caa81..21656757 100644 --- a/common/ScaLBL.cpp +++ b/common/ScaLBL.cpp @@ -352,7 +352,7 @@ void ScaLBL_Communicator::D3Q19_MapRecv(int Cqx, int Cqy, int Cqz, int *list, i delete [] ReturnDist; } -int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborList, char *id, int Np){ +int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborList, signed char *id, int Np){ /* * Generate a memory optimized layout * id[n] == 0 implies that site n should be ignored (treat as a mask) diff --git a/common/ScaLBL.h b/common/ScaLBL.h index f1eee8fe..a50ab7ed 100644 --- a/common/ScaLBL.h +++ b/common/ScaLBL.h @@ -158,7 +158,7 @@ public: int FirstInterior(); int LastInterior(); - int MemoryOptimizedLayoutAA(IntArray &Map, int *neighborList, char *id, int Np); + int MemoryOptimizedLayoutAA(IntArray &Map, int *neighborList, signed char *id, int Np); // void MemoryOptimizedLayout(IntArray &Map, int *neighborList, char *id, int Np); // void MemoryOptimizedLayoutFull(IntArray &Map, int *neighborList, char *id, int Np); // void MemoryDenseLayout(IntArray &Map, int *neighborList, char *id, int Np); diff --git a/models/ColorModel.h b/models/ColorModel.h index 805d8e22..3913270f 100644 --- a/models/ColorModel.h +++ b/models/ColorModel.h @@ -57,7 +57,7 @@ public: std::shared_ptr analysis_db; IntArray Map; - char *id; + signed char *id; int *NeighborList; int *dvcMap; double *fq, *Aq, *Bq; diff --git a/tests/lbpm_serial_decomp.cpp b/tests/lbpm_serial_decomp.cpp index 9277797f..41cb9686 100644 --- a/tests/lbpm_serial_decomp.cpp +++ b/tests/lbpm_serial_decomp.cpp @@ -115,8 +115,8 @@ int main(int argc, char **argv) printf("Input media: %s\n",Filename.c_str()); printf("Relabeling %lu values\n",ReadValues.size()); for (int idx=0; idx