Renamed OpenMMContext to Context

platforms/brook/src/BrookCalcKineticEnergyKernel.cpp

@@ -117,13 +117,13 @@ _brookVelocityCenterOfMassRemoval->setup( masses, getPlatform() );
 /** 
  * Calculate kinetic energy
  * 
- * @param context OpenMMContextImpl reference
+ * @param context ContextImpl reference
  *
  * @return kinetic energy of the system
  *
  */
 
-double BrookCalcKineticEnergyKernel::execute( OpenMMContextImpl& context ){
+double BrookCalcKineticEnergyKernel::execute( ContextImpl& context ){
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookCalcKineticEnergyKernel.h

@@ -72,11 +72,11 @@ class BrookCalcKineticEnergyKernel : public CalcKineticEnergyKernel {
       /** 
        * Execute the kernel.
        * 
-       * @param context OpenMMContextImpl reference
+       * @param context ContextImpl reference
        *
        */
 
-      double execute( OpenMMContextImpl& context );
+      double execute( ContextImpl& context );
 
    private:
 

platforms/brook/src/BrookCalcNonbondedForceKernel.cpp

@@ -272,11 +272,11 @@ void BrookCalcNonbondedForceKernel::initialize14Interactions( const System& syst
 /** 
  * Execute the kernel to calculate the nonbonded forces
  * 
- * @param context OpenMMContextImpl context
+ * @param context ContextImpl context
  *
  */
 
-void BrookCalcNonbondedForceKernel::executeForces( OpenMMContextImpl& context ){
+void BrookCalcNonbondedForceKernel::executeForces( ContextImpl& context ){
 
 // ---------------------------------------------------------------------------------------
 
@@ -294,14 +294,14 @@ void BrookCalcNonbondedForceKernel::executeForces( OpenMMContextImpl& context ){
 /**
  * Execute the kernel to calculate the energy.
  * 
- * @param context OpenMMContextImpl context
+ * @param context ContextImpl context
  *
  * @return  potential energy due to the NonbondedForce
  * Currently always return 0.0 since energies not calculated on gpu
  *
  */
 
-double BrookCalcNonbondedForceKernel::executeEnergy( OpenMMContextImpl& context ){
+double BrookCalcNonbondedForceKernel::executeEnergy( ContextImpl& context ){
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookCalcNonbondedForceKernel.h

@@ -79,7 +79,7 @@ class BrookCalcNonbondedForceKernel : public CalcNonbondedForceKernel {
        * @param context    the context in which to execute this kernel
        */
 
-      void executeForces( OpenMMContextImpl& context );
+      void executeForces( ContextImpl& context );
   
       /**
        * Execute the kernel to calculate the energy.
@@ -100,7 +100,7 @@ class BrookCalcNonbondedForceKernel : public CalcNonbondedForceKernel {
        * @return the potential energy due to the NonbondedForce
        */
   
-      double executeEnergy( OpenMMContextImpl& context );
+      double executeEnergy( ContextImpl& context );
 
       /** 
        * Set log file reference

platforms/brook/src/BrookCalcPeriodicTorsionForceKernel.cpp

@@ -173,11 +173,11 @@ void BrookCalcPeriodicTorsionForceKernel::initialize( const System& system, cons
 /** 
  * Compute forces given particle coordinates
  * 
- * @param context OpenMMContextImpl context
+ * @param context ContextImpl context
  *
  */
 
-void BrookCalcPeriodicTorsionForceKernel::executeForces( OpenMMContextImpl& context ){
+void BrookCalcPeriodicTorsionForceKernel::executeForces( ContextImpl& context ){
 
 // ---------------------------------------------------------------------------------------
 
@@ -197,13 +197,13 @@ void BrookCalcPeriodicTorsionForceKernel::executeForces( OpenMMContextImpl& cont
 /**
  * Execute the kernel to calculate the energy
  * 
- * @param context OpenMMContextImpl context
+ * @param context ContextImpl context
  *
  * @return  potential energy
  *
  */
 
-double BrookCalcPeriodicTorsionForceKernel::executeEnergy( OpenMMContextImpl& context ){
+double BrookCalcPeriodicTorsionForceKernel::executeEnergy( ContextImpl& context ){
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookCalcPeriodicTorsionForceKernel.h

@@ -72,7 +72,7 @@ class BrookCalcPeriodicTorsionForceKernel : public CalcPeriodicTorsionForceKerne
        *
        */
 
-      void executeForces( OpenMMContextImpl& context );
+      void executeForces( ContextImpl& context );
   
       /**
        * Execute the kernel to calculate the energy.
@@ -83,7 +83,7 @@ class BrookCalcPeriodicTorsionForceKernel : public CalcPeriodicTorsionForceKerne
        *
        */
 
-      double executeEnergy( OpenMMContextImpl& context );
+      double executeEnergy( ContextImpl& context );
 
       /** 
        * Set log file reference

platforms/brook/src/BrookCalcRBTorsionForceKernel.cpp

@@ -177,11 +177,11 @@ void BrookCalcRBTorsionForceKernel::initialize( const System& system, const RBTo
 /** 
  * Compute forces given particle coordinates
  * 
- * @param context OpenMMContextImpl context
+ * @param context ContextImpl context
  *
  */
 
-void BrookCalcRBTorsionForceKernel::executeForces( OpenMMContextImpl& context ){
+void BrookCalcRBTorsionForceKernel::executeForces( ContextImpl& context ){
 
 // ---------------------------------------------------------------------------------------
 
@@ -201,13 +201,13 @@ void BrookCalcRBTorsionForceKernel::executeForces( OpenMMContextImpl& context ){
 /**
  * Execute the kernel to calculate the energy
  * 
- * @param context OpenMMContextImpl context
+ * @param context ContextImpl context
  *
  * @return  potential energy
  *
  */
 
-double BrookCalcRBTorsionForceKernel::executeEnergy( OpenMMContextImpl& context ){
+double BrookCalcRBTorsionForceKernel::executeEnergy( ContextImpl& context ){
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookCalcRBTorsionForceKernel.h

@@ -72,7 +72,7 @@ class BrookCalcRBTorsionForceKernel : public CalcRBTorsionForceKernel {
        *
        */
 
-      void executeForces( OpenMMContextImpl& context );
+      void executeForces( ContextImpl& context );
   
       /**
        * Execute the kernel to calculate the energy.
@@ -83,7 +83,7 @@ class BrookCalcRBTorsionForceKernel : public CalcRBTorsionForceKernel {
        *
        */
 
-      double executeEnergy( OpenMMContextImpl& context );
+      double executeEnergy( ContextImpl& context );
 
       /** 
        * Set log file reference

platforms/brook/src/BrookInitializeForcesKernel.cpp

@@ -128,11 +128,11 @@ void BrookInitializeForcesKernel::initialize( const System& system ){
 /** 
  * Zero forces
  * 
- * @param context OpenMMContextImpl context
+ * @param context ContextImpl context
  *
  */
 
-void BrookInitializeForcesKernel::execute( OpenMMContextImpl& context ){
+void BrookInitializeForcesKernel::execute( ContextImpl& context ){
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookInitializeForcesKernel.h

@@ -57,7 +57,7 @@ class BrookInitializeForcesKernel : public InitializeForcesKernel {
        * @param context    the context in which to execute this kernel
        */
 
-      void execute( OpenMMContextImpl& context );
+      void execute( ContextImpl& context );
   
       /** 
        * Set log file reference

platforms/brook/src/BrookIntegrateLangevinStepKernel.cpp

@@ -219,12 +219,12 @@ void BrookIntegrateLangevinStepKernel::initialize( const System& system, const L
 /** 
  * Execute kernel
  * 
- * @param context            OpenMMContextImpl reference
+ * @param context            ContextImpl reference
  * @param integrator         LangevinIntegrator reference
  *
  */
 
-void BrookIntegrateLangevinStepKernel::execute( OpenMMContextImpl& context, const LangevinIntegrator& integrator ){
+void BrookIntegrateLangevinStepKernel::execute( ContextImpl& context, const LangevinIntegrator& integrator ){
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookIntegrateLangevinStepKernel.h

@@ -77,12 +77,12 @@ class BrookIntegrateLangevinStepKernel : public IntegrateLangevinStepKernel {
       /** 
        * Execute kernel
        * 
-       * @param context            OpenMMContextImpl reference
+       * @param context            ContextImpl reference
        * @param integrator         LangevinIntegrator reference
        *
        */
 
-      void execute( OpenMMContextImpl& context, const LangevinIntegrator& integrator );
+      void execute( ContextImpl& context, const LangevinIntegrator& integrator );
 
       /** 
        * Set log file reference

platforms/brook/src/BrookIntegrateVerletStepKernel.cpp

@@ -175,12 +175,12 @@ void BrookIntegrateVerletStepKernel::initialize(  const System& system, const Ve
 /** 
  * Execute kernel
  * 
- * @param context            OpenMMContextImpl reference
+ * @param context            ContextImpl reference
  * @param integrator         VerletIntegrator reference
  *
  */
 
-void BrookIntegrateVerletStepKernel::execute( OpenMMContextImpl& context, const VerletIntegrator& integrator ){
+void BrookIntegrateVerletStepKernel::execute( ContextImpl& context, const VerletIntegrator& integrator ){
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookIntegrateVerletStepKernel.h

@@ -76,12 +76,12 @@ class BrookIntegrateVerletStepKernel : public IntegrateVerletStepKernel {
       /** 
        * Execute kernel
        * 
-       * @param context            OpenMMContextImpl reference
+       * @param context            ContextImpl reference
        * @param integrator         VerletIntegrator reference
        *
        */
 
-      void execute( OpenMMContextImpl& context, const VerletIntegrator& integrator );
+      void execute( ContextImpl& context, const VerletIntegrator& integrator );
 
       /** 
        * Set log file reference

platforms/brook/src/BrookKernelFactory.cpp

@@ -38,11 +38,11 @@
 #include "BrookCalcKineticEnergyKernel.h"
 #include "BrookCalcGBSAOBCForceKernel.h"
 #include "BrookRemoveCMMotionKernel.h"
-#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/internal/ContextImpl.h"
 
 using namespace OpenMM;
 
-KernelImpl* BrookKernelFactory::createKernelImpl( std::string name, const Platform& platform, OpenMMContextImpl& context ) const {
+KernelImpl* BrookKernelFactory::createKernelImpl( std::string name, const Platform& platform, ContextImpl& context ) const {
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookNonBonded.cpp

@@ -1279,7 +1279,7 @@ std::string BrookNonBonded::getContentsString( int level ) const {
 /** 
  * Compute forces
  * 
- * @param context OpenMMContextImpl context
+ * @param context ContextImpl context
  *
  */
 

platforms/brook/src/BrookPlatform.cpp

@@ -27,7 +27,7 @@
 #include "BrookPlatform.h"
 #include "BrookKernelFactory.h"
 #include "OpenMMBrookInterface.h"
-#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/internal/ContextImpl.h"
 #include "openmm/OpenMMException.h"
 #include "openmm/kernels.h"
 #include "../../reference/src/SimTKUtilities/SimTKOpenMMRealType.h"
@@ -526,11 +526,11 @@ int BrookPlatform::setLog( FILE* log ){
 
 /** 
  *
- * This is called whenever a new OpenMMContext is created.  It gives the Platform a chance to initialize
+ * This is called whenever a new Context is created.  It gives the Platform a chance to initialize
  * the context and store platform-specific data in it.
  *
  */
-void BrookPlatform::contextCreated( OpenMMContextImpl& context ) const {
+void BrookPlatform::contextCreated( ContextImpl& context ) const {
 
 // ---------------------------------------------------------------------------------------
 
@@ -547,12 +547,12 @@ void BrookPlatform::contextCreated( OpenMMContextImpl& context ) const {
 
 /** 
  *
- * This is called whenever an OpenMMContext is deleted.  It gives the Platform a chance to clean up
+ * This is called whenever a Context is deleted.  It gives the Platform a chance to clean up
  * any platform-specific data that was stored in it.
  *
  */
 
-void BrookPlatform::contextDestroyed( OpenMMContextImpl& context ) const {
+void BrookPlatform::contextDestroyed( ContextImpl& context ) const {
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookRemoveCMMotionKernel.cpp

@@ -24,7 +24,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.      *
  * -------------------------------------------------------------------------- */
 
-#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/internal/ContextImpl.h"
 #include "openmm/System.h"
 #include "BrookRemoveCMMotionKernel.h"
 #include "BrookStreamInternal.h"
@@ -156,11 +156,11 @@ int BrookRemoveCMMotionKernel::getFrequency( void ) const {
 /** 
  * Execute kernel
  * 
- * @param context    OpenMMContextImpl reference
+ * @param context    ContextImpl reference
  *
  */
 
-void BrookRemoveCMMotionKernel::execute( OpenMMContextImpl& context ){
+void BrookRemoveCMMotionKernel::execute( ContextImpl& context ){
 
 // ---------------------------------------------------------------------------------------
 

platforms/brook/src/BrookRemoveCMMotionKernel.h

@@ -112,11 +112,11 @@ class BrookRemoveCMMotionKernel : public RemoveCMMotionKernel {
       /** 
        * Execute the kernel.
        * 
-       * @param context  OpenMMContextImpl reference
+       * @param context  ContextImpl reference
        *
        */
 
-      void execute( OpenMMContextImpl& context );
+      void execute( ContextImpl& context );
 
    private:
 

platforms/brook/src/BrookStreamFactory.cpp

@@ -27,7 +27,7 @@
 #include "openmm/OpenMMException.h"
 #include "BrookStreamFactory.h"
 #include "BrookStreamImpl.h"
-#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/internal/ContextImpl.h"
 #include "OpenMMBrookInterface.h"
 
 #include <sstream>
@@ -279,7 +279,7 @@ int BrookStreamFactory::setDefaultDangleValue( double defaultDangleValue ){
  */
 
 StreamImpl* BrookStreamFactory::createStreamImpl( std::string name, int size, Stream::DataType type,
-                                                  const Platform& platform, OpenMMContextImpl& context ) const {
+                                                  const Platform& platform, ContextImpl& context ) const {
 
 // ---------------------------------------------------------------------------------------