Fixed compilation warnings on Windows

olla/include/openmm/KernelFactory.h

@@ -42,7 +42,7 @@ namespace OpenMM {
  * KernelImpls as needed.
  */
 
-class KernelFactory {
+class OPENMM_EXPORT KernelFactory {
 public:
     /**
      * Create a KernelImpl.

openmmapi/include/openmm/internal/ForceImpl.h

@@ -32,6 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
+#include "openmm/internal/windowsExport.h"
 #include <map>
 #include <string>
 #include <vector>
@@ -52,7 +53,7 @@ class ContextImpl;
  * ForceImpl subclass.
  */
 
-class ForceImpl {
+class OPENMM_EXPORT ForceImpl {
 public:
     virtual ~ForceImpl() {
     }

platforms/reference/src/ReferenceKernels.cpp

@@ -191,9 +191,9 @@ void ReferenceUpdateStateDataKernel::setPositions(ContextImpl& context, const st
     int numParticles = context.getSystem().getNumParticles();
     RealOpenMM** posData = extractPositions(context);
     for (int i = 0; i < numParticles; ++i) {
-        posData[i][0] = positions[i][0];
-        posData[i][1] = positions[i][1];
-        posData[i][2] = positions[i][2];
+        posData[i][0] = (RealOpenMM) positions[i][0];
+        posData[i][1] = (RealOpenMM) positions[i][1];
+        posData[i][2] = (RealOpenMM) positions[i][2];
     }
 }
 
@@ -209,9 +209,9 @@ void ReferenceUpdateStateDataKernel::setVelocities(ContextImpl& context, const s
     int numParticles = context.getSystem().getNumParticles();
     RealOpenMM** velData = extractVelocities(context);
     for (int i = 0; i < numParticles; ++i) {
-        velData[i][0] = velocities[i][0];
-        velData[i][1] = velocities[i][1];
-        velData[i][2] = velocities[i][2];
+        velData[i][0] = (RealOpenMM) velocities[i][0];
+        velData[i][1] = (RealOpenMM) velocities[i][1];
+        velData[i][2] = (RealOpenMM) velocities[i][2];
     }
 }
 
@@ -540,12 +540,12 @@ void ReferenceCalcNonbondedForceKernel::initialize(const System& system, const N
     if (nonbondedMethod == Ewald) {
         double alpha;
         NonbondedForceImpl::calcEwaldParameters(system, force, alpha, kmax[0], kmax[1], kmax[2]);
-        ewaldAlpha = alpha;
+        ewaldAlpha = (RealOpenMM) alpha;
     }
     else if (nonbondedMethod == PME) {
         double alpha;
         NonbondedForceImpl::calcPMEParameters(system, force, alpha, gridSize[0], gridSize[1], gridSize[2]);
-        ewaldAlpha = alpha;
+        ewaldAlpha = (RealOpenMM) alpha;
     }
     rfDielectric = (RealOpenMM)force.getReactionFieldDielectric();
 }

platforms/reference/src/SimTKReference/PME.cpp

@@ -512,7 +512,7 @@ pme_reciprocal_convolution(pme_t     pme,
     pme_virial[1][2] = pme_virial[2][1] = (RealOpenMM) (0.25*viryz);
 
     /* The factor 0.5 is nothing special, but it is better to have it here than inside the loop :-) */
-    *energy = 0.5*esum;
+    *energy = (RealOpenMM) (0.5*esum);
 }
 
 

platforms/reference/src/SimTKReference/ReferenceConstraintAlgorithm.h

@@ -25,10 +25,12 @@
 #ifndef __ReferenceConstraintAlgorithm_H__
 #define __ReferenceConstraintAlgorithm_H__
 
+#include "openmm/internal/windowsExport.h"
+
 /**
  * This abstract class defines the interface which constraint algorithms must implement.
  */
-class ReferenceConstraintAlgorithm {
+class OPENMM_EXPORT ReferenceConstraintAlgorithm {
 public:
 
     virtual ~ReferenceConstraintAlgorithm() {};

platforms/reference/src/SimTKReference/ReferenceCustomGBIxn.cpp

@@ -218,7 +218,7 @@ void ReferenceCustomGBIxn::calculateOnePairValue(int index, int atom1, int atom2
     if (cutoff && r >= cutoffDistance)
         return;
     map<string, double> variables = globalParameters;
-    for (int i = 0; i < paramNames.size(); i++) {
+    for (int i = 0; i < (int) paramNames.size(); i++) {
         variables[particleParamNames[i*2]] = atomParameters[atom1][i];
         variables[particleParamNames[i*2+1]] = atomParameters[atom2][i];
     }
@@ -289,7 +289,7 @@ void ReferenceCustomGBIxn::calculateOnePairEnergyTerm(int index, int atom1, int
     // Record variables for evaluating expressions.
 
     map<string, double> variables = globalParameters;
-    for (int i = 0; i < paramNames.size(); i++) {
+    for (int i = 0; i < (int) paramNames.size(); i++) {
         variables[particleParamNames[i*2]] = atomParameters[atom1][i];
         variables[particleParamNames[i*2+1]] = atomParameters[atom2][i];
     }
@@ -361,7 +361,7 @@ void ReferenceCustomGBIxn::calculateOnePairChainRule(int atom1, int atom2, RealO
     // Record variables for evaluating expressions.
 
     map<string, double> variables = globalParameters;
-    for (int i = 0; i < paramNames.size(); i++) {
+    for (int i = 0; i < (int) paramNames.size(); i++) {
         variables[particleParamNames[i*2]] = atomParameters[atom1][i];
         variables[particleParamNames[i*2+1]] = atomParameters[atom2][i];
     }
@@ -379,7 +379,7 @@ void ReferenceCustomGBIxn::calculateOnePairChainRule(int atom1, int atom2, RealO
         forces[atom2][i] += f;
     }
     variables = globalParameters;
-    for (int i = 0; i < paramNames.size(); i++)
+    for (int i = 0; i < (int) paramNames.size(); i++)
         variables[paramNames[i]] = atomParameters[atom1][i];
     variables[valueNames[0]] = values[0][atom1];
     for (int i = 1; i < (int) valueNames.size(); i++) {

platforms/reference/src/gbsa/CpuGBVI.cpp

@@ -433,7 +433,7 @@ RealOpenMM CpuGBVI::computeBornEnergy( const RealOpenMM* bornRadii, RealOpenMM**
    static const RealOpenMM half          = (RealOpenMM) 0.5;
    static const RealOpenMM fourth        = (RealOpenMM) 0.25;
    static const RealOpenMM eighth        = (RealOpenMM) 0.125;
-   static const RealOpenMM CAL_TO_JOULE  = 0.4184;
+   static const RealOpenMM CAL_TO_JOULE  = (RealOpenMM) 0.4184;
 
    // ---------------------------------------------------------------------------------------
 
@@ -551,7 +551,7 @@ int CpuGBVI::computeBornForces( const RealOpenMM* bornRadii, RealOpenMM** atomCo
    static const RealOpenMM oneThird     = (RealOpenMM) (1.0/3.0);
    static const RealOpenMM fourth       = (RealOpenMM) 0.25;
    static const RealOpenMM eighth       = (RealOpenMM) 0.125;
-   static const RealOpenMM CAL_TO_JOULE = 0.4184;
+   static const RealOpenMM CAL_TO_JOULE = (RealOpenMM) 0.4184;
 
    // ---------------------------------------------------------------------------------------
 

plugins/freeEnergy/platforms/reference/src/gbsa/ObcSoftcoreParameters.cpp

@@ -118,7 +118,7 @@ ObcSoftcoreParameters::ObcSoftcoreParameters( int numberOfAtoms, ObcSoftcorePara
    _nonPolarScaleFactors         = NULL;
 
 
-   _nonPolarPreFactor            = 2.25936;
+   _nonPolarPreFactor            = (RealOpenMM) 2.25936;
 
    setObcTypeParameters( obcType );