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 "AmoebaReferenceWcaDispersionForce.h" #include "AmoebaReferenceWcaDispersionForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
AmoebaReferenceWcaDispersionForce::AmoebaReferenceWcaDispersionForce( RealOpenMM epso, RealOpenMM epsh, RealOpenMM rmino, RealOpenMM rminh, AmoebaReferenceWcaDispersionForce::AmoebaReferenceWcaDispersionForce( RealOpenMM epso, RealOpenMM epsh, RealOpenMM rmino, RealOpenMM rminh,
RealOpenMM awater, RealOpenMM shctd, RealOpenMM dispoff, RealOpenMM slevy ) : RealOpenMM awater, RealOpenMM shctd, RealOpenMM dispoff, RealOpenMM slevy ) :
......
...@@ -30,9 +30,7 @@ ...@@ -30,9 +30,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
using namespace OpenMM; namespace OpenMM {
// ---------------------------------------------------------------------------------------
class AmoebaReferenceWcaDispersionForce { class AmoebaReferenceWcaDispersionForce {
...@@ -118,6 +116,6 @@ private: ...@@ -118,6 +116,6 @@ private:
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // _AmoebaReferenceWcaDispersionForce___ #endif // _AmoebaReferenceWcaDispersionForce___
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