Skip to content

GitLab

Commit ff7931dc authored by Mark Friedrichs's avatar Mark Friedrichs
Browse files

round() not recognized on Windows

parent 43443ca4
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
plugins/amoeba/platforms/cuda/src/kernels/amoebaCudaGpu.cpp
View file @ ff7931dc
...@@ -2266,8 +2266,8 @@ static void getVdwTaper( double r, double vdwTaperCoefficients[6], double* taper ...@@ -2266,8 +2266,8 @@ static void getVdwTaper( double r, double vdwTaperCoefficients[6], double* taper
static void lookupVdwTaperLinear( float r, double vdwTaperCut, double delta, static void lookupVdwTaperLinear( float r, double vdwTaperCut, double delta,
std::vector<float>& taperTable, std::vector<float>& dtaperTable, float* taper, float* dtaper ){ std::vector<float>& taperTable, std::vector<float>& dtaperTable, float* taper, float* dtaper ){
//int index = static_cast<int>(floor( (r - vdwTaperCut)/delta)); int index = static_cast<int>(floor( (r - vdwTaperCut)/delta));
int index = static_cast<int>(round( (r - vdwTaperCut)/delta)); //int index = static_cast<int>(round( (r - vdwTaperCut)/delta));
if( index > taperTable.size()-1 ){ if( index > taperTable.size()-1 ){
*taper = *dtaper = 0.0f; *taper = *dtaper = 0.0f;
} else { } else {
...@@ -2288,7 +2288,8 @@ static void lookupVdwTaperLinear( float r, double vdwTaperCut, double delta, ...@@ -2288,7 +2288,8 @@ static void lookupVdwTaperLinear( float r, double vdwTaperCut, double delta,
static void lookupVdwTaper( float r, double vdwTaperCut, double delta, static void lookupVdwTaper( float r, double vdwTaperCut, double delta,
std::vector<float>& taperTable, std::vector<float>& dtaperTable, float* taper, float* dtaper ){ std::vector<float>& taperTable, std::vector<float>& dtaperTable, float* taper, float* dtaper ){
int index = static_cast<int>(round( (r - vdwTaperCut)/delta)); //int index = static_cast<int>(round( (r - vdwTaperCut)/delta));
int index = static_cast<int>(floor( (r - vdwTaperCut)/delta));
if( index > taperTable.size()-2 ){ if( index > taperTable.size()-2 ){
*taper = *dtaper = 0.0f; *taper = *dtaper = 0.0f;
} else if( index == 0){ } else if( index == 0){
......
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