Skip to content

GitLab

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

Change double to RealOpenMM to remove build warnings

parent 9535bef7
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
platforms/reference/src/gbsa/CpuGBVI.cpp
View file @ c4b8ba2d
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#include "../SimTKReference/ReferenceForce.h" #include "../SimTKReference/ReferenceForce.h"
#include <math.h> #include <math.h>
static const double CAL_TO_JOULE = 0.4184;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
CpuGBVI constructor CpuGBVI constructor
...@@ -435,6 +433,7 @@ RealOpenMM CpuGBVI::computeBornEnergy( const RealOpenMM* bornRadii, RealOpenMM** ...@@ -435,6 +433,7 @@ RealOpenMM CpuGBVI::computeBornEnergy( const RealOpenMM* bornRadii, RealOpenMM**
static const RealOpenMM half = (RealOpenMM) 0.5; static const RealOpenMM half = (RealOpenMM) 0.5;
static const RealOpenMM fourth = (RealOpenMM) 0.25; static const RealOpenMM fourth = (RealOpenMM) 0.25;
static const RealOpenMM eighth = (RealOpenMM) 0.125; static const RealOpenMM eighth = (RealOpenMM) 0.125;
static const RealOpenMM CAL_TO_JOULE = 0.4184;
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
...@@ -552,6 +551,7 @@ int CpuGBVI::computeBornForces( const RealOpenMM* bornRadii, RealOpenMM** atomCo ...@@ -552,6 +551,7 @@ int CpuGBVI::computeBornForces( const RealOpenMM* bornRadii, RealOpenMM** atomCo
static const RealOpenMM oneThird = (RealOpenMM) (1.0/3.0); static const RealOpenMM oneThird = (RealOpenMM) (1.0/3.0);
static const RealOpenMM fourth = (RealOpenMM) 0.25; static const RealOpenMM fourth = (RealOpenMM) 0.25;
static const RealOpenMM eighth = (RealOpenMM) 0.125; static const RealOpenMM eighth = (RealOpenMM) 0.125;
static const RealOpenMM CAL_TO_JOULE = 0.4184;
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
...@@ -717,7 +717,7 @@ if( atomI == 0 ){ ...@@ -717,7 +717,7 @@ if( atomI == 0 ){
#endif #endif
const RealOpenMM* scaledRadii = gbviParameters->getScaledRadii(); const RealOpenMM* scaledRadii = gbviParameters->getScaledRadii();
double stupidFactor = three/CAL_TO_JOULE; RealOpenMM stupidFactor = three/CAL_TO_JOULE;
for( int atomI = 0; atomI < numberOfAtoms; atomI++ ){ for( int atomI = 0; atomI < numberOfAtoms; atomI++ ){
RealOpenMM R = atomicRadii[atomI]; RealOpenMM R = atomicRadii[atomI];
......
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