ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use typecast to silence CodeQL warnings

Browse Source
This commit is contained in:
Giacomo Fiorin
2021-02-06 17:30:01 -05:00
committed by Axel Kohlmeyer
parent 1609c498bc
commit 5573d01079
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/colvars/colvargrid.cpp
View File

@ -423,8 +423,8 @@ void integrate_potential::atimes(const std::vector<cvm::real> &A, std::vector<cv
index++;
}
// Edges along x (x components only)
index = 0; // Follows left edge
index2 = h * (w - 1); // Follows right edge
index = 0L; // Follows left edge
index2 = h * static_cast<size_t>(w - 1); // Follows right edge
if (periodic[0]) {
xm = h * (w - 1);
xp = h;
@ -478,7 +478,7 @@ void integrate_potential::atimes(const std::vector<cvm::real> &A, std::vector<cv
index += 2; // skip the edges and move to next column
}
// Edges along y (y components only)
index = 0; // Follows bottom edge
index = 0L; // Follows bottom edge
index2 = h - 1; // Follows top edge
if (periodic[1]) {
fact = periodic[0] ? 1.0 : 0.5;
@ -545,7 +545,7 @@ void integrate_potential::atimes(const std::vector<cvm::real> &A, std::vector<cv
cvm::real ifactz = 1 / factz;
// All x components except on x edges
index = d * h; // Skip left slab
index = d * static_cast<size_t>(h); // Skip left slab
fact = facty * factz;
for (i=1; i<w-1; i++) {
for (j=0; j<d; j++) { // full range of y
@ -564,8 +564,8 @@ void integrate_potential::atimes(const std::vector<cvm::real> &A, std::vector<cv
}
}
// Edges along x (x components only)
index = 0; // Follows left slab
index2 = d * h * (w - 1); // Follows right slab
index = 0L; // Follows left slab
index2 = d * h * static_cast<size_t>(w - 1); // Follows right slab
if (periodic[0]) {
xm = d * h * (w - 1);
xp = d * h;
@ -639,8 +639,8 @@ void integrate_potential::atimes(const std::vector<cvm::real> &A, std::vector<cv
index += 2 * h; // skip columns in front and back slabs
}
// Edges along y (y components only)
index = 0; // Follows front slab
index2 = h * (d - 1); // Follows back slab
index = 0L; // Follows front slab
index2 = h * static_cast<size_t>(d - 1); // Follows back slab
if (periodic[1]) {
ym = h * (d - 1);
yp = h;
@ -664,8 +664,8 @@ void integrate_potential::atimes(const std::vector<cvm::real> &A, std::vector<cv
LA[index2] += fact * ffy * (A[index2 - yp] + A[index2 - ym] - 2.0 * A[index2]);
index++;
index2++;
index += h * (d - 1);
index2 += h * (d - 1);
index += h * static_cast<size_t>(d - 1);
index2 += h * static_cast<size_t>(d - 1);
}
} else {
ym = -h;
@ -691,8 +691,8 @@ void integrate_potential::atimes(const std::vector<cvm::real> &A, std::vector<cv
LA[index2] += fact * ffy * (A[index2 + ym] - A[index2]);
index++;
index2++;
index += h * (d - 1);
index2 += h * (d - 1);
index += h * static_cast<size_t>(d - 1);
index2 += h * static_cast<size_t>(d - 1);
}
}

2
lib/colvars/colvargrid.h
View File

@ -59,7 +59,7 @@ protected:
{
size_t addr = 0;
for (size_t i = 0; i < nd; i++) {
addr += ix[i]*nxc[i];
addr += ix[i]*static_cast<size_t>(nxc[i]);
if (cvm::debug()) {
if (ix[i] >= nx[i]) {
cvm::error("Error: exceeding bounds in colvar_grid.\n", BUG_ERROR);