Moved header files into an openmm subdirectory

openmmapi/src/NonbondedForce.cpp

@@ -29,10 +29,10 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "Force.h"
-#include "OpenMMException.h"
-#include "NonbondedForce.h"
-#include "internal/NonbondedForceImpl.h"
+#include "openmm/Force.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/internal/NonbondedForceImpl.h"
 #include <cmath>
 #include <utility>
 

openmmapi/src/NonbondedForceImpl.cpp

@@ -29,10 +29,10 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "OpenMMException.h"
-#include "internal/OpenMMContextImpl.h"
-#include "internal/NonbondedForceImpl.h"
-#include "kernels.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/internal/NonbondedForceImpl.h"
+#include "openmm/kernels.h"
 #include <sstream>
 
 using namespace OpenMM;

openmmapi/src/OpenMMContext.cpp

@@ -29,9 +29,9 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "OpenMMContext.h"
-#include "internal/OpenMMContextImpl.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/OpenMMException.h"
 
 using namespace OpenMM;
 using namespace std;

openmmapi/src/OpenMMContextImpl.cpp

@@ -29,13 +29,13 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "Force.h"
-#include "Integrator.h"
-#include "OpenMMException.h"
-#include "System.h"
-#include "kernels.h"
-#include "internal/ForceImpl.h"
-#include "internal/OpenMMContextImpl.h"
+#include "openmm/Force.h"
+#include "openmm/Integrator.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/System.h"
+#include "openmm/kernels.h"
+#include "openmm/internal/ForceImpl.h"
+#include "openmm/internal/OpenMMContextImpl.h"
 #include <map>
 #include <vector>
 

openmmapi/src/PeriodicTorsionForce.cpp

@@ -29,10 +29,10 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "Force.h"
-#include "OpenMMException.h"
-#include "PeriodicTorsionForce.h"
-#include "internal/PeriodicTorsionForceImpl.h"
+#include "openmm/Force.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/PeriodicTorsionForce.h"
+#include "openmm/internal/PeriodicTorsionForceImpl.h"
 
 using namespace OpenMM;
 

openmmapi/src/PeriodicTorsionForceImpl.cpp

@@ -29,9 +29,9 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "internal/OpenMMContextImpl.h"
-#include "internal/PeriodicTorsionForceImpl.h"
-#include "kernels.h"
+#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/internal/PeriodicTorsionForceImpl.h"
+#include "openmm/kernels.h"
 
 using namespace OpenMM;
 using std::pair;

openmmapi/src/RBTorsionForce.cpp

@@ -29,10 +29,10 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "Force.h"
-#include "OpenMMException.h"
-#include "RBTorsionForce.h"
-#include "internal/RBTorsionForceImpl.h"
+#include "openmm/Force.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/RBTorsionForce.h"
+#include "openmm/internal/RBTorsionForceImpl.h"
 
 using namespace OpenMM;
 

openmmapi/src/RBTorsionForceImpl.cpp

@@ -29,9 +29,9 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "internal/OpenMMContextImpl.h"
-#include "internal/RBTorsionForceImpl.h"
-#include "kernels.h"
+#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/internal/RBTorsionForceImpl.h"
+#include "openmm/kernels.h"
 
 using namespace OpenMM;
 using std::pair;

openmmapi/src/State.cpp

@@ -29,8 +29,8 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "OpenMMException.h"
-#include "State.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/State.h"
 
 using namespace OpenMM;
 using namespace std;

openmmapi/src/System.cpp

@@ -29,8 +29,8 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "Force.h"
-#include "System.h"
+#include "openmm/Force.h"
+#include "openmm/System.h"
 
 using namespace OpenMM;
 

openmmapi/src/VerletIntegrator.cpp

@@ -29,10 +29,10 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "VerletIntegrator.h"
-#include "OpenMMContext.h"
-#include "internal/OpenMMContextImpl.h"
-#include "kernels.h"
+#include "openmm/VerletIntegrator.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/kernels.h"
 #include <string>
 
 using namespace OpenMM;

platforms/brook/include/BrookKernelFactory.h

@@ -32,7 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "KernelFactory.h"
+#include "openmm/KernelFactory.h"
 
 namespace OpenMM {
 

platforms/brook/include/BrookPlatform.h

@@ -36,7 +36,7 @@
 
 #define BrookOpenMMFloat float
 
-#include "Platform.h"
+#include "openmm/Platform.h"
 #include "BrookStreamFactory.h"
 
 namespace OpenMM {

platforms/brook/include/BrookStreamFactory.h

@@ -32,8 +32,8 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "StreamFactory.h"
-#include "Platform.h"
+#include "openmm/StreamFactory.h"
+#include "openmm/Platform.h"
 
 namespace OpenMM {
 

platforms/brook/src/BrookBondParameters.cpp

@@ -31,7 +31,7 @@
 
 #include <sstream>
 #include "BrookBondParameters.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 
 using namespace OpenMM;
 using namespace std;

platforms/brook/src/BrookBonded.cpp

@@ -34,7 +34,7 @@
 #include "BrookBonded.h"
 #include "BrookPlatform.h"
 #include "BrookStreamFactory.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include "kernels/kinvmap_gather.h"
 #include "kernels/invmap.h"
 #include "kernels/kforce.h"

platforms/brook/src/BrookBonded.h

@@ -36,7 +36,7 @@
 
 #include "BrookStreamImpl.h"
 #include "BrookCommon.h"
-#include "OpenMMContext.h"
+#include "openmm/OpenMMContext.h"
 #include "BrookBondParameters.h"
 
 namespace OpenMM {

platforms/brook/src/BrookCalcGBSAOBCForceKernel.cpp

@@ -31,7 +31,7 @@
 
 #include <cmath>
 #include <limits>
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include <sstream>
 
 #include "BrookStreamImpl.h"

platforms/brook/src/BrookCalcGBSAOBCForceKernel.h

@@ -32,7 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "kernels.h"
+#include "openmm/kernels.h"
 #include "../../reference/src/SimTKUtilities/SimTKOpenMMRealType.h"
 #include "BrookGbsa.h"
 #include "OpenMMBrookInterface.h"

platforms/brook/src/BrookCalcHarmonicAngleForceKernel.cpp

@@ -29,7 +29,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include <sstream>
 #include "BrookCalcHarmonicAngleForceKernel.h"