Commit 9111cca0 authored by peastman's avatar peastman
Browse files

Moved reference platform classes into OpenMM namespace

parent 8148f51d
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "openmm/internal/ThreadPool.h" #include "openmm/internal/ThreadPool.h"
#include "sfmt/SFMT.h" #include "sfmt/SFMT.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class CpuLangevinDynamics : public ReferenceStochasticDynamics { class CpuLangevinDynamics : public ReferenceStochasticDynamics {
public: public:
...@@ -95,6 +95,6 @@ private: ...@@ -95,6 +95,6 @@ private:
OpenMM::RealVec* xPrime; OpenMM::RealVec* xPrime;
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __CPU_LANGEVIN_DYNAMICS_H__ #endif // __CPU_LANGEVIN_DYNAMICS_H__
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "RealVec.h" #include "RealVec.h"
#include "GBVIParameters.h" #include "GBVIParameters.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class CpuGBVI { class CpuGBVI {
...@@ -311,6 +311,6 @@ class CpuGBVI { ...@@ -311,6 +311,6 @@ class CpuGBVI {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __CpuGBVI_H__ #endif // __CpuGBVI_H__
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "ObcParameters.h" #include "ObcParameters.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class CpuObc { class CpuObc {
...@@ -181,6 +181,6 @@ class CpuObc { ...@@ -181,6 +181,6 @@ class CpuObc {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __CpuObc_H__ #endif // __CpuObc_H__
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "SimTKOpenMMCommon.h" #include "SimTKOpenMMCommon.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class GBVIParameters { class GBVIParameters {
...@@ -337,5 +337,7 @@ class GBVIParameters { ...@@ -337,5 +337,7 @@ class GBVIParameters {
void setQuinticUpperBornRadiusLimit( RealOpenMM quinticUpperSplineLimit ); void setQuinticUpperBornRadiusLimit( RealOpenMM quinticUpperSplineLimit );
}; };
} // namespace OpenMM
#endif // __GBVIParameters_H__ #endif // __GBVIParameters_H__
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "SimTKOpenMMCommon.h" #include "SimTKOpenMMCommon.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ObcParameters { class ObcParameters {
...@@ -352,7 +352,7 @@ class ObcParameters { ...@@ -352,7 +352,7 @@ class ObcParameters {
const OpenMM::RealVec* getPeriodicBox(); const OpenMM::RealVec* getPeriodicBox();
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __ObcParameters_H__ #endif // __ObcParameters_H__
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "SimTKOpenMMCommon.h" #include "SimTKOpenMMCommon.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceAndersenThermostat { class ReferenceAndersenThermostat {
...@@ -70,6 +70,6 @@ class ReferenceAndersenThermostat { ...@@ -70,6 +70,6 @@ class ReferenceAndersenThermostat {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __ReferenceAndersenThermostat_H__ #endif // __ReferenceAndersenThermostat_H__
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "ReferenceBondIxn.h" #include "ReferenceBondIxn.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceAngleBondIxn : public ReferenceBondIxn { class ReferenceAngleBondIxn : public ReferenceBondIxn {
...@@ -86,6 +86,6 @@ class ReferenceAngleBondIxn : public ReferenceBondIxn { ...@@ -86,6 +86,6 @@ class ReferenceAngleBondIxn : public ReferenceBondIxn {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __ReferenceAngleBondIxn_H__ #endif // __ReferenceAngleBondIxn_H__
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "ReferenceForce.h" #include "ReferenceForce.h"
#include "ReferenceBondIxn.h" #include "ReferenceBondIxn.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class OPENMM_EXPORT ReferenceBondForce : public ReferenceForce { class OPENMM_EXPORT ReferenceBondForce : public ReferenceForce {
...@@ -74,6 +74,6 @@ class OPENMM_EXPORT ReferenceBondForce : public ReferenceForce { ...@@ -74,6 +74,6 @@ class OPENMM_EXPORT ReferenceBondForce : public ReferenceForce {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __ReferenceBondForce_H__ #endif // __ReferenceBondForce_H__
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "openmm/internal/windowsExport.h" #include "openmm/internal/windowsExport.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class OPENMM_EXPORT ReferenceBondIxn { class OPENMM_EXPORT ReferenceBondIxn {
...@@ -126,6 +126,6 @@ class OPENMM_EXPORT ReferenceBondIxn { ...@@ -126,6 +126,6 @@ class OPENMM_EXPORT ReferenceBondIxn {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __ReferenceBondIxn_H__ #endif // __ReferenceBondIxn_H__
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "ReferenceDynamics.h" #include "ReferenceDynamics.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceBrownianDynamics : public ReferenceDynamics { class ReferenceBrownianDynamics : public ReferenceDynamics {
...@@ -88,6 +88,6 @@ class ReferenceBrownianDynamics : public ReferenceDynamics { ...@@ -88,6 +88,6 @@ class ReferenceBrownianDynamics : public ReferenceDynamics {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __ReferenceBrownianDynamics_H__ #endif // __ReferenceBrownianDynamics_H__
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <vector> #include <vector>
#include <set> #include <set>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class OPENMM_EXPORT ReferenceCCMAAlgorithm : public ReferenceConstraintAlgorithm { class OPENMM_EXPORT ReferenceCCMAAlgorithm : public ReferenceConstraintAlgorithm {
...@@ -120,6 +120,6 @@ public: ...@@ -120,6 +120,6 @@ public:
} }
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __ReferenceCCMAAlgorithm_H__ #endif // __ReferenceCCMAAlgorithm_H__
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "ReferenceBondIxn.h" #include "ReferenceBondIxn.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceCMAPTorsionIxn : public ReferenceBondIxn { class ReferenceCMAPTorsionIxn : public ReferenceBondIxn {
...@@ -92,4 +92,6 @@ public: ...@@ -92,4 +92,6 @@ public:
}; };
} // namespace OpenMM
#endif // __ReferenceCMAPTorsionIxn_H__ #endif // __ReferenceCMAPTorsionIxn_H__
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include "SimTKOpenMMCommon.h" #include "SimTKOpenMMCommon.h"
#include "openmm/internal/windowsExport.h" #include "openmm/internal/windowsExport.h"
namespace OpenMM {
/** /**
* This abstract class defines the interface which constraint algorithms must implement. * This abstract class defines the interface which constraint algorithms must implement.
*/ */
...@@ -59,6 +61,6 @@ public: ...@@ -59,6 +61,6 @@ public:
std::vector<OpenMM::RealVec>& velocities, std::vector<RealOpenMM>& inverseMasses, RealOpenMM tolerance) = 0; std::vector<OpenMM::RealVec>& velocities, std::vector<RealOpenMM>& inverseMasses, RealOpenMM tolerance) = 0;
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __ReferenceConstraintAlgorithm_H__ #endif // __ReferenceConstraintAlgorithm_H__
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "ReferenceBondIxn.h" #include "ReferenceBondIxn.h"
#include "lepton/CompiledExpression.h" #include "lepton/CompiledExpression.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceCustomAngleIxn : public ReferenceBondIxn { class ReferenceCustomAngleIxn : public ReferenceBondIxn {
...@@ -78,6 +78,6 @@ class ReferenceCustomAngleIxn : public ReferenceBondIxn { ...@@ -78,6 +78,6 @@ class ReferenceCustomAngleIxn : public ReferenceBondIxn {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _ReferenceCustomAngleIxn___ #endif // _ReferenceCustomAngleIxn___
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "ReferenceBondIxn.h" #include "ReferenceBondIxn.h"
#include "lepton/CompiledExpression.h" #include "lepton/CompiledExpression.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceCustomBondIxn : public ReferenceBondIxn { class ReferenceCustomBondIxn : public ReferenceBondIxn {
...@@ -79,6 +79,6 @@ class ReferenceCustomBondIxn : public ReferenceBondIxn { ...@@ -79,6 +79,6 @@ class ReferenceCustomBondIxn : public ReferenceBondIxn {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _ReferenceCustomBondIxn___ #endif // _ReferenceCustomBondIxn___
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceCustomCompoundBondIxn : public ReferenceBondIxn { class ReferenceCustomCompoundBondIxn : public ReferenceBondIxn {
...@@ -169,4 +169,6 @@ public: ...@@ -169,4 +169,6 @@ public:
} }
}; };
} // namespace OpenMM
#endif // __ReferenceCustomCompoundBondIxn_H__ #endif // __ReferenceCustomCompoundBondIxn_H__
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceCustomDynamics : public ReferenceDynamics { class ReferenceCustomDynamics : public ReferenceDynamics {
private: private:
...@@ -121,6 +121,6 @@ public: ...@@ -121,6 +121,6 @@ public:
std::map<std::string, RealOpenMM>& globals, std::vector<std::vector<OpenMM::RealVec> >& perDof, bool& forcesAreValid); std::map<std::string, RealOpenMM>& globals, std::vector<std::vector<OpenMM::RealVec> >& perDof, bool& forcesAreValid);
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __ReferenceCustomDynamics_H__ #endif // __ReferenceCustomDynamics_H__
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "ReferenceCustomExternalIxn.h" #include "ReferenceCustomExternalIxn.h"
#include "lepton/CompiledExpression.h" #include "lepton/CompiledExpression.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceCustomExternalIxn { class ReferenceCustomExternalIxn {
...@@ -85,6 +85,6 @@ class ReferenceCustomExternalIxn { ...@@ -85,6 +85,6 @@ class ReferenceCustomExternalIxn {
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _ReferenceCustomBondIxn___ #endif // _ReferenceCustomBondIxn___
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <set> #include <set>
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceCustomGBIxn { class ReferenceCustomGBIxn {
...@@ -290,4 +290,6 @@ class ReferenceCustomGBIxn { ...@@ -290,4 +290,6 @@ class ReferenceCustomGBIxn {
}; };
} // namespace OpenMM
#endif // __ReferenceCustomGBIxn_H__ #endif // __ReferenceCustomGBIxn_H__
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <set> #include <set>
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class ReferenceCustomHbondIxn : public ReferenceBondIxn { class ReferenceCustomHbondIxn : public ReferenceBondIxn {
...@@ -198,4 +198,6 @@ public: ...@@ -198,4 +198,6 @@ public:
} }
}; };
} // namespace OpenMM
#endif // __ReferenceCustomHbondIxn_H__ #endif // __ReferenceCustomHbondIxn_H__
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment