Commit 3c100e69 authored by Peter Eastman's avatar Peter Eastman
Browse files

Renamed GBSAOBCForceField to GBSAOBCForce.

parent 1b2ebaf0
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/** /**
* This tests the reference implementation of GBSAOBCForceField. * This tests the reference implementation of GBSAOBCForce.
*/ */
#include "../../../tests/AssertionUtilities.h" #include "../../../tests/AssertionUtilities.h"
#include "OpenMMContext.h" #include "OpenMMContext.h"
#include "ReferencePlatform.h" #include "ReferencePlatform.h"
#include "GBSAOBCForceField.h" #include "GBSAOBCForce.h"
#include "System.h" #include "System.h"
#include "LangevinIntegrator.h" #include "LangevinIntegrator.h"
#include "../src/SimTKUtilities/SimTKOpenMMRealType.h" #include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
...@@ -54,7 +54,7 @@ void testSingleParticle() { ...@@ -54,7 +54,7 @@ void testSingleParticle() {
System system(1, 0); System system(1, 0);
system.setParticleMass(0, 2.0); system.setParticleMass(0, 2.0);
LangevinIntegrator integrator(0, 0.1, 0.01); LangevinIntegrator integrator(0, 0.1, 0.01);
GBSAOBCForceField* forceField = new GBSAOBCForceField(1); GBSAOBCForce* forceField = new GBSAOBCForce(1);
forceField->setParticleParameters(0, 0.5, 0.15, 1); forceField->setParticleParameters(0, 0.5, 0.15, 1);
system.addForce(forceField); system.addForce(forceField);
OpenMMContext context(system, integrator, platform); OpenMMContext context(system, integrator, platform);
...@@ -75,7 +75,7 @@ void testForce() { ...@@ -75,7 +75,7 @@ void testForce() {
const int numParticles = 10; const int numParticles = 10;
System system(numParticles, 0); System system(numParticles, 0);
LangevinIntegrator integrator(0, 0.1, 0.01); LangevinIntegrator integrator(0, 0.1, 0.01);
GBSAOBCForceField* forceField = new GBSAOBCForceField(numParticles); GBSAOBCForce* forceField = new GBSAOBCForce(numParticles);
for (int i = 0; i < numParticles; ++i) for (int i = 0; i < numParticles; ++i)
forceField->setParticleParameters(i, i%2 == 0 ? -1 : 1, 0.15, 1); forceField->setParticleParameters(i, i%2 == 0 ? -1 : 1, 0.15, 1);
system.addForce(forceField); system.addForce(forceField);
......
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