Renamed OpenMMAmoeba,h to AmoebaOpenMM for consistency w/ other plugin

plugins/amoeba/openmmapi/include/AmoebaOpenMM.h → plugins/amoeba/openmmapi/include/OpenMMAmoeba.h

@@ -2,7 +2,7 @@
 #define AMOEBA_OPENMM_H_
 
 /* -------------------------------------------------------------------------- *
- *                               AmoebaOpenMM                                 *
+ *                               OpenMMAmoeba                                 *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_HARMONIC_ANGLE_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_HARMONIC_BOND_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *
@@ -38,7 +38,6 @@
 #include <vector>
 #include "openmm/internal/windowsExport.h"
 
-//namespace AmoebaOpenMM {
 namespace OpenMM {
 
 /**
@@ -157,6 +156,6 @@ public:
     }
 };
 
-} // namespace AmoebaOpenMM
+} // namespace OpenMM
 
 #endif /*OPENMM_AMOEBA_HARMONIC_BOND_FORCE_H_*/

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_HARMONIC_IN_PLANE_ANGLE_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_MULTIPOLE_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_OUT_OF_PLANE_BEND_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_PI_TORSION_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_STRETCH_BEND_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_TORSION_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_TORSION_TORSION_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_UREY_BRADLEY_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *
@@ -156,6 +156,6 @@ public:
     }
 };
 
-} // namespace AmoebaOpenMM
+} // namespace OpenMM
 
 #endif /*OPENMM_AMOEBA_UREY_BRADLEY_FORCE_H_*/

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_VDW_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_WCA_DISPERSION_FORCE_H_
 
 /* -------------------------------------------------------------------------- *
- *                              AmoebaOpenMM                                  *
+ *                              OpenMMAmoeba                                  *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define AMOEBA_OPENMM_KERNELS_H_
 
 /* -------------------------------------------------------------------------- *
- *                             AmoebaOpenMM                                   *
+ *                             OpenMMAmoeba                                   *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *
@@ -32,7 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "AmoebaOpenMM.h"
+#include "OpenMMAmoeba.h"
 #include "openmm/KernelImpl.h"
 #include "openmm/System.h"
 #include "openmm/Platform.h"

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_HARMONIC_ANGLE_FORCE_IMPL_H_
 
 /* -------------------------------------------------------------------------- *
- *                                AmoebaOpenMM                                *
+ *                                OpenMMAmoeba                                *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_HARMONIC_BOND_FORCE_IMPL_H_
 
 /* -------------------------------------------------------------------------- *
- *                                AmoebaOpenMM                                *
+ *                                OpenMMAmoeba                                *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_HARMONIC_IN_PLANE_ANGLE_FORCE_IMPL_H_
 
 /* -------------------------------------------------------------------------- *
- *                                AmoebaOpenMM                                *
+ *                                OpenMMAmoeba                                *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_MULTIPOLE_FORCE_IMPL_H_
 
 /* -------------------------------------------------------------------------- *
- *                                AmoebaOpenMM                                *
+ *                                OpenMMAmoeba                                *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_OUT_OF_PLANE_BEND_FORCE_IMPL_H_
 
 /* -------------------------------------------------------------------------- *
- *                                AmoebaOpenMM                                *
+ *                                OpenMMAmoeba                                *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *

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

@@ -2,7 +2,7 @@
 #define OPENMM_AMOEBA_PI_TORSION_FORCE_IMPL_H_
 
 /* -------------------------------------------------------------------------- *
- *                                AmoebaOpenMM                                *
+ *                                OpenMMAmoeba                                *
  * -------------------------------------------------------------------------- *
  * This is part of the OpenMM molecular simulation toolkit originating from   *
  * Simbios, the NIH National Center for Physics-Based Simulation of           *