Commit 25a308e6 authored by peastman's avatar peastman
Browse files

Moved AMOEBA reference code into OpenMM namespace

parent f72062af
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "AmoebaReferenceAngleForce.h" #include "AmoebaReferenceAngleForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "RealVec.h" #include "RealVec.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class AmoebaReferenceAngleForce { class AmoebaReferenceAngleForce {
...@@ -137,6 +137,6 @@ private: ...@@ -137,6 +137,6 @@ private:
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _AmoebaReferenceAngleForce___ #endif // _AmoebaReferenceAngleForce___
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "AmoebaReferenceForce.h" #include "AmoebaReferenceForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "RealVec.h" #include "RealVec.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class AmoebaReferenceBondForce { class AmoebaReferenceBondForce {
...@@ -102,6 +102,6 @@ private: ...@@ -102,6 +102,6 @@ private:
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _AmoebaReferenceBondForce___ #endif // _AmoebaReferenceBondForce___
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "AmoebaReferenceForce.h" #include "AmoebaReferenceForce.h"
#include <vector> #include <vector>
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "openmm/Vec3.h" #include "openmm/Vec3.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class AmoebaReferenceForce { class AmoebaReferenceForce {
...@@ -137,6 +137,6 @@ public: ...@@ -137,6 +137,6 @@ public:
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _AmoebaReferenceForce___ #endif // _AmoebaReferenceForce___
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "AmoebaReferenceGeneralizedKirkwoodForce.h" #include "AmoebaReferenceGeneralizedKirkwoodForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
AmoebaReferenceGeneralizedKirkwoodForce::AmoebaReferenceGeneralizedKirkwoodForce( ) : _numParticles(0), AmoebaReferenceGeneralizedKirkwoodForce::AmoebaReferenceGeneralizedKirkwoodForce( ) : _numParticles(0),
_includeCavityTerm(1), _includeCavityTerm(1),
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
// --------------------------------------------------------------------------------------- namespace OpenMM {
class AmoebaReferenceGeneralizedKirkwoodForce { class AmoebaReferenceGeneralizedKirkwoodForce {
...@@ -251,4 +251,6 @@ private: ...@@ -251,4 +251,6 @@ private:
}; };
} // namespace OpenMM
#endif // _AmoebaReferenceGeneralizedKirkwoodForce___ #endif // _AmoebaReferenceGeneralizedKirkwoodForce___
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "AmoebaReferenceInPlaneAngleForce.h" #include "AmoebaReferenceInPlaneAngleForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "RealVec.h" #include "RealVec.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class AmoebaReferenceInPlaneAngleForce { class AmoebaReferenceInPlaneAngleForce {
...@@ -140,6 +140,6 @@ private: ...@@ -140,6 +140,6 @@ private:
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _AmoebaReferenceInPlaneAngleForce___ #endif // _AmoebaReferenceInPlaneAngleForce___
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "openmm/internal/MSVC_erfc.h" #include "openmm/internal/MSVC_erfc.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
#undef AMOEBA_DEBUG #undef AMOEBA_DEBUG
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#include "fftpack.h" #include "fftpack.h"
#include <complex> #include <complex>
namespace OpenMM {
typedef std::map< unsigned int, RealOpenMM> MapIntRealOpenMM; typedef std::map< unsigned int, RealOpenMM> MapIntRealOpenMM;
typedef MapIntRealOpenMM::iterator MapIntRealOpenMMI; typedef MapIntRealOpenMM::iterator MapIntRealOpenMMI;
typedef MapIntRealOpenMM::const_iterator MapIntRealOpenMMCI; typedef MapIntRealOpenMM::const_iterator MapIntRealOpenMMCI;
...@@ -1664,4 +1666,6 @@ private: ...@@ -1664,4 +1666,6 @@ private:
}; };
} // namespace OpenMM
#endif // _AmoebaReferenceMultipoleForce___ #endif // _AmoebaReferenceMultipoleForce___
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "AmoebaReferenceOutOfPlaneBendForce.h" #include "AmoebaReferenceOutOfPlaneBendForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "RealVec.h" #include "RealVec.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class AmoebaReferenceOutOfPlaneBendForce { class AmoebaReferenceOutOfPlaneBendForce {
...@@ -114,6 +114,6 @@ private: ...@@ -114,6 +114,6 @@ private:
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _AmoebaReferenceOutOfPlaneBendForce___ #endif // _AmoebaReferenceOutOfPlaneBendForce___
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <vector> #include <vector>
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "RealVec.h" #include "RealVec.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class AmoebaReferencePiTorsionForce { class AmoebaReferencePiTorsionForce {
...@@ -109,6 +109,6 @@ private: ...@@ -109,6 +109,6 @@ private:
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _AmoebaReferencePiTorsionForce___ #endif // _AmoebaReferencePiTorsionForce___
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <vector> #include <vector>
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "RealVec.h" #include "RealVec.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class AmoebaReferenceStretchBendForce { class AmoebaReferenceStretchBendForce {
...@@ -110,6 +110,6 @@ private: ...@@ -110,6 +110,6 @@ private:
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _AmoebaReferenceStretchBendForce___ #endif // _AmoebaReferenceStretchBendForce___
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "AmoebaReferenceTorsionTorsionForce.h" #include "AmoebaReferenceTorsionTorsionForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "RealVec.h" #include "RealVec.h"
#include <vector> #include <vector>
// --------------------------------------------------------------------------------------- namespace OpenMM {
class AmoebaReferenceTorsionTorsionForce { class AmoebaReferenceTorsionTorsionForce {
...@@ -212,6 +212,6 @@ private: ...@@ -212,6 +212,6 @@ private:
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _AmoebaReferenceTorsionTorsionForce___ #endif // _AmoebaReferenceTorsionTorsionForce___
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