Merge pull request #619 from schwancr/patch-1

Update AmoebaMultipoleForceImpl.cpp

plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h

@@ -330,7 +330,7 @@ public:
      * the quadrupole moment is still undefined and should be ignored.
      *
      * @param context      context
-     * @param outputMultipoleMonents (charge,
+     * @param outputMultipoleMoments (charge,
                                       dipole_x, dipole_y, dipole_z,
                                       quadrupole_xx, quadrupole_xy, quadrupole_xz,
                                       quadrupole_yx, quadrupole_yy, quadrupole_yz,

plugins/amoeba/openmmapi/include/openmm/amoebaKernels.h

@@ -353,7 +353,7 @@ public:
     virtual void getElectrostaticPotential( ContextImpl& context, const std::vector< Vec3 >& inputGrid,
                                             std::vector< double >& outputElectrostaticPotential ) = 0;
 
-    virtual void getSystemMultipoleMoments( ContextImpl& context, std::vector< double >& outputMultipoleMonents ) = 0;
+    virtual void getSystemMultipoleMoments( ContextImpl& context, std::vector< double >& outputMultipoleMoments ) = 0;
     /**
      * Copy changed parameters over to a context.
      *

plugins/amoeba/openmmapi/include/openmm/internal/AmoebaMultipoleForceImpl.h

@@ -87,7 +87,7 @@ public:
     void getElectrostaticPotential( ContextImpl& context, const std::vector< Vec3 >& inputGrid,
                                     std::vector< double >& outputElectrostaticPotential );
 
-    void getSystemMultipoleMoments( ContextImpl& context, std::vector< double >& outputMultipoleMonents );
+    void getSystemMultipoleMoments( ContextImpl& context, std::vector< double >& outputMultipoleMoments );
     void updateParametersInContext(ContextImpl& context);
  
 

plugins/amoeba/openmmapi/src/AmoebaMultipoleForce.cpp

@@ -234,8 +234,8 @@ void AmoebaMultipoleForce::getElectrostaticPotential( const std::vector< Vec3 >&
     dynamic_cast<AmoebaMultipoleForceImpl&>(getImplInContext(context)).getElectrostaticPotential(getContextImpl(context), inputGrid, outputElectrostaticPotential);
 }
 
-void AmoebaMultipoleForce::getSystemMultipoleMoments(Context& context, std::vector< double >& outputMultipoleMonents ){
-    dynamic_cast<AmoebaMultipoleForceImpl&>(getImplInContext(context)).getSystemMultipoleMoments(getContextImpl(context), outputMultipoleMonents);
+void AmoebaMultipoleForce::getSystemMultipoleMoments(Context& context, std::vector< double >& outputMultipoleMoments ){
+    dynamic_cast<AmoebaMultipoleForceImpl&>(getImplInContext(context)).getSystemMultipoleMoments(getContextImpl(context), outputMultipoleMoments);
 }
 
 ForceImpl* AmoebaMultipoleForce::createImpl()  const {

plugins/amoeba/openmmapi/src/AmoebaMultipoleForceImpl.cpp

@@ -192,8 +192,8 @@ void AmoebaMultipoleForceImpl::getElectrostaticPotential( ContextImpl& context,
     kernel.getAs<CalcAmoebaMultipoleForceKernel>().getElectrostaticPotential(context, inputGrid, outputElectrostaticPotential);
 }
 
-void AmoebaMultipoleForceImpl::getSystemMultipoleMoments( ContextImpl& context, std::vector< double >& outputMultipoleMonents ){
-    kernel.getAs<CalcAmoebaMultipoleForceKernel>().getSystemMultipoleMoments(context, outputMultipoleMonents);
+void AmoebaMultipoleForceImpl::getSystemMultipoleMoments( ContextImpl& context, std::vector< double >& outputMultipoleMoments ){
+    kernel.getAs<CalcAmoebaMultipoleForceKernel>().getSystemMultipoleMoments(context, outputMultipoleMoments);
 }
 
 void AmoebaMultipoleForceImpl::updateParametersInContext(ContextImpl& context) {

plugins/amoeba/platforms/reference/src/AmoebaReferenceKernels.h

@@ -387,7 +387,7 @@ public:
      * Get the system multipole moments.
      *
      * @param context                context 
-     * @param outputMultipoleMonents vector of multipole moments:
+     * @param outputMultipoleMoments vector of multipole moments:
                                      (charge,
                                       dipole_x, dipole_y, dipole_z,
                                       quadrupole_xx, quadrupole_xy, quadrupole_xz,