Commit 7ee0076d authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed incorrect fix for Windows compilation problems

parent 593d359c
...@@ -113,7 +113,7 @@ void ReferenceCMAPTorsionIxn::calculateOneIxn(int index, RealOpenMM** atomCoordi ...@@ -113,7 +113,7 @@ void ReferenceCMAPTorsionIxn::calculateOneIxn(int index, RealOpenMM** atomCoordi
// Identify which patch this is in. // Identify which patch this is in.
int size = (int) SQRT(double(coeff[map].size())); int size = (int) SQRT((RealOpenMM) coeff[map].size());
RealOpenMM delta = 2*M_PI/size; RealOpenMM delta = 2*M_PI/size;
int s = (int) (angleA/delta); int s = (int) (angleA/delta);
int t = (int) (angleB/delta); int t = (int) (angleB/delta);
...@@ -189,6 +189,6 @@ void ReferenceCMAPTorsionIxn::calculateOneIxn(int index, RealOpenMM** atomCoordi ...@@ -189,6 +189,6 @@ void ReferenceCMAPTorsionIxn::calculateOneIxn(int index, RealOpenMM** atomCoordi
--------------------------------------------------------------------------------------- */ --------------------------------------------------------------------------------------- */
int ReferenceCMAPTorsionIxn::calculateBondIxn(int* atomIndices, RealOpenMM** atomCoordinates, int ReferenceCMAPTorsionIxn::calculateBondIxn(int* atomIndices, RealOpenMM** atomCoordinates,
RealOpenMM* parameters, RealOpenMM** forces, RealOpenMM* energyByBond, RealOpenMM* energyByAtom) const { RealOpenMM* parameters, RealOpenMM** forces, RealOpenMM* energyByBond, RealOpenMM* energyByAtom) const {
return 0; // but it must return a value to avoid MSVC compile error return ReferenceForce::DefaultReturn;
} }
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