Skip to content

GitLab

Commit 56323ff2 authored by peastman's avatar peastman
Browse files

Fixed bug under certain compilers

parent 751e7a31
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
platforms/cuda/src/CudaKernels.cpp
View file @ 56323ff2
...@@ -2144,7 +2144,7 @@ void CudaCalcCustomNonbondedForceKernel::initInteractionGroups(const CustomNonbo ...@@ -2144,7 +2144,7 @@ void CudaCalcCustomNonbondedForceKernel::initInteractionGroups(const CustomNonbo
} }
vector<int>& atoms1 = atomLists[tiles[tile].first]; vector<int>& atoms1 = atomLists[tiles[tile].first];
vector<int>& atoms2 = atomLists[tiles[tile].second]; vector<int>& atoms2 = atomLists[tiles[tile].second];
vector<int> flags(atoms1.size(), (1L<<atoms2.size())-1); vector<int> flags(atoms1.size(), (int) (1LL<<atoms2.size())-1);
int numExcluded = 0; int numExcluded = 0;
for (int i = 0; i < (int) atoms1.size(); i++) for (int i = 0; i < (int) atoms1.size(); i++)
for (int j = 0; j < (int) atoms2.size(); j++) { for (int j = 0; j < (int) atoms2.size(); j++) {
......
platforms/opencl/src/OpenCLKernels.cpp
View file @ 56323ff2
...@@ -2155,7 +2155,7 @@ void OpenCLCalcCustomNonbondedForceKernel::initInteractionGroups(const CustomNon ...@@ -2155,7 +2155,7 @@ void OpenCLCalcCustomNonbondedForceKernel::initInteractionGroups(const CustomNon
} }
vector<int>& atoms1 = atomLists[tiles[tile].first]; vector<int>& atoms1 = atomLists[tiles[tile].first];
vector<int>& atoms2 = atomLists[tiles[tile].second]; vector<int>& atoms2 = atomLists[tiles[tile].second];
vector<int> flags(atoms1.size(), (1L<<atoms2.size())-1); vector<int> flags(atoms1.size(), (int) (1LL<<atoms2.size())-1);
int numExcluded = 0; int numExcluded = 0;
for (int i = 0; i < (int) atoms1.size(); i++) for (int i = 0; i < (int) atoms1.size(); i++)
for (int j = 0; j < (int) atoms2.size(); j++) { for (int j = 0; j < (int) atoms2.size(); j++) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment