"platforms/vscode:/vscode.git/clone" did not exist on "c4e8dc2720a9d2141861fe5ad714d7ec84dff774"
Commit cd8bf0f2 authored by Mark Friedrichs's avatar Mark Friedrichs
Browse files

Windows complains about ambiguity is pow() arguments now that we are using double

parent 96db6b14
...@@ -78,8 +78,8 @@ ReferenceLJCoulomb14::~ReferenceLJCoulomb14( ){ ...@@ -78,8 +78,8 @@ ReferenceLJCoulomb14::~ReferenceLJCoulomb14( ){
cutoff = true; cutoff = true;
cutoffDistance = distance; cutoffDistance = distance;
krf = pow(cutoffDistance, -3.0f)*(solventDielectric-1.0f)/(2.0f*solventDielectric+1.0f); krf = pow(cutoffDistance, -3.0)*(solventDielectric-1.0)/(2.0*solventDielectric+1.0);
crf = (1.0f/cutoffDistance)*(3.0f*solventDielectric)/(2.0f*solventDielectric+1.0f); crf = (1.0f/cutoffDistance)*(3.0*solventDielectric)/(2.0*solventDielectric+1.0);
return ReferenceForce::DefaultReturn; return ReferenceForce::DefaultReturn;
} }
......
...@@ -88,8 +88,8 @@ ReferenceLJCoulombIxn::~ReferenceLJCoulombIxn( ){ ...@@ -88,8 +88,8 @@ ReferenceLJCoulombIxn::~ReferenceLJCoulombIxn( ){
cutoff = true; cutoff = true;
cutoffDistance = distance; cutoffDistance = distance;
neighborList = &neighbors; neighborList = &neighbors;
krf = pow(cutoffDistance, -3.0f)*(solventDielectric-1.0f)/(2.0f*solventDielectric+1.0f); krf = pow(cutoffDistance, -3.0)*(solventDielectric-1.0)/(2.0*solventDielectric+1.0);
crf = (1.0f/cutoffDistance)*(3.0f*solventDielectric)/(2.0f*solventDielectric+1.0f); crf = (1.0/cutoffDistance)*(3.0*solventDielectric)/(2.0*solventDielectric+1.0);
return ReferenceForce::DefaultReturn; 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