Moved header files into an openmm subdirectory

olla/include/Kernel.h → olla/include/openmm/Kernel.h

@@ -33,7 +33,7 @@
  * -------------------------------------------------------------------------- */
 
 #include "KernelImpl.h"
-#include "internal/windowsExport.h"
+#include "openmm/internal/windowsExport.h"
 
 namespace OpenMM {
 

olla/include/KernelImpl.h → olla/include/openmm/KernelImpl.h

@@ -35,7 +35,7 @@
 #include "Platform.h"
 #include <string>
 #include <cassert>
-#include "internal/windowsExport.h"
+#include "openmm/internal/windowsExport.h"
 
 namespace OpenMM {
 

olla/include/Platform.h → olla/include/openmm/Platform.h

@@ -35,7 +35,7 @@
 #include "Stream.h"
 #include <map>
 #include <vector>
-#include "internal/windowsExport.h"
+#include "openmm/internal/windowsExport.h"
 
 namespace OpenMM {
 

olla/include/Stream.h → olla/include/openmm/Stream.h

@@ -33,7 +33,7 @@
  * -------------------------------------------------------------------------- */
 
 #include <string>
-#include "internal/windowsExport.h"
+#include "openmm/internal/windowsExport.h"
 
 namespace OpenMM {
 

olla/include/StreamFactory.h → olla/include/openmm/StreamFactory.h

@@ -33,7 +33,7 @@
  * -------------------------------------------------------------------------- */
 
 #include "StreamImpl.h"
-#include "internal/windowsExport.h"
+#include "openmm/internal/windowsExport.h"
 
 namespace OpenMM {
 

olla/include/kernels.h → olla/include/openmm/kernels.h

@@ -32,21 +32,21 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "AndersenThermostat.h"
-#include "BrownianIntegrator.h"
-#include "CMMotionRemover.h"
-#include "GBSAOBCForce.h"
-#include "GBVIForce.h"
-#include "HarmonicAngleForce.h"
-#include "HarmonicBondForce.h"
-#include "KernelImpl.h"
-#include "LangevinIntegrator.h"
-#include "PeriodicTorsionForce.h"
-#include "RBTorsionForce.h"
-#include "NonbondedForce.h"
-#include "Stream.h"
-#include "System.h"
-#include "VerletIntegrator.h"
+#include "openmm/AndersenThermostat.h"
+#include "openmm/BrownianIntegrator.h"
+#include "openmm/CMMotionRemover.h"
+#include "openmm/GBSAOBCForce.h"
+#include "openmm/GBVIForce.h"
+#include "openmm/HarmonicAngleForce.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/KernelImpl.h"
+#include "openmm/LangevinIntegrator.h"
+#include "openmm/PeriodicTorsionForce.h"
+#include "openmm/RBTorsionForce.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/Stream.h"
+#include "openmm/System.h"
+#include "openmm/VerletIntegrator.h"
 #include <set>
 #include <string>
 #include <vector>

olla/src/Kernel.cpp

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

olla/src/KernelImpl.cpp

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

olla/src/Platform.cpp

@@ -29,12 +29,12 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "Platform.h"
-#include "OpenMMException.h"
-#include "Kernel.h"
-#include "Stream.h"
-#include "KernelFactory.h"
-#include "StreamFactory.h"
+#include "openmm/Platform.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/Kernel.h"
+#include "openmm/Stream.h"
+#include "openmm/KernelFactory.h"
+#include "openmm/StreamFactory.h"
 #ifdef WIN32
 #include <windows.h>
 #include <sstream>

olla/src/Stream.cpp

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

olla/src/StreamImpl.cpp

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

openmmapi/include/OpenMM.h

+#ifndef OPENMM_H_
+#define OPENMM_H_
+
+/* -------------------------------------------------------------------------- *
+ *                                   OpenMM                                   *
+ * -------------------------------------------------------------------------- *
+ * This is part of the OpenMM molecular simulation toolkit originating from   *
+ * Simbios, the NIH National Center for Physics-Based Simulation of           *
+ * Biological Structures at Stanford, funded under the NIH Roadmap for        *
+ * Medical Research, grant U54 GM072970. See https://simtk.org.               *
+ *                                                                            *
+ * Portions copyright (c) 2009 Stanford University and the Authors.           *
+ * Authors: Peter Eastman                                                     *
+ * Contributors:                                                              *
+ *                                                                            *
+ * Permission is hereby granted, free of charge, to any person obtaining a    *
+ * copy of this software and associated documentation files (the "Software"), *
+ * to deal in the Software without restriction, including without limitation  *
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,   *
+ * and/or sell copies of the Software, and to permit persons to whom the      *
+ * Software is furnished to do so, subject to the following conditions:       *
+ *                                                                            *
+ * The above copyright notice and this permission notice shall be included in *
+ * all copies or substantial portions of the Software.                        *
+ *                                                                            *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   *
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    *
+ * THE AUTHORS, CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,    *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR      *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE  *
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
+ * -------------------------------------------------------------------------- */
+
+#include "openmm/AndersenThermostat.h"
+#include "openmm/BrownianIntegrator.h"
+#include "openmm/CMMotionRemover.h"
+#include "openmm/Force.h"
+#include "openmm/GBSAOBCForce.h"
+#include "openmm/GBVIForce.h"
+#include "openmm/HarmonicAngleForce.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/Integrator.h"
+#include "openmm/LangevinIntegrator.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/PeriodicTorsionForce.h"
+#include "openmm/RBTorsionForce.h"
+#include "openmm/State.h"
+#include "openmm/System.h"
+#include "openmm/Vec3.h"
+#include "openmm/VerletIntegrator.h"
+#include "openmm/Platform.h"
+
+#endif /*OPENMM_H_*/

openmmapi/include/BrownianIntegrator.h → openmmapi/include/openmm/BrownianIntegrator.h

@@ -33,7 +33,7 @@
  * -------------------------------------------------------------------------- */
 
 #include "Integrator.h"
-#include "Kernel.h"
+#include "openmm/Kernel.h"
 #include "internal/windowsExport.h"
 
 namespace OpenMM {