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

Updated to allow compilation in both float & double

Code surrounding 'RealOpenMMType == 0' will be removed 
once confirmed free-energy plugin code does not break
parent a072c113
...@@ -300,7 +300,7 @@ int GBVIParameters::setScaledRadii( RealOpenMM* scaledRadii ){ ...@@ -300,7 +300,7 @@ int GBVIParameters::setScaledRadii( RealOpenMM* scaledRadii ){
} }
#if RealOpenMMType == 2 #if RealOpenMMType == 0
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
...@@ -443,7 +443,7 @@ int GBVIParameters::setGammaParameters( RealOpenMM* gammas ){ ...@@ -443,7 +443,7 @@ int GBVIParameters::setGammaParameters( RealOpenMM* gammas ){
} }
#if RealOpenMMType == 2 #if RealOpenMMType == 0
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -93,7 +93,7 @@ class GBVIParameters : public ImplicitSolventParameters { ...@@ -93,7 +93,7 @@ class GBVIParameters : public ImplicitSolventParameters {
--------------------------------------------------------------------------------------- */ --------------------------------------------------------------------------------------- */
int setScaledRadii( RealOpenMM* scaledRadii ); int setScaledRadii( RealOpenMM* scaledRadii );
#if RealOpenMMType == 2 #if RealOpenMMType == 0
int setScaledRadii( float* scaledRadii ); int setScaledRadii( float* scaledRadii );
#endif #endif
int setScaledRadii( const RealOpenMMVector& scaledRadii ); int setScaledRadii( const RealOpenMMVector& scaledRadii );
......
...@@ -431,7 +431,7 @@ int ObcParameters::setScaledRadiusFactors( RealOpenMM* scaledRadiusFactors ){ ...@@ -431,7 +431,7 @@ int ObcParameters::setScaledRadiusFactors( RealOpenMM* scaledRadiusFactors ){
} }
#if RealOpenMMType == 2 #if RealOpenMMType == 0
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -184,7 +184,7 @@ class ObcParameters : public ImplicitSolventParameters { ...@@ -184,7 +184,7 @@ class ObcParameters : public ImplicitSolventParameters {
--------------------------------------------------------------------------------------- */ --------------------------------------------------------------------------------------- */
int setScaledRadiusFactors( RealOpenMM* scaledRadiusFactors ); int setScaledRadiusFactors( RealOpenMM* scaledRadiusFactors );
#if RealOpenMMType == 2 #if RealOpenMMType == 0
int setScaledRadiusFactors( float* scaledRadiusFactors ); int setScaledRadiusFactors( float* scaledRadiusFactors );
#endif #endif
int setScaledRadiusFactors( const RealOpenMMVector& scaledRadiusFactors ); int setScaledRadiusFactors( const RealOpenMMVector& scaledRadiusFactors );
......
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