Commit 1775e497 authored by Michael Sherman's avatar Michael Sherman
Browse files

Eliminated some Windows build warnings.

parent 5610057f
...@@ -479,9 +479,9 @@ void testBlockInteractions(bool periodic) { ...@@ -479,9 +479,9 @@ void testBlockInteractions(bool periodic) {
float dy = pos.y-center.y; float dy = pos.y-center.y;
float dz = pos.z-center.z; float dz = pos.z-center.z;
if (periodic) { if (periodic) {
dx -= floor(0.5+dx/boxSize)*boxSize; dx -= (float)(floor(0.5+dx/boxSize)*boxSize);
dy -= floor(0.5+dy/boxSize)*boxSize; dy -= (float)(floor(0.5+dy/boxSize)*boxSize);
dz -= floor(0.5+dz/boxSize)*boxSize; dz -= (float)(floor(0.5+dz/boxSize)*boxSize);
} }
ASSERT(abs(dx) < gridSize.x+TOL); ASSERT(abs(dx) < gridSize.x+TOL);
ASSERT(abs(dy) < gridSize.y+TOL); ASSERT(abs(dy) < gridSize.y+TOL);
...@@ -528,9 +528,9 @@ void testBlockInteractions(bool periodic) { ...@@ -528,9 +528,9 @@ void testBlockInteractions(bool periodic) {
float dy = center1.y-center2.y; float dy = center1.y-center2.y;
float dz = center1.z-center2.z; float dz = center1.z-center2.z;
if (periodic) { if (periodic) {
dx -= floor(0.5+dx/boxSize)*boxSize; dx -= (float)(floor(0.5+dx/boxSize)*boxSize);
dy -= floor(0.5+dy/boxSize)*boxSize; dy -= (float)(floor(0.5+dy/boxSize)*boxSize);
dz -= floor(0.5+dz/boxSize)*boxSize; dz -= (float)(floor(0.5+dz/boxSize)*boxSize);
} }
dx = max(0.0f, abs(dx)-gridSize1.x-gridSize2.x); dx = max(0.0f, abs(dx)-gridSize1.x-gridSize2.x);
dy = max(0.0f, abs(dy)-gridSize1.y-gridSize2.y); dy = max(0.0f, abs(dy)-gridSize1.y-gridSize2.y);
...@@ -549,9 +549,9 @@ void testBlockInteractions(bool periodic) { ...@@ -549,9 +549,9 @@ void testBlockInteractions(bool periodic) {
float dy = pos2.y-pos1.y; float dy = pos2.y-pos1.y;
float dz = pos2.z-pos1.z; float dz = pos2.z-pos1.z;
if (periodic) { if (periodic) {
dx -= floor(0.5+dx/boxSize)*boxSize; dx -= (float)(floor(0.5+dx/boxSize)*boxSize);
dy -= floor(0.5+dy/boxSize)*boxSize; dy -= (float)(floor(0.5+dy/boxSize)*boxSize);
dz -= floor(0.5+dz/boxSize)*boxSize; dz -= (float)(floor(0.5+dz/boxSize)*boxSize);
} }
if (dx*dx+dy*dy+dz*dz < cutoff*cutoff) { if (dx*dx+dy*dy+dz*dz < cutoff*cutoff) {
dx = pos2.x-center1.x; dx = pos2.x-center1.x;
...@@ -571,7 +571,7 @@ void testBlockInteractions(bool periodic) { ...@@ -571,7 +571,7 @@ void testBlockInteractions(bool periodic) {
// Check the tiles that did not have interactions to make sure all atoms are beyond the cutoff. // Check the tiles that did not have interactions to make sure all atoms are beyond the cutoff.
data.gpu->psWorkUnit->Download(); data.gpu->psWorkUnit->Download();
for (int i = 0; i < hasInteractions.size(); i++) for (int i = 0; i < (int)hasInteractions.size(); i++)
if (!hasInteractions[i]) { if (!hasInteractions[i]) {
unsigned int workUnit = (*data.gpu->psWorkUnit)[i]; unsigned int workUnit = (*data.gpu->psWorkUnit)[i];
unsigned int x = (workUnit >> 17); unsigned int x = (workUnit >> 17);
...@@ -584,9 +584,9 @@ void testBlockInteractions(bool periodic) { ...@@ -584,9 +584,9 @@ void testBlockInteractions(bool periodic) {
float dy = pos1.y-pos2.y; float dy = pos1.y-pos2.y;
float dz = pos1.z-pos2.z; float dz = pos1.z-pos2.z;
if (periodic) { if (periodic) {
dx -= floor(0.5+dx/boxSize)*boxSize; dx -= (float)(floor(0.5+dx/boxSize)*boxSize);
dy -= floor(0.5+dy/boxSize)*boxSize; dy -= (float)(floor(0.5+dy/boxSize)*boxSize);
dz -= floor(0.5+dz/boxSize)*boxSize; dz -= (float)(floor(0.5+dz/boxSize)*boxSize);
} }
ASSERT(dx*dx+dy*dy+dz*dz > cutoff*cutoff); ASSERT(dx*dx+dy*dy+dz*dz > cutoff*cutoff);
} }
......
...@@ -183,7 +183,7 @@ ReferenceRigidShakeAlgorithm::~ReferenceRigidShakeAlgorithm( ){ ...@@ -183,7 +183,7 @@ ReferenceRigidShakeAlgorithm::~ReferenceRigidShakeAlgorithm( ){
SimTKOpenMMUtilities::freeOneDRealOpenMMArray( _distanceTolerance, "distanceTolerance" ); SimTKOpenMMUtilities::freeOneDRealOpenMMArray( _distanceTolerance, "distanceTolerance" );
SimTKOpenMMUtilities::freeOneDRealOpenMMArray( _reducedMasses, "reducedMasses" ); SimTKOpenMMUtilities::freeOneDRealOpenMMArray( _reducedMasses, "reducedMasses" );
} }
for (int i = 0; i < _matrices.size(); i++) for (int i = 0; i < (int)_matrices.size(); i++)
SimTKOpenMMUtilities::freeTwoDRealOpenMMArray(_matrices[i], ""); SimTKOpenMMUtilities::freeTwoDRealOpenMMArray(_matrices[i], "");
} }
...@@ -346,13 +346,13 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo ...@@ -346,13 +346,13 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo
reducedMasses[ii] = half/( inverseMasses[atomI] + inverseMasses[atomJ] ); reducedMasses[ii] = half/( inverseMasses[atomI] + inverseMasses[atomJ] );
} }
vector<double> temp; vector<double> temp;
for (int i = 0; i < _rigidClusters.size(); i++) { for (int i = 0; i < (int)_rigidClusters.size(); i++) {
// Compute the constraint coupling matrix for this cluster. // Compute the constraint coupling matrix for this cluster.
const vector<int>& cluster = _rigidClusters[i]; const vector<int>& cluster = _rigidClusters[i];
int size = cluster.size(); int size = cluster.size();
vector<Vec3> r(size); vector<Vec3> r(size);
for (int j = 0; j < cluster.size(); j++) { for (int j = 0; j < (int)cluster.size(); j++) {
int atom1 = _atomIndices[cluster[j]][0]; int atom1 = _atomIndices[cluster[j]][0];
int atom2 = _atomIndices[cluster[j]][1]; int atom2 = _atomIndices[cluster[j]][1];
r[j] = Vec3(atomCoordinates[atom1][0]-atomCoordinates[atom2][0], r[j] = Vec3(atomCoordinates[atom1][0]-atomCoordinates[atom2][0],
...@@ -397,7 +397,7 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo ...@@ -397,7 +397,7 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo
double singularValueCutoff = 0.01*w[0]; double singularValueCutoff = 0.01*w[0];
for (int j = 0; j < size; j++) for (int j = 0; j < size; j++)
w[j] = (w[j] < singularValueCutoff ? 0.0 : 1.0/w[j]); w[j] = (w[j] < singularValueCutoff ? 0.0 : 1.0/w[j]);
if (temp.size() < size) if ((int)temp.size() < size)
temp.resize(size); temp.resize(size);
for (int j = 0; j < size; j++) { for (int j = 0; j < size; j++) {
for (int k = 0; k < size; k++) { for (int k = 0; k < size; k++) {
...@@ -411,7 +411,7 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo ...@@ -411,7 +411,7 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo
for (int j = 0; j < size; j++) for (int j = 0; j < size; j++)
for (int k = 0; k < size; k++) for (int k = 0; k < size; k++)
_matrices[i][j][k] = matrix[j][k]; _matrices[i][j][k] = (RealOpenMM)matrix[j][k];
} }
} }
...@@ -458,7 +458,7 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo ...@@ -458,7 +458,7 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo
RealOpenMM diff = dist2 - rp2; RealOpenMM diff = dist2 - rp2;
constraintForce[ii] = zero; constraintForce[ii] = zero;
RealOpenMM rrpr = DOT3( rp_ij, r_ij[ii] ); RealOpenMM rrpr = DOT3( rp_ij, r_ij[ii] );
RealOpenMM acor;
if( rrpr < d_ij2[ii]*epsilon6 ){ if( rrpr < d_ij2[ii]*epsilon6 ){
std::stringstream message; std::stringstream message;
message << iterations <<" "<<atomI<<" "<<atomJ<< " Error: sign of rrpr < 0?\n"; message << iterations <<" "<<atomI<<" "<<atomJ<< " Error: sign of rrpr < 0?\n";
...@@ -473,11 +473,11 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo ...@@ -473,11 +473,11 @@ int ReferenceRigidShakeAlgorithm::apply( int numberOfAtoms, RealOpenMM** atomCoo
if( numberConverged == _numberOfConstraints ){ if( numberConverged == _numberOfConstraints ){
done = true; done = true;
} }
for (int i = 0; i < _rigidClusters.size(); i++) { for (int i = 0; i < (int)_rigidClusters.size(); i++) {
const vector<int>& cluster = _rigidClusters[i]; const vector<int>& cluster = _rigidClusters[i];
RealOpenMM** matrix = _matrices[i]; RealOpenMM** matrix = _matrices[i];
int size = cluster.size(); int size = cluster.size();
if (size > tempForce.size()) if (size > (int)tempForce.size())
tempForce.resize(size); tempForce.resize(size);
for (int j = 0; j < size; j++) { for (int j = 0; j < size; j++) {
tempForce[j] = zero; tempForce[j] = zero;
......
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