Moved AMOEBA include files to plugins/amoeba/openmmapi/include/openmm to be...

Moved AMOEBA include files to plugins/amoeba/openmmapi/include/openmm to be consistent w/ outlay other plugins, ...

plugins/amoeba/openmmapi/src/AmoebaPiTorsionForce.cpp

@@ -31,8 +31,8 @@
 
 #include "openmm/Force.h"
 #include "openmm/OpenMMException.h"
-#include "AmoebaPiTorsionForce.h"
-#include "internal/AmoebaPiTorsionForceImpl.h"
+#include "openmm/AmoebaPiTorsionForce.h"
+#include "openmm/internal/AmoebaPiTorsionForceImpl.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaPiTorsionForceImpl.cpp

@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/internal/ContextImpl.h"
-#include "internal/AmoebaPiTorsionForceImpl.h"
-#include "amoebaKernels.h"
+#include "openmm/internal/AmoebaPiTorsionForceImpl.h"
+#include "openmm/amoebaKernels.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaStretchBendForce.cpp

@@ -31,8 +31,8 @@
 
 #include "openmm/Force.h"
 #include "openmm/OpenMMException.h"
-#include "AmoebaStretchBendForce.h"
-#include "internal/AmoebaStretchBendForceImpl.h"
+#include "openmm/AmoebaStretchBendForce.h"
+#include "openmm/internal/AmoebaStretchBendForceImpl.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaStretchBendForceImpl.cpp

@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/internal/ContextImpl.h"
-#include "internal/AmoebaStretchBendForceImpl.h"
-#include "amoebaKernels.h"
+#include "openmm/internal/AmoebaStretchBendForceImpl.h"
+#include "openmm/amoebaKernels.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaTorsionForce.cpp

@@ -31,8 +31,8 @@
 
 #include "openmm/Force.h"
 #include "openmm/OpenMMException.h"
-#include "AmoebaTorsionForce.h"
-#include "internal/AmoebaTorsionForceImpl.h"
+#include "openmm/AmoebaTorsionForce.h"
+#include "openmm/internal/AmoebaTorsionForceImpl.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaTorsionForceImpl.cpp

@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/internal/ContextImpl.h"
-#include "internal/AmoebaTorsionForceImpl.h"
-#include "amoebaKernels.h"
+#include "openmm/internal/AmoebaTorsionForceImpl.h"
+#include "openmm/amoebaKernels.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaTorsionTorsionForce.cpp

@@ -31,8 +31,8 @@
 
 #include "openmm/Force.h"
 #include "openmm/OpenMMException.h"
-#include "AmoebaTorsionTorsionForce.h"
-#include "internal/AmoebaTorsionTorsionForceImpl.h"
+#include "openmm/AmoebaTorsionTorsionForce.h"
+#include "openmm/internal/AmoebaTorsionTorsionForceImpl.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaTorsionTorsionForceImpl.cpp

@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/internal/ContextImpl.h"
-#include "internal/AmoebaTorsionTorsionForceImpl.h"
-#include "amoebaKernels.h"
+#include "openmm/internal/AmoebaTorsionTorsionForceImpl.h"
+#include "openmm/amoebaKernels.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaUreyBradleyForce.cpp

@@ -31,8 +31,8 @@
 
 #include "openmm/Force.h"
 #include "openmm/OpenMMException.h"
-#include "AmoebaUreyBradleyForce.h"
-#include "internal/AmoebaUreyBradleyForceImpl.h"
+#include "openmm/AmoebaUreyBradleyForce.h"
+#include "openmm/internal/AmoebaUreyBradleyForceImpl.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaUreyBradleyForceImpl.cpp

@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/internal/ContextImpl.h"
-#include "internal/AmoebaUreyBradleyForceImpl.h"
-#include "amoebaKernels.h"
+#include "openmm/internal/AmoebaUreyBradleyForceImpl.h"
+#include "openmm/amoebaKernels.h"
 #include "openmm/Platform.h"
 
 using namespace OpenMM;

plugins/amoeba/openmmapi/src/AmoebaVdwForce.cpp

@@ -31,8 +31,8 @@
 
 #include "openmm/Force.h"
 #include "openmm/OpenMMException.h"
-#include "AmoebaVdwForce.h"
-#include "internal/AmoebaVdwForceImpl.h"
+#include "openmm/AmoebaVdwForce.h"
+#include "openmm/internal/AmoebaVdwForceImpl.h"
 
 using namespace OpenMM;
 using std::string;

plugins/amoeba/openmmapi/src/AmoebaVdwForceImpl.cpp

@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/internal/ContextImpl.h"
-#include "internal/AmoebaVdwForceImpl.h"
-#include "amoebaKernels.h"
+#include "openmm/internal/AmoebaVdwForceImpl.h"
+#include "openmm/amoebaKernels.h"
 
 using namespace OpenMM;
 

plugins/amoeba/openmmapi/src/AmoebaWcaDispersionForce.cpp

@@ -31,8 +31,8 @@
 
 #include "openmm/Force.h"
 #include "openmm/OpenMMException.h"
-#include "AmoebaWcaDispersionForce.h"
-#include "internal/AmoebaWcaDispersionForceImpl.h"
+#include "openmm/AmoebaWcaDispersionForce.h"
+#include "openmm/internal/AmoebaWcaDispersionForceImpl.h"
 #include <cmath>
 
 using namespace OpenMM;

plugins/amoeba/openmmapi/src/AmoebaWcaDispersionForceImpl.cpp

@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/internal/ContextImpl.h"
-#include "internal/AmoebaWcaDispersionForceImpl.h"
-#include "amoebaKernels.h"
+#include "openmm/internal/AmoebaWcaDispersionForceImpl.h"
+#include "openmm/amoebaKernels.h"
 #include <cmath>
 
 using namespace OpenMM;

plugins/amoeba/platforms/cuda/src/AmoebaCudaKernels.cpp

@@ -29,8 +29,8 @@
 #include "kernels/amoebaGpuTypes.h"
 #include "kernels/cudaKernels.h"
 #include "kernels/amoebaCudaKernels.h"
-#include "internal/AmoebaMultipoleForceImpl.h"
-#include "internal/AmoebaWcaDispersionForceImpl.h"
+#include "openmm/internal/AmoebaMultipoleForceImpl.h"
+#include "openmm/internal/AmoebaWcaDispersionForceImpl.h"
 #include "openmm/internal/NonbondedForceImpl.h"
 #include "CudaForceInfo.h"
 

plugins/amoeba/platforms/cuda/src/AmoebaCudaKernels.h

@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.      *
  * -------------------------------------------------------------------------- */
 
-#include "amoebaKernels.h"
+#include "openmm/amoebaKernels.h"
 #include "openmm/System.h"
 #include "AmoebaCudaData.h"
 

plugins/amoeba/platforms/cuda/tests/AmoebaTinkerParameterFile.h

@@ -35,21 +35,21 @@
 #include "openmm/VariableVerletIntegrator.h"
 #include "openmm/BrownianIntegrator.h"
 
-#include "AmoebaHarmonicBondForce.h"
-#include "AmoebaHarmonicAngleForce.h"
-#include "AmoebaHarmonicInPlaneAngleForce.h"
-#include "AmoebaTorsionForce.h"
-#include "AmoebaPiTorsionForce.h"
-#include "AmoebaStretchBendForce.h"
-#include "AmoebaOutOfPlaneBendForce.h"
-#include "AmoebaTorsionTorsionForce.h"
-#include "AmoebaMultipoleForce.h"
-#include "AmoebaGeneralizedKirkwoodForce.h"
-#include "AmoebaVdwForce.h"
-#include "AmoebaWcaDispersionForce.h"
-#include "AmoebaUreyBradleyForce.h"
-#include "internal/windowsExport.h"
-#include "internal/AmoebaWcaDispersionForceImpl.h"
+#include "openmm/AmoebaHarmonicBondForce.h"
+#include "openmm/AmoebaHarmonicAngleForce.h"
+#include "openmm/AmoebaHarmonicInPlaneAngleForce.h"
+#include "openmm/AmoebaTorsionForce.h"
+#include "openmm/AmoebaPiTorsionForce.h"
+#include "openmm/AmoebaStretchBendForce.h"
+#include "openmm/AmoebaOutOfPlaneBendForce.h"
+#include "openmm/AmoebaTorsionTorsionForce.h"
+#include "openmm/AmoebaMultipoleForce.h"
+#include "openmm/AmoebaGeneralizedKirkwoodForce.h"
+#include "openmm/AmoebaVdwForce.h"
+#include "openmm/AmoebaWcaDispersionForce.h"
+#include "openmm/AmoebaUreyBradleyForce.h"
+#include "openmm/internal/windowsExport.h"
+#include "openmm/internal/AmoebaWcaDispersionForceImpl.h"
 
 #include <ctime>
 #include <vector>

plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaPME.cpp

@@ -36,7 +36,7 @@
 #include "../../../tests/AssertionUtilities.h"
 #include "openmm/Context.h"
 #include "CudaPlatform.h"
-#include "AmoebaMultipoleForce.h"
+#include "openmm/AmoebaMultipoleForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
 #include "../src/SimTKUtilities/SimTKOpenMMRealType.h"

plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaTorsionTorsionForce.cpp

@@ -39,7 +39,7 @@ const double DegreesToRadians = 3.14159265/180.0;
 #include "openmm/Context.h"
 #include "AmoebaOpenMM.h"
 #include "openmm/System.h"
-#include "AmoebaTorsionTorsionForce.h"
+#include "openmm/AmoebaTorsionTorsionForce.h"
 #include "openmm/LangevinIntegrator.h"
 #include <iostream>
 #include <vector>

plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaVdwForce.cpp

@@ -38,7 +38,7 @@
 #include "openmm/Context.h"
 #include "AmoebaOpenMM.h"
 #include "openmm/System.h"
-#include "AmoebaVdwForce.h"
+#include "openmm/AmoebaVdwForce.h"
 #include "openmm/LangevinIntegrator.h"
 #include <iostream>
 #include <vector>